cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 11:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
parent b4dbcc9db1 44b3075544
commit 71faa643bf
379 changed files with 37535 additions and 33147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2
View File
@@ -30,6 +30,8 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/mod/module/plasma_stabilizer(src)
new /obj/item/climbing_hook/syndicate(src)
new /obj/item/mod/module/thermal_regulator(src)
new /obj/item/mod/module/plasma_stabilizer(src)
/obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for a Syndicate boarding party."
code/game/objects/structures/girders.dm
+5 -5
View File
@@ -136,7 +136,7 @@
qdel(src)
return
if(istype(stack, /obj/item/stack/sheet/iron))
else if(istype(stack, /obj/item/stack/sheet/iron))
var/amount = construction_cost[/obj/item/stack/sheet/iron]
if(state == GIRDER_DISPLACED)
if(stack.get_amount() < amount)
@@ -182,7 +182,7 @@
qdel(src)
return
if(istype(stack, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
else if(istype(stack, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
var/amount = construction_cost[/obj/item/stack/sheet/titaniumglass]
if(stack.get_amount() < amount)
balloon_alert(user, "need [amount] sheets!")
@@ -198,7 +198,7 @@
qdel(src)
return
if(istype(stack, /obj/item/stack/sheet/plasteel))
else if(istype(stack, /obj/item/stack/sheet/plasteel))
var/amount = construction_cost[/obj/item/stack/sheet/plasteel]
if(state == GIRDER_DISPLACED)
if(stack.get_amount() < amount)
@@ -241,7 +241,7 @@
qdel(src)
return
if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
else if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
if(state == GIRDER_REINF)
if(stack.get_amount() < 1)
return
@@ -257,7 +257,7 @@
return
// No return here because generic material construction handles making normal plastitanium walls
if(!stack.has_unique_girder && stack.material_type)
else if(!stack.has_unique_girder && stack.material_type)
if(istype(src, /obj/structure/girder/reinforced))
balloon_alert(user, "need plasteel or plastitanium!")
return
code/game/objects/structures/secure_safe.dm
+1 -1
View File
@@ -104,7 +104,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
/obj/structure/secure_safe/Initialize(mapload)
. = ..()
//this will create the storage for us.
AddComponent(/datum/component/lockable_storage, , stored_lock_code)
AddComponent(/datum/component/lockable_storage, stored_lock_code)
if(mapload)
PopulateContents()
find_and_hang_on_wall()