Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crafting Cruft Removal #3296

Merged
merged 15 commits into from
Sep 10, 2024
Merged

Crafting Cruft Removal #3296

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b0e812c
aaaaaaaa
Sadhorizon Aug 17, 2024
3297895
removed this
Sadhorizon Aug 17, 2024
7ce5443
these too
Sadhorizon Aug 17, 2024
9766de7
this should work
Sadhorizon Aug 17, 2024
62aec79
oopsie
Sadhorizon Aug 17, 2024
650bd2d
now it works
Sadhorizon Aug 17, 2024
717bb83
spesslaw
Sadhorizon Aug 17, 2024
6af1c80
cloudbreak
Sadhorizon Aug 17, 2024
e7b3e43
flamethrower slapcrafting
Sadhorizon Aug 17, 2024
74ae684
more ashies
Sadhorizon Aug 17, 2024
c6b2967
Eh, sure. You win.
Sadhorizon Aug 30, 2024
810dc59
brings back mushroom bowls
Sadhorizon Aug 30, 2024
b39550d
comment + crystal spear bye bye
Sadhorizon Aug 30, 2024
1012adf
nah, actually
Sadhorizon Aug 30, 2024
10f385f
brings back the scooter
Sadhorizon Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/datums/components/crafting/crafting.dm
View file
Open in desktop
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
View file
Open in desktop
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/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
77 changes: 34 additions & 43 deletions code/datums/components/crafting/recipes/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
/obj/item/stack/rods = 10)
category = CAT_MISC

/datum/crafting_recipe/scooter
name = "Scooter"
result = /obj/vehicle/ridden/scooter
time = 65
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/rods = 12)
category = CAT_MISC

/datum/crafting_recipe/wheelchair
name = "Wheelchair"
result = /obj/vehicle/ridden/wheelchair
Expand Down Expand Up @@ -50,16 +42,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 +69,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 +80,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 +170,42 @@
/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/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
View file
Open in desktop
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
Loading
Loading