Skip to content

Commit

Permalink
Recipe Managment (#2934)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Sorts all the crafting recipes into there own category while removing
some "cruft" recipes
Removes some recipes but some of them are just because they already
exist in sheet recipes
Look at the last commit for recipes removed

Part 1 of Spaceman detribalization because I have to split up this pr or
tghvr will behead me

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Makes it easier to manage recipes and removes some bad ones to clean up
the recipe list
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: deleted some bad recipes like a golden horn, black carpet, aitater,
and legion staff
code: organized recipe files
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
FalloutFalcon authored May 20, 2024
1 parent f41723d commit 732dab1
Show file tree
Hide file tree
Showing 15 changed files with 922 additions and 1,263 deletions.
1,109 changes: 0 additions & 1,109 deletions code/datums/components/crafting/recipes.dm

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/hudsunsecremoval
name = "Security HUD removal"
result = /obj/item/clothing/glasses/sunglasses
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/hudsunmed
name = "Medical HUDsunglasses"
result = /obj/item/clothing/glasses/hud/health/sunglasses
Expand All @@ -93,14 +85,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/hudsunmedremoval
name = "Medical HUD removal"
result = /obj/item/clothing/glasses/sunglasses
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/hudsundiag
name = "Diagnostic HUDsunglasses"
result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
Expand All @@ -113,14 +97,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/hudsundiagremoval
name = "Diagnostic HUD removal"
result = /obj/item/clothing/glasses/sunglasses
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/sciencesunglasses
name = "Science Sunglasses"
result = /obj/item/clothing/glasses/sunglasses/chemical
Expand All @@ -133,14 +109,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/sciencesunglassesremoval
name = "Science Sunglasses Dissemble"
result = /obj/item/clothing/glasses/sunglasses
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/medhudglasses // The prescription HUD glasses. This long to have them... #Lianvee
name = "MedicalHUD Prescription Glasses"
result = /obj/item/clothing/glasses/hud/health/prescription
Expand All @@ -153,14 +121,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/medhudglassesremoval
name = "MedicalHUD Prescription Glasses Disassembly"
result = /obj/item/clothing/glasses/regular
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/health/prescription = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/sechudglasses
name = "SecurityHUD Prescription Glasses"
result = /obj/item/clothing/glasses/hud/security/prescription
Expand All @@ -173,14 +133,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/sechudglassesremoval
name = "SecurityHUD Prescription Glasses Disassembly"
result = /obj/item/clothing/glasses/regular
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/security/prescription = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/mesonglasses
name = "Meson Prescription Glasses"
result = /obj/item/clothing/glasses/meson/prescription
Expand All @@ -193,14 +145,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/mesonglassesremoval
name = "Meson Prescription Glasses Disassembly"
result = /obj/item/clothing/glasses/regular
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/meson/prescription = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/scienceglasses
name = "Science Prescription Glasses"
result = /obj/item/clothing/glasses/science/prescription
Expand All @@ -213,14 +157,6 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/scienceglassesremoval
name = "Science Prescription Glasses Disassembly"
result = /obj/item/clothing/glasses/regular
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/science/prescription = 1)
category = CAT_CLOTHING

// Misc.
/datum/crafting_recipe/ghostsheet
name = "Ghost Sheet"
Expand All @@ -236,3 +172,21 @@
reqs = list(/obj/item/stack/sheet/leather = 2)
time = 45
category = CAT_CLOTHING

/datum/crafting_recipe/gripperoffbrand
name = "Improvised Gripper Gloves"
reqs = list(
/obj/item/clothing/gloves/fingerless = 1,
/obj/item/stack/tape = 1)
result = /obj/item/clothing/gloves/tackler/offbrand
category = CAT_CLOTHING

/datum/crafting_recipe/scrap_armor
name = "Scrap Armor"
result = /obj/item/clothing/suit/armor/vest/scrap_armor
time = 60
reqs = list(
/obj/item/stack/sheet/metal = 10,
/obj/item/stack/cable_coil = 20,
)
category = CAT_CLOTHING
52 changes: 52 additions & 0 deletions code/datums/components/crafting/recipes/drink.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/datum/crafting_recipe/umbrellared
name = "Red Drink Umbrella"
result = /obj/item/garnish/umbrellared
time = 1 SECONDS
tools = list(/obj/item/toy/crayon/spraycan)
reqs = list(
/obj/item/paper = 1,
/obj/item/stack/rods = 1)
category = CAT_DRINK

/datum/crafting_recipe/umbrellablue
name = "Blue Drink Umbrella"
result = /obj/item/garnish/umbrellablue
time = 1 SECONDS
tools = list(/obj/item/toy/crayon/spraycan)
reqs = list(
/obj/item/paper = 1,
/obj/item/stack/rods = 1)
category = CAT_DRINK

/datum/crafting_recipe/umbrellagreen
name = "Green Drink Umbrella"
result = /obj/item/garnish/umbrellagreen
time = 1 SECONDS
tools = list(/obj/item/toy/crayon/spraycan)
reqs = list(
/obj/item/paper = 1,
/obj/item/stack/rods = 1)
category = CAT_DRINK

/datum/crafting_recipe/ash_garnish
name = "Ash Garnish"
result = /obj/item/garnish/ash
reqs = list(/datum/reagent/ash = 10)
time = 5
category = CAT_DRINK

/datum/crafting_recipe/salt_garnish
name = "Salt Garnish"
result = /obj/item/garnish/salt
reqs = list(/datum/reagent/consumable/sodiumchloride = 10)
time = 5
category = CAT_DRINK

/datum/crafting_recipe/breakawayflask
name = "Breakaway Flask"
result = /obj/item/reagent_containers/food/drinks/breakawayflask
time = 5 SECONDS
reqs = list(/obj/item/stack/sheet/glass = 5,
/obj/item/stack/sheet/mineral/plasma = 1)
tools = list(TOOL_WELDER)
category = CAT_DRINK
Loading

0 comments on commit 732dab1

Please sign in to comment.