Skip to content

Commit

Permalink
New Tablecrafting Catagories (#2102)
Browse files Browse the repository at this point in the history
Tablecrafting is a bit bloated with the large amount of slime jelly doughnut varients and other stuff so ive made a new catagory and put the stranger recipies in there. I also made several odd recipies require to be learned first since they were contributing to the bloat.

moves around stuff

Create tools.dm
  • Loading branch information
InsightfulParasite authored May 18, 2024
1 parent d87a7de commit a68f0a7
Show file tree
Hide file tree
Showing 36 changed files with 3,866 additions and 3,620 deletions.
4 changes: 2 additions & 2 deletions ModularTegustation/tegufood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
/obj/item/food/chocolatebar = 2
)
result = /obj/item/food/cake/bbird
subcategory = CAT_CAKE
subcategory = CAT_PASTRY

/obj/item/food/sundae/jbird
name = "Judgement sundae"
Expand All @@ -74,7 +74,7 @@
/obj/item/food/icecream = 1
)
result = /obj/item/food/sundae/jbird
subcategory = CAT_ICE
subcategory = CAT_MISCFOOD

/obj/item/food/apoctrifle
name = "Apocalypse trifle"
Expand Down
10 changes: 4 additions & 6 deletions code/__DEFINES/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,22 @@
#define CAT_AMMO "Ammunition"
#define CAT_ROBOT "Robots"
#define CAT_MISC "Misc"
#define CAT_PRIMAL "Tribal"
#define CAT_TOOL "Tools"
#define CAT_STRUCT "Structures"
#define CAT_CLOTHING "Clothing"
#define CAT_FOOD "Foods"
#define CAT_BREAD "Breads"
#define CAT_BURGER "Burgers"
#define CAT_CAKE "Cakes"
#define CAT_EGG "Egg-Based Food"
#define CAT_MEAT "Meats"
#define CAT_MISCFOOD "Misc. Food"
#define CAT_PASTRY "Pastries"
#define CAT_PIE "Pies"
#define CAT_PIZZA "Pizzas"
#define CAT_SALAD "Salads"
#define CAT_SANDWICH "Sandwiches"
#define CAT_SOUP "Soups"
#define CAT_SPAGHETTI "Spaghettis"
#define CAT_ICE "Frozen"
#define CAT_UNUSUAL "Unusual"
#define CAT_DRINK "Drinks"
#define CAT_SILK "Silkcrafting"

// these aren't even used as bitflags so who even knows why they are treated like them
#define RCD_FLOORWALL (1<<0)
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
/obj/item/clothing/head/helmet/abductor = 1,
/obj/item/clothing/head/helmet/justice =1,
/obj/item/clothing/suit/space/hardsuit/carp = 1,
/obj/item/book/granter/crafting_recipe/pipegun_prime =1,
/obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool.
/obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1
/obj/item/clothing/shoes/jackboots/fast = 1,
Expand Down
49 changes: 23 additions & 26 deletions code/datums/components/crafting/crafting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,29 @@
var/viewing_category = 1 //typical powergamer starting on the Weapons tab
var/viewing_subcategory = 1
var/list/categories = list(
CAT_WEAPONRY = list(
CAT_WEAPON,
CAT_AMMO,
),
CAT_ROBOT = CAT_NONE,
CAT_MISC = CAT_NONE,
CAT_PRIMAL = CAT_NONE,
CAT_FOOD = list(
CAT_BREAD,
CAT_BURGER,
CAT_CAKE,
CAT_EGG,
CAT_ICE,
CAT_MEAT,
CAT_MISCFOOD,
CAT_PASTRY,
CAT_PIE,
CAT_PIZZA,
CAT_SALAD,
CAT_SANDWICH,
CAT_SOUP,
CAT_SPAGHETTI,
),
CAT_DRINK = CAT_NONE,
CAT_CLOTHING = CAT_NONE,
)
CAT_WEAPONRY = list(
CAT_WEAPON,
CAT_AMMO,
),
CAT_MISC = CAT_NONE,
CAT_CLOTHING = CAT_NONE,
CAT_STRUCT = CAT_NONE,
CAT_FOOD = list(
CAT_BREAD,
CAT_MEAT,
CAT_PASTRY,
CAT_PIZZA,
CAT_SALAD,
CAT_SANDWICH,
CAT_SOUP,
CAT_SPAGHETTI,
CAT_UNUSUAL,
CAT_MISCFOOD,
),
CAT_DRINK = CAT_NONE,
CAT_ROBOT = CAT_NONE,
CAT_SILK = CAT_NONE,
)

var/cur_category = CAT_NONE
var/cur_subcategory = CAT_NONE
Expand Down
Loading

0 comments on commit a68f0a7

Please sign in to comment.