From 8f8c41a7c181e8e2846ab346d8e95203f94e1992 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sun, 27 May 2018 19:33:34 -0400 Subject: [PATCH] SYNC: Correct vorestation closets/crates to use new system --- .../closets/secure/security_vr.dm | 218 +++++++++--------- .../closets/utility_closets_vr.dm | 10 +- .../crates_lockers/largecrate_vr.dm | 33 ++- 3 files changed, 130 insertions(+), 131 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index 739410a820..8a066cc754 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -59,7 +59,6 @@ //Custom NT Security Lockers, Only found at central command /obj/structure/closet/secure_closet/nanotrasen_security name = "NanoTrasen security officer's locker" - req_access = list(access_brig) icon = 'icons/obj/closet_vr.dmi' icon_state = "secC1" icon_closed = "secC" @@ -67,45 +66,46 @@ icon_opened = "secCopen" icon_broken = "secCbroken" icon_off = "seCcoff" + req_access = list(access_brig) storage_capacity = 3.5 * MOB_MEDIUM - New() - ..() - if(prob(25)) - new /obj/item/weapon/storage/backpack/security(src) - else - new /obj/item/weapon/storage/backpack/satchel/sec(src) - if(prob(75)) - new /obj/item/weapon/storage/backpack/dufflebag/sec(src) - new /obj/item/clothing/suit/storage/vest/nanotrasen(src) - new /obj/item/clothing/head/helmet(src) - new /obj/item/weapon/cartridge/security(src) - new /obj/item/device/radio/headset/headset_sec(src) - new /obj/item/device/radio/headset/headset_sec/alt(src) - new /obj/item/weapon/storage/belt/security(src) - new /obj/item/device/flash(src) - new /obj/item/weapon/reagent_containers/spray/pepper(src) - new /obj/item/weapon/grenade/flashbang(src) - new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/clothing/glasses/sunglasses/sechud(src) - new /obj/item/taperoll/police(src) - new /obj/item/device/hailer(src) - new /obj/item/device/flashlight/flare(src) - new /obj/item/clothing/accessory/storage/black_vest(src) - new /obj/item/weapon/gun/energy/taser(src) - new /obj/item/weapon/cell/device/weapon(src) - new /obj/item/device/flashlight/maglight(src) - new /obj/item/clothing/head/soft/nanotrasen(src) - new /obj/item/clothing/head/beret/nanotrasen(src) - new /obj/item/clothing/under/nanotrasen/security(src) - new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/shoes/boots/jackboots(src) - new /obj/item/clothing/shoes/boots/jackboots/toeless(src) - return + starts_with = list( + /obj/item/clothing/suit/storage/vest/nanotrasen, + /obj/item/clothing/head/helmet, + /obj/item/weapon/cartridge/security, + /obj/item/device/radio/headset/headset_sec, + /obj/item/device/radio/headset/headset_sec/alt, + /obj/item/weapon/storage/belt/security, + /obj/item/device/flash, + /obj/item/weapon/reagent_containers/spray/pepper, + /obj/item/weapon/grenade/flashbang, + /obj/item/weapon/melee/baton/loaded, + /obj/item/clothing/glasses/sunglasses/sechud, + /obj/item/taperoll/police, + /obj/item/device/hailer, + /obj/item/device/flashlight/flare, + /obj/item/clothing/accessory/storage/black_vest, + /obj/item/weapon/gun/energy/taser, + /obj/item/weapon/cell/device/weapon, + /obj/item/device/flashlight/maglight, + /obj/item/clothing/head/soft/nanotrasen, + /obj/item/clothing/head/beret/nanotrasen, + /obj/item/clothing/under/nanotrasen/security, + /obj/item/clothing/gloves/black, + /obj/item/clothing/shoes/boots/jackboots, + /obj/item/clothing/shoes/boots/jackboots/toeless) + +/obj/structure/closet/secure_closet/nanotrasen_security/initialize() + if(prob(25)) + starts_with += /obj/item/weapon/storage/backpack/security + else + starts_with += /obj/item/weapon/storage/backpack/satchel/sec + if(prob(75)) + starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec + return ..() /obj/structure/closet/secure_closet/nanotrasen_commander name = "NanoTrasen commander's locker" - req_access = list(access_brig) icon = 'icons/obj/closet_vr.dmi' icon_state = "secC1" icon_closed = "secC" @@ -113,52 +113,53 @@ icon_opened = "secCopen" icon_broken = "secCbroken" icon_off = "seCcoff" + req_access = list(access_brig) storage_capacity = 3.5 * MOB_MEDIUM - New() - ..() - if(prob(25)) - new /obj/item/weapon/storage/backpack/security(src) - else - new /obj/item/weapon/storage/backpack/satchel/sec(src) - if(prob(75)) - new /obj/item/weapon/storage/backpack/dufflebag/sec(src) - new /obj/item/clothing/head/helmet/HoS(src) - new /obj/item/clothing/suit/storage/vest/hos(src) - new /obj/item/clothing/under/rank/head_of_security/jensen(src) - new /obj/item/clothing/suit/storage/vest/hoscoat/jensen(src) - new /obj/item/clothing/suit/storage/vest/hoscoat(src) - new /obj/item/clothing/head/helmet/dermal(src) - new /obj/item/weapon/cartridge/hos(src) - new /obj/item/device/radio/headset/heads/hos(src) - new /obj/item/device/radio/headset/heads/hos/alt(src) - new /obj/item/clothing/glasses/sunglasses/sechud(src) - new /obj/item/taperoll/police(src) - new /obj/item/weapon/shield/riot(src) - new /obj/item/weapon/shield/riot/tele(src) - new /obj/item/weapon/storage/box/holobadge/hos(src) - new /obj/item/clothing/accessory/badge/holo/hos(src) - new /obj/item/weapon/reagent_containers/spray/pepper(src) - new /obj/item/weapon/crowbar/red(src) - new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/weapon/storage/belt/security(src) - new /obj/item/device/flash(src) - new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/weapon/cell/device/weapon(src) - new /obj/item/clothing/accessory/holster/waist(src) - new /obj/item/weapon/melee/telebaton(src) - new /obj/item/clothing/head/beret/sec/corporate/hos(src) - new /obj/item/device/flashlight/maglight(src) - new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/shoes/boots/jackboots(src) - new /obj/item/clothing/shoes/boots/jackboots/toeless(src) - new /obj/item/clothing/under/nanotrasen/security/commander(src) - return + starts_with = list( + /obj/item/clothing/head/helmet/HoS, + /obj/item/clothing/suit/storage/vest/hos, + /obj/item/clothing/under/rank/head_of_security/jensen, + /obj/item/clothing/suit/storage/vest/hoscoat/jensen, + /obj/item/clothing/suit/storage/vest/hoscoat, + /obj/item/clothing/head/helmet/dermal, + /obj/item/weapon/cartridge/hos, + /obj/item/device/radio/headset/heads/hos, + /obj/item/device/radio/headset/heads/hos/alt, + /obj/item/clothing/glasses/sunglasses/sechud, + /obj/item/taperoll/police, + /obj/item/weapon/shield/riot, + /obj/item/weapon/shield/riot/tele, + /obj/item/weapon/storage/box/holobadge/hos, + /obj/item/clothing/accessory/badge/holo/hos, + /obj/item/weapon/reagent_containers/spray/pepper, + /obj/item/weapon/crowbar/red, + /obj/item/weapon/storage/box/flashbangs, + /obj/item/weapon/storage/belt/security, + /obj/item/device/flash, + /obj/item/weapon/melee/baton/loaded, + /obj/item/weapon/gun/energy/gun, + /obj/item/weapon/cell/device/weapon, + /obj/item/clothing/accessory/holster/waist, + /obj/item/weapon/melee/telebaton, + /obj/item/clothing/head/beret/sec/corporate/hos, + /obj/item/device/flashlight/maglight, + /obj/item/clothing/gloves/black, + /obj/item/clothing/shoes/boots/jackboots, + /obj/item/clothing/shoes/boots/jackboots/toeless, + /obj/item/clothing/under/nanotrasen/security/commander) + +/obj/structure/closet/secure_closet/nanotrasen_commander/initialize() + if(prob(25)) + starts_with += /obj/item/weapon/storage/backpack/security + else + starts_with += /obj/item/weapon/storage/backpack/satchel/sec + if(prob(75)) + starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec + return ..() /obj/structure/closet/secure_closet/nanotrasen_warden name = "NanoTrasen warden's locker" - req_access = list(access_brig) icon = 'icons/obj/closet_vr.dmi' icon_state = "secC1" icon_closed = "secC" @@ -166,38 +167,39 @@ icon_opened = "secCopen" icon_broken = "secCbroken" icon_off = "seCcoff" + req_access = list(access_brig) storage_capacity = 3.5 * MOB_MEDIUM + starts_with = list( + /obj/item/clothing/suit/storage/vest/warden, + /obj/item/clothing/under/nanotrasen/security/warden, + /obj/item/clothing/suit/storage/vest/wardencoat/alt, + /obj/item/clothing/head/helmet/warden, + /obj/item/weapon/cartridge/security, + /obj/item/device/radio/headset/headset_sec, + /obj/item/device/radio/headset/headset_sec/alt, + /obj/item/clothing/glasses/sunglasses/sechud, + /obj/item/taperoll/police, + /obj/item/clothing/accessory/badge/holo/warden, + /obj/item/weapon/storage/box/flashbangs, + /obj/item/weapon/storage/belt/security, + /obj/item/weapon/reagent_containers/spray/pepper, + /obj/item/weapon/melee/baton/loaded, + /obj/item/weapon/gun/energy/gun, + /obj/item/weapon/cell/device/weapon, + /obj/item/weapon/storage/box/holobadge, + /obj/item/clothing/head/beret/sec/corporate/warden, + /obj/item/device/flashlight/maglight, + /obj/item/device/megaphone, + /obj/item/clothing/gloves/black, + /obj/item/clothing/shoes/boots/jackboots, + /obj/item/clothing/shoes/boots/jackboots/toeless) - New() - ..() - if(prob(25)) - new /obj/item/weapon/storage/backpack/security(src) - else - new /obj/item/weapon/storage/backpack/satchel/sec(src) - if(prob(75)) - new /obj/item/weapon/storage/backpack/dufflebag/sec(src) - new /obj/item/clothing/suit/storage/vest/warden(src) - new /obj/item/clothing/under/nanotrasen/security/warden(src) - new /obj/item/clothing/suit/storage/vest/wardencoat/alt(src) - new /obj/item/clothing/head/helmet/warden(src) - new /obj/item/weapon/cartridge/security(src) - new /obj/item/device/radio/headset/headset_sec(src) - new /obj/item/device/radio/headset/headset_sec/alt(src) - new /obj/item/clothing/glasses/sunglasses/sechud(src) - new /obj/item/taperoll/police(src) - new /obj/item/clothing/accessory/badge/holo/warden(src) - new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/weapon/storage/belt/security(src) - new /obj/item/weapon/reagent_containers/spray/pepper(src) - new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/weapon/cell/device/weapon(src) - new /obj/item/weapon/storage/box/holobadge(src) - new /obj/item/clothing/head/beret/sec/corporate/warden(src) - new /obj/item/device/flashlight/maglight(src) - new /obj/item/device/megaphone(src) - new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/shoes/boots/jackboots(src) - new /obj/item/clothing/shoes/boots/jackboots/toeless(src) - return +/obj/structure/closet/secure_closet/nanotrasen_warden/initialize() + if(prob(25)) + new /obj/item/weapon/storage/backpack/security(src) + else + new /obj/item/weapon/storage/backpack/satchel/sec(src) + if(prob(75)) + new /obj/item/weapon/storage/backpack/dufflebag/sec(src) + return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm index fec6045064..54abff6eb3 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm @@ -1,7 +1,7 @@ -/obj/structure/closet/firecloset/New() - ..() - new /obj/item/weapon/storage/toolbox/emergency(src) +/obj/structure/closet/firecloset/initialize() + starts_with += /obj/item/weapon/storage/toolbox/emergency + return ..() /obj/structure/closet/hydrant/New() - ..() - new /obj/item/weapon/storage/toolbox/emergency(src) \ No newline at end of file + starts_with += /obj/item/weapon/storage/toolbox/emergency + return ..() diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 134aad487f..2c4ae9917f 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -39,11 +39,10 @@ /obj/structure/largecrate/animal/pred name = "Predator carrier" - held_type = /mob/living/simple_animal/catgirl + starts_with = list(/mob/living/simple_animal/catgirl) -/obj/structure/largecrate/animal/pred/New() //This is nessesary to get a random one each time. - - held_type = pick(/mob/living/simple_animal/retaliate/bee, +/obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time. + starts_with = list(pick(/mob/living/simple_animal/retaliate/bee, /mob/living/simple_animal/catgirl;3, /mob/living/simple_animal/hostile/frog, /mob/living/simple_animal/horse, @@ -55,17 +54,15 @@ /mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/mimic, /mob/living/simple_animal/hostile/rat, - /mob/living/simple_animal/otie;0.5) - ..() - + /mob/living/simple_animal/otie;0.5)) + return ..() /obj/structure/largecrate/animal/dangerous name = "Dangerous Predator carrier" held_type = /mob/living/simple_animal/hostile/alien -/obj/structure/largecrate/animal/dangerous/New() //This is nessesary to get a random one each time. - - held_type = pick(/mob/living/simple_animal/hostile/carp/pike, +/obj/structure/largecrate/animal/dangerous/initialize() + starts_with = list(pick(/mob/living/simple_animal/hostile/carp/pike, /mob/living/simple_animal/hostile/deathclaw, /mob/living/simple_animal/hostile/dino, /mob/living/simple_animal/hostile/alien, @@ -73,35 +70,35 @@ /mob/living/simple_animal/hostile/alien/sentinel, /mob/living/simple_animal/hostile/alien/queen, /mob/living/simple_animal/otie/feral, - /mob/living/simple_animal/hostile/corrupthound) - ..() + /mob/living/simple_animal/hostile/corrupthound)) + return ..() /obj/structure/largecrate/animal/guardbeast name = "VARMAcorp autoNOMous security solution" desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs." icon = 'icons/obj/storage_vr.dmi' icon_state = "sotiecrate" - held_type = /mob/living/simple_animal/otie/security + starts_with = list(/mob/living/simple_animal/otie/security) /obj/structure/largecrate/animal/guardmutant name = "VARMAcorp autoNOMous security solution for hostile environments." desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere." icon = 'icons/obj/storage_vr.dmi' icon_state = "sotiecrate" - held_type = /mob/living/simple_animal/otie/security/phoron + starts_with = list(/mob/living/simple_animal/otie/security/phoron) /obj/structure/largecrate/animal/otie name = "VARMAcorp adoptable reject (Dangerous!)" desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!" icon = 'icons/obj/storage_vr.dmi' icon_state = "otiecrate2" - held_type = /mob/living/simple_animal/otie/cotie + starts_with = list(/mob/living/simple_animal/otie/cotie) var/taped = 1 /obj/structure/largecrate/animal/otie/phoron name = "VARMAcorp adaptive beta subject (Experimental)" desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!" - held_type = /mob/living/simple_animal/otie/cotie/phoron + starts_with = list(/mob/living/simple_animal/otie/cotie/phoron) /obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao if(taped == 1) @@ -113,9 +110,9 @@ /obj/structure/largecrate/animal/catgirl name = "Catgirl Crate" desc = "A sketchy looking crate with airholes that seems to have had most marks and stickers removed. You can almost make out 'genetically-engineered subject' written on it." - held_type = /mob/living/simple_animal/catgirl + starts_with = list(/mob/living/simple_animal/catgirl) /obj/structure/largecrate/animal/wolfgirl name = "Wolfgirl Crate" desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out." - held_type = /mob/living/simple_animal/retaliate/awoo + starts_with = list(/mob/living/simple_animal/retaliate/awoo)