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

steel pass 2

Browse Source
This commit is contained in:
S34NW
2021-10-02 22:26:37 +01:00
parent e78613e591
commit 5dc80d6cba
9 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+2 -8
View File
@@ -9,9 +9,7 @@
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60)
var/icon_closed
var/icon_opened
var/is_wardrobe
var/open_door_sprite = "generic_door"
var/shared_open_sprite
var/opened = FALSE
var/welded = FALSE
var/locked = FALSE
@@ -31,12 +29,8 @@
/obj/structure/closet/Initialize(mapload)
. = ..()
icon_closed = "[icon_state]"
icon_opened = "[icon_state]_open"
if(shared_open_sprite)
icon_opened = shared_open_sprite
if(is_wardrobe)
icon_opened = "generic_open"
open_door_sprite = "generic_door"
if(!icon_opened)
icon_opened = "[icon_state]_open"
if(mapload && !opened)
// Youre probably asking, why is this a 0 seconds timer AA?
// Well, I will tell you. One day, all /obj/effect/spawner will use Initialize
code/game/objects/structures/crates_lockers/closets/fitness.dm
+10 -5
View File
@@ -2,7 +2,8 @@
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
icon_state = "mixed"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/athletic_mixed/populate_contents()
new /obj/item/clothing/under/shorts/grey(src)
@@ -20,7 +21,8 @@
/obj/structure/closet/boxinggloves
name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring."
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/boxinggloves/populate_contents()
new /obj/item/clothing/gloves/boxing/blue(src)
@@ -32,7 +34,8 @@
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/masks/populate_contents()
new /obj/item/clothing/mask/luchador(src)
@@ -44,7 +47,8 @@
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "red"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/lasertag/red/populate_contents()
new /obj/item/gun/energy/laser/tag/red(src)
@@ -59,7 +63,8 @@
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "blue"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/lasertag/blue/populate_contents()
new /obj/item/gun/energy/laser/tag/blue(src)
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+10 -5
View File
@@ -12,7 +12,8 @@
name = "formal closet"
desc = "It's a storage unit for formal clothing."
icon_state = "black"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/gmcloset/populate_contents()
new /obj/item/clothing/head/that(src)
@@ -39,7 +40,8 @@
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
icon_state = "black"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/chefcloset/populate_contents()
new /obj/item/clothing/under/waiter(src)
@@ -66,7 +68,8 @@
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
icon_state = "mixed"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/jcloset/populate_contents()
new /obj/item/flashlight(src)
@@ -106,7 +109,8 @@
name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items."
icon_state = "blue"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/lawcloset/populate_contents()
new /obj/item/storage/box/tapes(src)
@@ -131,7 +135,8 @@
name = "paramedic wardrobe"
desc = "It's a storage unit for paramedic equipment."
icon_state = "blue"
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
/obj/structure/closet/paramedic/populate_contents()
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -44,7 +44,7 @@
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng_elec"
open_door_sprite = "eng_door"
shared_open_sprite = "eng_open"
icon_opened = "eng_open"
/obj/structure/closet/secure_closet/engineering_electrical/populate_contents()
new /obj/item/clothing/gloves/color/yellow(src)
@@ -66,7 +66,7 @@
req_access = list(ACCESS_ENGINE_EQUIP)
icon_state = "eng_weld"
open_door_sprite = "eng_door"
shared_open_sprite = "eng_open"
icon_opened = "eng_open"
/obj/structure/closet/secure_closet/engineering_welding/populate_contents()
new /obj/item/clothing/head/welding(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+6 -6
View File
@@ -3,7 +3,7 @@
desc = "Filled with medical junk."
icon_state = "med"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical1/populate_contents()
@@ -27,7 +27,7 @@
desc = "Used to knock people out."
icon_state = "med"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/populate_contents()
@@ -70,7 +70,7 @@
desc = "Filled with exam room materials."
icon_state = "med"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/exam/populate_contents()
@@ -188,7 +188,7 @@
desc = "Store dangerous chemicals in here."
icon_state = "chemical"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/chemical/populate_contents()
@@ -202,7 +202,7 @@
desc = "A locker with a Paramedic EVA suit."
icon_state = "med"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_PARAMEDIC)
/obj/structure/closet/secure_closet/paramedic/populate_contents()
@@ -218,7 +218,7 @@
desc = "Store dangerous chemicals in here."
icon_state = "chemical"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/reagents/populate_contents()
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -67,7 +67,7 @@
desc = "Store dangerous chemicals in here."
icon_state = "rchemical"
open_door_sprite = "med_door"
shared_open_sprite = "med_open"
icon_opened = "med_open"
req_access = list(ACCESS_TOX_STORAGE)
/obj/structure/closet/secure_closet/research_reagents/populate_contents()
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -2
View File
@@ -200,7 +200,7 @@
req_access = list(ACCESS_BLUESHIELD)
icon_state = "bs"
open_door_sprite = "hop_door"
shared_open_sprite = "hop_open"
icon_opened = "hop_open"
/obj/structure/closet/secure_closet/blueshield/populate_contents()
new /obj/item/storage/briefcase(src)
@@ -231,7 +231,7 @@
req_access = list(ACCESS_NTREP)
icon_state = "ntr"
open_door_sprite = "hop_door"
shared_open_sprite = "hop_open"
icon_opened = "hop_open"
/obj/structure/closet/secure_closet/ntrep/populate_contents()
new /obj/item/book/manual/faxes(src)
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+2 -2
View File
@@ -88,7 +88,7 @@
desc = "It's a storage unit for tools."
icon_state = "eng_tool"
open_door_sprite = "eng_door"
shared_open_sprite = "eng_open"
icon_opened = "eng_open"
/obj/structure/closet/toolcloset/populate_contents()
if(prob(40))
@@ -131,7 +131,7 @@
desc = "It's a storage unit for rad-protective suits."
icon_state = "eng_rad"
open_door_sprite = "eng_door"
shared_open_sprite = "eng_open"
icon_opened = "eng_open"
/obj/structure/closet/radiation/populate_contents()
new /obj/item/geiger_counter(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
is_wardrobe = TRUE
icon_opened = "generic_open"
open_door_sprite = "generic_door"
icon_state = "blue"
/obj/structure/closet/wardrobe/generic