cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 02:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)

Browse Source 
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
This commit is contained in:
ElorgRHG
2022-10-09 14:24:10 +01:00
committed by GitHub
parent 7904d3d7c3
commit e843567671
182 changed files with 1953 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+16 -16
View File
@@ -427,13 +427,13 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/gladiator/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/gladiator(src.loc)
new /obj/item/clothing/under/costume/gladiator(src.loc)
new /obj/item/clothing/head/helmet/gladiator(src.loc)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/costume/madscientist/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/under/misc/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
new /obj/item/clothing/glasses/gglasses(src.loc)
@@ -441,7 +441,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/elpresidente/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/under/misc/gimmick/rank/captain/suit(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
new /obj/item/clothing/shoes/jackboots(src.loc)
@@ -449,12 +449,12 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/schoolgirl/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/schoolgirl(src.loc)
new /obj/item/clothing/under/dress/schoolgirl(src.loc)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/costume/maid/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/blackskirt(src.loc)
new /obj/item/clothing/under/dress/blackskirt(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
@@ -463,7 +463,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/butler/Initialize(mapload)
. = ..()
new /obj/item/clothing/suit/wcoat(src.loc)
new /obj/item/clothing/under/suit_jacket(src.loc)
new /obj/item/clothing/under/suit(src.loc)
new /obj/item/clothing/head/that(src.loc)
return INITIALIZE_HINT_QDEL
@@ -471,14 +471,14 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
. = ..()
new /obj/item/clothing/gloves/color/white(src.loc)
new /obj/item/clothing/shoes/white(src.loc)
new /obj/item/clothing/under/scratch(src.loc)
new /obj/item/clothing/under/misc/scratch(src.loc)
if(prob(30))
new /obj/item/clothing/head/cueball(src.loc)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/costume/highlander/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/kilt(src.loc)
new /obj/item/clothing/under/costume/kilt(src.loc)
new /obj/item/clothing/head/beret(src.loc)
qdel(src)
@@ -490,7 +490,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
new CHOICE(src.loc)
new /obj/item/clothing/shoes/black(src.loc)
new /obj/item/cane(src.loc)
new /obj/item/clothing/under/sl_suit(src.loc)
new /obj/item/clothing/under/misc/sl_suit(src.loc)
new /obj/item/clothing/mask/fakemoustache(src.loc)
return INITIALIZE_HINT_QDEL
@@ -502,13 +502,13 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/nightowl/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/owl(src.loc)
new /obj/item/clothing/under/costume/owl(src.loc)
new /obj/item/clothing/mask/gas/owl_mask(src.loc)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/costume/waiter/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/waiter(src.loc)
new /obj/item/clothing/under/misc/waiter(src.loc)
var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
new CHOICE(src.loc)
new /obj/item/clothing/suit/apron(src.loc)
@@ -516,7 +516,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/pirate/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/pirate(src.loc)
new /obj/item/clothing/under/costume/pirate(src.loc)
new /obj/item/clothing/suit/pirate_black(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
new CHOICE(src.loc)
@@ -525,7 +525,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/commie/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/soviet(src.loc)
new /obj/item/clothing/under/costume/soviet(src.loc)
new /obj/item/clothing/head/ushanka(src.loc)
return INITIALIZE_HINT_QDEL
@@ -550,7 +550,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/cutewitch/Initialize(mapload)
. = ..()
new /obj/item/clothing/under/sundress(src.loc)
new /obj/item/clothing/under/dress/sundress(src.loc)
new /obj/item/clothing/head/witchwig(src.loc)
new /obj/item/twohanded/staff/broom(src.loc)
return INITIALIZE_HINT_QDEL
@@ -565,13 +565,13 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
/obj/effect/landmark/costume/sexyclown/Initialize(mapload)
. = ..()
new /obj/item/clothing/mask/gas/clown_hat/sexy(loc)
new /obj/item/clothing/under/rank/clown/sexy(loc)
new /obj/item/clothing/under/rank/civilian/clown/sexy(loc)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/costume/sexymime/Initialize(mapload)
. = ..()
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
new /obj/item/clothing/under/rank/civilian/mime/sexy(src.loc)
qdel(src)
/obj/effect/landmark/ruin
code/game/objects/effects/spawners/lootdrop.dm
+2 -2
View File
@@ -71,7 +71,7 @@
/obj/item/clothing/head/welding = 10,
/obj/item/clothing/mask/gas = 10,
/obj/item/clothing/suit/storage/hazardvest = 10,
/obj/item/clothing/under/rank/vice = 10,
/obj/item/clothing/under/misc/vice = 10,
/obj/item/assembly/prox_sensor = 40,
/obj/item/assembly/timer = 30,
/obj/item/flashlight = 40,
@@ -203,7 +203,7 @@
/obj/item/soap/syndie = 50,
/obj/item/lighter/zippo/gonzofist = 50,
/obj/item/stack/nanopaste = 50,
/obj/item/clothing/under/psyjump = 50,
/obj/item/clothing/under/costume/psyjump = 50,
/obj/item/immortality_talisman = 50,
/obj/item/grenade/clusterbuster/smoke = 50
)
code/game/objects/items/weapons/storage/backpack.dm
+2 -2
View File
@@ -109,7 +109,7 @@
/obj/item/storage/backpack/clown/syndie
/obj/item/storage/backpack/clown/syndie/populate_contents()
new /obj/item/clothing/under/rank/clown(src)
new /obj/item/clothing/under/rank/civilian/clown(src)
new /obj/item/clothing/shoes/magboots/clown(src)
new /obj/item/clothing/mask/chameleon(src)
new /obj/item/radio/headset/headset_service(src)
@@ -410,7 +410,7 @@
new /obj/item/clothing/glasses/meson(src)
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/under/rank/miner/lavaland(src)
new /obj/item/clothing/under/rank/cargo/miner/lavaland(src)
new /obj/item/encryptionkey/headset_cargo(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/gun/energy/kinetic_accelerator(src)
code/game/objects/items/weapons/storage/garment.dm
+20 -20
View File
@@ -41,7 +41,7 @@
new /obj/item/clothing/suit/mantle/armor/captain(src)
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/under/rank/captain/parade(src)
new /obj/item/clothing/under/dress/dress_cap(src)
new /obj/item/clothing/under/rank/captain/dress(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/laceup(src)
@@ -55,13 +55,13 @@
new /obj/item/clothing/head/hopcap(src)
new /obj/item/clothing/suit/mantle/armor/head_of_personnel(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/under/dress/dress_hop(src)
new /obj/item/clothing/under/dress/dress_hr(src)
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/oldman(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress(src)
new /obj/item/clothing/under/rank/civilian/lawyer/dress_hr(src)
new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
new /obj/item/clothing/under/rank/civilian/lawyer/oldman(src)
new /obj/item/clothing/under/suit/female(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/leather(src)
@@ -79,11 +79,11 @@
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/suit/armor/hos/alt(src)
new /obj/item/clothing/suit/mantle/armor(src)
new /obj/item/clothing/under/rank/head_of_security(src)
new /obj/item/clothing/under/rank/head_of_security/formal(src)
new /obj/item/clothing/under/rank/head_of_security/corp(src)
new /obj/item/clothing/under/rank/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/head_of_security/skirt/corp(src)
new /obj/item/clothing/under/rank/security/head_of_security(src)
new /obj/item/clothing/under/rank/security/formal/head_of_security(src)
new /obj/item/clothing/under/rank/security/head_of_security/corporate(src)
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/skirt/corporate(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
/obj/item/storage/bag/garment/research_director
@@ -91,7 +91,7 @@
desc = "A bag for storing extra clothes and shoes. This one belongs to the research director."
/obj/item/storage/bag/garment/research_director/populate_contents()
new /obj/item/clothing/under/rank/research_director(src)
new /obj/item/clothing/under/rank/rnd/research_director(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/suit/mantle/labcoat(src)
new /obj/item/clothing/shoes/white(src)
@@ -106,10 +106,10 @@
new /obj/item/clothing/head/surgery/blue(src)
new /obj/item/clothing/head/surgery/green(src)
new /obj/item/clothing/head/surgery/purple(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/scrubs(src)
new /obj/item/clothing/under/rank/medical/scrubs/green(src)
new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
new /obj/item/clothing/suit/storage/labcoat/cmo(src)
new /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer(src)
new /obj/item/clothing/shoes/white(src)
@@ -124,8 +124,8 @@
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/beret/ce(src)
new /obj/item/clothing/head/beret/eng(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/suit/mantle/chief_engineer(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/shoes/brown(src)
code/game/objects/items/weapons/storage/uplink_kits.dm
+3 -3
View File
@@ -30,7 +30,7 @@
/obj/item/suppressor, // 1TC
/obj/item/ammo_box/magazine/m10mm/hp, // 3TC
/obj/item/ammo_box/magazine/m10mm/ap, // 2TC
/obj/item/clothing/under/suit_jacket/really_black, // 0TC
/obj/item/clothing/under/suit/really_black, // 0TC
/obj/item/card/id/syndicate, // 2TC
/obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC
/obj/item/encryptionkey/syndicate, // 2TC
@@ -60,7 +60,7 @@
/obj/item/card/emag, // 6TC
/obj/item/jammer, // 5TC
/obj/item/card/id/syndicate, // 2TC
/obj/item/clothing/under/suit_jacket/really_black, //0TC
/obj/item/clothing/under/suit/really_black, //0TC
/obj/item/clothing/suit/storage/lawyer/blackjacket/armored, //0TC
/obj/item/clothing/gloves/color/latex/nitrile, //0 TC
/obj/item/clothing/mask/gas/clown_hat, // 0TC
@@ -105,7 +105,7 @@
/obj/item/ammo_box/magazine/sniper_rounds/soporific, // 3TC
/obj/item/clothing/glasses/chameleon/thermal, // 6TC
/obj/item/clothing/gloves/combat, // 0 TC
/obj/item/clothing/under/suit_jacket/really_black, // 0 TC
/obj/item/clothing/under/suit/really_black, // 0 TC
/obj/item/clothing/suit/storage/lawyer/blackjacket/armored, // 0TC
/obj/item/pen/edagger, // 2TC
/obj/item/encryptionkey/syndicate) // 2TC
code/game/objects/structures/crates_lockers/closets/fitness.dm
+10 -10
View File
@@ -6,16 +6,16 @@
open_door_sprite = "generic_door"
/obj/structure/closet/athletic_mixed/populate_contents()
new /obj/item/clothing/under/shorts/grey(src)
new /obj/item/clothing/under/shorts/black(src)
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)
new /obj/item/clothing/under/swimsuit/red(src)
new /obj/item/clothing/under/swimsuit/black(src)
new /obj/item/clothing/under/swimsuit/blue(src)
new /obj/item/clothing/under/swimsuit/green(src)
new /obj/item/clothing/under/swimsuit/purple(src)
new /obj/item/clothing/under/pants/shorts/grey(src)
new /obj/item/clothing/under/pants/shorts/black(src)
new /obj/item/clothing/under/pants/shorts/red(src)
new /obj/item/clothing/under/pants/shorts/blue(src)
new /obj/item/clothing/under/pants/shorts/green(src)
new /obj/item/clothing/under/misc/swimsuit/red(src)
new /obj/item/clothing/under/misc/swimsuit/black(src)
new /obj/item/clothing/under/misc/swimsuit/blue(src)
new /obj/item/clothing/under/misc/swimsuit/green(src)
new /obj/item/clothing/under/misc/swimsuit/purple(src)
/obj/structure/closet/boxinggloves
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+5 -5
View File
@@ -44,11 +44,11 @@
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/head/ushanka(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/under/costume/soviet(src)
new /obj/item/clothing/under/costume/soviet(src)
new /obj/item/clothing/under/costume/soviet(src)
new /obj/item/clothing/under/costume/soviet(src)
new /obj/item/clothing/under/costume/soviet(src)
/obj/structure/closet/gimmick/tacticool
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+13 -13
View File
@@ -21,10 +21,10 @@
new /obj/item/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/head/hairflower
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/misc/sl_suit(src)
new /obj/item/clothing/under/misc/sl_suit(src)
new /obj/item/clothing/under/rank/civilian/bartender(src)
new /obj/item/clothing/under/rank/civilian/bartender(src)
new /obj/item/clothing/under/dress/dress_saloon
new /obj/item/clothing/suit/wcoat(src)
new /obj/item/clothing/suit/wcoat(src)
@@ -44,8 +44,8 @@
open_door_sprite = "generic_door"
/obj/structure/closet/chefcloset/populate_contents()
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/misc/waiter(src)
new /obj/item/clothing/under/misc/waiter(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/accessory/waistcoat(src)
@@ -57,7 +57,7 @@
new /obj/item/clothing/head/soft/mime(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/under/rank/civilian/chef(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/reagent_containers/glass/rag(src)
@@ -99,7 +99,7 @@
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/clothing/under/rank/civilian/janitor(src)
new /obj/item/cartridge/janitor(src)
/*
@@ -113,12 +113,12 @@
open_door_sprite = "generic_door"
/obj/structure/closet/lawcloset/populate_contents()
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/red(src)
new /obj/item/clothing/under/lawyer/bluesuit(src)
new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
new /obj/item/clothing/under/rank/civilian/lawyer/bluesuit(src)
new /obj/item/clothing/under/suit/female(src)
new /obj/item/clothing/suit/storage/lawyer/bluejacket(src)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src)
new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+4 -4
View File
@@ -5,8 +5,8 @@
open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/cargotech/populate_contents()
new /obj/item/clothing/under/rank/cargotech(src)
new /obj/item/clothing/under/rank/cargotech/skirt(src)
new /obj/item/clothing/under/rank/cargo/tech(src)
new /obj/item/clothing/under/rank/cargo/tech/skirt(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/fingerless(src)
@@ -21,8 +21,8 @@
open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/quartermaster/populate_contents()
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/rank/cargo/skirt(src)
new /obj/item/clothing/under/rank/cargo/quartermaster(src)
new /obj/item/clothing/under/rank/cargo/quartermaster/skirt(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/fingerless(src)
code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+2 -2
View File
@@ -6,7 +6,7 @@
open_door_sprite = "chaplain_door"
/obj/structure/closet/secure_closet/chaplain/populate_contents()
new /obj/item/clothing/under/rank/chaplain(src)
new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/suit/hooded/nun(src)
new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
@@ -14,7 +14,7 @@
new /obj/item/clothing/suit/witchhunter(src)
new /obj/item/clothing/head/witchhunter_hat(src)
new /obj/item/clothing/suit/holidaypriest(src)
new /obj/item/clothing/under/wedding/bride_white(src)
new /obj/item/clothing/under/dress/wedding/bride_white(src)
new /obj/item/storage/backpack/cultpack(src)
new /obj/item/clothing/head/helmet/riot/knight/templar(src)
new /obj/item/clothing/suit/armor/riot/knight/templar(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -84,8 +84,8 @@
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/holosign_creator/engineering(src)
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/engineer(src)
new /obj/item/clothing/under/rank/engineering/engineer/skirt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson/engine(src)
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -11,7 +11,7 @@
if(2)
new /obj/item/clothing/suit/apron/overalls(src)
new /obj/item/storage/bag/plants/portaseeder(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/clothing/under/rank/civilian/hydroponics(src)
new /obj/item/plant_analyzer(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/mask/bandana/botany(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -51,7 +51,7 @@
else
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/duffel/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical/doctor(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/radio/headset/headset_med(src)
code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+2 -2
View File
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/clown/populate_contents()
new /obj/item/storage/backpack/clown(src)
new /obj/item/clothing/under/rank/clown(src)
new /obj/item/clothing/under/rank/civilian/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
@@ -29,7 +29,7 @@
new /obj/item/clothing/head/beret(src)
new /obj/item/clothing/mask/gas/mime(src)
new /obj/item/radio/headset/headset_service(src)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/under/rank/civilian/mime(src)
new /obj/item/clothing/suit/suspenders(src)
new /obj/item/clothing/gloves/color/white(src)
new /obj/item/clothing/shoes/black(src)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+2 -2
View File
@@ -7,8 +7,8 @@
/obj/structure/closet/secure_closet/scientist/populate_contents()
new /obj/item/storage/backpack/science(src)
new /obj/item/storage/backpack/satchel_tox(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
new /obj/item/clothing/under/rank/rnd/scientist(src)
new /obj/item/clothing/under/rank/rnd/scientist/skirt(src)
//new /obj/item/clothing/suit/labcoat/science(src)
new /obj/item/clothing/suit/storage/labcoat/science(src)
new /obj/item/clothing/shoes/white(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+11 -11
View File
@@ -91,11 +91,11 @@
new /obj/item/clothing/head/warden(src)
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
new /obj/item/clothing/head/beret/sec/warden(src)
new /obj/item/clothing/under/rank/warden(src)
new /obj/item/clothing/under/rank/warden/formal(src)
new /obj/item/clothing/under/rank/warden/corp(src)
new /obj/item/clothing/under/rank/warden/skirt(src)
new /obj/item/clothing/under/rank/warden/skirt/corp(src)
new /obj/item/clothing/under/rank/security/warden(src)
new /obj/item/clothing/under/rank/security/formal/warden(src)
new /obj/item/clothing/under/rank/security/warden/corporate(src)
new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/under/rank/security/warden/skirt/corporate(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer/warden(src)
@@ -173,9 +173,9 @@
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/gloves/color/white(src)
new /obj/item/clothing/shoes/centcom(src)
new /obj/item/clothing/under/lawyer/oldman(src)
new /obj/item/clothing/under/lawyer/black(src)
new /obj/item/clothing/under/lawyer/female(src)
new /obj/item/clothing/under/rank/civilian/lawyer/oldman(src)
new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
new /obj/item/clothing/under/suit/female(src)
new /obj/item/clothing/under/rank/centcom/representative(src)
new /obj/item/clothing/head/ntrep(src)
new /obj/item/clothing/shoes/sandal/fancy(src)
@@ -222,7 +222,7 @@
close_sound = 'sound/machines/wooden_closet_close.ogg'
/obj/structure/closet/secure_closet/detective/populate_contents()
new /obj/item/clothing/under/det(src)
new /obj/item/clothing/under/rank/security/detective(src)
new /obj/item/clothing/suit/storage/det_suit(src)
new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src)
new /obj/item/clothing/suit/storage/det_suit/forensics/red(src)
@@ -327,7 +327,7 @@
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/gloves/color/white(src)
new /obj/item/clothing/shoes/centcom(src)
new /obj/item/clothing/under/suit_jacket/really_black(src)
new /obj/item/clothing/under/suit/really_black(src)
new /obj/item/clothing/under/rank/centcom/magistrate(src)
new /obj/item/clothing/suit/judgerobe(src)
new /obj/item/clothing/head/powdered_wig(src)
@@ -352,7 +352,7 @@
new /obj/item/storage/briefcase(src)
new /obj/item/storage/briefcase(src)
new /obj/item/radio/headset/headset_iaa(src)
new /obj/item/clothing/under/rank/internalaffairs(src)
new /obj/item/clothing/under/rank/civilian/internalaffairs(src)
new /obj/item/clothing/suit/storage/internalaffairs(src)
new /obj/item/clothing/glasses/sunglasses/big(src)
new /obj/item/clothing/glasses/sunglasses/big(src)
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+1 -1
View File
@@ -162,6 +162,6 @@
/obj/structure/closet/bombclosetsecurity/populate_contents()
new /obj/item/clothing/suit/bomb_suit/security( src )
new /obj/item/clothing/under/rank/security( src )
new /obj/item/clothing/under/rank/security/officer( src )
new /obj/item/clothing/shoes/brown( src )
new /obj/item/clothing/head/bomb_hood/security( src )
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+71 -71
View File
@@ -30,15 +30,15 @@
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/mask/bandana/red(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/under/rank/security/formal(src)
new /obj/item/clothing/under/rank/security/formal(src)
new /obj/item/clothing/under/rank/security/formal(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/under/rank/security/officer/skirt(src)
new /obj/item/clothing/under/rank/security/officer/skirt(src)
new /obj/item/clothing/under/rank/security/officer/skirt(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
@@ -60,9 +60,9 @@
icon_state = "red"
/obj/structure/closet/redcorp/populate_contents()
new /obj/item/clothing/under/rank/security/corp(src)
new /obj/item/clothing/under/rank/security/corp(src)
new /obj/item/clothing/under/rank/security/corp(src)
new /obj/item/clothing/under/rank/security/officer/corporate(src)
new /obj/item/clothing/under/rank/security/officer/corporate(src)
new /obj/item/clothing/under/rank/security/officer/corporate(src)
new /obj/item/clothing/head/soft/sec/corp(src)
new /obj/item/clothing/head/soft/sec/corp(src)
new /obj/item/clothing/head/soft/sec/corp(src)
@@ -168,12 +168,12 @@
icon_state = "atmos_wardrobe"
/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt(src)
new /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
@@ -191,12 +191,12 @@
icon_state = "yellow"
/obj/structure/closet/wardrobe/engineering_yellow/populate_contents()
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/engineer(src)
new /obj/item/clothing/under/rank/engineering/engineer(src)
new /obj/item/clothing/under/rank/engineering/engineer(src)
new /obj/item/clothing/under/rank/engineering/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/engineer/skirt(src)
new /obj/item/clothing/under/rank/engineering/engineer/skirt(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
@@ -225,25 +225,25 @@
icon_state = "white"
/obj/structure/closet/wardrobe/medical_white/populate_contents()
new /obj/item/clothing/under/rank/nursesuit (src)
new /obj/item/clothing/under/rank/medical/nursesuit (src)
new /obj/item/clothing/head/nursehat (src)
new /obj/item/clothing/under/rank/nurse(src)
new /obj/item/clothing/under/rank/orderly(src)
new /obj/item/clothing/under/rank/medical/nurse(src)
new /obj/item/clothing/under/rank/medical/orderly(src)
new /obj/item/clothing/suit/storage/fr_jacket(src)
new /obj/item/clothing/suit/storage/fr_jacket(src)
new /obj/item/clothing/suit/storage/fr_jacket(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/scrubs(src)
new /obj/item/clothing/head/surgery/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/scrubs/green(src)
new /obj/item/clothing/head/surgery/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/under/rank/medical/skirt(src)
new /obj/item/clothing/under/rank/medical/skirt(src)
new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
new /obj/item/clothing/under/rank/medical/doctor/skirt(src)
new /obj/item/clothing/under/rank/medical/doctor/skirt(src)
new /obj/item/clothing/head/surgery/purple(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
@@ -253,10 +253,10 @@
icon_state = "white"
/obj/structure/closet/wardrobe/pjs/populate_contents()
new /obj/item/clothing/under/pj/red(src)
new /obj/item/clothing/under/pj/red(src)
new /obj/item/clothing/under/pj/blue(src)
new /obj/item/clothing/under/pj/blue(src)
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/under/misc/pj/blue(src)
new /obj/item/clothing/under/misc/pj/blue(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/slippers(src)
@@ -268,12 +268,12 @@
icon_state = "white"
/obj/structure/closet/wardrobe/toxins_white/populate_contents()
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
new /obj/item/clothing/under/rank/rnd/scientist(src)
new /obj/item/clothing/under/rank/rnd/scientist(src)
new /obj/item/clothing/under/rank/rnd/scientist(src)
new /obj/item/clothing/under/rank/rnd/scientist/skirt(src)
new /obj/item/clothing/under/rank/rnd/scientist/skirt(src)
new /obj/item/clothing/under/rank/rnd/scientist/skirt(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/suit/storage/labcoat(src)
@@ -290,10 +290,10 @@
icon_state = "black"
/obj/structure/closet/wardrobe/robotics_black/populate_contents()
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/roboticist(src)
new /obj/item/clothing/under/rank/roboticist/skirt(src)
new /obj/item/clothing/under/rank/roboticist/skirt(src)
new /obj/item/clothing/under/rank/rnd/roboticist(src)
new /obj/item/clothing/under/rank/rnd/roboticist(src)
new /obj/item/clothing/under/rank/rnd/roboticist/skirt(src)
new /obj/item/clothing/under/rank/rnd/roboticist/skirt(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/gloves/fingerless(src)
@@ -307,10 +307,10 @@
icon_state = "white"
/obj/structure/closet/wardrobe/chemistry_white/populate_contents()
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/chemist/skirt(src)
new /obj/item/clothing/under/rank/chemist/skirt(src)
new /obj/item/clothing/under/rank/medical/chemist(src)
new /obj/item/clothing/under/rank/medical/chemist(src)
new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/labcoat/chemist(src)
@@ -330,8 +330,8 @@
icon_state = "white"
/obj/structure/closet/wardrobe/genetics_white/populate_contents()
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/rnd/geneticist(src)
new /obj/item/clothing/under/rank/rnd/geneticist(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/labcoat/genetics(src)
@@ -347,10 +347,10 @@
icon_state = "white"
/obj/structure/closet/wardrobe/virology_white/populate_contents()
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/virologist/skirt(src)
new /obj/item/clothing/under/rank/virologist/skirt(src)
new /obj/item/clothing/under/rank/medical/virologist(src)
new /obj/item/clothing/under/rank/medical/virologist(src)
new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/labcoat/virologist(src)
@@ -368,23 +368,23 @@
icon_state = "white"
/obj/structure/closet/wardrobe/medic_white/populate_contents()
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical/skirt(src)
new /obj/item/clothing/under/rank/medical/skirt(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/under/rank/medical/doctor(src)
new /obj/item/clothing/under/rank/medical/doctor(src)
new /obj/item/clothing/under/rank/medical/doctor/skirt(src)
new /obj/item/clothing/under/rank/medical/doctor/skirt(src)
new /obj/item/clothing/under/rank/medical/scrubs(src)
new /obj/item/clothing/under/rank/medical/scrubs/green(src)
new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/medigown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/under/rank/medical/gown(src)
new /obj/item/clothing/head/headmirror(src)
new /obj/item/clothing/head/headmirror(src)
@@ -406,9 +406,9 @@
if(prob(50))
new /obj/item/storage/backpack/duffel(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
new /obj/item/clothing/under/misc/assistantformal(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
new /obj/item/clothing/under/misc/assistantformal(src)
/obj/structure/closet/wardrobe/mixed
@@ -443,7 +443,7 @@
new /obj/item/storage/backpack/duffel/medical(src)
new /obj/item/clothing/suit/storage/labcoat/mortician(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/under/rank/medical/mortician(src)
new /obj/item/clothing/under/rank/medical/scrubs/coroner(src)
new /obj/item/clothing/head/surgery/black(src)
new /obj/item/reagent_containers/glass/bottle/reagent/formaldehyde(src)
new /obj/item/reagent_containers/dropper(src)