Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
This commit is contained in:
Lin
@@ -12,6 +12,9 @@
|
||||
new /obj/item/clothing/under/shorts/blue(src)
|
||||
new /obj/item/clothing/under/shorts/green(src)
|
||||
new /obj/item/clothing/under/jabroni(src)
|
||||
new /obj/item/clothing/under/polychromic/shortpants(src)
|
||||
new /obj/item/clothing/under/polychromic/shortpants(src)
|
||||
new /obj/item/clothing/under/polychromic/shortpants(src)
|
||||
|
||||
|
||||
/obj/structure/closet/boxinggloves
|
||||
|
||||
@@ -352,6 +352,7 @@
|
||||
icon_door = "black"
|
||||
|
||||
/obj/structure/closet/wardrobe/curator/PopulateContents()
|
||||
new /obj/item/clothing/accessory/pocketprotector/full(src)
|
||||
new /obj/item/clothing/head/fedora/curator(src)
|
||||
new /obj/item/clothing/suit/curator(src)
|
||||
new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
new /obj/item/clothing/under/rank/cargo(src)
|
||||
new /obj/item/clothing/under/rank/cargo/skirt(src)
|
||||
new /obj/item/clothing/shoes/sneakers/brown(src)
|
||||
new /obj/item/radio/headset/headset_cargo(src)
|
||||
new /obj/item/radio/headset/heads/qm(src)
|
||||
new /obj/item/clothing/suit/fire/firefighter(src)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
new /obj/item/megaphone/cargo(src)
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
new /obj/item/storage/belt/medical(src)
|
||||
new /obj/item/healthanalyzer/advanced(src)
|
||||
new /obj/item/assembly/flash/handheld(src)
|
||||
// new /obj/item/reagent_containers/hypospray/CMO(src) // CITADEL EDIT comments out the hypospray mk I. the MK II kit is modularized
|
||||
new /obj/item/storage/hypospraykit/cmo(src)
|
||||
new /obj/item/autosurgeon/cmo(src)
|
||||
new /obj/item/door_remote/chief_medical_officer(src)
|
||||
new /obj/item/clothing/neck/petcollar(src)
|
||||
|
||||
@@ -142,28 +142,21 @@
|
||||
new /obj/item/clothing/suit/jacket(src)
|
||||
if(prob(40))
|
||||
new /obj/item/clothing/suit/jacket(src)
|
||||
new /obj/item/clothing/under/color/white(src)
|
||||
new /obj/item/clothing/under/skirt/color/white(src)
|
||||
new /obj/item/clothing/under/color/blue(src)
|
||||
new /obj/item/clothing/under/skirt/color/blue(src)
|
||||
new /obj/item/clothing/under/color/yellow(src)
|
||||
new /obj/item/clothing/under/skirt/color/yellow(src)
|
||||
new /obj/item/clothing/under/color/green(src)
|
||||
new /obj/item/clothing/under/skirt/color/green(src)
|
||||
new /obj/item/clothing/under/color/orange(src)
|
||||
new /obj/item/clothing/under/skirt/color/orange(src)
|
||||
new /obj/item/clothing/under/color/pink(src)
|
||||
new /obj/item/clothing/under/skirt/color/pink(src)
|
||||
new /obj/item/clothing/under/color/red(src)
|
||||
new /obj/item/clothing/under/skirt/color/red(src)
|
||||
new /obj/item/clothing/under/color/darkblue(src)
|
||||
new /obj/item/clothing/under/skirt/color/darkblue(src)
|
||||
new /obj/item/clothing/under/color/teal(src)
|
||||
new /obj/item/clothing/under/skirt/color/teal(src)
|
||||
new /obj/item/clothing/under/color/lightpurple(src)
|
||||
new /obj/item/clothing/under/skirt/color/lightpurple(src)
|
||||
new /obj/item/clothing/under/color/green(src)
|
||||
new /obj/item/clothing/under/skirt/color/green(src)
|
||||
new /obj/item/clothing/under/polychromic/jumpsuit(src)
|
||||
new /obj/item/clothing/under/polychromic/jumpsuit(src)
|
||||
new /obj/item/clothing/under/polychromic/jumpsuit(src)
|
||||
new /obj/item/clothing/under/polychromic/shirt(src)
|
||||
new /obj/item/clothing/under/polychromic/shirt(src)
|
||||
new /obj/item/clothing/under/polychromic/shirt(src)
|
||||
new /obj/item/clothing/under/polychromic/kilt(src)
|
||||
new /obj/item/clothing/under/polychromic/kilt(src)
|
||||
new /obj/item/clothing/under/polychromic/kilt(src)
|
||||
new /obj/item/clothing/under/polychromic/skirt(src)
|
||||
new /obj/item/clothing/under/polychromic/skirt(src)
|
||||
new /obj/item/clothing/under/polychromic/skirt(src)
|
||||
new /obj/item/clothing/under/polychromic/shorts(src)
|
||||
new /obj/item/clothing/under/polychromic/shorts(src)
|
||||
new /obj/item/clothing/under/polychromic/shorts(src)
|
||||
new /obj/item/clothing/mask/bandana/red(src)
|
||||
new /obj/item/clothing/mask/bandana/red(src)
|
||||
new /obj/item/clothing/mask/bandana/blue(src)
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
/obj/structure/closet/athletic_mixed/PopulateContents()
|
||||
..()
|
||||
new /obj/item/clothing/under/polychromic/shortpants(src)
|
||||
new /obj/item/clothing/under/polychromic/shortpants(src)
|
||||
new /obj/item/clothing/under/polychromic/shortpants(src)
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
|
||||
..()
|
||||
new /obj/item/radio/headset/heads/qm(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/CMO/PopulateContents()
|
||||
..()
|
||||
new /obj/item/storage/hypospraykit/cmo(src)
|
||||
@@ -1,37 +0,0 @@
|
||||
/obj/structure/closet/wardrobe/mixed/PopulateContents()
|
||||
if(prob(40))
|
||||
new /obj/item/clothing/suit/jacket(src)
|
||||
if(prob(40))
|
||||
new /obj/item/clothing/suit/jacket(src)
|
||||
new /obj/item/clothing/under/polychromic/jumpsuit(src)
|
||||
new /obj/item/clothing/under/polychromic/jumpsuit(src)
|
||||
new /obj/item/clothing/under/polychromic/jumpsuit(src)
|
||||
new /obj/item/clothing/under/polychromic/shirt(src)
|
||||
new /obj/item/clothing/under/polychromic/shirt(src)
|
||||
new /obj/item/clothing/under/polychromic/shirt(src)
|
||||
new /obj/item/clothing/under/polychromic/kilt(src)
|
||||
new /obj/item/clothing/under/polychromic/kilt(src)
|
||||
new /obj/item/clothing/under/polychromic/kilt(src)
|
||||
new /obj/item/clothing/under/polychromic/skirt(src)
|
||||
new /obj/item/clothing/under/polychromic/skirt(src)
|
||||
new /obj/item/clothing/under/polychromic/skirt(src)
|
||||
new /obj/item/clothing/under/polychromic/shorts(src)
|
||||
new /obj/item/clothing/under/polychromic/shorts(src)
|
||||
new /obj/item/clothing/under/polychromic/shorts(src)
|
||||
new /obj/item/clothing/mask/bandana/red(src)
|
||||
new /obj/item/clothing/mask/bandana/red(src)
|
||||
new /obj/item/clothing/mask/bandana/blue(src)
|
||||
new /obj/item/clothing/mask/bandana/blue(src)
|
||||
new /obj/item/clothing/mask/bandana/gold(src)
|
||||
new /obj/item/clothing/mask/bandana/gold(src)
|
||||
new /obj/item/clothing/shoes/sneakers/black(src)
|
||||
new /obj/item/clothing/shoes/sneakers/brown(src)
|
||||
new /obj/item/clothing/shoes/sneakers/white(src)
|
||||
if(prob(30))
|
||||
new /obj/item/clothing/suit/hooded/wintercoat(src)
|
||||
new /obj/item/clothing/shoes/winterboots(src)
|
||||
return
|
||||
|
||||
/obj/structure/closet/wardrobe/curator/PopulateContents()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/pocketprotector/full(src)
|
||||
@@ -3025,9 +3025,6 @@
|
||||
#include "modular_citadel\code\game\objects\items\storage\firstaid.dm"
|
||||
#include "modular_citadel\code\game\objects\structures\tables_racks.dm"
|
||||
#include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
|
||||
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm"
|
||||
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
|
||||
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\secure\citadel_lockers.dm"
|
||||
#include "modular_citadel\code\modules\admin\admin.dm"
|
||||
#include "modular_citadel\code\modules\admin\chat_commands.dm"
|
||||
#include "modular_citadel\code\modules\admin\holder2.dm"
|
||||
|
||||
Reference in New Issue
Block a user