Skip to content

Commit

Permalink
Crafting Cruft Removal (shiptest-ss13#3296)
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. -->
Removes the following recipes because:

Clothing
- Scrap Armor - it sucks, it's ugly, it's expensive and it's honestly a
bait to have it craftable

Drinks
- Holy Water Flask - god died
- Nothing Bottle - mimes died

Misc
- Flashlight eyes - just why.
- Extendo-hand - TG slop
- Guillotine - meme item
- Moth Plushie - plushies are cool, but the recipe itself is a meme

Robots
- Honkbot - clowns died

Tribal
- Bonfire, Distiller, Mushroom Bowl and Charcoal Stylus moved to Misc -
they are okay
- Bone Spear, Bone Axe and Bone Sword moved to Weapons - Hate to keep
them, but there isn't really any other okay melee weapons available,
outside of the crusher I suppose, but that one's inconsitent to get.
- Bone Armlet, Wolf Fang Necklace, Goliath Cloak, Hunters Belt and Polar
Cloak moved to Clothing - they are okay
- **Everything else got removed, including the category itself** - it's
about time to let ash walker gear go I think

Weapons/Ammunition
- Explosive Lance - item's definitely on the goofier side
- Teleprod - teleportation is often fucked
- Gonbola - gondolas barely exist, might as well axe it
- Flamethrower - feels like this should be locked behind more than
crafting
- Chainsaw moved to Misc - it's a gardening tool, you MANIACS
- Pipe Bow and All The Arrows - bows are kinda broken rn? Commented it
out cuz feels like it can be used later, but having broken stuff here is
dumb.

**Note here: It's just the crafting recipes, not foods themselves.
Crafting cleanup, not food cleanup.**

Breads
- Mimana Bread - mimes died

Burgers
- Ghost Burger - magic is not real
- Clown Burger - clowns died
- Mime Burger - mimes died
- Spellburger I and II - magic is not real

Cakes
- Slime Cake - you are NOT getting slime extracts for this
- Angel Food Cake's recipe was changed - god died, so it uses cream
instead of holy water
- Clown Cake - clowns died

Frozen
- Honkdae - clowns died
- Mime Snowcone - mimes died
- Clown Snowcone - clowns died
- Also renamed all the cola cones according to names from the drink
rename

Meats
- Meat Clown - clowns died

Pastries
- Honk-pockets - clowns died

Pies
- Mime Tart - mimes died

Salads
- Monkey's Delight - it's very questionable

Soups
- Clowns Tears - clowns died

Spaghettis
- Spesslaw - space law died

Egg-Based Foods, Pizzas, Sandwiches
- Nothing :D

Also, removes flamethrower slapcrafting for the same reason that's
above.

Also removes bone clup, skull helmets and bone armor from bone
construction menu.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Explained for every item individually.
<!-- 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. -->

:cl:
del: Removed a lot of cruft from the loadout.
del: Removed flamethrower slapcrafting.
del: Removed the Tribal crafting tab (some items were moved to other
tabs).
del: Removed bone club, skull helmet and bone armor from the bone
construction menu.
/: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
Sadhorizon authored and MysticalFaceLesS committed Sep 11, 2024
1 parent 77637ae commit 929584d
Show file tree
Hide file tree
Showing 20 changed files with 121 additions and 341 deletions.
1 change: 0 additions & 1 deletion code/datums/components/crafting/crafting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
),
CAT_ROBOT = CAT_NONE,
CAT_MISC = CAT_NONE,
CAT_PRIMAL = CAT_NONE,
CAT_FOOD = list(
CAT_BREAD,
CAT_BURGER,
Expand Down
49 changes: 41 additions & 8 deletions code/datums/components/crafting/recipes/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,45 @@
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,
)
/datum/crafting_recipe/bonearmlet
name = "Bone Armlet"
result = /obj/item/clothing/accessory/bonearmlet
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/fangnecklace
name = "Wolf Fang Necklace"
result = /obj/item/clothing/neck/fangnecklace
time = 20
reqs = list(/obj/item/stack/sheet/sinew = 2,
/obj/item/crusher_trophy/fang = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/goliathcloak
name = "Goliath Cloak"
result = /obj/item/clothing/suit/hooded/cloak/goliath
time = 50
reqs = list(/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2) //it takes 4 goliaths to make 1 cloak if the plates are skinned
category = CAT_CLOTHING

/datum/crafting_recipe/hunterbelt
name = "Hunters Belt"
result = /obj/item/storage/belt/mining/primitive
time = 20
reqs = list(/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
category = CAT_CLOTHING

/datum/crafting_recipe/polarbearcloak
name = "Polar Cloak"
result = /obj/item/clothing/suit/hooded/cloak/goliath/polar
time = 50
reqs = list(/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 2)
blacklist = list(/obj/item/stack/sheet/animalhide/goliath_hide)
category = CAT_CLOTHING
76 changes: 41 additions & 35 deletions code/datums/components/crafting/recipes/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@
reqs = list(/obj/item/paper = 5)
category = CAT_MISC

/datum/crafting_recipe/flashlight_eyes
name = "Flashlight Eyes"
result = /obj/item/organ/eyes/robotic/flashlight
time = 10
reqs = list(
/obj/item/flashlight = 2,
/obj/item/restraints/handcuffs/cable = 1
)
category = CAT_MISC

/datum/crafting_recipe/paperframes
name = "Paper Frames"
result = /obj/item/stack/sheet/paperframes/five
Expand Down Expand Up @@ -87,12 +77,6 @@
result = /obj/structure/curtain
category = CAT_MISC

/datum/crafting_recipe/extendohand
name = "Extendo-Hand"
reqs = list(/obj/item/bodypart/r_arm/robot = 1, /obj/item/clothing/gloves/boxing = 1)
result = /obj/item/extendohand
category = CAT_MISC

/datum/crafting_recipe/pressureplate
name = "Pressure Plate"
result = /obj/item/pressure_plate
Expand All @@ -104,23 +88,13 @@
category = CAT_MISC

/datum/crafting_recipe/rcl
name = "Makeshift Rapid Pipe Cleaner Layer"
name = "Makeshift Rapid Cable Layer"
result = /obj/item/rcl/ghetto
time = 40
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
reqs = list(/obj/item/stack/sheet/metal = 15)
category = CAT_MISC

/datum/crafting_recipe/guillotine
name = "Guillotine"
result = /obj/structure/guillotine
time = 150 // Building a functioning guillotine takes time
reqs = list(/obj/item/stack/sheet/plasteel = 3,
/obj/item/stack/sheet/mineral/wood = 20,
/obj/item/stack/cable_coil = 10)
tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
category = CAT_MISC

/datum/crafting_recipe/ghettojetpack
name = "Improvised Jetpack"
result = /obj/item/tank/jetpack/improvised
Expand Down Expand Up @@ -204,17 +178,49 @@
/obj/item/aquarium_kit = 1)
category = CAT_MISC

/datum/crafting_recipe/mothplush
name = "Moth Plushie"
result = /obj/item/toy/plush/moth
reqs = list(/obj/item/stack/sheet/animalhide/mothroach = 1,
/obj/item/organ/heart = 1,
/obj/item/stack/sheet/cotton/cloth = 3)
category = CAT_MISC

/datum/crafting_recipe/candorupgrade
name = "Candor Upgrade"
result = /obj/item/gun/ballistic/automatic/pistol/candor/phenex
reqs = list(/obj/item/stack/sheet/mineral/hidden = 4,
/obj/item/gun/ballistic/automatic/pistol/candor = 1)
category = CAT_MISC

/datum/crafting_recipe/bonfire
name = "Bonfire"
time = 60
reqs = list(/obj/item/grown/log = 5)
parts = list(/obj/item/grown/log = 5)
blacklist = list(/obj/item/grown/log/steel)
result = /obj/structure/bonfire
category = CAT_MISC

/datum/crafting_recipe/distiller
name = "Distiller"
result = /obj/structure/fermenting_barrel/distiller
reqs = list(/obj/item/stack/sheet/mineral/wood = 8, /obj/item/stack/sheet/metal = 5, /datum/reagent/srm_bacteria = 30)
time = 50
category = CAT_MISC

/datum/crafting_recipe/charcoal_stylus
name = "Charcoal Stylus"
result = /obj/item/pen/charcoal
reqs = list(/obj/item/stack/sheet/mineral/wood = 1, /datum/reagent/ash = 30)
time = 30
category = CAT_MISC

/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
time = 30
category = CAT_MISC

/datum/crafting_recipe/chainsaw
name = "Chainsaw"
result = /obj/item/chainsaw
reqs = list(/obj/item/circular_saw = 1,
/obj/item/stack/cable_coil = 3,
/obj/item/stack/sheet/plasteel = 5)
tools = list(TOOL_WELDER)
time = 50
category = CAT_MISC
10 changes: 0 additions & 10 deletions code/datums/components/crafting/recipes/robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,6 @@
time = 40
category = CAT_ROBOT

/datum/crafting_recipe/honkbot
name = "Honkbot"
result = /mob/living/simple_animal/bot/honkbot
reqs = list(/obj/item/storage/box/clown = 1,
/obj/item/bodypart/r_arm/robot = 1,
/obj/item/assembly/prox_sensor = 1,
/obj/item/bikehorn/ = 1)
time = 40
category = CAT_ROBOT

/datum/crafting_recipe/Firebot
name = "Firebot"
result = /mob/living/simple_animal/bot/firebot
Expand Down
88 changes: 29 additions & 59 deletions code/datums/components/crafting/recipes/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/lance
name = "Explosive Lance (Grenade)"
result = /obj/item/spear/explosive
reqs = list(/obj/item/spear = 1,
/obj/item/grenade = 1)
blacklist = list(/obj/item/spear/bonespear)
parts = list(/obj/item/spear = 1,
/obj/item/grenade = 1)
time = 15
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/strobeshield
name = "Strobe Shield"
result = /obj/item/shield/riot/flash
Expand Down Expand Up @@ -56,17 +44,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/teleprod
name = "Teleprod"
result = /obj/item/melee/baton/cattleprod/teleprod
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
/obj/item/assembly/igniter = 1,
/obj/item/stack/ore/bluespace_crystal = 1)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/bola
name = "Bola"
result = /obj/item/restraints/legcuffs/bola
Expand All @@ -76,16 +53,6 @@
category= CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/gonbola
name = "Gonbola"
result = /obj/item/restraints/legcuffs/bola/gonbola
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/sheet/metal = 6,
/obj/item/stack/sheet/animalhide/gondola = 1)
time = 40
category= CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but
name = "Pneumatic Cannon"
result = /obj/item/pneumatic_cannon/ghetto
Expand All @@ -97,19 +64,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/flamethrower
name = "Flamethrower"
result = /obj/item/flamethrower
reqs = list(/obj/item/weldingtool = 1,
/obj/item/assembly/igniter = 1,
/obj/item/stack/rods = 1)
parts = list(/obj/item/assembly/igniter = 1,
/obj/item/weldingtool = 1)
tools = list(TOOL_SCREWDRIVER)
time = 10
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/meteorslug
name = "Meteorslug Shell"
result = /obj/item/ammo_casing/shotgun/meteorslug
Expand Down Expand Up @@ -205,17 +159,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/chainsaw
name = "Chainsaw"
result = /obj/item/chainsaw
reqs = list(/obj/item/circular_saw = 1,
/obj/item/stack/cable_coil = 3,
/obj/item/stack/sheet/plasteel = 5)
tools = list(TOOL_WELDER)
time = 50
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/spear
name = "Spear"
result = /obj/item/spear
Expand Down Expand Up @@ -253,7 +196,7 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/pipebow
/*/datum/crafting_recipe/pipebow
name = "Pipe Bow"
result = /obj/item/gun/ballistic/bow/pipe
reqs = list(/obj/item/pipe = 5,
Expand Down Expand Up @@ -300,7 +243,7 @@
/obj/item/stack/tile/bronze = 1,
/obj/item/stack/sheet/silk = 1)
category = CAT_WEAPONRY
subcategory = CAT_AMMO
subcategory = CAT_AMMO */

/datum/crafting_recipe/zip_pistol
name = "Zip Pistol"
Expand All @@ -315,3 +258,30 @@
time = 100
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/bonespear
name = "Bone Spear"
result = /obj/item/spear/bonespear
time = 30
reqs = list(/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 1)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/boneaxe
name = "Bone Axe"
result = /obj/item/fireaxe/boneaxe
time = 50
reqs = list(/obj/item/stack/sheet/bone = 6,
/obj/item/stack/sheet/sinew = 3)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON

/datum/crafting_recipe/bonesword
name = "Bone Sword"
result = /obj/item/claymore/bone
time = 40
reqs = list(/obj/item/stack/sheet/bone = 3,
/obj/item/stack/sheet/sinew = 2)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
2 changes: 0 additions & 2 deletions code/game/objects/items/granters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,8 @@
name = "Cooking Desserts 101"
desc = "A cook book that teaches you some more of the newest desserts. AI approved, and a best seller on Honkplanet."
crafting_recipe_types = list(
/datum/crafting_recipe/food/mimetart,
/datum/crafting_recipe/food/berrytart,
/datum/crafting_recipe/food/cocolavatart,
/datum/crafting_recipe/food/clowncake,
/datum/crafting_recipe/food/vanillacake
)
icon_state = "cooking_learing_sweets"
Expand Down
5 changes: 1 addition & 4 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -522,10 +522,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \

GLOBAL_LIST_INIT(bone_recipes, list( \
new /datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/bone, 3), \
new /datum/stack_recipe("bone armor", /obj/item/clothing/suit/armor/bone, 6), \
new /datum/stack_recipe("skull helmet", /obj/item/clothing/head/helmet/skull, 4), \
new /datum/stack_recipe("bone dagger", /obj/item/kitchen/knife/combat/bone, 2), \
new /datum/stack_recipe("club", /obj/item/melee/baseball_bat/bone, 6)))
new /datum/stack_recipe("bone dagger", /obj/item/kitchen/knife/combat/bone, 2)))
/obj/item/stack/sheet/bone
name = "bones"
icon = 'icons/obj/mining.dmi'
Expand Down
18 changes: 1 addition & 17 deletions code/game/objects/items/tools/weldingtool.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@
/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_SCREWDRIVER)
flamethrower_screwdriver(I, user)
else if(istype(I, /obj/item/stack/rods))
flamethrower_rods(I, user)
else
. = ..()
update_appearance()
Expand Down Expand Up @@ -282,24 +280,10 @@
to_chat(user, "<span class='notice'>You resecure [src] and close the fuel tank.</span>")
reagents.flags &= ~(OPENCONTAINER)
else
to_chat(user, "<span class='notice'>[src] can now be attached, modified, and refuelled.</span>")
to_chat(user, "<span class='notice'>[src] can now be refuelled.</span>")
reagents.flags |= OPENCONTAINER
add_fingerprint(user)

/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
if(!status)
var/obj/item/stack/rods/R = I
if (R.use(1))
var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
if(!remove_item_from_storage(F))
user.transferItemToLoc(src, F, TRUE)
F.weldtool = src
add_fingerprint(user)
to_chat(user, "<span class='notice'>You add a rod to a welder, starting to build a flamethrower.</span>")
user.put_in_hands(F)
else
to_chat(user, "<span class='warning'>You need one rod to start building a flamethrower!</span>")

/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
if(use_tool(A, user, 0, amount=1))
return "<span class='notice'>[user] casually lights [A] with [src], what a badass.</span>"
Expand Down
Loading

0 comments on commit 929584d

Please sign in to comment.