cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +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/game/objects/items/storage/bags.dm
+3
View File
@@ -357,6 +357,9 @@
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*1.5)
custom_price = PAYCHECK_CREW * 0.6
storage_type = /datum/storage/bag/tray
sound_vary = TRUE
pickup_sound = SFX_TRAY_PICKUP
drop_sound = SFX_TRAY_DROP
/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
. = ..()
code/game/objects/items/storage/boxes/service_boxes.dm
+11
View File
@@ -294,3 +294,14 @@
/obj/item/storage/box/heretic_box/PopulateContents()
for(var/i in 1 to rand(1,4))
new /obj/item/toy/reality_pierce(src)
/obj/item/storage/box/purity_seal_box
name = "box of purity seals"
desc = "A box containing several blessed purity seals."
/obj/item/storage/box/purity_seal_box/PopulateContents()
for(var/i in 1 to 4)
new /obj/item/sticker/purity_seal(src)
new /obj/item/sticker/purity_seal/purity_seal_2(src)
code/game/objects/items/storage/briefcase.dm
+8 -1
View File
@@ -85,10 +85,17 @@
icon_state = "secure"
base_icon_state = "secure"
inhand_icon_state = "sec-case"
var/stored_lock_code
/obj/item/storage/briefcase/secure/Initialize(mapload)
. = ..()
AddComponent(/datum/component/lockable_storage)
AddComponent(/datum/component/lockable_storage, stored_lock_code)
RegisterSignal(src, COMSIG_LOCKABLE_STORAGE_SET_CODE, PROC_REF(update_lock_code))
/obj/item/storage/briefcase/secure/proc/update_lock_code(obj/item/storage/briefcase/secure/briefacase, new_code)
SIGNAL_HANDLER
stored_lock_code = new_code
/// Base container used for gimmick disks.
/obj/item/storage/briefcase/secure/digital_storage
code/game/objects/items/storage/fancy.dm
+3
View File
@@ -465,6 +465,9 @@
spawn_coupon = FALSE
open_status = FANCY_CONTAINER_OPEN
/obj/item/storage/fancy/cigarettes/flash_powder
spawn_type = /obj/item/cigarette/flash_powder
/obj/item/storage/fancy/rollingpapers
name = "rolling paper pack"
desc = "A pack of Nanotrasen brand rolling papers."
code/game/objects/items/storage/garment.dm
+11
View File
@@ -39,6 +39,10 @@
name = "quartermasters's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster."
/obj/item/storage/bag/garment/paramedic
name = "EMT's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the emergency medical team."
/obj/item/storage/bag/garment/captain/PopulateContents()
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/under/rank/captain/skirt(src)
@@ -248,3 +252,10 @@
new /obj/item/clothing/suit/jacket/tailcoat/quartermaster(src)
new /obj/item/clothing/neck/tie/bunnytie/cargo(src)
/obj/item/storage/bag/garment/paramedic/PopulateContents()
new /obj/item/clothing/under/rank/medical/paramedic(src)
new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
new /obj/item/clothing/gloves/latex/nitrile(src)
new /obj/item/clothing/shoes/workboots/black(src)
new /obj/item/clothing/glasses/hud/health(src)