cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Brief Locker overhaul

Browse Source 
Emergency lockers and secure lockers now start anchored to the ground. If you want to move them, you'd better have access and a wrench.

Adjusted emergency lockers to have suit cooling units, and fixes the missing first aid kit in the 25% chance Aid roll.
This commit is contained in:
Victor Zisthus
2023-07-15 20:51:16 -04:00
parent fa44322203
commit 2ca59be725
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
View File

@@ -10,6 +10,7 @@
var/large = 1 var/large = 1
wall_mounted = 0 //never solid (You can always pass over it) wall_mounted = 0 //never solid (You can always pass over it)
health = 200 health = 200
anchored = 1 //CHOMPADD - Making them properly IMMOBILE. Like the Desc says? Yeah...
closet_appearance = /decl/closet_appearance/secure_closet closet_appearance = /decl/closet_appearance/secure_closet

44
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
View File

@@ -16,42 +16,51 @@
name = "emergency closet" name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and O2 tanks." desc = "It's a storage unit for emergency breathmasks and O2 tanks."
closet_appearance = /decl/closet_appearance/oxygen closet_appearance = /decl/closet_appearance/oxygen
anchored = 1 //CHOMPADD - No more lockers flying away!
/obj/structure/closet/emcloset/Initialize() /obj/structure/closet/emcloset/Initialize()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10))) switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
//VOREStation Block Edit Start - Modified List //CHOMPEdit Block Start - Modified List
if ("small") if ("small")
starts_with = list( starts_with = list(
/obj/item/weapon/storage/toolbox/emergency,
/obj/item/weapon/tank/emergency/oxygen = 2, /obj/item/weapon/tank/emergency/oxygen = 2,
/obj/item/clothing/mask/breath = 2, /obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2, /obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2) /obj/item/clothing/head/helmet/space/emergency = 2,
/obj/item/device/suit_cooling_unit/emergency = 2)
if ("aid") if ("aid")
starts_with = list(
/obj/item/weapon/tank/emergency/oxygen,
/obj/item/weapon/storage/toolbox/emergency,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/emergency,
/obj/item/clothing/head/helmet/space/emergency)
if ("tank")
starts_with = list(
/obj/item/weapon/tank/emergency/oxygen/engi = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2)
if ("both")
starts_with = list( starts_with = list(
/obj/item/weapon/storage/toolbox/emergency, /obj/item/weapon/storage/toolbox/emergency,
/obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2,
/obj/item/weapon/tank/emergency/oxygen/engi = 2, /obj/item/weapon/tank/emergency/oxygen/engi = 2,
/obj/item/clothing/mask/breath = 2, /obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2, /obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2) /obj/item/clothing/head/helmet/space/emergency = 2,
//VOREStation Block Edit End /obj/item/device/suit_cooling_unit/emergency = 2)
if ("tank")
starts_with = list(
/obj/item/weapon/storage/toolbox/emergency,
/obj/item/weapon/tank/emergency/oxygen/double = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2,
/obj/item/device/suit_cooling_unit = 2)
if ("both")
starts_with = list(
/obj/item/weapon/storage/toolbox/emergency,
/obj/item/weapon/storage/firstaid/o2,
/obj/item/weapon/tank/emergency/oxygen/double = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2,
/obj/item/device/suit_cooling_unit = 2)
//CHOMPEdit Block End
return ..() return ..()
/obj/structure/closet/emcloset/legacy /obj/structure/closet/emcloset/legacy
anchored = 1 //CHOMPADD - No more lockers flying away!
starts_with = list( starts_with = list(
/obj/item/weapon/tank/oxygen, /obj/item/weapon/tank/oxygen,
/obj/item/clothing/mask/gas) /obj/item/clothing/mask/gas)
@@ -63,6 +72,7 @@
name = "fire-safety closet" name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies." desc = "It's a storage unit for fire-fighting supplies."
closet_appearance = /decl/closet_appearance/oxygen/fire closet_appearance = /decl/closet_appearance/oxygen/fire
anchored = 1 //CHOMPADD - No more lockers flying away!
starts_with = list( starts_with = list(
/obj/item/clothing/suit/fire, /obj/item/clothing/suit/fire,