shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds a bunch of RP clothes and ports the detvendor

Browse Source
This commit is contained in:
Detective Google
2020-09-30 20:50:00 -05:00
parent 28ea9cc91c
commit c4480afc09
35 changed files with 556 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
_maps/map_files/BoxStation/BoxStation.dmm
View File

@@ -1128,8 +1128,7 @@
/area/security/prison)
"acI" = (
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/obj/machinery/door/firedoor,
@@ -1280,8 +1279,7 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
@@ -1296,8 +1294,7 @@
"acZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
@@ -21317,8 +21314,7 @@
name = "Privacy Shutters";
pixel_y = 24
},
/obj/structure/rack,
/obj/item/storage/briefcase,
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aYk" = (
@@ -46725,12 +46721,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"cjb" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel{
name = "floor"
},
/area/engine/engineering)
"cjc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -56119,7 +56109,6 @@
dir = 4
},
/obj/machinery/door/airlock/maintenance/abandoned{
name = "maintenance access";
req_access_txt = "12"
},
/obj/structure/barricade/wooden,
@@ -58287,7 +58276,6 @@
},
/obj/machinery/computer/security/telescreen/toxins{
dir = 1;
network = list("toxins");
pixel_y = -28
},
/obj/structure/chair{
@@ -87415,8 +87403,8 @@ bVJ
cay
ccw
cig
cjb
cjb
cSV
cSV
cig
cig
cmG

25
_maps/map_files/CogStation/CogStation.dmm
View File

@@ -8974,7 +8974,6 @@
},
/obj/machinery/turnstile{
dir = 8;
icon_state = "turnstile_map";
name = "Genpop Entrance Turnstile";
req_access_txt = "69"
},
@@ -9657,7 +9656,6 @@
},
/obj/machinery/turnstile{
dir = 8;
icon_state = "turnstile_map";
name = "Genpop Entrance Turnstile";
req_access_txt = "69"
},
@@ -28878,8 +28876,7 @@
icon_state = "0-4"
},
/obj/machinery/door/poddoor/preopen{
id = "capblast";
name = "blast door"
id = "capblast"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
@@ -33205,8 +33202,7 @@
"bts" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/light_construct/small{
dir = 1;
icon_state = "bulb-construct-stage1"
dir = 1
},
/turf/open/floor/plasteel,
/area/maintenance/aft)
@@ -33760,8 +33756,7 @@
icon_state = "0-8"
},
/obj/machinery/door/poddoor/preopen{
id = "capblast";
name = "blast door"
id = "capblast"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
@@ -37603,7 +37598,6 @@
/turf/open/floor/plasteel,
/area/maintenance/disposal)
"bDc" = (
/obj/machinery/vending/security,
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -37611,6 +37605,7 @@
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
},
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"bDd" = (
@@ -46836,8 +46831,7 @@
},
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "capblast";
name = "blast door"
id = "capblast"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
@@ -47893,8 +47887,7 @@
icon_state = "0-8"
},
/obj/machinery/door/poddoor/preopen{
id = "capblast";
name = "blast door"
id = "capblast"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
@@ -49489,8 +49482,7 @@
},
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "capblast";
name = "blast door"
id = "capblast"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
@@ -49570,8 +49562,7 @@
},
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "capblast";
name = "blast door"
id = "capblast"
},
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)

51
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -501,8 +501,7 @@
dir = 4
},
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 8;
icon_state = "yellowcornersiding"
dir = 8
},
/area/crew_quarters/fitness/pool)
"aba" = (
@@ -518,8 +517,7 @@
dir = 8
},
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abb" = (
@@ -612,8 +610,7 @@
dir = 4
},
/turf/open/floor/plasteel/yellowsiding{
dir = 8;
icon_state = "yellowsiding"
dir = 8
},
/area/crew_quarters/fitness/pool)
"abn" = (
@@ -627,8 +624,7 @@
dir = 8
},
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abo" = (
@@ -712,8 +708,7 @@
name = "pool camera"
},
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abv" = (
@@ -732,8 +727,7 @@
dir = 4
},
/turf/open/floor/plasteel/yellowsiding{
dir = 8;
icon_state = "yellowsiding"
dir = 8
},
/area/crew_quarters/fitness/pool)
"aby" = (
@@ -773,8 +767,7 @@
dir = 8
},
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abC" = (
@@ -912,8 +905,7 @@
pixel_x = -23
},
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abP" = (
@@ -980,8 +972,7 @@
pixel_x = -26
},
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 4;
icon_state = "yellowcornersiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abW" = (
@@ -990,8 +981,7 @@
dir = 8
},
/turf/open/floor/plasteel/yellowsiding{
dir = 1;
icon_state = "yellowsiding"
dir = 1
},
/area/crew_quarters/fitness/pool)
"abX" = (
@@ -1003,8 +993,7 @@
dir = 4
},
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 1;
icon_state = "yellowcornersiding"
dir = 1
},
/area/crew_quarters/fitness/pool)
"abY" = (
@@ -9915,8 +9904,7 @@
/area/engine/atmospherics_engine)
"avi" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8;
name = "scrubbers pipe"
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -50511,12 +50499,6 @@
/turf/open/floor/plasteel/dark,
/area/security/detectives_office)
"bJn" = (
/obj/structure/rack,
/obj/item/storage/briefcase{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/secure/briefcase,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -50527,6 +50509,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/dark,
/area/security/detectives_office)
"bJo" = (
@@ -63207,7 +63190,6 @@
},
/obj/machinery/camera{
c_tag = "Library - Aft";
dir = 2;
name = "library camera"
},
/turf/open/floor/wood,
@@ -64373,8 +64355,7 @@
/area/library)
"cel" = (
/obj/structure/chair/sofa/right{
dir = 8;
icon_state = "sofaend_right"
dir = 8
},
/obj/structure/sign/painting/library{
pixel_x = 32
@@ -125710,7 +125691,6 @@
},
/obj/machinery/camera{
c_tag = "Library - Aft";
dir = 2;
name = "library camera"
},
/turf/open/floor/plasteel/grimy,
@@ -127863,8 +127843,7 @@
/area/science/mixing)
"xER" = (
/obj/structure/chair/sofa/left{
dir = 8;
icon_state = "sofaend_left"
dir = 8
},
/turf/open/floor/wood,
/area/library)

7
_maps/map_files/KiloStation/KiloStation.dmm
View File

@@ -10384,9 +10384,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/dark,
/area/security/detectives_office)
"ars" = (
@@ -70077,8 +70075,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8;
name = "scrubbers pipe"
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line,

18
_maps/map_files/LambdaStation/lambda.dmm
View File

@@ -2480,8 +2480,7 @@
/area/security/prison)
"aga" = (
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
@@ -2489,8 +2488,7 @@
/area/security/execution/education)
"agb" = (
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -17213,22 +17211,14 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"aFo" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
pixel_x = -3;
pixel_y = 2
},
/obj/item/storage/secure/briefcase{
pixel_x = 2;
pixel_y = -2
},
/obj/item/camera/detective,
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aFp" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
/obj/machinery/light/small,
/obj/item/camera/detective,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aFq" = (

27
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -1136,8 +1136,7 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/red{
@@ -1155,8 +1154,7 @@
"acB" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -1196,8 +1194,7 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -9534,7 +9531,6 @@
"arF" = (
/obj/structure/pool/ladder{
dir = 8;
icon_state = "ladder";
pixel_x = 4
},
/turf/open/pool,
@@ -10230,7 +10226,6 @@
/area/security/main)
"asN" = (
/obj/machinery/light/built{
icon_state = "tube-empty";
dir = 8
},
/turf/open/floor/plasteel,
@@ -15691,15 +15686,7 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aDN" = (
/obj/structure/rack,
/obj/item/storage/briefcase{
pixel_x = -3;
pixel_y = 2
},
/obj/item/storage/secure/briefcase{
pixel_x = 2;
pixel_y = -2
},
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aDO" = (
@@ -63650,8 +63637,7 @@
"cvL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "researchrangeshutters";
name = "blast door"
id = "researchrangeshutters"
},
/turf/open/floor/plating,
/area/science/misc_lab/range)
@@ -66513,8 +66499,7 @@
"cBm" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "researchrangeshutters";
name = "blast door"
id = "researchrangeshutters"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4

51
_maps/map_files/OmegaStation/OmegaStation.dmm
View File

@@ -3061,7 +3061,6 @@
pixel_x = 26
},
/obj/machinery/computer/card/minor/qm{
icon_state = "computer";
dir = 8
},
/obj/effect/turf_decal/tile/brown{
@@ -3232,9 +3231,9 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/turnstile{
dir = 8;
name = "Genpop Exit Turnstile";
req_access_txt = "70";
dir = 8
req_access_txt = "70"
},
/turf/open/floor/plasteel,
/area/security/prison)
@@ -4288,7 +4287,6 @@
pixel_x = 30
},
/obj/machinery/computer/security/hos{
icon_state = "computer";
dir = 8
},
/turf/open/floor/plasteel/grimy,
@@ -4821,7 +4819,6 @@
dir = 4
},
/obj/machinery/computer/card/minor/hos{
icon_state = "computer";
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -6388,9 +6385,9 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/turnstile{
dir = 4;
name = "Genpop Entrance Turnstile";
req_access_txt = "69";
dir = 4
req_access_txt = "69"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -8523,13 +8520,10 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"any" = (
/obj/structure/table/wood,
/obj/machinery/newscaster{
pixel_y = 32
},
/obj/item/clipboard,
/obj/item/folder/red,
/obj/item/hand_labeler,
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/wood,
/area/security/detectives_office)
"anz" = (
@@ -9097,7 +9091,6 @@
},
/obj/machinery/computer/security/telescreen/ce{
dir = 1;
icon_state = "telescreen";
pixel_y = -24
},
/turf/open/floor/plasteel,
@@ -12534,20 +12527,6 @@
/turf/open/floor/plasteel/dark,
/area/security/detectives_office)
"ats" = (
/obj/item/clothing/suit/jacket{
desc = "All the class of a trenchcoat without the security fibers.";
icon_state = "greydet";
name = "trenchcoat"
},
/obj/item/clothing/suit/jacket{
desc = "All the class of a trenchcoat without the security fibers.";
icon_state = "detective";
name = "trenchcoat"
},
/obj/item/clothing/head/fedora,
/obj/item/clothing/head/fedora{
icon_state = "detective"
},
/obj/machinery/light/small{
dir = 1
},
@@ -12687,7 +12666,6 @@
dir = 8
},
/obj/machinery/computer/med_data/laptop{
icon_state = "laptop";
dir = 4
},
/obj/machinery/requests_console{
@@ -13264,7 +13242,6 @@
/obj/structure/table/wood,
/obj/machinery/computer/secure_data/laptop{
dir = 1;
icon_state = "laptop";
pixel_y = 4
},
/turf/open/floor/wood,
@@ -16189,9 +16166,9 @@
name = "Brig Blast door"
},
/obj/machinery/turnstile{
dir = 8;
name = "Genpop Exit Turnstile";
req_access_txt = "70";
dir = 8
req_access_txt = "70"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -18134,9 +18111,8 @@
"aCt" = (
/obj/machinery/door/firedoor,
/obj/machinery/turnstile{
name = "Genpop Exit Turnstile";
icon_state = "turnstile_map";
dir = 1;
name = "Genpop Exit Turnstile";
req_access_txt = "70"
},
/obj/effect/turf_decal/stripes/line,
@@ -26149,7 +26125,6 @@
},
/obj/machinery/computer/security/telescreen/cmo{
dir = 1;
icon_state = "telescreen";
pixel_y = -32
},
/turf/open/floor/plasteel/cafeteria,
@@ -26762,7 +26737,6 @@
"aPC" = (
/obj/machinery/computer/security/telescreen/entertainment,
/obj/structure/bodycontainer/morgue{
icon_state = "morgue1";
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -26806,7 +26780,6 @@
/area/medical/medbay/zone3)
"aPE" = (
/obj/structure/bodycontainer/morgue{
icon_state = "morgue1";
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -27105,7 +27078,6 @@
dir = 1
},
/obj/machinery/computer/scan_consolenew{
icon_state = "computer";
dir = 1
},
/obj/effect/turf_decal/bot,
@@ -27733,7 +27705,6 @@
/area/crew_quarters/heads/cmo)
"aRp" = (
/obj/structure/bodycontainer/morgue{
icon_state = "morgue1";
dir = 2
},
/obj/effect/turf_decal/tile/neutral{
@@ -27806,7 +27777,6 @@
/area/science/research)
"aRw" = (
/obj/structure/bodycontainer/morgue{
icon_state = "morgue1";
dir = 2
},
/obj/effect/turf_decal/tile/neutral{
@@ -34455,7 +34425,6 @@
icon_state = "0-8"
},
/obj/machinery/power/solar_control{
dir = 2;
id = "forestarboard";
name = "Starboard Bow Solar Control"
},
@@ -35051,7 +35020,6 @@
},
/obj/machinery/power/apc{
areastring = "/area/maintenance/solars/starboard/fore";
dir = 2;
name = "Starboard Bow Solar APC";
pixel_y = -26
},
@@ -35995,7 +35963,6 @@
department = "Research Director's Desk";
departmentType = 5;
name = "Research Director RC";
pixel_x = 0;
pixel_y = -32;
receive_ore_updates = 1
},
@@ -36304,7 +36271,6 @@
},
/obj/machinery/computer/security/telescreen/rd{
dir = 1;
icon_state = "telescreen";
pixel_y = -28
},
/turf/open/floor/plasteel{
@@ -36546,7 +36512,6 @@
/obj/machinery/shower{
desc = "From what you understand it was put in rather recently, but the design looks right out of the 2510's. Weird.";
dir = 1;
icon_state = "shower";
name = "Emergency Shower"
},
/obj/effect/turf_decal/stripes/line{

45
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -334,8 +334,7 @@
/area/crew_quarters/fitness/pool)
"aaM" = (
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 8;
icon_state = "yellowcornersiding"
dir = 8
},
/area/crew_quarters/fitness/pool)
"aaN" = (
@@ -354,8 +353,7 @@
/area/crew_quarters/fitness/pool)
"aaP" = (
/turf/open/floor/plasteel/yellowsiding{
dir = 8;
icon_state = "yellowsiding"
dir = 8
},
/area/crew_quarters/fitness/pool)
"aaQ" = (
@@ -433,8 +431,7 @@
/area/crew_quarters/fitness/pool)
"aaW" = (
/turf/open/floor/plasteel/yellowsiding{
dir = 1;
icon_state = "yellowsiding"
dir = 1
},
/area/crew_quarters/fitness/pool)
"aaX" = (
@@ -550,8 +547,7 @@
"abm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abn" = (
@@ -580,8 +576,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/yellowsiding{
dir = 4;
icon_state = "yellowsiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abr" = (
@@ -595,8 +590,7 @@
"abt" = (
/obj/structure/pool/Rboard,
/turf/open/floor/plasteel/yellowsiding{
dir = 8;
icon_state = "yellowsiding"
dir = 8
},
/area/crew_quarters/fitness/pool)
"abu" = (
@@ -659,8 +653,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 4;
icon_state = "yellowcornersiding"
dir = 4
},
/area/crew_quarters/fitness/pool)
"abB" = (
@@ -670,21 +663,18 @@
pixel_y = -27
},
/turf/open/floor/plasteel/yellowsiding{
dir = 1;
icon_state = "yellowsiding"
dir = 1
},
/area/crew_quarters/fitness/pool)
"abC" = (
/obj/machinery/light,
/turf/open/floor/plasteel/yellowsiding{
dir = 1;
icon_state = "yellowsiding"
dir = 1
},
/area/crew_quarters/fitness/pool)
"abD" = (
/turf/open/floor/plasteel/yellowsiding/corner{
dir = 1;
icon_state = "yellowcornersiding"
dir = 1
},
/area/crew_quarters/fitness/pool)
"abE" = (
@@ -2757,8 +2747,7 @@
icon_state = "0-8"
},
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plating,
@@ -54863,6 +54852,10 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"gQo" = (
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"gSH" = (
/turf/closed/wall,
/area/lawoffice)
@@ -57234,8 +57227,7 @@
icon_state = "0-4"
},
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
@@ -59204,8 +59196,7 @@
icon_state = "2-4"
},
/obj/machinery/door/poddoor/preopen{
id = "executionfireblast";
name = "blast door"
id = "executionfireblast"
},
/turf/open/floor/plating,
/area/security/execution/transfer)
@@ -85514,7 +85505,7 @@ aCo
aCk
aEr
aGa
aCk
gQo
oEA
uoS
uoS

30
_maps/map_files/Snaxi/Snaxi.dmm
View File

@@ -197,12 +197,10 @@
/obj/structure/closet/emcloset/anchored,
/obj/structure/sign/directions/medical{
dir = 8;
icon_state = "direction_med";
pixel_y = 36
},
/obj/structure/sign/directions/science{
dir = 8;
icon_state = "direction_sci";
pixel_y = 28
},
/turf/open/floor/plasteel,
@@ -247,7 +245,6 @@
},
/obj/structure/sign/directions/engineering{
dir = 4;
icon_state = "direction_eng";
pixel_x = 32;
pixel_y = -28
},
@@ -285,7 +282,6 @@
},
/obj/structure/sign/directions/engineering{
dir = 4;
icon_state = "direction_eng";
pixel_y = 40
},
/turf/open/floor/plasteel,
@@ -349,7 +345,6 @@
/obj/structure/disposalpipe/segment,
/obj/structure/sign/directions/engineering{
dir = 1;
icon_state = "direction_eng";
pixel_x = 32;
pixel_y = 32
},
@@ -384,12 +379,10 @@
"aaC" = (
/obj/structure/sign/directions/medical{
dir = 8;
icon_state = "direction_med";
pixel_y = 36
},
/obj/structure/sign/directions/science{
dir = 8;
icon_state = "direction_sci";
pixel_y = 28
},
/turf/open/floor/plasteel,
@@ -397,12 +390,10 @@
"aaD" = (
/obj/structure/sign/directions/engineering{
dir = 4;
icon_state = "direction_eng";
pixel_y = 36
},
/obj/structure/sign/directions/supply{
dir = 4;
icon_state = "direction_supply";
pixel_y = 28
},
/turf/open/floor/plasteel,
@@ -444,12 +435,10 @@
},
/obj/structure/sign/directions/medical{
dir = 8;
icon_state = "direction_med";
pixel_y = 40
},
/obj/structure/sign/directions/science{
dir = 8;
icon_state = "direction_sci";
pixel_y = 32
},
/obj/structure/sign/directions/security{
@@ -470,12 +459,10 @@
},
/obj/structure/sign/directions/engineering{
dir = 4;
icon_state = "direction_eng";
pixel_y = 40
},
/obj/structure/sign/directions/supply{
dir = 4;
icon_state = "direction_supply";
pixel_y = 32
},
/obj/structure/sign/directions/evac{
@@ -525,12 +512,10 @@
},
/obj/structure/sign/directions/medical{
dir = 8;
icon_state = "direction_med";
pixel_y = 36
},
/obj/structure/sign/directions/science{
dir = 8;
icon_state = "direction_sci";
pixel_y = 28
},
/obj/structure/sign/directions/science{
@@ -561,12 +546,10 @@
/obj/machinery/computer/shuttle/snow_taxi,
/obj/structure/sign/directions/supply{
dir = 4;
icon_state = "direction_supply";
pixel_y = 36
},
/obj/structure/sign/directions/engineering{
dir = 4;
icon_state = "direction_eng";
pixel_y = 28
},
/turf/open/floor/plasteel,
@@ -600,16 +583,13 @@
"aaV" = (
/obj/structure/sign/directions/evac{
dir = 1;
icon_state = "direction_evac";
pixel_y = 8
},
/obj/structure/sign/directions/security{
dir = 8;
icon_state = "direction_sec"
dir = 8
},
/obj/structure/sign/directions/command{
dir = 8;
icon_state = "direction_bridge";
pixel_y = -8
},
/turf/closed/wall/r_wall,
@@ -686,7 +666,6 @@
},
/obj/structure/sign/directions/supply{
dir = 4;
icon_state = "direction_supply";
pixel_x = 32;
pixel_y = -24
},
@@ -787,7 +766,6 @@
},
/obj/structure/sign/directions/evac{
dir = 8;
icon_state = "direction_evac";
pixel_x = 32;
pixel_y = 32
},
@@ -1158,13 +1136,11 @@
/obj/structure/disposalpipe/segment,
/obj/structure/sign/directions/evac{
dir = 8;
icon_state = "direction_evac";
pixel_x = 32;
pixel_y = 40
},
/obj/structure/sign/directions/engineering{
dir = 4;
icon_state = "direction_eng";
pixel_x = 32;
pixel_y = 24
},
@@ -3934,7 +3910,7 @@
name = "Privacy Shutters";
pixel_y = 24
},
/obj/machinery/computer/med_data,
/obj/machinery/vending/wardrobe/det_wardrobe,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aMR" = (
@@ -20407,7 +20383,6 @@
"iXZ" = (
/obj/machinery/computer/security/telescreen/toxins{
dir = 1;
network = list("toxins");
pixel_y = -28
},
/obj/structure/chair{
@@ -43137,6 +43112,7 @@
pixel_x = 6;
pixel_y = 36
},
/obj/machinery/computer/med_data/laptop,
/turf/open/floor/carpet,
/area/security/detectives_office)
"wtY" = (

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

@@ -8,6 +8,7 @@
new /obj/item/clothing/neck/cloak/qm(src)
new /obj/item/clothing/head/beret/qm(src)
new /obj/item/storage/lockbox/medal/cargo(src)
new /obj/item/clothing/suit/toggle/labcoat/depjacket/sup/qm(src)
new /obj/item/clothing/under/rank/cargo/qm(src)
new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
new /obj/item/clothing/shoes/sneakers/brown(src)

14
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -25,6 +25,7 @@
/obj/structure/closet/secure_closet/hop/PopulateContents()
..()
new /obj/item/clothing/neck/cloak/hop(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/whimsy(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src)
new /obj/item/clothing/head/hopcap(src)
@@ -59,6 +60,7 @@
new /obj/item/radio/headset/heads/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade(src)
new /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/hoscorp(src)
new /obj/item/clothing/suit/armor/vest/leather(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
@@ -95,6 +97,7 @@
new /obj/item/clothing/head/warden/drill(src)
new /obj/item/clothing/head/beret/sec/navywarden(src)
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
new /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/wardencorp(src)
new /obj/item/clothing/under/rank/security/warden/formal(src)
new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
@@ -156,17 +159,6 @@
/obj/structure/closet/secure_closet/detective/PopulateContents()
..()
new /obj/item/clothing/under/rank/security/detective(src)
new /obj/item/clothing/under/rank/security/detective/skirt(src)
new /obj/item/clothing/suit/det_suit(src)
new /obj/item/clothing/head/fedora/det_hat(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/under/rank/security/detective/grey(src)
new /obj/item/clothing/under/rank/security/detective/grey/skirt(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/suit/det_suit/grey(src)
new /obj/item/clothing/head/fedora(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/storage/box/evidence(src)
new /obj/item/radio/headset/headset_sec(src)
new /obj/item/detective_scanner(src)

35
code/modules/clothing/suits/jobs.dm
View File

@@ -117,6 +117,27 @@
icon_state = "greydet"
item_state = "greydet"
/obj/item/clothing/suit/det_suit/forensicsred
name = "red forensics coat"
icon_state = "forensics_red"
item_state = "forensics_red"
/obj/item/clothing/suit/det_suit/forensicsred/long
name = "long red forensics coat"
icon_state = "forensics_red_long"
item_state = "forensics_red_long"
/obj/item/clothing/suit/det_suit/forensicsblue
name = "blue forensics coat"
icon_state = "forensics_blue"
item_state = "forensics_blue"
/obj/item/clothing/suit/det_suit/forensicsblue/long
name = "long blue forensics coat"
icon_state = "forensics_blue_long"
item_state = "forensics_blue_long"
//Engineering
/obj/item/clothing/suit/hazardvest
name = "hazard vest"
@@ -222,4 +243,16 @@
desc = "A dark blue vest with reflective strips for emergency medical technicians."
icon_state = "labcoat_emt"
item_state = "labcoat_emt"
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/suit/toggle/labcoat/emt/red
name = "red emt vest"
desc = "A red vest with reflective strips for emergency medical technicians."
icon_state = "labcoat_emtred"
item_state = "labcoat_emtred"
/obj/item/clothing/suit/toggle/labcoat/emt/highvis
name = "high visibility emt vest"
desc = "a high visibility vest for emergency medical technicians."
icon_state = "labcoat_highvis"
item_state = "labcoat_highvis"

45
code/modules/clothing/suits/labcoat.dm
View File

@@ -62,3 +62,48 @@
name = "scientist labcoat"
desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
icon_state = "labcoat_tox"
// Departmental Jackets
/obj/item/clothing/suit/toggle/labcoat/depjacket/sci
name = "science jacket"
desc = "A comfortable jacket in science purple."
icon_state = "sci_dep_jacket"
item_state = "sci_dep_jacket"
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/suit/toggle/labcoat/depjacket/med
name = "medical jacket"
desc = "A comfortable jacket in medical blue."
icon_state = "med_dep_jacket"
item_state = "med_dep_jacket"
allowed = list(/obj/item/analyzer, /obj/item/sensor_device, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 45)
/obj/item/clothing/suit/toggle/labcoat/depjacket/sec
name = "security jacket"
desc = "A comfortable jacket in security red."
icon_state = "sec_dep_jacket"
item_state = "sec_dep_jacket"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
/obj/item/clothing/suit/toggle/labcoat/depjacket/sup
name = "supply jacket"
desc = "A comfortable jacket in supply brown."
icon_state = "supply_dep_jacket"
item_state = "supply_dep_jacket"
/obj/item/clothing/suit/toggle/labcoat/depjacket/sup/qm
name = "quartermaster's jacket"
desc = "A loose covering often warn by station quartermasters."
icon_state = "qmjacket"
item_state = "qmjacket"
/obj/item/clothing/suit/toggle/labcoat/depjacket/eng
name = "engineering jacket"
desc = "A comfortable jacket in engineering yellow."
icon_state = "engi_dep_jacket"
item_state = "engi_dep_jacket"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)

23
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -94,6 +94,23 @@
flags_inv = HIDEJUMPSUIT
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/suit/tailcoat
name = "tailcoat"
desc = "A rather impractical, long coat."
icon_state = "tailcoat"
item_state = "tailcoat"
/obj/item/clothing/suit/vickyblack
name = "black victorian coat"
desc = "An overbearing black coat, it looks far older than you are."
icon_state = "vickyblack"
item_state = "vickyblack"
/obj/item/clothing/suit/vickyred
name = "red victorian coat"
desc = "An overbearing red coat, it looks far older than you are."
icon_state = "vickyred"
item_state = "vickyred"
/obj/item/clothing/suit/apron/overalls
name = "coveralls"
@@ -1064,3 +1081,9 @@
desc = "An outfit used by traditional japanese warriors."
icon_state = "samurai"
item_state = "samurai"
/obj/item/clothing/suit/bomber
name = "old bomber jacket"
desc = "It looks like someone dragged this out of a muddy lake."
icon_state = "bomberalt"
item_state = "bomberalt"

8
code/modules/clothing/under/jobs/cargo.dm
View File

@@ -23,6 +23,14 @@
body_parts_covered = CHEST|GROIN|ARMS
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/cargo/util
name = "cargo utility uniform"
desc = "a utility uniform for cargo personnel"
icon_state = "utilsupply"
item_state = "utilsupply"
can_adjust = FALSE
/obj/item/clothing/under/rank/cargo/tech/skirt
name = "cargo technician's jumpskirt"
desc = "Skiiiiirts! They're comfy and easy to wear"

68
code/modules/clothing/under/jobs/civilian/civilian.dm
View File

@@ -23,6 +23,68 @@
fitted = FEMALE_UNIFORM_TOP
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/under/rank/civilian/util
name = "generic utility uniform"
desc = "A utility uniform worn by various crew."
icon_state = "utilgen"
item_state = "utilgen"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/util/greyshirt
name = "grey uniform"
desc = "A bland, grey uniform."
icon_state = "greyshirt"
item_state = "greyshirt"
/obj/item/clothing/under/rank/civilian/victorian_redsleeves
name = "black vest red victorian suit"
desc = "A stark red victorian suit with a black vest."
icon_state = "victorianblred"
item_state = "victorianblred"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/victorian_redvest
name = "red-vested victorian suit"
desc = "A victorian suit with a red vest."
icon_state = "victorianredvest"
item_state = "victorianredvest"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/victorian_vest
name = "black victorian suit"
desc = "A simple black victorian suit."
icon_state = "victorianvest"
item_state = "victorianvest"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/victorian_purple
name = "purple victorian suit"
desc = "A victorian suit in regal purple."
icon_state = "victorianlightfire"
item_state = "victorianlightfire"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/victorianreddress
name = "red victorian dress"
desc = "A flashy red victorian dress."
icon_state = "victorianreddress"
item_state = "victorianreddress"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/victorianblackdress
name = "black victorian dress"
desc = "A victorian dress in somber black."
icon_state = "victorianblackdress"
item_state = "victorianblackdress"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/dutch
name = "dutch suit"
desc = "A dapper dutch suit."
icon_state = "dutch"
item_state = "dutch"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
name = "chaplain's jumpsuit"
@@ -62,6 +124,12 @@
item_state = "b_suit"
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/head_of_personnel/whimsy
name = "casual head of personnel's jumpsuit"
desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\", this one seems to be a bit more casual."
icon_state = "hop_casual"
item_state = "hop_casual"
/obj/item/clothing/under/rank/civilian/head_of_personnel/skirt
name = "head of personnel's jumpskirt"
desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"."

7
code/modules/clothing/under/jobs/command.dm
View File

@@ -6,6 +6,13 @@
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/captain/util
name = "Command Utiltiy Uniform"
desc = "A utility uniform for command personnel."
icon_state = "utilcom"
item_state = "utilcom"
can_adjust = FALSE
/obj/item/clothing/under/rank/captain/skirt
name = "captain's jumpskirt"
desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"."

14
code/modules/clothing/under/jobs/engineering.dm
View File

@@ -42,6 +42,20 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 5)
resistance_flags = NONE
/obj/item/clothing/under/rank/engineering/engineer/mechanic
name = "mechanic's jumpsuit"
desc = "an old mechanic's jumpsuit"
icon_state = "mechanic"
item_state = "mechanic"
can_adjust = FALSE
/obj/item/clothing/under/rank/engineering/engineer/util
name = "engineering utility uniform"
desc = "a utility jumpsuit for engineering personnel"
icon_state = "utileng"
item_state = "utileng"
can_adjust = FALSE
/obj/item/clothing/under/rank/engineering/engineer/hazard
name = "engineer's hazard jumpsuit"
desc = "A high visibility jumpsuit made from heat and radiation resistant materials."

13
code/modules/clothing/under/jobs/medical.dm
View File

@@ -86,6 +86,12 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5)
/obj/item/clothing/under/rank/medical/paramedic/red
name = "red paramedic jumpsuit"
icon_state = "pmedred"
item_state = "pmedred"
can_adjust = FALSE
/obj/item/clothing/under/rank/medical/paramedic/light
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic."
icon_state = "paramedic-light"
@@ -124,6 +130,13 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5)
/obj/item/clothing/under/rank/medical/doctor/util
name = "Medical Utility Uniform"
desc = "Utility jumpsuit for medical personnel"
icon_state = "utilmed"
item_state = "utilmed"
can_adjust = FALSE
/obj/item/clothing/under/rank/medical/doctor/blue
name = "blue medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."

13
code/modules/clothing/under/jobs/rnd.dm
View File

@@ -61,6 +61,13 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5)
/obj/item/clothing/under/rank/rnd/scientist/util
name = "Science Utility Uniform"
desc = "A utility uniform for science personnel"
icon_state = "utilsci"
item_state = "utilsci"
can_adjust = FALSE
/obj/item/clothing/under/rank/rnd/scientist/skirt
name = "scientist's jumpskirt"
desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
@@ -78,6 +85,12 @@
item_state = "robotics"
resistance_flags = NONE
/obj/item/clothing/under/rank/rnd/roboticist/sleek
name = "sleek roboticist's jumpsuit"
icon_state = "robosleek"
item_state = "robosleek"
can_adjust = FALSE
/obj/item/clothing/under/rank/rnd/roboticist/skirt
name = "roboticist's jumpskirt"
desc = "It's a slimming black with reinforced seams; great for industrial work."

41
code/modules/clothing/under/jobs/security.dm
View File

@@ -21,6 +21,13 @@
item_state = "r_suit"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30, "wound" = 10)
/obj/item/clothing/under/rank/security/officer/util
name = "security utility uniform"
desc = "a grey security uniform"
icon_state = "utilsec"
item_state = "utilsec"
can_adjust = FALSE
/obj/item/clothing/under/rank/security/officer/grey
name = "grey security jumpsuit"
desc = "A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
@@ -51,6 +58,28 @@
item_state = "blueshift"
can_adjust = FALSE
/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp
name = "corporate security uniform"
desc = "How positively stuffy."
icon_state = "seccorp"
item_state = "seccorp"
can_adjust = FALSE
/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/wardencorp
name = "corporate warden uniform"
icon_state = "wardencorp"
item_state = "wardencorp"
/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/hoscorp
name = "corporate head of security's uniform"
icon_state = "hoscorp"
item_state = "hoscorp"
/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/detcorp
name = "corporate detective's uniform"
icon_state = "detcorp"
item_state = "detcorp"
/obj/item/clothing/under/rank/security/officer/spacepol
name = "police uniform"
desc = "Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol."
@@ -103,6 +132,16 @@
item_state = "det"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30, "wound" = 10)
/obj/item/clothing/under/rank/security/detective/brown
name = "dark boiled suit"
icon_state = "detectivebrown"
item_state = "detectivebrown"
/obj/item/clothing/under/rank/security/detective/brown/brown2
name = "padded suit"
icon_state = "detectivebrown2"
item_state = "detectivebrown2"
/obj/item/clothing/under/rank/security/detective/skirt
name = "detective's suitskirt"
desc = "Someone who wears this means business."
@@ -202,4 +241,4 @@
desc = "Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol."
icon_state = "spacepol"
item_state = "spacepol"
can_adjust = FALSE
can_adjust = FALSE

16
code/modules/clothing/under/suits.dm
View File

@@ -116,3 +116,19 @@
/obj/item/clothing/under/suit/polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, list("#FFFFFF", "#FFFFFF", "#808080"), 3)
/obj/item/clothing/under/suit/turtle
desc = "a debatably stylish turtleneck."
can_adjust = FALSE
/obj/item/clothing/under/suit/turtle/teal
name = "teal turtleneck"
icon_state = "tealturtle"
item_state = "tealturtle"
can_adjust = FALSE
/obj/item/clothing/under/suit/turtle/grey
name = "grey turtleneck"
icon_state = "greyturtle"
item_state = "greyturtle"
can_adjust = FALSE

10
code/modules/vending/autodrobe.dm
View File

@@ -29,6 +29,16 @@
/obj/item/clothing/glasses/monocle =1,
/obj/item/clothing/head/bowler = 1,
/obj/item/cane = 1,
/obj/item/clothing/under/rank/civilian/victorian_redsleeves = 1,
/obj/item/clothing/under/rank/civilian/victorian_redvest = 1,
/obj/item/clothing/under/rank/civilian/victorian_vest = 1,
/obj/item/clothing/under/rank/civilian/victorian_purple = 1,
/obj/item/clothing/suit/tailcoat = 1,
/obj/item/clothing/under/rank/civilian/victorianreddress = 1,
/obj/item/clothing/suit/vickyred = 1,
/obj/item/clothing/under/rank/civilian/victorianblackdress = 1,
/obj/item/clothing/suit/vickyblack =1,
/obj/item/clothing/under/rank/civilian/dutch = 2,
/obj/item/clothing/under/suit/sl = 1,
/obj/item/clothing/mask/fakemoustache = 1,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,

5
code/modules/vending/clothesmate.dm
View File

@@ -21,6 +21,11 @@
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
/obj/item/clothing/suit/bomber = 5,
/obj/item/clothing/under/suit/turtle/teal = 3,
/obj/item/clothing/under/suit/turtle/grey = 3,
/obj/item/clothing/under/rank/civilian/util = 5,
/obj/item/clothing/under/rank/civilian/util/greyshirt = 5,
/obj/item/clothing/under/suit/navy = 3,
/obj/item/clothing/under/suit/black_really = 3,
/obj/item/clothing/under/suit/burgundy = 3,

59
code/modules/vending/wardrobes.dm
View File

@@ -27,7 +27,10 @@
/obj/item/clothing/mask/bandana/red = 5,
/obj/item/clothing/under/rank/security/officer/skirt = 5,
/obj/item/clothing/under/rank/security/officer/grey = 5,
/obj/item/clothing/under/pants/khaki = 5)
/obj/item/clothing/under/pants/khaki = 5,
/obj/item/clothing/suit/toggle/labcoat/depjacket/sec = 5,
/obj/item/clothing/under/rank/security/officer/util = 5,
/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp = 5)
premium = list(/obj/item/clothing/under/rank/security/officer/formal = 5,
/obj/item/clothing/head/beret/sec/navyofficer = 5)
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
@@ -39,6 +42,44 @@
/obj/item/vending_refill/wardrobe/sec_wardrobe
machine_name = "SecDrobe"
/obj/machinery/vending/wardrobe/det_wardrobe
name = "\improper DetDrobe"
desc = "A machine for all your detective needs, as long as you need clothes."
icon_state = "detdrobe"
product_ads = "Apply your brilliant deductive methods in style!"
vend_reply = "Thank you for using the DetDrobe!"
products = list(/obj/item/clothing/under/rank/security/detective = 2,
/obj/item/clothing/under/rank/security/detective/skirt = 2,
/obj/item/clothing/under/rank/security/detective/brown = 2,
/obj/item/clothing/under/rank/security/detective/brown/brown2 = 2,
/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/detcorp = 2,
/obj/item/clothing/under/rank/security/officer/util = 2,
/obj/item/clothing/shoes/sneakers/brown = 2,
/obj/item/clothing/suit/det_suit = 2,
/obj/item/clothing/head/fedora/det_hat = 2,
/obj/item/clothing/under/rank/security/detective/grey = 2,
/obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/suit/det_suit/grey = 1,
/obj/item/clothing/suit/det_suit/forensicsred = 1,
/obj/item/clothing/suit/det_suit/forensicsred/long = 1,
/obj/item/clothing/suit/det_suit/forensicsblue = 1,
/obj/item/clothing/suit/det_suit/forensicsblue/long = 1,
/obj/item/clothing/head/fedora = 2,
/obj/item/clothing/gloves/color/black = 2,
/obj/item/clothing/gloves/color/latex = 2,
/obj/item/reagent_containers/food/drinks/flask/det = 2,
/obj/item/storage/fancy/cigarettes = 5)
premium = list(/obj/item/clothing/head/flatcap = 1)
refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
extra_price = 350
payment_department = ACCOUNT_SEC
/obj/item/vending_refill/wardrobe/det_wardrobe
machine_name = "DetDrobe"
/obj/machinery/vending/wardrobe/medi_wardrobe
name = "\improper MediDrobe"
desc = "A vending machine rumoured to be capable of dispensing clothing for medical personnel."
@@ -66,10 +107,15 @@
/obj/item/clothing/suit/toggle/labcoat = 5,
/obj/item/clothing/suit/toggle/labcoat/paramedic = 5,
/obj/item/clothing/suit/toggle/labcoat/emt = 5,
/obj/item/clothing/suit/toggle/labcoat/depjacket/med = 5,
/obj/item/clothing/shoes/sneakers/white = 5,
/obj/item/clothing/head/soft/emt = 5,
/obj/item/clothing/suit/apron/surgical = 5,
/obj/item/clothing/mask/surgical = 5)
/obj/item/clothing/mask/surgical = 5,
/obj/item/clothing/under/rank/medical/doctor/util = 5,
/obj/item/clothing/under/rank/medical/paramedic/red = 5,
/obj/item/clothing/suit/toggle/labcoat/emt/red = 5,
/obj/item/clothing/suit/toggle/labcoat/emt/highvis = 5)
refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
payment_department = ACCOUNT_MED
cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
@@ -94,6 +140,9 @@
/obj/item/clothing/under/rank/engineering/engineer/hazard = 5,
/obj/item/clothing/under/rank/engineering/engineer/hazard/green = 5,
/obj/item/clothing/under/rank/engineering/engineer/hazard/white = 5,
/obj/item/clothing/suit/toggle/labcoat/depjacket/eng = 5,
/obj/item/clothing/under/rank/engineering/engineer/util = 5,
/obj/item/clothing/under/rank/engineering/engineer/mechanic = 5,
/obj/item/clothing/suit/hazardvest = 5,
/obj/item/clothing/shoes/workboots = 5,
/obj/item/clothing/head/hardhat = 5,
@@ -137,6 +186,8 @@
products = list(/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
/obj/item/clothing/under/rank/cargo/tech = 5,
/obj/item/clothing/under/rank/cargo/tech/skirt = 5,
/obj/item/clothing/under/rank/cargo/util = 5,
/obj/item/clothing/suit/toggle/labcoat/depjacket/sup = 5,
/obj/item/clothing/shoes/sneakers/black = 5,
/obj/item/clothing/gloves/fingerless = 5,
/obj/item/clothing/head/soft = 5,
@@ -157,6 +208,7 @@
products = list(/obj/item/clothing/glasses/hud/diagnostic = 3,
/obj/item/clothing/head/beret/robo = 3,
/obj/item/clothing/under/rank/rnd/roboticist = 3,
/obj/item/clothing/under/rank/rnd/roboticist/sleek = 3,
/obj/item/clothing/under/rank/rnd/roboticist/skirt = 3,
/obj/item/clothing/suit/hooded/wintercoat/robotics = 3,
/obj/item/clothing/suit/toggle/labcoat = 3,
@@ -187,8 +239,10 @@
/obj/item/storage/backpack/satchel/tox = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
/obj/item/clothing/under/rank/rnd/scientist = 4,
/obj/item/clothing/under/rank/rnd/scientist/util = 4,
/obj/item/clothing/under/rank/rnd/scientist/skirt = 4,
/obj/item/clothing/suit/toggle/labcoat/science = 4,
/obj/item/clothing/suit/toggle/labcoat/depjacket/sci = 4,
/obj/item/clothing/shoes/sneakers/white = 4,
/obj/item/radio/headset/headset_sci = 4,
/obj/item/clothing/mask/gas = 5)
@@ -477,6 +531,7 @@
/obj/item/clothing/neck/cloak/cap = 1,
/obj/item/clothing/shoes/sneakers/brown = 2,
/obj/item/clothing/under/rank/captain = 1,
/obj/item/clothing/under/rank/captain/util = 1,
/obj/item/clothing/under/rank/captain/skirt = 1,
/obj/item/clothing/head/caphat = 1,
/obj/item/clothing/head/caphat/parade = 1,

BIN
icons/mob/clothing/accessories.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
icons/mob/clothing/feet.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
icons/mob/clothing/suit.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 452 KiB

BIN
icons/mob/clothing/uniform.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 427 KiB

After

Width:  |  Height:  |  Size: 449 KiB

BIN
icons/obj/clothing/accessories.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
icons/obj/clothing/shoes.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
icons/obj/clothing/suits.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 161 KiB

BIN
icons/obj/clothing/uniforms.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 130 KiB

BIN
icons/obj/vending.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 108 KiB

129
modular_citadel/code/modules/client/loadout/uniform.dm
View File

@@ -211,6 +211,14 @@
name = "Keyhole Sweater"
path = /obj/item/clothing/under/misc/keyholesweater
/datum/gear/uniform/tealturtle
name = "Teal Turtleneck"
path = /obj/item/clothing/under/suit/turtle/teal
/datum/gear/uniform/greyturtle
name = "Grey Turtleneck"
path = /obj/item/clothing/under/suit/turtle/grey
/datum/gear/uniform/polyjump
name = "Polychromic Jumpsuit"
path = /obj/item/clothing/under/misc/polyjumpsuit
@@ -246,6 +254,127 @@
path = /obj/item/clothing/under/shorts/polychromic
cost = 2
/datum/gear/uniform/hopcasual
name = "Casual Head of Personnel's uniform"
path = /obj/item/clothing/under/rank/civilian/head_of_personnel/whimsy
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Head of Personnel"
restricted_roles = list("Head of Personnel")
/datum/gear/uniform/robosleek
name = "Sleek roboticist's jumpsuit"
path = /obj/item/clothing/under/rank/rnd/roboticist/sleek
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Roboticist"
restricted_roles = list("Roboticist")
/datum/gear/uniform/seccorp
name = "Corporate Security Uniform"
path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security Officer"
restricted_roles = list("Security Officer")
/datum/gear/uniform/wardencorp
name = "Corporate Warden's Uniform"
path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/wardencorp
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Warden"
restricted_roles = list("Warden")
/datum/gear/uniform/hoscorp
name = "Corporate Head of Security's Uniform"
path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/hoscorp
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Head Of Security"
restricted_roles = list("Head Of Security")
/datum/gear/uniform/detcorp
name = "Corporate Detective's Uniform"
path = /obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/detcorp
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Detective"
restricted_roles = list("Detective")
/datum/gear/uniform/detbrown
name = "Brown Worn Suit"
path = /obj/item/clothing/under/rank/security/detective/brown
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Detective"
restricted_roles = list("Detective")
/datum/gear/uniform/detbrown/detbrown2
name = "Padded Worn Suit"
path = /obj/item/clothing/under/rank/security/detective/brown/brown2
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Detective"
restricted_roles = list("Detective")
// Grey utility
/datum/gear/uniform/grey
name = "Grey Uniform"
path = /obj/item/clothing/under/rank/civilian/util/greyshirt
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
/datum/gear/uniform/grey/util
name = "Grey Utility Uniform"
path = /obj/item/clothing/under/rank/civilian/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
/datum/gear/uniform/grey/sec
name = "Security Utility Uniform"
path = /obj/item/clothing/under/rank/security/officer/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Detective", "Security Officer", "Warden", "Head of Security")
/datum/gear/uniform/grey/sci
name = "Science Utility Uniform"
path = /obj/item/clothing/under/rank/rnd/scientist/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Science"
restricted_roles = list("Scientist", "Roboticist", "Research Director", "Geneticist")
/datum/gear/uniform/grey/med
name = "Medical Utility Uniform"
path = /obj/item/clothing/under/rank/medical/doctor/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Medical"
restricted_roles = list("Medical Doctor", "Virologist", "Chemist", "Geneticist", "Paramedic")
/datum/gear/uniform/grey/eng
name = "Engineering Utility Uniform"
path = /obj/item/clothing/under/rank/engineering/engineer/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Engineering"
restricted_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")
/datum/gear/uniform/grey/supply
name = "Supply Utility Uniform"
path = /obj/item/clothing/under/rank/cargo/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Supply"
restricted_roles = list("Shaft Miner", "Cargo Technician", "Quartermaster")
/datum/gear/uniform/grey/com
name = "Command Utility Uniform"
path = /obj/item/clothing/under/rank/captain/util
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Command"
restricted_roles = list("Quartermaster", "Research Director", "Chief Medical Officer", "Head Of Security", "Head Of Personnel", "Captain")
/datum/gear/uniform/grey/eng/mech
name = "Mechanic's Uniform"
path = /obj/item/clothing/under/rank/engineering/engineer/mechanic
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
/datum/gear/unifrom/grey/med/red
name = "Red Paramedic's Uniform"
path = /obj/item/clothing/under/rank/medical/paramedic/red
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
// Trekie things
//TOS
/datum/gear/uniform/trekcmdtos