cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/crafting/crafting.dm
+1 -1
View File
@@ -382,8 +382,8 @@
if(recipe.structures)
requirements += recipe.structures
var/list/surroundings
for(var/path_key in requirements)
var/list/surroundings
var/amount = recipe.reqs?[path_key] || recipe.machinery?[path_key] || recipe.structures?[path_key]
if(!amount)//since machinery & structures can have 0 aka CRAFTING_MACHINERY_USE - i.e. use it, don't consume it!
continue
code/datums/components/crafting/structures.dm
+43
View File
@@ -105,3 +105,46 @@
/obj/item/stack/sheet/iron = 30,
)
category = CAT_STRUCTURE
/datum/crafting_recipe/secure_safe
name = "Secure safe"
result = /obj/item/wallframe/secure_safe
reqs = list(
/obj/item/stack/sheet/plasteel = 10,
/obj/item/stack/sheet/mineral/titanium = 5,
/obj/item/stack/cable_coil = 5,
/obj/item/stack/rods = 5,
/obj/item/wallframe/button = 1,
)
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_DRILL)
time = 30 SECONDS
category = CAT_STRUCTURE
/datum/crafting_recipe/vault
name = "Vault"
result = /obj/structure/safe/open
reqs = list(
/obj/item/stack/sheet/mineral/metal_hydrogen = 20,
/obj/item/stack/sheet/mineral/plastitanium = 10,
/obj/item/stack/cable_coil = 5,
/obj/item/stack/rods = 5,
/obj/item/wallframe/secure_safe = 1,
)
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_DRILL)
time = 90 SECONDS
category = CAT_STRUCTURE
crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND
/datum/crafting_recipe/vault_floor
name = "Floor Vault"
result = /obj/structure/safe/floor/open
reqs = list(
/obj/item/stack/sheet/mineral/metal_hydrogen = 20,
/obj/item/stack/sheet/mineral/plastitanium = 10,
/obj/item/stack/cable_coil = 5,
/obj/item/stack/rods = 5,
)
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_DRILL)
time = 90 SECONDS
category = CAT_STRUCTURE
crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND
code/datums/components/crafting/tools.dm
+11
View File
@@ -118,3 +118,14 @@
)
category = CAT_TOOLS
/datum/crafting_recipe/jaws_of_recovery
name = "Modified Jaws of Life"
time = 10 SECONDS
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER)
result = /obj/item/crowbar/power/paramedic/silent
reqs = list(
/obj/item/crowbar/power = 1,
/obj/item/bonesetter = 1,
)
category = CAT_TOOLS