cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes HUD sunglasses deconstruction (#15444)

Browse Source 
* sunglasses

* Unit test test

* Unit test test tested
This commit is contained in:
SabreML
2021-03-14 13:17:20 +00:00
committed by GitHub
parent 181d282848
commit 76e237edc5
12 changed files with 198 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/craft.dm
+7 -6
View File
@@ -166,12 +166,13 @@
if(!check_pathtools(user, R, contents))
return ", missing tool."
var/list/parts = del_reqs(R, user)
var/atom/movable/I = new R.result (get_turf(user.loc))
I.CheckParts(parts, R)
if(isitem(I))
user.put_in_hands(I)
if(send_feedback)
SSblackbox.record_feedback("tally", "object_crafted", 1, I.type)
for(var/I in R.result)
var/atom/movable/M = new I (get_turf(user))
M.CheckParts(parts)
if(isitem(M))
user.put_in_hands(M)
if(send_feedback)
SSblackbox.record_feedback("tally", "object_crafted", 1, M.type)
return 0
return "."
return ", missing tool."
code/modules/crafting/recipes.dm
+127 -115
View File
@@ -1,21 +1,33 @@
/datum/crafting_recipe
var/name = "" //in-game display name
var/reqs[] = list() //type paths of items consumed associated with how many are needed
var/blacklist[] = list() //type paths of items explicitly not allowed as an ingredient
var/result //type path of item resulting from this craft
var/tools[] = list() //tool behaviours of items needed but not consumed
var/pathtools[] = list() //type paths of items needed but not consumed
var/time = 30 //time in deciseconds
var/parts[] = list() //type paths of items that will be placed in the result
var/chem_catalysts[] = list() //like tools but for reagents
var/category = CAT_NONE //where it shows up in the crafting UI
/// In-game display name.
var/name = ""
/// Type paths of items consumed associated with how many are needed.
var/list/reqs = list()
/// Type paths of items explicitly not allowed as an ingredient.
var/list/blacklist = list()
/// Type paths of item(s) resulting from this craft.
var/list/result = list()
/// Tool behaviours of items needed but not consumed.
var/list/tools = list()
/// Type paths of items needed but not consumed.
var/list/pathtools = list()
/// Crafting time in deciseconds.
var/time = 30
/// Type paths of items that will be placed inside the result.
var/list/parts = list()
var/list/chem_catalysts = list() //like tools but for reagents
/// What category it's shown under in the crafting UI.
var/category = CAT_NONE
/// What subcategory it's shown under in the crafting UI. (e.g 'Ammo' under 'Weapons')
var/subcategory = CAT_NONE
var/always_availible = TRUE //Set to FALSE if it needs to be learned first.
/// Is this recipe always available, or does it need to be learned first.
var/always_availible = TRUE
/// Will this recipe send an admin message when it's completed.
var/alert_admins_on_craft = FALSE
/datum/crafting_recipe/IED
name = "IED"
result = /obj/item/grenade/iedcasing
result = list(/obj/item/grenade/iedcasing)
reqs = list(/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
@@ -27,7 +39,7 @@
/datum/crafting_recipe/molotov
name = "Molotov"
result = /obj/item/reagent_containers/food/drinks/bottle/molotov
result = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
reqs = list(/obj/item/reagent_containers/glass/rag = 1,
/obj/item/reagent_containers/food/drinks/bottle = 1)
parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
@@ -37,7 +49,7 @@
/datum/crafting_recipe/stunprod
name = "Stunprod"
result = /obj/item/melee/baton/cattleprod
result = list(/obj/item/melee/baton/cattleprod)
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
/obj/item/assembly/igniter = 1)
@@ -47,7 +59,7 @@
/datum/crafting_recipe/bola
name = "Bola"
result = /obj/item/restraints/legcuffs/bola
result = list(/obj/item/restraints/legcuffs/bola)
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/sheet/metal = 6)
time = 20//15 faster than crafting them by hand!
@@ -56,7 +68,7 @@
/datum/crafting_recipe/ed209
name = "ED209"
result = /mob/living/simple_animal/bot/ed209
result = list(/mob/living/simple_animal/bot/ed209)
reqs = list(/obj/item/robot_parts/robot_suit = 1,
/obj/item/clothing/head/helmet = 1,
/obj/item/clothing/suit/armor/vest = 1,
@@ -73,7 +85,7 @@
/datum/crafting_recipe/secbot
name = "Secbot"
result = /mob/living/simple_animal/bot/secbot
result = list(/mob/living/simple_animal/bot/secbot)
reqs = list(/obj/item/assembly/signaler = 1,
/obj/item/clothing/head/helmet = 1,
/obj/item/melee/baton = 1,
@@ -85,7 +97,7 @@
/datum/crafting_recipe/griefsky
name = "General Griefsky"
result = /mob/living/simple_animal/bot/secbot/griefsky
result = list(/mob/living/simple_animal/bot/secbot/griefsky)
reqs = list(/obj/item/assembly/signaler = 1,
/obj/item/clothing/head/helmet = 1,
/obj/item/melee/energy/sword = 4,
@@ -99,7 +111,7 @@
/datum/crafting_recipe/cleanbot
name = "Cleanbot"
result = /mob/living/simple_animal/bot/cleanbot
result = list(/mob/living/simple_animal/bot/cleanbot)
reqs = list(/obj/item/reagent_containers/glass/bucket = 1,
/obj/item/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
@@ -108,7 +120,7 @@
/datum/crafting_recipe/honkbot
name = "Honkbot"
result = /mob/living/simple_animal/bot/honkbot
result = list(/mob/living/simple_animal/bot/honkbot)
reqs = list(/obj/item/robot_parts/r_arm = 1,
/obj/item/bikehorn = 1,
/obj/item/assembly/prox_sensor = 1,
@@ -119,7 +131,7 @@
/datum/crafting_recipe/floorbot
name = "Floorbot"
result = /mob/living/simple_animal/bot/floorbot
result = list(/mob/living/simple_animal/bot/floorbot)
reqs = list(/obj/item/storage/toolbox = 1,
/obj/item/stack/tile/plasteel = 10,
/obj/item/assembly/prox_sensor = 1,
@@ -129,7 +141,7 @@
/datum/crafting_recipe/medbot
name = "Medbot"
result = /mob/living/simple_animal/bot/medbot
result = list(/mob/living/simple_animal/bot/medbot)
reqs = list(/obj/item/healthanalyzer = 1,
/obj/item/storage/firstaid = 1,
/obj/item/assembly/prox_sensor = 1,
@@ -139,7 +151,7 @@
/datum/crafting_recipe/flamethrower
name = "Flamethrower"
result = /obj/item/flamethrower
result = list(/obj/item/flamethrower)
reqs = list(/obj/item/weldingtool = 1,
/obj/item/assembly/igniter = 1,
/obj/item/stack/rods = 1)
@@ -153,7 +165,7 @@
/datum/crafting_recipe/pulseslug
name = "Pulse Slug Shell"
result = /obj/item/ammo_casing/shotgun/pulseslug
result = list(/obj/item/ammo_casing/shotgun/pulseslug)
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/stock_parts/capacitor/adv = 2,
/obj/item/stock_parts/micro_laser/ultra = 1)
@@ -164,7 +176,7 @@
/datum/crafting_recipe/dragonsbreath
name = "Dragonsbreath Shell"
result = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
result = list(/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath)
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/datum/reagent/phosphorus = 5,)
tools = list(TOOL_SCREWDRIVER)
@@ -174,7 +186,7 @@
/datum/crafting_recipe/frag12
name = "FRAG-12 Shell"
result = /obj/item/ammo_casing/shotgun/frag12
result = list(/obj/item/ammo_casing/shotgun/frag12)
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/datum/reagent/glycerol = 5,
/datum/reagent/acid = 5,
@@ -186,7 +198,7 @@
/datum/crafting_recipe/ionslug
name = "Ion Scatter Shell"
result = /obj/item/ammo_casing/shotgun/ion
result = list(/obj/item/ammo_casing/shotgun/ion)
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/stock_parts/micro_laser/ultra = 1)
tools = list(TOOL_SCREWDRIVER)
@@ -196,7 +208,7 @@
/datum/crafting_recipe/improvisedslug
name = "Improvised Shotgun Shell"
result = /obj/item/ammo_casing/shotgun/improvised
result = list(/obj/item/ammo_casing/shotgun/improvised)
reqs = list(/obj/item/grenade/chem_grenade = 1,
/obj/item/stack/sheet/metal = 1,
/obj/item/stack/cable_coil = 1,
@@ -208,7 +220,7 @@
/datum/crafting_recipe/improvisedslugoverload
name = "Overload Improvised Shell"
result = /obj/item/ammo_casing/shotgun/improvised/overload
result = list(/obj/item/ammo_casing/shotgun/improvised/overload)
reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1,
/datum/reagent/blackpowder = 10,
/datum/reagent/plasma_dust = 20)
@@ -219,7 +231,7 @@
/datum/crafting_recipe/laserslug
name = "Laser Slug Shell"
result = /obj/item/ammo_casing/shotgun/laserslug
result = list(/obj/item/ammo_casing/shotgun/laserslug)
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/stock_parts/capacitor/adv = 1,
/obj/item/stock_parts/micro_laser/high = 1)
@@ -230,7 +242,7 @@
/datum/crafting_recipe/ishotgun
name = "Improvised Shotgun"
result = /obj/item/gun/projectile/revolver/doublebarrel/improvised
result = list(/obj/item/gun/projectile/revolver/doublebarrel/improvised)
reqs = list(/obj/item/weaponcrafting/receiver = 1,
/obj/item/pipe = 1,
/obj/item/weaponcrafting/stock = 1,
@@ -242,7 +254,7 @@
/datum/crafting_recipe/chainsaw
name = "Chainsaw"
result = /obj/item/twohanded/required/chainsaw
result = list(/obj/item/twohanded/required/chainsaw)
reqs = list(/obj/item/circular_saw = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/plasteel = 1)
@@ -254,7 +266,7 @@
/datum/crafting_recipe/spear
name = "Spear"
result = /obj/item/twohanded/spear
result = list(/obj/item/twohanded/spear)
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/shard = 1,
/obj/item/stack/rods = 1)
@@ -264,7 +276,7 @@
/datum/crafting_recipe/spooky_camera
name = "Camera Obscura"
result = /obj/item/camera/spooky
result = list(/obj/item/camera/spooky)
time = 15
reqs = list(/obj/item/camera = 1,
/datum/reagent/holywater = 10)
@@ -273,14 +285,14 @@
/datum/crafting_recipe/papersack
name = "Paper Sack"
result = /obj/item/storage/box/papersack
result = list(/obj/item/storage/box/papersack)
time = 10
reqs = list(/obj/item/paper = 5)
category = CAT_MISC
/datum/crafting_recipe/flashlight_eyes
name = "Flashlight Eyes"
result = /obj/item/organ/internal/eyes/cybernetic/flashlight
result = list(/obj/item/organ/internal/eyes/cybernetic/flashlight)
time = 10
reqs = list(/obj/item/flashlight = 2,
/obj/item/restraints/handcuffs/cable = 1)
@@ -288,7 +300,7 @@
/datum/crafting_recipe/sushimat
name = "Sushi Mat"
result = /obj/item/kitchen/sushimat
result = list(/obj/item/kitchen/sushimat)
time = 10
reqs = list(/obj/item/stack/sheet/wood = 1,
/obj/item/stack/cable_coil = 2)
@@ -296,7 +308,7 @@
/datum/crafting_recipe/notreallysoap
name = "Homemade Soap"
result = /obj/item/soap/ducttape
result = list(/obj/item/soap/ducttape)
time = 50
reqs = list(/obj/item/stack/tape_roll = 1,
/datum/reagent/liquidgibs = 10)
@@ -304,7 +316,7 @@
/datum/crafting_recipe/garrote
name = "Makeshift Garrote"
result = /obj/item/twohanded/garrote/improvised
result = list(/obj/item/twohanded/garrote/improvised)
time = 15
reqs = list(/obj/item/stack/sheet/wood = 1,
/obj/item/stack/cable_coil = 5)
@@ -314,7 +326,7 @@
/datum/crafting_recipe/makeshift_bolt
name = "Makeshift Bolt"
result = /obj/item/arrow/rod
result = list(/obj/item/arrow/rod)
time = 5
reqs = list(/obj/item/stack/rods = 1)
tools = list(TOOL_WELDER)
@@ -323,7 +335,7 @@
/datum/crafting_recipe/crossbow
name = "Powered Crossbow"
result = /obj/item/gun/throw/crossbow
result = list(/obj/item/gun/throw/crossbow)
time = 150
reqs = list(/obj/item/stack/rods = 3,
/obj/item/stack/cable_coil = 10,
@@ -335,7 +347,7 @@
/datum/crafting_recipe/glove_balloon
name = "Latex Glove Balloon"
result = /obj/item/latexballon
result = list(/obj/item/latexballon)
time = 15
reqs = list(/obj/item/clothing/gloves/color/latex = 1,
/obj/item/stack/cable_coil = 5)
@@ -343,7 +355,7 @@
/datum/crafting_recipe/gold_horn
name = "Golden bike horn"
result = /obj/item/bikehorn/golden
result = list(/obj/item/bikehorn/golden)
time = 20
reqs = list(/obj/item/stack/sheet/mineral/bananium = 5,
/obj/item/bikehorn)
@@ -351,7 +363,7 @@
/datum/crafting_recipe/blackcarpet
name = "Black Carpet"
result = /obj/item/stack/tile/carpet/black
result = list(/obj/item/stack/tile/carpet/black)
time = 20
reqs = list(/obj/item/stack/tile/carpet = 1)
pathtools = list(/obj/item/toy/crayon)
@@ -359,7 +371,7 @@
/datum/crafting_recipe/showercurtain
name = "Shower Curtains"
result = /obj/structure/curtain
result = list(/obj/structure/curtain)
time = 20
reqs = list(/obj/item/stack/sheet/cloth = 2,
/obj/item/stack/sheet/plastic = 2,
@@ -368,7 +380,7 @@
/datum/crafting_recipe/chemical_payload
name = "Chemical Payload (C4)"
result = /obj/item/bombcore/chemical
result = list(/obj/item/bombcore/chemical)
reqs = list(
/obj/item/stock_parts/matter_bin = 1,
/obj/item/grenade/plastic/c4 = 1,
@@ -382,7 +394,7 @@
/datum/crafting_recipe/chemical_payload2
name = "Chemical Payload (gibtonite)"
result = /obj/item/bombcore/chemical
result = list(/obj/item/bombcore/chemical)
reqs = list(
/obj/item/stock_parts/matter_bin = 1,
/obj/item/twohanded/required/gibtonite = 1,
@@ -396,7 +408,7 @@
/datum/crafting_recipe/toxins_payload
name = "Toxins Payload Casing"
result = /obj/item/bombcore/toxins
result = list(/obj/item/bombcore/toxins)
reqs = list(
/obj/item/stock_parts/matter_bin = 1,
/obj/item/assembly/signaler = 1,
@@ -407,14 +419,14 @@
/datum/crafting_recipe/bonearmor
name = "Bone Armor"
result = /obj/item/clothing/suit/armor/bone
result = list(/obj/item/clothing/suit/armor/bone)
time = 30
reqs = list(/obj/item/stack/sheet/bone = 6)
category = CAT_PRIMAL
/datum/crafting_recipe/bonetalisman
name = "Bone Talisman"
result = /obj/item/clothing/accessory/necklace/talisman
result = list(/obj/item/clothing/accessory/necklace/talisman)
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 1)
@@ -422,7 +434,7 @@
/datum/crafting_recipe/bonecodpiece
name = "Skull Codpiece"
result = /obj/item/clothing/accessory/necklace/skullcodpiece
result = list(/obj/item/clothing/accessory/necklace/skullcodpiece)
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 1)
@@ -430,7 +442,7 @@
/datum/crafting_recipe/bracers
name = "Bone Bracers"
result = /obj/item/clothing/gloves/bracer
result = list(/obj/item/clothing/gloves/bracer)
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 1)
@@ -438,14 +450,14 @@
/datum/crafting_recipe/skullhelm
name = "Skull Helmet"
result = /obj/item/clothing/head/helmet/skull
result = list(/obj/item/clothing/head/helmet/skull)
time = 30
reqs = list(/obj/item/stack/sheet/bone = 4)
category = CAT_PRIMAL
/datum/crafting_recipe/goliathcloak
name = "Goliath Cloak"
result = /obj/item/clothing/suit/hooded/goliath
result = list(/obj/item/clothing/suit/hooded/goliath)
time = 50
reqs = list(/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/sinew = 2,
@@ -454,7 +466,7 @@
/datum/crafting_recipe/drakecloak
name = "Ash Drake Armour"
result = /obj/item/clothing/suit/hooded/drake
result = list(/obj/item/clothing/suit/hooded/drake)
time = 60
reqs = list(/obj/item/stack/sheet/bone = 10,
/obj/item/stack/sheet/sinew = 2,
@@ -463,7 +475,7 @@
/datum/crafting_recipe/firebrand
name = "Firebrand"
result = /obj/item/match/firebrand
result = list(/obj/item/match/firebrand)
time = 100 //Long construction time. Making fire is hard work.
reqs = list(/obj/item/stack/sheet/wood = 2)
category = CAT_PRIMAL
@@ -473,19 +485,19 @@
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 1)
result = /obj/item/stack/medical/splint/tribal
result = list(/obj/item/stack/medical/splint/tribal)
category = CAT_PRIMAL
/datum/crafting_recipe/bonedagger
name = "Bone Dagger"
result = /obj/item/kitchen/knife/combat/survival/bone
result = list(/obj/item/kitchen/knife/combat/survival/bone)
time = 20
reqs = list(/obj/item/stack/sheet/bone = 2)
category = CAT_PRIMAL
/datum/crafting_recipe/bonespear
name = "Bone Spear"
result = /obj/item/twohanded/spear/bonespear
result = list(/obj/item/twohanded/spear/bonespear)
time = 30
reqs = list(/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 1)
@@ -493,7 +505,7 @@
/datum/crafting_recipe/boneaxe
name = "Bone Axe"
result = /obj/item/twohanded/fireaxe/boneaxe
result = list(/obj/item/twohanded/fireaxe/boneaxe)
time = 50
reqs = list(/obj/item/stack/sheet/bone = 6,
/obj/item/stack/sheet/sinew = 3)
@@ -503,7 +515,7 @@
name = "Bonfire"
time = 60
reqs = list(/obj/item/grown/log = 5)
result = /obj/structure/bonfire
result = list(/obj/structure/bonfire)
category = CAT_PRIMAL
alert_admins_on_craft = TRUE
@@ -511,19 +523,19 @@
name = "Rake"
time = 30
reqs = list(/obj/item/stack/sheet/wood = 5)
result = /obj/item/cultivator/rake
result = list(/obj/item/cultivator/rake)
category = CAT_PRIMAL
/datum/crafting_recipe/woodbucket
name = "Wooden Bucket"
time = 30
reqs = list(/obj/item/stack/sheet/wood = 3)
result = /obj/item/reagent_containers/glass/bucket/wooden
result = list(/obj/item/reagent_containers/glass/bucket/wooden)
category = CAT_PRIMAL
/datum/crafting_recipe/guillotine
name = "Guillotine"
result = /obj/structure/guillotine
result = list(/obj/structure/guillotine)
time = 150 // Building a functioning guillotine takes time
reqs = list(/obj/item/stack/sheet/plasteel = 3,
/obj/item/stack/sheet/wood = 20,
@@ -533,7 +545,7 @@
/datum/crafting_recipe/ghettojetpack
name = "Improvised Jetpack"
result = /obj/item/tank/jetpack/improvised
result = list(/obj/item/tank/jetpack/improvised)
time = 30
reqs = list(/obj/item/tank/internals/oxygen = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = MAXCOIL)
category = CAT_MISC
@@ -541,7 +553,7 @@
/datum/crafting_recipe/drill
name = "Thermal Drill"
result = /obj/item/thermal_drill
result = list(/obj/item/thermal_drill)
time = 60
reqs = list(/obj/item/stack/cable_coil = 5,
/obj/item/mecha_parts/mecha_equipment/drill = 1,
@@ -553,7 +565,7 @@
/datum/crafting_recipe/d_drill
name = "Diamond Tipped Thermal Drill"
result = /obj/item/thermal_drill/diamond_drill
result = list(/obj/item/thermal_drill/diamond_drill)
time = 60
reqs = list(/obj/item/stack/cable_coil = 5,
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill = 1,
@@ -565,7 +577,7 @@
/datum/crafting_recipe/faketoolbox
name = "Black and Red toolbox"
result = /obj/item/storage/toolbox/fakesyndi
result = list(/obj/item/storage/toolbox/fakesyndi)
time = 40
reqs = list(/datum/reagent/paint/red = 10,
/datum/reagent/paint/black = 30,
@@ -575,7 +587,7 @@
/datum/crafting_recipe/snowman
name = "Snowman"
result = /obj/structure/snowman/built
result = list(/obj/structure/snowman/built)
reqs = list(/obj/item/snowball = 10,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/grown/log = 2)
@@ -586,7 +598,7 @@
/datum/crafting_recipe/paper_craft
name = "Paper Heart"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/heart
result = list(/obj/item/decorations/sticky_decorations/flammable/heart)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 1)
tools = list(TOOL_WIRECUTTER) //cutters act as makeshift scissors. I doubt the barber wants to have their scissors stolen when somone wants to decorate
@@ -596,7 +608,7 @@
/datum/crafting_recipe/paper_craft/single_eye
name = "Paper Eye"
result = /obj/item/decorations/sticky_decorations/flammable/singleeye
result = list(/obj/item/decorations/sticky_decorations/flammable/singleeye)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen, /obj/item/toy/crayon/blue)
category = CAT_DECORATIONS
@@ -604,7 +616,7 @@
/datum/crafting_recipe/paper_craft/googlyeyes
name = "Paper Googly Eye"
result = /obj/item/decorations/sticky_decorations/flammable/googlyeyes
result = list(/obj/item/decorations/sticky_decorations/flammable/googlyeyes)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
category = CAT_DECORATIONS
@@ -612,7 +624,7 @@
/datum/crafting_recipe/paper_craft/clock
name = "Paper Clock"
result = /obj/item/decorations/sticky_decorations/flammable/paperclock
result = list(/obj/item/decorations/sticky_decorations/flammable/paperclock)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
category = CAT_DECORATIONS
@@ -620,7 +632,7 @@
/datum/crafting_recipe/paper_craft/jack_o_lantern
name = "Paper Jack o'Lantern"
result = /obj/item/decorations/sticky_decorations/flammable/jack_o_lantern
result = list(/obj/item/decorations/sticky_decorations/flammable/jack_o_lantern)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/orange,
@@ -630,7 +642,7 @@
/datum/crafting_recipe/paper_craft/ghost
name = "Paper Ghost"
result = /obj/item/decorations/sticky_decorations/flammable/ghost
result = list(/obj/item/decorations/sticky_decorations/flammable/ghost)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)//it's white paper why need a white crayon?
category = CAT_DECORATIONS
@@ -638,7 +650,7 @@
/datum/crafting_recipe/paper_craft/spider
name = "Paper Spider"
result = /obj/item/decorations/sticky_decorations/flammable/spider
result = list(/obj/item/decorations/sticky_decorations/flammable/spider)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/red)
@@ -647,7 +659,7 @@
/datum/crafting_recipe/paper_craft/spiderweb
name = "Paper Spiderweb"
result = /obj/item/decorations/sticky_decorations/flammable/spiderweb
result = list(/obj/item/decorations/sticky_decorations/flammable/spiderweb)
tools = list(TOOL_WIRECUTTER)
pathtools = list()
category = CAT_DECORATIONS
@@ -655,7 +667,7 @@
/datum/crafting_recipe/paper_craft/skull
name = "Paper Skull"
result = /obj/item/decorations/sticky_decorations/flammable/skull
result = list(/obj/item/decorations/sticky_decorations/flammable/skull)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
category = CAT_DECORATIONS
@@ -663,7 +675,7 @@
/datum/crafting_recipe/paper_craft/skeleton
name = "Paper Skeleton"
result = /obj/item/decorations/sticky_decorations/flammable/skeleton
result = list(/obj/item/decorations/sticky_decorations/flammable/skeleton)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
category = CAT_DECORATIONS
@@ -671,7 +683,7 @@
/datum/crafting_recipe/paper_craft/cauldron
name = "Paper Cauldron"
result = /obj/item/decorations/sticky_decorations/flammable/cauldron
result = list(/obj/item/decorations/sticky_decorations/flammable/cauldron)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
category = CAT_DECORATIONS
@@ -679,7 +691,7 @@
/datum/crafting_recipe/paper_craft/snowman
name = "Paper Snowman"
result = /obj/item/decorations/sticky_decorations/flammable/snowman
result = list(/obj/item/decorations/sticky_decorations/flammable/snowman)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/orange)
@@ -688,7 +700,7 @@
/datum/crafting_recipe/paper_craft/christmas_stocking
name = "Paper Christmas Stocking"
result = /obj/item/decorations/sticky_decorations/flammable/christmas_stocking
result = list(/obj/item/decorations/sticky_decorations/flammable/christmas_stocking)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
category = CAT_DECORATIONS
@@ -696,7 +708,7 @@
/datum/crafting_recipe/paper_craft/christmas_tree
name = "Paper Christmas Tree"
result = /obj/item/decorations/sticky_decorations/flammable/christmas_tree
result = list(/obj/item/decorations/sticky_decorations/flammable/christmas_tree)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red,
/obj/item/toy/crayon/yellow,
@@ -707,7 +719,7 @@
/datum/crafting_recipe/paper_craft/snowflake
name = "Paper Snowflake"
result = /obj/item/decorations/sticky_decorations/flammable/snowflake
result = list(/obj/item/decorations/sticky_decorations/flammable/snowflake)
tools = list(TOOL_WIRECUTTER)
pathtools = list()
category = CAT_DECORATIONS
@@ -715,7 +727,7 @@
/datum/crafting_recipe/paper_craft/candy_cane
name = "Paper Candy Cane"
result = /obj/item/decorations/sticky_decorations/flammable/candy_cane
result = list(/obj/item/decorations/sticky_decorations/flammable/candy_cane)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
category = CAT_DECORATIONS
@@ -723,7 +735,7 @@
/datum/crafting_recipe/paper_craft/mistletoe
name = "Paper Mistletoe"
result = /obj/item/decorations/sticky_decorations/flammable/mistletoe
result = list(/obj/item/decorations/sticky_decorations/flammable/mistletoe)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red,
/obj/item/toy/crayon/green)
@@ -732,7 +744,7 @@
/datum/crafting_recipe/paper_craft/holly
name = "Paper Holly"
result = /obj/item/decorations/sticky_decorations/flammable/holly
result = list(/obj/item/decorations/sticky_decorations/flammable/holly)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red,
/obj/item/toy/crayon/green)
@@ -742,7 +754,7 @@
/datum/crafting_recipe/paper_craft/tinsel_white
name = "Paper Tinsel White"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -753,7 +765,7 @@
/datum/crafting_recipe/paper_craft/tinsel_red
name = "Red Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/red
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/red)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -764,7 +776,7 @@
/datum/crafting_recipe/paper_craft/tinsel_blue
name = "Blue Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/blue
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/blue)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -775,7 +787,7 @@
/datum/crafting_recipe/paper_craft/tinsel_yellow
name = "Yellow Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/yellow
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -786,7 +798,7 @@
/datum/crafting_recipe/paper_craft/tinsel_purple
name = "Purple Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/purple
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/purple)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -797,7 +809,7 @@
/datum/crafting_recipe/paper_craft/tinsel_green
name = "Green Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/green
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/green)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -808,7 +820,7 @@
/datum/crafting_recipe/paper_craft/tinsel_orange
name = "Orange Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/orange
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/orange)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -819,7 +831,7 @@
/datum/crafting_recipe/paper_craft/tinsel_black
name = "Black Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/black
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/black)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -830,7 +842,7 @@
/datum/crafting_recipe/paper_craft/tinsel_halloween
name = "Halloween style Paper Tinsel"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/tinsel/halloween
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/halloween)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
@@ -841,7 +853,7 @@
/datum/crafting_recipe/paper_craft/arrowed_heart
name = "Paper Arrowed Heart"
result = /obj/item/decorations/sticky_decorations/flammable/arrowed_heart
result = list(/obj/item/decorations/sticky_decorations/flammable/arrowed_heart)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
category = CAT_DECORATIONS
@@ -849,7 +861,7 @@
/datum/crafting_recipe/paper_craft/heart_chain
name = "Paper Heart Chain"
result = /obj/item/decorations/sticky_decorations/flammable/heart_chain
result = list(/obj/item/decorations/sticky_decorations/flammable/heart_chain)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2,
/obj/item/stack/cable_coil = 2)
@@ -860,7 +872,7 @@
/datum/crafting_recipe/paper_craft/four_leaf_clover
name = "Paper Four Leaf Clover"
result = /obj/item/decorations/sticky_decorations/flammable/four_leaf_clover
result = list(/obj/item/decorations/sticky_decorations/flammable/four_leaf_clover)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/green)
category = CAT_DECORATIONS
@@ -868,7 +880,7 @@
/datum/crafting_recipe/paper_craft/pot_of_gold
name = "Paper Pot of Gold"
result = /obj/item/decorations/sticky_decorations/flammable/pot_of_gold
result = list(/obj/item/decorations/sticky_decorations/flammable/pot_of_gold)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/red,
@@ -883,7 +895,7 @@
/datum/crafting_recipe/paper_craft/leprechaun_hat
name = "Paper Leprechaun Hat"
time = 10
result = /obj/item/decorations/sticky_decorations/flammable/leprechaun_hat
result = list(/obj/item/decorations/sticky_decorations/flammable/leprechaun_hat)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/yellow,
@@ -893,7 +905,7 @@
/datum/crafting_recipe/paper_craft/easter_bunny
name = "Paper Easter Bunny"
result = /obj/item/decorations/sticky_decorations/flammable/easter_bunny
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_bunny)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/blue,
@@ -903,7 +915,7 @@
/datum/crafting_recipe/paper_craft/easter_egg_blue
name = "Blue Paper Easter Egg"
result = /obj/item/decorations/sticky_decorations/flammable/easter_egg
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/blue)
category = CAT_DECORATIONS
@@ -911,7 +923,7 @@
/datum/crafting_recipe/paper_craft/easter_egg_yellow
name = "Yellow Paper Easter Egg"
result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/yellow
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/yellow)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/yellow)
category = CAT_DECORATIONS
@@ -919,7 +931,7 @@
/datum/crafting_recipe/paper_craft/easter_egg_red
name = "Red Paper Easter Egg"
result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/red
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/red)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
category = CAT_DECORATIONS
@@ -927,7 +939,7 @@
/datum/crafting_recipe/paper_craft/easter_egg_purple
name = "Purple Paper Easter Egg"
result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/purple
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/purple)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/purple)
category = CAT_DECORATIONS
@@ -935,7 +947,7 @@
/datum/crafting_recipe/paper_craft/easter_egg_orange
name = "Orange Paper Easter Egg"
result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/orange
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/orange)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/orange)
category = CAT_DECORATIONS
@@ -944,7 +956,7 @@
/datum/crafting_recipe/metal_angel_statue
name = "Metal angel statue"
time = 50
result = /obj/structure/decorative_structures/metal/statue/metal_angel
result = list(/obj/structure/decorative_structures/metal/statue/metal_angel)
reqs = list(/obj/item/stack/sheet/metal = 10,
/obj/item/stack/sheet/mineral/gold = 6)
tools = list(TOOL_WELDER)
@@ -954,7 +966,7 @@
/datum/crafting_recipe/golden_disk_statue
name = "Golden disk statue"
time = 50
result = /obj/structure/decorative_structures/metal/statue/golden_disk
result = list(/obj/structure/decorative_structures/metal/statue/golden_disk)
reqs = list(/obj/item/stack/sheet/metal = 10,
/obj/item/stack/sheet/mineral/plasma = 3,
/obj/item/stack/sheet/mineral/gold = 8)
@@ -965,7 +977,7 @@
/datum/crafting_recipe/sun_statue
name = "Sun statue"
time = 40
result = /obj/structure/decorative_structures/metal/statue/sun
result = list(/obj/structure/decorative_structures/metal/statue/sun)
reqs = list(/obj/item/stack/sheet/metal = 6,
/obj/item/stack/sheet/mineral/gold = 4)
tools = list(TOOL_WELDER)
@@ -975,7 +987,7 @@
/datum/crafting_recipe/moon_statue
name = "Moon statue"
time = 50
result = /obj/structure/decorative_structures/metal/statue/moon
result = list(/obj/structure/decorative_structures/metal/statue/moon)
reqs = list(/obj/item/stack/sheet/metal = 6,
/obj/item/stack/sheet/mineral/silver = 6,
/obj/item/stack/sheet/mineral/gold = 4)
@@ -986,7 +998,7 @@
/datum/crafting_recipe/tesla_statue
name = "Tesla statue"
time = 40
result = /obj/structure/decorative_structures/metal/statue/tesla
result = list(/obj/structure/decorative_structures/metal/statue/tesla)
reqs = list(/obj/item/stack/sheet/metal = 4,
/obj/item/stack/sheet/glass = 8)
tools = list(TOOL_WELDER)
@@ -996,7 +1008,7 @@
/datum/crafting_recipe/tesla_monument
name = "Tesla monument"
time = 50
result = /obj/structure/decorative_structures/metal/statue/tesla_monument
result = list(/obj/structure/decorative_structures/metal/statue/tesla_monument)
reqs = list(/obj/item/stack/sheet/metal = 8,
/obj/item/stock_parts/cell = 3,
/obj/item/stack/cable_coil = 4)
@@ -1007,7 +1019,7 @@
/datum/crafting_recipe/grandfather_clock
name = "Grandfather clock"
time = 50
result = /obj/structure/decorative_structures/flammable/grandfather_clock
result = list(/obj/structure/decorative_structures/flammable/grandfather_clock)
reqs = list(/obj/item/stack/sheet/wood = 5,
/obj/item/stack/sheet/mineral/gold = 1,
/obj/item/stack/sheet/glass = 2)
@@ -1017,7 +1029,7 @@
/datum/crafting_recipe/lava_land_display
name = "Lava land display"
time = 50
result = /obj/structure/decorative_structures/flammable/lava_land_display
result = list(/obj/structure/decorative_structures/flammable/lava_land_display)
reqs = list(/obj/item/paper = 4,
/obj/item/stack/sheet/wood = 4,
/obj/item/stack/rods = 4,
code/modules/crafting/tailoring.dm
+22 -22
View File
@@ -1,6 +1,6 @@
/datum/crafting_recipe/durathread_vest
name = "Durathread Vest"
result = /obj/item/clothing/suit/armor/vest/durathread
result = list(/obj/item/clothing/suit/armor/vest/durathread)
reqs = list(/obj/item/stack/sheet/durathread = 5,
/obj/item/stack/sheet/leather = 4)
time = 50
@@ -8,7 +8,7 @@
/datum/crafting_recipe/durathread_helmet
name = "Durathread Helmet"
result = /obj/item/clothing/head/helmet/durathread
result = list(/obj/item/clothing/head/helmet/durathread)
reqs = list(/obj/item/stack/sheet/durathread = 4,
/obj/item/stack/sheet/leather = 5)
time = 40
@@ -16,35 +16,35 @@
/datum/crafting_recipe/durathread_jumpsuit
name = "Durathread Jumpsuit"
result = /obj/item/clothing/under/misc/durathread
result = list(/obj/item/clothing/under/misc/durathread)
reqs = list(/obj/item/stack/sheet/durathread = 4)
time = 40
category = CAT_CLOTHING
/datum/crafting_recipe/durathread_beret
name = "Durathread Beret"
result = /obj/item/clothing/head/beret/durathread
result = list(/obj/item/clothing/head/beret/durathread)
reqs = list(/obj/item/stack/sheet/durathread = 2)
time = 40
category = CAT_CLOTHING
/datum/crafting_recipe/durathread_beanie
name = "Durathread Beanie"
result = /obj/item/clothing/head/beanie/durathread
result = list(/obj/item/clothing/head/beanie/durathread)
reqs = list(/obj/item/stack/sheet/durathread = 2)
time = 40
category = CAT_CLOTHING
/datum/crafting_recipe/durathread_bandana
name = "Durathread Bandana"
result = /obj/item/clothing/mask/bandana/durathread
result = list(/obj/item/clothing/mask/bandana/durathread)
reqs = list(/obj/item/stack/sheet/durathread = 1)
time = 25
category = CAT_CLOTHING
/datum/crafting_recipe/fannypack
name = "Fannypack"
result = /obj/item/storage/belt/fannypack
result = list(/obj/item/storage/belt/fannypack)
reqs = list(/obj/item/stack/sheet/cloth = 2,
/obj/item/stack/sheet/leather = 1)
time = 20
@@ -52,7 +52,7 @@
/datum/crafting_recipe/hudsunsec
name = "Security HUDsunglasses"
result = /obj/item/clothing/glasses/hud/security/sunglasses
result = list(/obj/item/clothing/glasses/hud/security/sunglasses)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/security = 1,
@@ -62,7 +62,7 @@
/datum/crafting_recipe/hudsunsecremoval
name = "Security HUD removal"
result = /obj/item/clothing/glasses/sunglasses
result = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/hud/security)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1)
@@ -70,7 +70,7 @@
/datum/crafting_recipe/hudsunmed
name = "Medical HUDsunglasses"
result = /obj/item/clothing/glasses/hud/health/sunglasses
result = list(/obj/item/clothing/glasses/hud/health/sunglasses)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/health = 1,
@@ -80,7 +80,7 @@
/datum/crafting_recipe/hudsunmedremoval
name = "Medical HUD removal"
result = /obj/item/clothing/glasses/sunglasses
result = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/hud/health)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1)
@@ -88,7 +88,7 @@
/datum/crafting_recipe/hudsundiag
name = "Diagnostic HUDsunglasses"
result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
result = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
@@ -98,15 +98,15 @@
/datum/crafting_recipe/hudsundiagremoval
name = "Diagnostic HUD removal"
result = /obj/item/clothing/glasses/sunglasses
result = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/hud/diagnostic)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/beergoggles
name = "Beer Goggles"
result = /obj/item/clothing/glasses/sunglasses/reagent
name = "Sunscanners"
result = list(/obj/item/clothing/glasses/sunglasses/reagent)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/science = 1,
@@ -115,8 +115,8 @@
category = CAT_CLOTHING
/datum/crafting_recipe/beergogglesremoval
name = "Beer Goggles removal"
result = /obj/item/clothing/glasses/sunglasses
name = "Sunscanners removal"
result = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/science)
time = 20
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
@@ -124,7 +124,7 @@
/datum/crafting_recipe/ghostsheet
name = "Ghost Sheet"
result = /obj/item/clothing/suit/ghost_sheet
result = list(/obj/item/clothing/suit/ghost_sheet)
time = 5
tools = list(TOOL_WIRECUTTER)
reqs = list(/obj/item/bedsheet = 1)
@@ -132,21 +132,21 @@
/datum/crafting_recipe/cowboyboots
name = "Cowboy Boots"
result = /obj/item/clothing/shoes/cowboy
result = list(/obj/item/clothing/shoes/cowboy)
reqs = list(/obj/item/stack/sheet/leather = 2)
time = 45
category = CAT_CLOTHING
/datum/crafting_recipe/lizardboots
name = "Lizard Skin Boots"
result = /obj/effect/spawner/lootdrop/lizardboots
result = list(/obj/effect/spawner/lootdrop/lizardboots)
reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1, /obj/item/stack/sheet/leather = 1)
time = 60
category = CAT_CLOTHING
/datum/crafting_recipe/rubberduckyshoes
name = "Rubber Ducky Shoes"
result = /obj/item/clothing/shoes/ducky
result = list(/obj/item/clothing/shoes/ducky)
time = 45
reqs = list(/obj/item/bikehorn/rubberducky = 2,
/obj/item/clothing/shoes/sandal = 1)
@@ -155,7 +155,7 @@
/datum/crafting_recipe/salmonsuit
name = "Salmon Suit"
result = /obj/item/clothing/suit/hooded/salmon_costume
result = list(/obj/item/clothing/suit/hooded/salmon_costume)
time = 60
reqs = list(/obj/item/fish/salmon = 20,
/obj/item/stack/tape_roll = 5)
code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
+26 -26
View File
@@ -15,7 +15,7 @@
/obj/item/reagent_containers/food/snacks/breadslice = 2,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
)
result = /obj/item/reagent_containers/food/snacks/sandwich
result = list(/obj/item/reagent_containers/food/snacks/sandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -25,7 +25,7 @@
/datum/reagent/slimejelly = 5,
/obj/item/reagent_containers/food/snacks/breadslice = 2,
)
result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime
result = list(/obj/item/reagent_containers/food/snacks/jellysandwich/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -35,7 +35,7 @@
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/reagent_containers/food/snacks/breadslice = 2,
)
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
result = list(/obj/item/reagent_containers/food/snacks/jellysandwich/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -45,7 +45,7 @@
/datum/reagent/slimejelly = 5,
/obj/item/reagent_containers/food/snacks/bun = 1,
)
result = /obj/item/reagent_containers/food/snacks/jellyburger/slime
result = list(/obj/item/reagent_containers/food/snacks/jellyburger/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -55,7 +55,7 @@
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/reagent_containers/food/snacks/bun = 1,
)
result = /obj/item/reagent_containers/food/snacks/jellyburger/cherry
result = list(/obj/item/reagent_containers/food/snacks/jellyburger/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -65,7 +65,7 @@
/obj/item/melee/baseball_bat = 1,
/obj/item/reagent_containers/food/snacks/bun = 1,
)
result = /obj/item/reagent_containers/food/snacks/baseballburger
result = list(/obj/item/reagent_containers/food/snacks/baseballburger)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -75,7 +75,7 @@
/obj/item/reagent_containers/food/snacks/breadslice = 2,
/obj/item/clothing/mask/fakemoustache = 1,
)
result = /obj/item/reagent_containers/food/snacks/notasandwich
result = list(/obj/item/reagent_containers/food/snacks/notasandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -85,7 +85,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/boiled_shrimp = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
result = list(/obj/item/reagent_containers/food/snacks/sushi_Ebi)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -96,7 +96,7 @@
/obj/item/reagent_containers/food/snacks/boiled_shrimp = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -106,7 +106,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/salmon = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
result = list(/obj/item/reagent_containers/food/snacks/sushi_Ikura)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -117,7 +117,7 @@
/obj/item/fish_eggs/salmon = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -127,7 +127,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/fried_tofu = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Inari
result = list(/obj/item/reagent_containers/food/snacks/sushi_Inari)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -138,7 +138,7 @@
/obj/item/reagent_containers/food/snacks/fried_tofu = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -148,7 +148,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/salmonmeat = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Sake
result = list(/obj/item/reagent_containers/food/snacks/sushi_Sake)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -159,7 +159,7 @@
/obj/item/reagent_containers/food/snacks/salmonmeat = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -169,7 +169,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/salmonsteak = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
result = list(/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -180,7 +180,7 @@
/obj/item/reagent_containers/food/snacks/salmonsteak = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -190,7 +190,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Masago
result = list(/obj/item/reagent_containers/food/snacks/sushi_Masago)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -201,7 +201,7 @@
/obj/item/fish_eggs/goldfish = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -211,7 +211,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/shark = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
result = list(/obj/item/reagent_containers/food/snacks/sushi_Tobiko)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -222,7 +222,7 @@
/obj/item/fish_eggs/shark = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -232,7 +232,7 @@
/obj/item/reagent_containers/food/snacks/sushi_Tobiko = 1,
/obj/item/reagent_containers/food/snacks/egg = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
result = list(/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -243,7 +243,7 @@
/obj/item/reagent_containers/food/snacks/egg = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -253,7 +253,7 @@
/obj/item/reagent_containers/food/snacks/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/catfishmeat = 1,
)
result = /obj/item/reagent_containers/food/snacks/sushi_Tai
result = list(/obj/item/reagent_containers/food/snacks/sushi_Tai)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -264,7 +264,7 @@
/obj/item/reagent_containers/food/snacks/catfishmeat = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
result = list(/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -284,6 +284,6 @@
/datum/reagent/consumable/sprinkles = 5,
/datum/reagent/teslium = 1,
)
result = /mob/living/simple_animal/pet/cat/cak
result = list(/mob/living/simple_animal/pet/cat/cak)
category = CAT_FOOD
subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Felines -Foxes are better
code/modules/hydroponics/fermenting_barrel.dm
+1 -1
View File
@@ -93,7 +93,7 @@
/datum/crafting_recipe/fermenting_barrel
name = "Wooden Barrel"
result = /obj/structure/fermenting_barrel
result = list(/obj/structure/fermenting_barrel)
reqs = list(/obj/item/stack/sheet/wood = 30)
time = 50
category = CAT_PRIMAL
code/modules/instruments/objs/items/instruments.dm
+4 -4
View File
@@ -177,7 +177,7 @@
// Crafting recipes
/datum/crafting_recipe/violin
name = "Violin"
result = /obj/item/instrument/violin
result = list(/obj/item/instrument/violin)
reqs = list(/obj/item/stack/sheet/wood = 5,
/obj/item/stack/cable_coil = 6,
/obj/item/stack/tape_roll = 5)
@@ -187,7 +187,7 @@
/datum/crafting_recipe/guitar
name = "Guitar"
result = /obj/item/instrument/guitar
result = list(/obj/item/instrument/guitar)
reqs = list(/obj/item/stack/sheet/wood = 5,
/obj/item/stack/cable_coil = 6,
/obj/item/stack/tape_roll = 5)
@@ -197,7 +197,7 @@
/datum/crafting_recipe/eguitar
name = "Electric Guitar"
result = /obj/item/instrument/eguitar
result = list(/obj/item/instrument/eguitar)
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/cable_coil = 6,
/obj/item/stack/tape_roll = 5)
@@ -207,7 +207,7 @@
/datum/crafting_recipe/banjo
name = "Banjo"
result = /obj/item/instrument/banjo
result = list(/obj/item/instrument/banjo)
reqs = list(/obj/item/stack/sheet/wood = 5,
/obj/item/stack/cable_coil = 6,
/obj/item/stack/tape_roll = 5)
code/modules/mining/lavaland/ash_flora.dm
+1 -1
View File
@@ -267,7 +267,7 @@
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
result = /obj/item/reagent_containers/food/drinks/mushroom_bowl
result = list(/obj/item/reagent_containers/food/drinks/mushroom_bowl)
reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
code/modules/mining/lavaland/loot/tendril_loot.dm
+2 -2
View File
@@ -189,14 +189,14 @@
/datum/crafting_recipe/oar
name = "goliath bone oar"
result = /obj/item/oar
result = list(/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/lavaboat
result = list(/obj/vehicle/lavaboat)
reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3)
time = 50
category = CAT_PRIMAL
code/modules/unit_tests/_unit_tests.dm
+1
View File
@@ -3,6 +3,7 @@
#ifdef UNIT_TESTS
#include "component_tests.dm"
#include "crafting_lists.dm"
#include "log_format.dm"
#include "map_templates.dm"
#include "reagent_id_typos.dm"
code/modules/unit_tests/crafting_lists.dm
+5
View File
@@ -0,0 +1,5 @@
/datum/unit_test/crafting_lists/Run()
for(var/I in subtypesof(/datum/crafting_recipe))
var/datum/crafting_recipe/C = new I()
if(!islist(C.result))
Fail("Expected a list for the 'result' of [C.type].")