From f2246c575e61c3fea3d3565714c8f035613aa164 Mon Sep 17 00:00:00 2001
From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com>
Date: Tue, 10 Sep 2024 11:07:21 +0200
Subject: [PATCH 1/4] Crafting Cruft Removal (#3296)
## About The Pull Request
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.
## Why It's Good For The Game
Explained for every item individually.
## Changelog
: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:
---
code/datums/components/crafting/crafting.dm | 1 -
.../components/crafting/recipes/clothing.dm | 49 +++-
.../components/crafting/recipes/misc.dm | 76 +++---
.../components/crafting/recipes/robot.dm | 10 -
.../components/crafting/recipes/tribal.dm | 234 ------------------
.../components/crafting/recipes/weapon.dm | 88 +++----
code/game/objects/items/granters.dm | 2 -
.../items/stacks/sheets/sheet_types.dm | 5 +-
code/game/objects/items/tools/weldingtool.dm | 18 +-
.../recipes/tablecraft/recipes_bread.dm | 11 -
.../recipes/tablecraft/recipes_burger.dm | 46 ----
.../recipes/tablecraft/recipes_cake.dm | 30 +--
.../recipes/tablecraft/recipes_drink.dm | 22 --
.../recipes/tablecraft/recipes_frozen.dm | 38 +--
.../recipes/tablecraft/recipes_meat.dm | 9 -
.../recipes/tablecraft/recipes_pastry.dm | 11 -
.../recipes/tablecraft/recipes_pie.dm | 12 -
.../recipes/tablecraft/recipes_salad.dm | 13 -
.../recipes/tablecraft/recipes_soup.dm | 11 -
.../recipes/tablecraft/recipes_spaghetti.dm | 9 -
shiptest.dme | 1 -
21 files changed, 121 insertions(+), 575 deletions(-)
delete mode 100644 code/datums/components/crafting/recipes/tribal.dm
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index df5ae1319c2e..e7d0ebaace60 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -23,7 +23,6 @@
),
CAT_ROBOT = CAT_NONE,
CAT_MISC = CAT_NONE,
- CAT_PRIMAL = CAT_NONE,
CAT_FOOD = list(
CAT_BREAD,
CAT_BURGER,
diff --git a/code/datums/components/crafting/recipes/clothing.dm b/code/datums/components/crafting/recipes/clothing.dm
index 95b37502bcaf..e574337f9861 100644
--- a/code/datums/components/crafting/recipes/clothing.dm
+++ b/code/datums/components/crafting/recipes/clothing.dm
@@ -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/mob_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
diff --git a/code/datums/components/crafting/recipes/misc.dm b/code/datums/components/crafting/recipes/misc.dm
index 0ed4acb5be78..e76641789157 100644
--- a/code/datums/components/crafting/recipes/misc.dm
+++ b/code/datums/components/crafting/recipes/misc.dm
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/code/datums/components/crafting/recipes/robot.dm b/code/datums/components/crafting/recipes/robot.dm
index a5558682e86b..cab33ef5f796 100644
--- a/code/datums/components/crafting/recipes/robot.dm
+++ b/code/datums/components/crafting/recipes/robot.dm
@@ -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
diff --git a/code/datums/components/crafting/recipes/tribal.dm b/code/datums/components/crafting/recipes/tribal.dm
deleted file mode 100644
index c831b85d7878..000000000000
--- a/code/datums/components/crafting/recipes/tribal.dm
+++ /dev/null
@@ -1,234 +0,0 @@
-/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_PRIMAL
-
-/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/mob_trophy/fang = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bonecodpiece
- name = "Skull Codpiece"
- result = /obj/item/clothing/accessory/skullcodpiece
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 2,
- /obj/item/mob_trophy/legion_skull = 1,
- /obj/item/stack/sheet/animalhide/goliath_hide = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/skilt
- name = "Sinew Kilt"
- result = /obj/item/clothing/accessory/skilt
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 1,
- /obj/item/stack/sheet/sinew = 2)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bracers
- name = "Bone Bracers"
- result = /obj/item/clothing/gloves/bracer
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 2,
- /obj/item/stack/sheet/sinew = 1)
- category = CAT_PRIMAL
-
-/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_PRIMAL
-
-/datum/crafting_recipe/drakecloak
- name = "Ash Drake Armour"
- result = /obj/item/clothing/suit/hooded/cloak/drake
- time = 60
- reqs = list(/obj/item/stack/sheet/bone = 10,
- /obj/item/stack/sheet/sinew = 2,
- /obj/item/stack/sheet/animalhide/ashdrake = 5)
- category = CAT_PRIMAL
-
-/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_PRIMAL
-
-/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_PRIMAL
-
-/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_PRIMAL
-
-/datum/crafting_recipe/headpike
- name = "Spike Head (Glass Spear)"
- time = 65
- reqs = list(/obj/item/spear = 1,
- /obj/item/bodypart/head = 1)
- parts = list(/obj/item/bodypart/head = 1,
- /obj/item/spear = 1)
- blacklist = list(/obj/item/spear/explosive, /obj/item/spear/bonespear)
- result = /obj/structure/headpike
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/headpikebone
- name = "Spike Head (Bone Spear)"
- time = 65
- reqs = list(/obj/item/spear/bonespear = 1,
- /obj/item/bodypart/head = 1)
- parts = list(/obj/item/bodypart/head = 1,
- /obj/item/spear/bonespear = 1)
- result = /obj/structure/headpike/bone
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/lasso
- name = "Bone Lasso"
- reqs = list(
- /obj/item/stack/sheet/bone = 1,
- /obj/item/stack/sheet/sinew = 5)
- result = /obj/item/key/lasso
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/heavybonearmor
- name = "Heavy Bone Armor"
- result = /obj/item/clothing/suit/hooded/cloak/bone
- time = 60
- reqs = list(/obj/item/stack/sheet/bone = 8,
- /obj/item/stack/sheet/sinew = 3)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/watcherbola
- name = "Watcher Bola"
- result = /obj/item/restraints/legcuffs/bola/watcher
- time = 30
- reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 2,
- /obj/item/restraints/handcuffs/cable/sinew = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/goliathshield
- name = "Goliath shield"
- result = /obj/item/shield/riot/goliath
- time = 60
- reqs = list(/obj/item/stack/sheet/bone = 4,
- /obj/item/stack/sheet/animalhide/goliath_hide = 3)
- category = CAT_PRIMAL
-
-/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_PRIMAL
-
-/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_PRIMAL
-
-/datum/crafting_recipe/quiver
- name = "Quiver"
- result = /obj/item/storage/bag/quiver/empty
- time = 80
- reqs = list(/obj/item/stack/sheet/leather = 3,
- /obj/item/stack/sheet/sinew = 4)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bone_bow
- name = "Bone Bow"
- result = /obj/item/gun/ballistic/bow/ashen
- time = 200
- reqs = list(/obj/item/stack/sheet/bone = 8,
- /obj/item/stack/sheet/sinew = 4)
- category = CAT_PRIMAL
-
-/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_PRIMAL
-
-/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_PRIMAL
-
-/datum/crafting_recipe/crystalamulet
- name = "Crystal Amulet"
- result = /obj/item/clothing/neck/crystal_amulet
- time = 4 SECONDS
- reqs = list(/obj/item/strange_crystal = 3)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/crystalspear
- name = "Crystal Spear"
- result = /obj/item/spear/crystal
- time = 4 SECONDS
- reqs = list(/obj/item/strange_crystal = 2)
- category = CAT_PRIMAL
-
-/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_PRIMAL
-
-/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_PRIMAL
-
-/datum/crafting_recipe/mushroom_mortar
- name = "Mushroom Mortar"
- result = /obj/item/reagent_containers/glass/mortar/mushroom
- reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
- time = 30
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/oar
- name = "Goliath Bone Oar"
- result = /obj/item/oar
- reqs = list(/obj/item/stack/sheet/bone = 2)
- time = 15
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/boat
- name = "Goliath Hide Boat"
- result = /obj/vehicle/ridden/lavaboat
- reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3)
- time = 50
- category = CAT_PRIMAL
diff --git a/code/datums/components/crafting/recipes/weapon.dm b/code/datums/components/crafting/recipes/weapon.dm
index c1dde04b3650..65983b06df23 100644
--- a/code/datums/components/crafting/recipes/weapon.dm
+++ b/code/datums/components/crafting/recipes/weapon.dm
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
@@ -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"
@@ -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
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 50da920b06f1..79b37d41e52c 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -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"
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index ead6b8aeb8f1..8f5b95ec89a7 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -519,10 +519,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'
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 53f3396f2727..f953a3604367 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -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()
@@ -282,24 +280,10 @@
to_chat(user, "You resecure [src] and close the fuel tank.")
reagents.flags &= ~(OPENCONTAINER)
else
- to_chat(user, "[src] can now be attached, modified, and refuelled.")
+ to_chat(user, "[src] can now be refuelled.")
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, "You add a rod to a welder, starting to build a flamethrower.")
- user.put_in_hands(F)
- else
- to_chat(user, "You need one rod to start building a flamethrower!")
-
/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
if(use_tool(A, user, 0, amount=1))
return "[user] casually lights [A] with [src], what a badass."
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
index 0dec69a393f5..751f6017eb90 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
@@ -64,17 +64,6 @@
result = /obj/item/food/bread/creamcheese
subcategory = CAT_BREAD
-/datum/crafting_recipe/food/mimanabread
- name = "Mimana bread"
- reqs = list(
- /datum/reagent/consumable/soymilk = 5,
- /obj/item/food/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 3,
- /obj/item/reagent_containers/food/snacks/grown/banana/mime = 1
- )
- result = /obj/item/food/bread/mimana
- subcategory = CAT_BREAD
-
/datum/crafting_recipe/food/garlicbread
name = "Garlic Bread"
time = 40
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index 38ea04421827..4f5838909486 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -91,34 +91,6 @@
result = /obj/item/reagent_containers/food/snacks/burger/tofu
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/ghostburger
- name = "Ghost burger"
- reqs = list(
- /obj/item/ectoplasm = 1,
- /datum/reagent/consumable/sodiumchloride = 2,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/ghost
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/clownburger
- name = "Clown burger"
- reqs = list(
- /obj/item/clothing/mask/gas/clown_hat = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/clown
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/mimeburger
- name = "Mime burger"
- reqs = list(
- /obj/item/clothing/mask/gas/mime = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/mime
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/redburger
name = "Red burger"
reqs = list(
@@ -199,24 +171,6 @@
result = /obj/item/reagent_containers/food/snacks/burger/white
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/spellburger
- name = "Spell burger"
- reqs = list(
- /obj/item/clothing/head/wizard/fake = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/spell
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/spellburger2
- name = "Spell burger"
- reqs = list(
- /obj/item/clothing/head/wizard = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/spell
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/bigbiteburger
name = "Big bite burger"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index 7a3a4c6837b5..c79d4cea8474 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -96,15 +96,6 @@
result = /obj/item/food/cake/brain
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/slimecake
- name = "Slime cake"
- reqs = list(
- /obj/item/slime_extract = 1,
- /obj/item/food/cake/plain = 1
- )
- result = /obj/item/food/cake/slimecake
- subcategory = CAT_CAKE
-
/datum/crafting_recipe/food/pumpkinspicecake
name = "Pumpkin spice cake"
reqs = list(
@@ -114,10 +105,10 @@
result = /obj/item/food/cake/pumpkinspice
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/holycake
+/datum/crafting_recipe/food/angelcake
name = "Angel food cake"
reqs = list(
- /datum/reagent/water/holywater = 15,
+ /datum/reagent/consumable/cream = 25,
/obj/item/food/cake/plain = 1
)
result = /obj/item/food/cake/holy_cake
@@ -142,7 +133,7 @@
subcategory = CAT_CAKE
/datum/crafting_recipe/food/bscccake
- name = "blackberry and strawberry chocolate cake"
+ name = "Blackberry and Strawberry Chocolate cake"
reqs = list(
/obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 2,
@@ -152,7 +143,7 @@
subcategory = CAT_CAKE
/datum/crafting_recipe/food/bscvcake
- name = "blackberry and strawberry vanilla cake"
+ name = "Blackberry and Strawberry Vanilla cake"
reqs = list(
/obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 5
@@ -160,19 +151,8 @@
result = /obj/item/food/cake/bsvc
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/clowncake
- name = "clown cake"
- always_availible = FALSE
- reqs = list(
- /obj/item/food/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/sundae = 2,
- /obj/item/reagent_containers/food/snacks/grown/banana = 5
- )
- result = /obj/item/food/cake/clown_cake
- subcategory = CAT_CAKE
-
/datum/crafting_recipe/food/vanillacake
- name = "vanilla cake"
+ name = "Vanilla cake"
always_availible = FALSE
reqs = list(
/obj/item/food/cake/plain = 1,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
index 96c67eca7a9e..2032a33bd46d 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
@@ -86,28 +86,6 @@
////////////////////// Non-alcoholic recipes ///////////////////
-/datum/crafting_recipe/holybottle
- name = "Holy Water Flask"
- time = 30
- reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
- /datum/reagent/water/holywater = 100
- )
- result = /obj/item/reagent_containers/food/drinks/bottle/holywater
- category = CAT_DRINK
-
-//flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson
-
-/datum/crafting_recipe/nothingbottle
- name = "Nothing Bottle"
- time = 30
- reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
- /datum/reagent/consumable/nothing = 100
- )
- result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
- category = CAT_DRINK
-
/datum/crafting_recipe/smallcarton
name = "Small Carton"
result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index edca42fda076..dbe7f1149631 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -44,18 +44,6 @@
result = /obj/item/reagent_containers/food/snacks/sundae
subcategory = CAT_ICE
-/datum/crafting_recipe/food/honkdae
- name ="Honkdae"
- reqs = list(
- /datum/reagent/consumable/cream = 5,
- /obj/item/clothing/mask/gas/clown_hat = 1,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 2,
- /obj/item/reagent_containers/food/snacks/icecream = 1
- )
- result = /obj/item/reagent_containers/food/snacks/honkdae
- subcategory = CAT_ICE
-
/datum/crafting_recipe/food/cornuto
name = "Cornuto"
reqs = list(
@@ -182,28 +170,8 @@
result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad
subcategory = CAT_ICE
-/datum/crafting_recipe/food/mime_sc
- name = "Mime snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/nothing = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/mime
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/clown_sc
- name = "Clown snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/laughter = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/clown
- subcategory = CAT_ICE
-
/datum/crafting_recipe/food/soda_sc
- name = "Space Cola snowcone"
+ name = "Master Cola snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
@@ -213,7 +181,7 @@
subcategory = CAT_ICE
/datum/crafting_recipe/food/spacemountainwind_sc
- name = "Space Mountain Wind snowcone"
+ name = "Comet Trail snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
@@ -223,7 +191,7 @@
subcategory = CAT_ICE
/datum/crafting_recipe/food/pwrgame_sc
- name = "Pwrgame snowcone"
+ name = "Pacfuel snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 72f2046a3b84..ade14f27241e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -242,15 +242,6 @@
result = /obj/item/reagent_containers/food/snacks/bbqribs
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/meatclown
- name = "Meat Clown"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1
- )
- result = /obj/item/reagent_containers/food/snacks/meatclown
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/gumbo
name = "Black eyed gumbo"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index a1c1297647c3..3de7c3c3d75d 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -370,17 +370,6 @@
result = /obj/item/reagent_containers/food/snacks/donkpocket/pizza
subcategory = CAT_PASTRY
-/datum/crafting_recipe/food/donkpocket/honk
- time = 15
- name = "Honk-Pocket"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
- /datum/reagent/consumable/sugar = 3
- )
- result = /obj/item/reagent_containers/food/snacks/donkpocket/honk
- subcategory = CAT_PASTRY
-
/datum/crafting_recipe/food/donkpocket/berry
time = 15
name = "Berry-pocket"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
index 83e923f53fbf..5c9bcc56cc7d 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
@@ -130,18 +130,6 @@
result = /obj/item/reagent_containers/food/snacks/pie/grapetart
subcategory = CAT_PIE
-/datum/crafting_recipe/food/mimetart
- name = "Mime tart"
- always_availible = FALSE
- reqs = list(
- /datum/reagent/consumable/milk = 5,
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /datum/reagent/consumable/nothing = 5
- )
- result = /obj/item/reagent_containers/food/snacks/pie/mimetart
- subcategory = CAT_PIE
-
/datum/crafting_recipe/food/berrytart
name = "Berry tart"
always_availible = FALSE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
index 73ccc0f37897..778c639a074e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
@@ -34,19 +34,6 @@
result = /obj/item/reagent_containers/food/snacks/salad/validsalad
subcategory = CAT_SALAD
-/datum/crafting_recipe/food/monkeysdelight
- name = "Monkeys delight"
- reqs = list(
- /datum/reagent/consumable/flour = 5,
- /datum/reagent/consumable/sodiumchloride = 1,
- /datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
- subcategory = CAT_SALAD
-
/datum/crafting_recipe/food/oatmeal
name = "Oatmeal"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index d0558f94fdb5..daf98f0444a4 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -146,17 +146,6 @@
result = /obj/item/reagent_containers/food/snacks/soup/slime
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/clownstears
- name = "Clowns tears"
- reqs = list(
- /datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
- /obj/item/stack/sheet/mineral/hidden/hellstone = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/clownstears
- subcategory = CAT_SOUP
-
/datum/crafting_recipe/food/mysterysoup
name = "Mystery soup"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
index 2ad56d0ce62b..f123ced2ffc5 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -29,15 +29,6 @@
result = /obj/item/food/spaghetti/meatballspaghetti
subcategory = CAT_SPAGHETTI
-/datum/crafting_recipe/food/spesslaw
- name = "Spesslaw"
- reqs = list(
- /obj/item/food/spaghetti/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 4
- )
- result = /obj/item/food/spaghetti/spesslaw
- subcategory = CAT_SPAGHETTI
-
/datum/crafting_recipe/food/beefnoodle
name = "Beef noodle"
reqs = list(
diff --git a/shiptest.dme b/shiptest.dme
index 262625237701..850167e0ec50 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -574,7 +574,6 @@
#include "code\datums\components\crafting\recipes\drink.dm"
#include "code\datums\components\crafting\recipes\misc.dm"
#include "code\datums\components\crafting\recipes\robot.dm"
-#include "code\datums\components\crafting\recipes\tribal.dm"
#include "code\datums\components\crafting\recipes\weapon.dm"
#include "code\datums\components\fantasy\_fantasy.dm"
#include "code\datums\components\fantasy\affix.dm"
From d8a47e153c5859b0e7bedb06502d7c11c1a2170a Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Tue, 10 Sep 2024 04:32:31 -0500
Subject: [PATCH 2/4] Automatic changelog generation for PR #3296 [ci skip]
---
html/changelogs/AutoChangeLog-pr-3296.yml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-3296.yml
diff --git a/html/changelogs/AutoChangeLog-pr-3296.yml b/html/changelogs/AutoChangeLog-pr-3296.yml
new file mode 100644
index 000000000000..5477a1913a08
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3296.yml
@@ -0,0 +1,8 @@
+author: Sadhorizon
+changes:
+ - {rscdel: Removed a lot of cruft from the loadout.}
+ - {rscdel: Removed flamethrower slapcrafting.}
+ - {rscdel: Removed the Tribal crafting tab (some items were moved to other tabs).}
+ - {rscdel: 'Removed bone club, skull helmet and bone armor from the bone construction
+ menu.'}
+delete-after: true
From 4f36dfa0b85a1244366770c2900bb1c7d2ac0a73 Mon Sep 17 00:00:00 2001
From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:07:30 -0500
Subject: [PATCH 3/4] Removes Sheetza (#3347)
## About The Pull Request
you can no longer make pizza tables
I am become gerg orwall
#1219
## Why It's Good For The Game
cruft...
## Changelog
:cl:
del: Removed sheetz. Feel free to send me threats for this crime!
/:cl:
---
code/datums/materials/meat.dm | 20 -------
code/datums/materials/pizza.dm | 31 -----------
code/game/machinery/sheetifier.dm | 55 -------------------
.../circuitboards/machine_circuitboards.dm | 10 ----
.../items/stacks/sheets/sheet_types.dm | 35 ------------
.../food_and_drinks/food/snacks_pizza.dm | 11 ----
.../research/designs/machine_designs.dm | 7 ---
code/modules/research/techweb/all_nodes.dm | 2 +-
shiptest.dme | 2 -
9 files changed, 1 insertion(+), 172 deletions(-)
delete mode 100644 code/datums/materials/pizza.dm
delete mode 100644 code/game/machinery/sheetifier.dm
diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm
index 9539b2847774..8512753a22af 100644
--- a/code/datums/materials/meat.dm
+++ b/code/datums/materials/meat.dm
@@ -5,7 +5,6 @@
desc = "Meat"
color = rgb(214, 67, 67)
categories = list(MAT_CATEGORY_RIGID = TRUE)
- sheet_type = /obj/item/stack/sheet/meat
value_per_unit = 0.05
beauty_modifier = -0.3
strength_modifier = 0.7
@@ -13,22 +12,3 @@
item_sound_override = 'sound/effects/meatslap.ogg'
turf_sound_override = FOOTSTEP_MEAT
texture_layer_icon_state = "meat"
-
-/datum/material/meat/on_removed(atom/source, amount, material_flags)
- . = ..()
- qdel(source.GetComponent(/datum/component/edible))
-
-/datum/material/meat/on_applied_obj(obj/O, amount, material_flags)
- . = ..()
- O.obj_flags |= UNIQUE_RENAME //So you can name it after the person its made from, a depressing comprimise.
- make_edible(O, amount, material_flags)
-
-/datum/material/meat/on_applied_turf(turf/T, amount, material_flags)
- . = ..()
- make_edible(T, amount, material_flags)
-
-/datum/material/meat/proc/make_edible(atom/source, amount, material_flags)
- var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT)
- var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT)
- source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, RAW | MEAT | GROSS, null, 30, list("Fleshy"))
-
diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm
deleted file mode 100644
index 62479d90e0d3..000000000000
--- a/code/datums/materials/pizza.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/datum/material/pizza
- name = "pizza"
- id = "pizza"
- desc = "~Jamme, jamme, n'coppa, jamme ja! Jamme, jamme, n'coppa jamme ja, funi-culi funi-cala funi-culi funi-cala!! Jamme jamme ja funiculi funicula!~"
- color = "#FF9F23"
- categories = list(MAT_CATEGORY_RIGID = TRUE)
- sheet_type = /obj/item/stack/sheet/pizza
- value_per_unit = 0.05
- beauty_modifier = 0.1
- strength_modifier = 0.7
- armor_modifiers = list("melee" = 0.3, "bullet" = 0.3, "laser" = 1.2, "energy" = 1.2, "bomb" = 0.3, "bio" = 0, "rad" = 0.7, "fire" = 1, "acid" = 1)
- item_sound_override = 'sound/effects/meatslap.ogg'
- turf_sound_override = FOOTSTEP_MEAT
- texture_layer_icon_state = "pizza"
-
-/datum/material/pizza/on_removed(atom/source, amount, material_flags)
- . = ..()
- qdel(source.GetComponent(/datum/component/edible))
-
-/datum/material/pizza/on_applied_obj(obj/O, amount, material_flags)
- . = ..()
- make_edible(O, amount, material_flags)
-
-/datum/material/pizza/on_applied_turf(turf/T, amount, material_flags)
- . = ..()
- make_edible(T, amount, material_flags)
-
-/datum/material/pizza/proc/make_edible(atom/source, amount, material_flags)
- var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT)
- var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT)
- source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat"), filling_color = COLOR_YELLOW)
diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm
deleted file mode 100644
index ec9f0f5ff5a3..000000000000
--- a/code/game/machinery/sheetifier.dm
+++ /dev/null
@@ -1,55 +0,0 @@
-/obj/machinery/sheetifier
- name = "Sheet-meister 2000"
- desc = "A very sheety machine"
- icon = 'icons/obj/machines/sheetifier.dmi'
- icon_state = "base_machine"
- density = TRUE
- use_power = IDLE_POWER_USE
- idle_power_usage = IDLE_DRAW_MINIMAL
- active_power_usage = ACTIVE_DRAW_LOW
- circuit = /obj/item/circuitboard/machine/sheetifier
- layer = BELOW_OBJ_LAYER
- var/busy_processing = FALSE
-
-/obj/machinery/sheetifier/Initialize()
- . = ..()
- AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials)))
-
-/obj/machinery/sheetifier/update_overlays()
- . = ..()
- if(machine_stat & (BROKEN|NOPOWER))
- return
- var/mutable_appearance/on_overlay = mutable_appearance(icon, "buttons_on")
- . += on_overlay
-
-/obj/machinery/sheetifier/update_icon_state()
- icon_state = "base_machine[busy_processing ? "_processing" : ""]"
- return ..()
-
-/obj/machinery/sheetifier/proc/CanInsertMaterials()
- return !busy_processing
-
-/obj/machinery/sheetifier/proc/AfterInsertMaterials(item_inserted, id_inserted, amount_inserted)
- busy_processing = TRUE
- update_appearance()
- var/datum/material/last_inserted_material = id_inserted
- var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing")
- processing_overlay.color = last_inserted_material.color
- flick_overlay_static(processing_overlay, src, 64)
- addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64)
-
-/obj/machinery/sheetifier/proc/finish_processing()
- busy_processing = FALSE
- update_appearance()
- var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
- materials.retrieve_all() //Returns all as sheets
-
-/obj/machinery/sheetifier/attackby(obj/item/I, mob/user, params)
- if(default_unfasten_wrench(user, I))
- return
- if(default_deconstruction_screwdriver(user, I))
- update_appearance()
- return
- if(default_deconstruction_crowbar(I))
- return
- return ..()
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index a74ed8c81b27..1d6a0d61c180 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -1392,16 +1392,6 @@
/obj/item/stock_parts/scanning_module = 2,
/obj/item/stock_parts/micro_laser = 2)
-//Misc
-/obj/item/circuitboard/machine/sheetifier
- name = "Sheet-meister 2000 (Machine Board)"
- icon_state = "supply"
- build_path = /obj/machinery/sheetifier
- req_components = list(
- /obj/item/stock_parts/manipulator = 2,
- /obj/item/stock_parts/matter_bin = 2)
- needs_anchored = FALSE
-
/obj/item/circuitboard/machine/abductor
name = "alien board (Report This)"
icon_state = "abductor_mod"
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 8f5b95ec89a7..4443218e4385 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -605,41 +605,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
/obj/item/stack/sheet/paperframes/fifty
amount = 50
-/obj/item/stack/sheet/meat
- name = "meat sheets"
- desc = "Something's bloody meat compressed into a nice solid sheet."
- singular_name = "meat sheet"
- icon_state = "sheet-meat"
- material_flags = MATERIAL_COLOR
- custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT)
- merge_type = /obj/item/stack/sheet/meat
- material_type = /datum/material/meat
- material_modifier = 1 //None of that wussy stuff
-
-/obj/item/stack/sheet/meat/fifty
- amount = 50
-/obj/item/stack/sheet/meat/twenty
- amount = 20
-/obj/item/stack/sheet/meat/five
- amount = 5
-
-/obj/item/stack/sheet/pizza
- name = "pepperoni sheetzzas"
- desc = "It's a delicious pepperoni sheetzza!"
- singular_name = "pepperoni sheetzza"
- icon_state = "sheet-meat" //This needs a pizza sheet but we also i dont think anyone will ever make this.
- custom_materials = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT)
- merge_type = /obj/item/stack/sheet/pizza
- material_type = /datum/material/pizza
- material_modifier = 1
-
-/obj/item/stack/sheet/pizza/fifty
- amount = 50
-/obj/item/stack/sheet/pizza/twenty
- amount = 20
-/obj/item/stack/sheet/pizza/five
- amount = 5
-
/obj/item/stack/sheet/sandblock
name = "blocks of sand"
desc = "You're too old to be playing with sandcastles. Now you build... sandstations."
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index 9b8e949b06e6..5129911cd311 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -215,14 +215,3 @@
icon_state = "pizzamargheritaslice"
filling_color = "#FFFFFF"
foodtype = GRAIN | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/kitchen/rollingpin))
- if(!isturf(loc))
- to_chat(user, "You need to put [src] on a surface to roll it out!")
- return
- new /obj/item/stack/sheet/pizza(loc)
- to_chat(user, "You smoosh [src] into a cheesy sheet.")
- qdel(src)
- return
- return ..()
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 5f79bbbf12e5..fdfe0f7f7341 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -604,13 +604,6 @@
category = list ("Medical Machinery")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/board/sheetifier
- name = "Sheetifier"
- desc = "This machine turns weird things into sheets."
- id = "sheetifier"
- build_path = /obj/item/circuitboard/machine/sheetifier
- category = list ("Misc. Machinery")
-
/datum/design/board/shieldwallgen
name = "Machine Design (Shield Wall Generator)"
desc = "A shield generator commonly used in xenobiology research."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index ab2cfd3a4681..81f6938dd8c2 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -193,7 +193,7 @@
display_name = "Advanced Engineering"
description = "Pushing the boundaries of physics, one chainsaw-fist at a time."
prereq_ids = list("engineering", "emp_basic")
- design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "rcd_loaded", "rpd_loaded", "sheetifier")
+ design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "rcd_loaded", "rpd_loaded")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/shiptest.dme b/shiptest.dme
index 850167e0ec50..0bc938d7e2a0 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -737,7 +737,6 @@
#include "code\datums\materials\_material.dm"
#include "code\datums\materials\basemats.dm"
#include "code\datums\materials\meat.dm"
-#include "code\datums\materials\pizza.dm"
#include "code\datums\mood_events\_mood_event.dm"
#include "code\datums\mood_events\beauty_events.dm"
#include "code\datums\mood_events\drink_events.dm"
@@ -937,7 +936,6 @@
#include "code\game\machinery\requests_console.dm"
#include "code\game\machinery\roulette_machine.dm"
#include "code\game\machinery\scan_gate.dm"
-#include "code\game\machinery\sheetifier.dm"
#include "code\game\machinery\shieldgen.dm"
#include "code\game\machinery\sleeper.dm"
#include "code\game\machinery\slotmachine.dm"
From 8c72d7145c774b30a7247e7505d6a05e18b4b5d4 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Tue, 10 Sep 2024 04:46:16 -0500
Subject: [PATCH 4/4] Automatic changelog generation for PR #3347 [ci skip]
---
html/changelogs/AutoChangeLog-pr-3347.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-3347.yml
diff --git a/html/changelogs/AutoChangeLog-pr-3347.yml b/html/changelogs/AutoChangeLog-pr-3347.yml
new file mode 100644
index 000000000000..e90a60544055
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3347.yml
@@ -0,0 +1,4 @@
+author: FalloutFalcon
+changes:
+ - {rscdel: Removed sheetz. Feel free to send me threats for this crime!}
+delete-after: true