diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
index 0f443874e79..5016a9ec28a 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
@@ -11040,9 +11040,9 @@
/obj/item/clothing/under/tarkon/sec,
/obj/item/clothing/under/tarkon/sec,
/obj/item/clothing/under/tarkon/sec,
-/obj/item/storage/backpack/duffelbag/sec/redsec,
-/obj/item/storage/backpack/satchel/sec/redsec,
-/obj/item/storage/backpack/security/redsec,
+/obj/item/storage/backpack/duffelbag/sec,
+/obj/item/storage/backpack/satchel/sec,
+/obj/item/storage/backpack/security,
/obj/item/clothing/head/utility/welding/hat,
/obj/item/clothing/head/utility/welding/hat,
/turf/open/floor/wood,
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 3cc82c2f0c0..d147fd6d296 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -274,7 +274,7 @@
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/table,
/obj/item/book/manual/wiki/security_space_law,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -656,10 +656,10 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/turf/open/floor/iron/dark/textured_edge,
@@ -1343,7 +1343,7 @@
/turf/open/floor/iron/dark,
/area/station/security/prison/safe)
"alB" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/effect/spawner/structure/window/reinforced,
@@ -3102,7 +3102,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/machinery/wall_healer/directional/north,
@@ -3118,8 +3118,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -3868,7 +3868,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/tile/red,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
@@ -3917,7 +3917,7 @@
/turf/closed/wall/r_wall,
/area/station/command/eva)
"ayT" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/closed/wall/r_wall,
@@ -4524,7 +4524,7 @@
"aCd" = (
/obj/structure/closet/emcloset,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -5662,7 +5662,7 @@
/area/space/nearstation)
"aHt" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6983,13 +6983,13 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"aOA" = (
@@ -7215,7 +7215,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/iron/dark/textured,
@@ -9528,7 +9528,7 @@
"aZJ" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -9548,7 +9548,7 @@
pixel_x = 26;
pixel_y = -6
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/obj/machinery/light/directional/east,
@@ -11003,7 +11003,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"bgU" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/shrink_cw{
+/obj/effect/turf_decal/trimline/red/filled/shrink_cw{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -12950,8 +12950,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/iron/dark/textured,
@@ -13719,10 +13719,10 @@
dir = 4
},
/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/iron/dark/textured,
@@ -14058,20 +14058,20 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"buS" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/iron/dark/textured,
@@ -14272,7 +14272,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -14338,7 +14338,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/tile/red,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
@@ -15441,7 +15441,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
dir = 8;
alpha = 200
},
@@ -17856,7 +17856,7 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"bNo" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/structure/cable,
@@ -18649,7 +18649,7 @@
/area/station/engineering/atmos)
"bSP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/structure/extinguisher_cabinet/directional/north,
@@ -19021,7 +19021,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/tile/red,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
@@ -19073,7 +19073,7 @@
/turf/closed/wall/r_wall,
/area/station/tcommsat/computer)
"bVL" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -22104,7 +22104,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -25924,7 +25924,7 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"cMg" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/turf/open/floor/iron/dark/smooth_corner{
@@ -26516,7 +26516,7 @@
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
"cVG" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/obj/machinery/atmospherics/components/binary/pump/off{
@@ -26689,7 +26689,7 @@
/obj/structure/chair/office{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"daa" = (
@@ -26867,7 +26867,7 @@
/turf/open/floor/iron,
/area/station/security/prison/safe)
"ddh" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -26878,7 +26878,7 @@
/turf/open/floor/iron/dark/small,
/area/station/security/interrogation)
"ddx" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/turf/open/floor/iron/dark,
@@ -27052,7 +27052,7 @@
/turf/open/floor/plating,
/area/station/security/execution/transfer)
"dgy" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/machinery/firealarm/directional/north,
@@ -27173,7 +27173,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/obj/effect/mapping_helpers/mail_sorting/security/general,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -27248,7 +27248,7 @@
/turf/open/floor/plating,
/area/station/security/processing)
"dkc" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -27274,7 +27274,7 @@
},
/area/station/engineering/atmos)
"dkz" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/obj/structure/closet/secure_closet/brig/genpop,
@@ -27398,10 +27398,10 @@
/obj/effect/turf_decal/stripes/blue/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/turf/open/floor/iron/dark/small,
@@ -27826,10 +27826,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/stripes,
/obj/effect/turf_decal/stripes/blue/line,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/small,
@@ -28158,7 +28158,7 @@
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
"dzt" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -28174,7 +28174,7 @@
/turf/open/floor/iron/white/small,
/area/station/commons/toilet)
"dzX" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/turf/open/floor/iron/dark/smooth_corner{
@@ -28307,7 +28307,7 @@
"dCg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -28615,7 +28615,7 @@
/turf/open/floor/plating,
/area/station/security/prison)
"dIb" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/structure/extinguisher_cabinet/directional/north,
@@ -28868,7 +28868,7 @@
/area/station/cargo/storage)
"dMA" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -29192,7 +29192,7 @@
/turf/open/floor/iron/smooth,
/area/station/engineering/gravity_generator)
"dTR" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -29313,7 +29313,7 @@
/area/station/maintenance/port/aft)
"dXx" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -29382,7 +29382,7 @@
/turf/open/floor/iron,
/area/station/cargo/storage)
"dZf" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/firealarm/directional/east,
@@ -29509,7 +29509,7 @@
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"eaU" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -29581,7 +29581,7 @@
pixel_x = -27;
pixel_y = -2
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"ecz" = (
@@ -29602,11 +29602,11 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"ecL" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/closet/secure_closet/brig/genpop,
/obj/structure/cable,
/obj/item/clothing/under/rank/prisoner/lowsec,
@@ -29674,7 +29674,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/port)
"eet" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -29689,7 +29689,7 @@
},
/area/station/security/execution/education)
"eeu" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/structure/cable,
@@ -29806,7 +29806,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/obj/machinery/button/flasher{
@@ -29873,7 +29873,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -29943,7 +29943,7 @@
/area/station/science/genetics)
"eii" = (
/obj/structure/sign/departments/court/directional/east,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/turf/open/floor/iron/dark,
@@ -30164,7 +30164,7 @@
dir = 1
},
/obj/effect/landmark/start/security_officer,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -30268,7 +30268,7 @@
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"eqH" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -30740,7 +30740,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -30792,7 +30792,7 @@
/turf/open/floor/iron/edge,
/area/station/hallway/primary/aft)
"eDz" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/gulag_teleporter,
@@ -30886,7 +30886,7 @@
/area/station/security/prison)
"eFk" = (
/obj/machinery/computer/security,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"eFn" = (
@@ -31166,7 +31166,7 @@
/area/space/nearstation)
"eMX" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31314,7 +31314,7 @@
/turf/open/floor/wood,
/area/station/service/library)
"ePz" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/portable_atmospherics/scrubber,
@@ -31743,7 +31743,7 @@
dir = 8
},
/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/office)
"eWy" = (
@@ -31945,7 +31945,7 @@
/area/station/security/prison)
"fcq" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/end{
+/obj/effect/turf_decal/trimline/red/filled/end{
dir = 1
},
/obj/effect/turf_decal/stripes{
@@ -31965,7 +31965,7 @@
},
/area/station/hallway/primary/central)
"fcs" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
@@ -32015,7 +32015,7 @@
/area/station/maintenance/port/aft)
"fcR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/firealarm/directional/north,
@@ -32151,7 +32151,7 @@
/area/station/maintenance/starboard/fore)
"fft" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32814,7 +32814,7 @@
/turf/open/floor/iron,
/area/station/security/office)
"fpO" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/button/door{
@@ -32974,7 +32974,7 @@
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
"ftu" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/obj/machinery/computer/security/labor,
@@ -33259,7 +33259,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -33290,7 +33290,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -33323,7 +33323,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security)
"fzH" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -33905,7 +33905,7 @@
/turf/open/floor/iron/large,
/area/station/cargo/storage)
"fLP" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/turf/open/floor/iron/dark/smooth_corner{
@@ -33916,7 +33916,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -34036,7 +34036,7 @@
/turf/open/floor/wood/parquet,
/area/station/service/bar)
"fOh" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/effect/spawner/structure/window/reinforced,
@@ -34061,7 +34061,7 @@
dir = 8
},
/obj/effect/landmark/start/security_medic,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -34553,7 +34553,7 @@
/turf/open/floor/iron/textured_large,
/area/station/cargo/miningdock)
"fXR" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/structure/cable,
@@ -34605,7 +34605,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -35176,7 +35176,7 @@
/area/station/maintenance/solars/starboard/fore)
"gnf" = (
/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"gnm" = (
@@ -35357,7 +35357,7 @@
/area/station/command/heads_quarters/captain)
"gpU" = (
/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -35411,7 +35411,7 @@
/turf/open/floor/iron/smooth,
/area/station/engineering/engine_smes)
"grM" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/status_display/door_timer{
id = "Cell 3";
name = "Cell 3";
@@ -35625,7 +35625,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
dir = 8;
alpha = 200
},
@@ -36127,7 +36127,7 @@
},
/area/station/common/pool/sauna)
"gEa" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -36169,7 +36169,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -36185,7 +36185,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/turf/open/floor/iron/dark/side{
@@ -36217,8 +36217,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/iron/dark/textured,
@@ -36251,7 +36251,7 @@
/turf/open/floor/iron/white,
/area/station/science/explab)
"gGF" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -36276,7 +36276,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/turf/open/floor/iron/dark/smooth_corner{
@@ -36604,10 +36604,10 @@
/area/station/service/chapel)
"gMx" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36806,7 +36806,7 @@
/turf/closed/wall/r_wall,
/area/station/engineering/engine_smes)
"gRy" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -36914,7 +36914,7 @@
},
/area/station/hallway/primary/central)
"gUt" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -37040,7 +37040,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 5
},
@@ -37209,7 +37209,7 @@
dir = 4
},
/obj/machinery/holopad/secure,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -37296,7 +37296,7 @@
/turf/open/floor/plating,
/area/station/hallway/primary/starboard)
"gZJ" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -37595,7 +37595,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/turf/open/floor/iron/dark,
@@ -37622,7 +37622,7 @@
/turf/open/floor/iron/small,
/area/station/cargo/drone_bay)
"hgb" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/structure/cable,
@@ -37950,7 +37950,7 @@
/turf/open/floor/circuit/red,
/area/station/ai/upload/chamber)
"hmC" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/status_display/door_timer{
id = "Cell 1";
name = "Cell 1";
@@ -38061,7 +38061,7 @@
/turf/open/floor/wood,
/area/station/security/prison)
"hoG" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/structure/cable,
@@ -38292,7 +38292,7 @@
/area/station/maintenance/aft)
"hsM" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38353,7 +38353,7 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"htP" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -38692,7 +38692,7 @@
/turf/open/floor/iron/edge,
/area/station/hallway/primary/starboard)
"hAN" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/computer/prisoner/gulag_teleporter_computer,
@@ -38718,7 +38718,7 @@
/turf/open/floor/iron/dark/textured,
/area/station/science/genetics)
"hCd" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/structure/chair/plastic{
@@ -38820,7 +38820,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -39032,7 +39032,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -39425,7 +39425,7 @@
},
/area/station/medical/treatment_center)
"hQJ" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/item/clothing/under/rank/prisoner/skirt/supermax,
@@ -39512,7 +39512,7 @@
/area/station/service/chapel)
"hSi" = (
/obj/machinery/modular_computer/preset/cargochat/security,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -39758,7 +39758,7 @@
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/mechbay)
"hWX" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -39791,7 +39791,7 @@
/turf/open/floor/grass,
/area/station/security/prison)
"hXz" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/obj/structure/cable,
@@ -39834,7 +39834,7 @@
/turf/open/floor/iron,
/area/station/cargo/office)
"hXW" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -40479,7 +40479,7 @@
"ijF" = (
/obj/machinery/computer/security,
/obj/structure/cable,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/office)
"ijG" = (
@@ -40547,7 +40547,7 @@
"ikR" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -40811,7 +40811,7 @@
/area/station/command/eva)
"ioK" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -40904,7 +40904,7 @@
/turf/open/floor/iron,
/area/station/commons/locker)
"iqM" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -40980,7 +40980,7 @@
/area/station/engineering/atmos/hfr_room)
"isG" = (
/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -41046,7 +41046,7 @@
/turf/open/floor/iron/white,
/area/station/medical/virology)
"itv" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/computer/security/telescreen/isolation/directional/north,
@@ -41165,7 +41165,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 10
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 10
},
@@ -41379,7 +41379,7 @@
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
"iAr" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -41670,7 +41670,7 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"iEF" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/turf/open/floor/iron/dark,
@@ -41834,7 +41834,7 @@
},
/area/station/cargo/office)
"iIN" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41887,7 +41887,7 @@
/area/station/maintenance/solars/port/aft)
"iJk" = (
/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -41942,7 +41942,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/corner{
+/obj/effect/turf_decal/trimline/red/corner{
alpha = 200;
dir = 8
},
@@ -42005,7 +42005,7 @@
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
"iLg" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/noticeboard/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -42387,7 +42387,7 @@
/obj/structure/disposalpipe/junction/flip{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -42652,7 +42652,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/obj/effect/turf_decal/stripes,
@@ -42664,7 +42664,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 5
},
@@ -42891,10 +42891,10 @@
/turf/open/floor/grass,
/area/station/security/prison)
"iZW" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/structure/cable,
@@ -43035,7 +43035,7 @@
pixel_x = 6;
pixel_y = 2
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"jbq" = (
@@ -43149,7 +43149,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -43297,7 +43297,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -43450,7 +43450,7 @@
"jjw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/security_officer,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark,
/area/station/security/office)
"jjy" = (
@@ -43965,7 +43965,7 @@
/area/station/medical/morgue)
"jsU" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200
},
/obj/machinery/firealarm/directional/south,
@@ -44295,7 +44295,7 @@
/area/station/maintenance/starboard/aft)
"jBF" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -44839,7 +44839,7 @@
},
/area/station/science/research)
"jLw" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -45095,7 +45095,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/office)
"jOo" = (
@@ -45181,7 +45181,7 @@
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/clothing/gloves/color/orange,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -45439,7 +45439,7 @@
"jWH" = (
/obj/machinery/gateway/centerstation,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue,
+/obj/effect/turf_decal/trimline/red,
/obj/structure/marker_beacon/cerulean,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/smooth_large,
@@ -45452,10 +45452,10 @@
dir = 4
},
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/turf/open/floor/iron/edge{
@@ -45629,7 +45629,7 @@
/area/station/maintenance/starboard/fore)
"kaX" = (
/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"kbj" = (
@@ -45929,10 +45929,10 @@
dir = 4
},
/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/turf/open/floor/iron/dark/textured,
@@ -45952,7 +45952,7 @@
fax_name = "Security Office";
name = "Security Office Fax Machine"
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"kgE" = (
@@ -46213,7 +46213,7 @@
/turf/open/floor/wood,
/area/station/hallway/primary/starboard)
"kod" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/light/directional/east,
@@ -46561,7 +46561,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
@@ -46859,7 +46859,7 @@
/area/station/maintenance/starboard)
"kzE" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -47237,7 +47237,7 @@
/turf/open/floor/iron,
/area/station/science/ordnance)
"kET" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/structure/table,
@@ -47265,7 +47265,7 @@
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/turf/open/floor/iron/dark,
@@ -47343,7 +47343,7 @@
dir = 6
},
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -47980,7 +47980,7 @@
},
/area/station/commons/fitness)
"kQK" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/obj/structure/cable,
@@ -48086,7 +48086,7 @@
},
/area/station/hallway/primary/central)
"kSr" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/cable,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -48166,7 +48166,7 @@
/turf/open/floor/plating,
/area/station/science/research)
"kTH" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -48194,7 +48194,7 @@
/obj/structure/table,
/obj/item/assembly/signaler,
/obj/item/clothing/suit/jacket/straight_jacket,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/item/electropack,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -48334,7 +48334,7 @@
dir = 4;
name = "Prosecution"
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -48492,7 +48492,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -48770,7 +48770,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -48798,7 +48798,7 @@
/area/station/service/hydroponics)
"lit" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -49571,7 +49571,7 @@
/turf/open/floor/iron/dark/small,
/area/station/security/brig)
"lvo" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -49970,8 +49970,8 @@
/obj/effect/turf_decal/stripes/blue/line{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/small,
@@ -50546,10 +50546,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/turf/open/floor/iron/dark,
@@ -50582,7 +50582,7 @@
/obj/machinery/computer/crew{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"lMr" = (
@@ -50827,7 +50827,7 @@
/turf/open/floor/plating,
/area/station/construction)
"lQk" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50883,7 +50883,7 @@
"lRc" = (
/obj/structure/table,
/obj/item/clothing/accessory/badge/holo/warden,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"lRl" = (
@@ -50949,7 +50949,7 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"lSU" = (
-/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/dark/textured_corner,
/area/station/hallway/primary/central)
"lSY" = (
@@ -51203,7 +51203,7 @@
/turf/open/floor/plating,
/area/station/commons/vacant_room/office)
"lXy" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -51621,7 +51621,7 @@
/obj/machinery/light_switch{
pixel_y = -23
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -51780,7 +51780,7 @@
/turf/open/floor/wood,
/area/station/service/bar)
"mjB" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/camera/directional/south{
c_tag = "Brig West"
},
@@ -52024,7 +52024,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 10
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 10
},
@@ -52155,7 +52155,7 @@
/turf/open/floor/engine,
/area/station/science/explab)
"msr" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -52257,7 +52257,7 @@
},
/area/station/hallway/primary/port)
"mum" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -52305,7 +52305,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 4
},
@@ -52875,7 +52875,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/corner{
+/obj/effect/turf_decal/trimline/red/corner{
alpha = 200;
dir = 8
},
@@ -53052,7 +53052,7 @@
dir = 5
},
/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/turf/open/floor/iron/dark/small,
@@ -53067,7 +53067,7 @@
/turf/open/floor/wood,
/area/station/service/barber)
"mJP" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/airalarm/directional/north,
@@ -53086,7 +53086,7 @@
/area/station/hallway/secondary/entry)
"mLI" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -53480,7 +53480,7 @@
/turf/open/floor/iron/dark/small,
/area/station/medical/chemistry)
"mRj" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -53552,7 +53552,7 @@
},
/area/station/hallway/primary/central)
"mSW" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/turf/open/floor/iron/dark,
@@ -53635,7 +53635,7 @@
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
"mUS" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 9
},
/obj/machinery/firealarm/directional/north,
@@ -53758,7 +53758,7 @@
dir = 4;
name = "Prosecution"
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/obj/machinery/light/directional/west,
@@ -53767,7 +53767,7 @@
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
"mXs" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54246,7 +54246,7 @@
pixel_y = 4
},
/obj/item/storage/toolbox/electrical,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"nhf" = (
@@ -54490,7 +54490,7 @@
/turf/open/floor/iron/dark,
/area/station/security/office)
"nlo" = (
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/iron/dark/textured_corner{
@@ -54891,7 +54891,7 @@
c_tag = "Prison Public Area";
network = list("ss13","prison")
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/turf/open/floor/iron/dark,
@@ -54980,7 +54980,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue{
+/obj/effect/turf_decal/trimline/red{
alpha = 200
},
/turf/open/floor/iron/dark/smooth_large,
@@ -55020,10 +55020,10 @@
/area/station/security/armory)
"nwd" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
dir = 1
},
/turf/open/floor/iron/edge{
@@ -55061,7 +55061,7 @@
/turf/open/floor/iron/white,
/area/station/hallway/secondary/entry)
"nwZ" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -55199,7 +55199,7 @@
/turf/open/floor/iron,
/area/station/science/auxlab/firing_range)
"nzF" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/turf/open/floor/iron/dark,
@@ -55220,7 +55220,7 @@
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/nt_rep)
"nzI" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/status_display/evac/directional/north,
@@ -55400,7 +55400,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/warning{
+/obj/effect/turf_decal/trimline/red/warning{
alpha = 200;
dir = 8
},
@@ -55431,10 +55431,10 @@
/obj/effect/turf_decal/stripes/blue/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -55845,7 +55845,7 @@
},
/area/station/hallway/primary/central)
"nLt" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -56170,7 +56170,7 @@
"nQX" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -56273,7 +56273,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -56586,7 +56586,7 @@
/turf/open/floor/iron,
/area/station/security/prison/safe)
"nZX" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -57527,7 +57527,7 @@
/obj/item/restraints/handcuffs,
/obj/item/assembly/timer,
/obj/item/storage/box/holobadge,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"ouC" = (
@@ -57631,7 +57631,7 @@
/area/station/medical/pharmacy)
"owR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/turf/open/floor/iron/dark/small,
@@ -57825,7 +57825,7 @@
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"oAx" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/structure/cable,
@@ -58040,7 +58040,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue{
+/obj/effect/turf_decal/trimline/red{
alpha = 200
},
/obj/item/beacon,
@@ -58121,8 +58121,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/turf/open/floor/iron/dark/textured,
@@ -58205,7 +58205,7 @@
specialfunctions = 4;
req_access = list("brig")
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -58285,7 +58285,7 @@
/area/station/commons/fitness)
"oJC" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
@@ -58502,7 +58502,7 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"oNj" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/directional/south,
/obj/structure/closet/secure_closet/brig/genpop,
/obj/item/clothing/under/rank/prisoner/lowsec,
@@ -58583,7 +58583,7 @@
},
/area/station/hallway/primary/central)
"oOO" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/obj/structure/cable,
@@ -58696,7 +58696,7 @@
/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
"oRo" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -58965,7 +58965,7 @@
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"oVM" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -58979,8 +58979,8 @@
/obj/effect/turf_decal/stripes/blue/line{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59059,7 +59059,7 @@
/obj/structure/table,
/obj/machinery/syndicatebomb/training,
/obj/item/gun/energy/laser/practice,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/turf/open/floor/iron/dark,
@@ -59169,7 +59169,7 @@
"oZs" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/obj/effect/turf_decal/trimline/white/warning,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -59234,7 +59234,7 @@
/area/station/engineering/atmos)
"pbY" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59252,7 +59252,7 @@
/area/station/commons/storage/tools)
"pcD" = (
/obj/structure/sign/warning/secure_area/directional/north,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/light/directional/north,
@@ -59289,7 +59289,7 @@
/area/station/science/ordnance/storage)
"pea" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/smooth_edge{
@@ -60038,7 +60038,7 @@
/area/station/security/courtroom)
"prX" = (
/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -60114,7 +60114,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"ptb" = (
@@ -60122,7 +60122,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
dir = 8;
alpha = 200
},
@@ -60208,7 +60208,7 @@
/area/station/security/detectives_office)
"pvN" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60518,7 +60518,7 @@
/area/station/maintenance/port/aft)
"pBz" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
@@ -60703,7 +60703,7 @@
"pEy" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start/warden,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -60815,7 +60815,7 @@
/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"pHn" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
@@ -60833,7 +60833,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/obj/structure/cable,
@@ -61087,7 +61087,7 @@
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"pLs" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -61280,7 +61280,7 @@
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"pQd" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/computer/security/telescreen/interrogation/directional/north,
@@ -61440,7 +61440,7 @@
/obj/machinery/camera/directional/south{
c_tag = "Security Office"
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -61504,7 +61504,7 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"pST" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/cable,
/obj/structure/closet/secure_closet/brig/genpop,
/obj/item/clothing/under/rank/prisoner/lowsec,
@@ -61721,7 +61721,7 @@
/turf/closed/wall/r_wall,
/area/station/hallway/primary/central)
"qaU" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark/smooth_corner,
/area/station/security/office)
"qaV" = (
@@ -61958,7 +61958,7 @@
},
/obj/item/clothing/head/costume/snakeeater,
/obj/item/clothing/neck/pauldron/commander,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"qel" = (
@@ -62092,7 +62092,7 @@
/turf/closed/wall,
/area/station/cargo/bitrunning/den)
"qhu" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62484,7 +62484,7 @@
/area/station/service/lawoffice)
"qoL" = (
/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/turf/open/floor/iron/edge{
@@ -62500,7 +62500,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 1
},
@@ -63112,13 +63112,13 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
/area/station/security/execution/transfer)
"qAY" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -63165,7 +63165,7 @@
"qCv" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -63247,7 +63247,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
dir = 8;
alpha = 200
},
@@ -63579,7 +63579,7 @@
/obj/structure/table,
/obj/item/pen/blue,
/obj/effect/mapping_helpers/mail_sorting/security/hos_office,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"qLQ" = (
@@ -64813,7 +64813,7 @@
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
"rhg" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 5
},
/turf/open/floor/iron/dark,
@@ -64863,7 +64863,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 9
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 9
},
@@ -64899,8 +64899,8 @@
"rib" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/small,
@@ -65306,7 +65306,7 @@
dir = 4
},
/obj/effect/landmark/start/security_officer,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -65921,7 +65921,7 @@
pixel_x = -8;
pixel_y = 3
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -66036,7 +66036,7 @@
/area/station/maintenance/aft)
"rKo" = (
/obj/machinery/computer/records/security,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"rKC" = (
@@ -66051,7 +66051,7 @@
},
/area/station/medical/medbay/lobby)
"rKD" = (
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/camera/directional/west{
@@ -66178,7 +66178,7 @@
/area/station/science/ordnance/freezerchamber)
"rMo" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66367,7 +66367,7 @@
/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/treatment_center)
"rPQ" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -66399,7 +66399,7 @@
/turf/open/floor/plating,
/area/station/security/checkpoint/medical)
"rQf" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/structure/cable,
@@ -66501,7 +66501,7 @@
"rSz" = (
/obj/structure/table,
/obj/item/electropack,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/obj/item/storage/toolbox/mechanical,
@@ -66601,7 +66601,7 @@
/turf/open/floor/iron/smooth,
/area/station/engineering/main)
"rTY" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/closet/secure_closet/brig/genpop,
/obj/item/clothing/under/rank/prisoner/lowsec,
/obj/item/clothing/under/rank/prisoner/highsec,
@@ -66618,7 +66618,7 @@
/turf/open/floor/iron/dark/textured_large,
/area/station/command/vault)
"rUu" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -66707,7 +66707,7 @@
},
/obj/machinery/light/small/directional/east,
/obj/machinery/computer/security/telescreen/normal/directional/south,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rVE" = (
@@ -66789,7 +66789,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"rXl" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -67077,7 +67077,7 @@
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/north,
/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"sed" = (
@@ -67345,7 +67345,7 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"skx" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/airalarm/directional/north,
@@ -67431,7 +67431,7 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -67597,7 +67597,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -67941,7 +67941,7 @@
/turf/open/floor/grass,
/area/station/science/robotics/lab)
"stj" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -68218,7 +68218,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/corner{
+/obj/effect/turf_decal/trimline/red/corner{
alpha = 200;
dir = 4
},
@@ -68392,7 +68392,7 @@
/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -68804,7 +68804,7 @@
/turf/open/floor/iron/white,
/area/station/science/ordnance)
"sIo" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"sIY" = (
@@ -68858,7 +68858,7 @@
dir = 4
},
/obj/effect/landmark/start/security_medic,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -68899,7 +68899,7 @@
"sKn" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/trimline/yellow/filled/line,
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200
},
/turf/open/floor/iron/smooth_edge{
@@ -69389,7 +69389,7 @@
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"sTf" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/structure/table,
@@ -69615,7 +69615,7 @@
/turf/open/floor/iron/white/smooth_corner,
/area/station/medical/treatment_center)
"sWY" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/structure/chair{
@@ -69747,7 +69747,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"sYV" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 5
},
/obj/machinery/button/flasher{
@@ -70011,7 +70011,7 @@
/area/station/engineering/main)
"ten" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70075,7 +70075,7 @@
"tfm" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"tfs" = (
@@ -70099,7 +70099,7 @@
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/xenobiology)
"tfS" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/chair{
dir = 1
},
@@ -70153,7 +70153,7 @@
/area/station/maintenance/fore)
"tgt" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -70473,7 +70473,7 @@
c_tag = "Fore Primary Hallway"
},
/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -70492,7 +70492,7 @@
/area/space/nearstation)
"tmx" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/light/directional/east,
@@ -70951,8 +70951,8 @@
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
"tue" = (
-/obj/effect/turf_decal/tile/dark_blue,
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/iron/dark/textured_edge{
@@ -70963,7 +70963,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/effect/turf_decal/trimline/white/warning{
@@ -71060,7 +71060,7 @@
c_tag = "Labor Shuttle Dock South"
},
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/sign/warning/vacuum/external/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -71203,7 +71203,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
/turf/open/floor/iron/dark,
@@ -71473,7 +71473,7 @@
},
/area/station/cargo/office)
"tFu" = (
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 1
},
/turf/open/floor/iron/dark/textured_corner{
@@ -71574,7 +71574,7 @@
/obj/item/pen,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"tHc" = (
@@ -71973,7 +71973,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
dir = 8;
alpha = 200
},
@@ -72327,7 +72327,7 @@
/area/station/security/prison/visit)
"tXM" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -72383,14 +72383,14 @@
},
/area/station/command/heads_quarters/ce)
"tYB" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark,
/area/station/security/office)
"tYP" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -72713,7 +72713,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark,
/area/station/security/office)
"uga" = (
@@ -72780,7 +72780,7 @@
name = "Brig Desk";
req_access = list("brig")
},
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"uhR" = (
@@ -72995,7 +72995,7 @@
/turf/closed/wall,
/area/station/security/prison/visit)
"unc" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
/obj/item/bedsheet,
@@ -73075,7 +73075,7 @@
/turf/open/floor/engine,
/area/station/science/explab)
"uot" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/photobooth/security,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -73423,7 +73423,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 2
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200
},
/turf/open/floor/iron/smooth,
@@ -73439,7 +73439,7 @@
/turf/open/floor/iron,
/area/station/cargo/office)
"uwt" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -73724,7 +73724,7 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"uBh" = (
@@ -73743,7 +73743,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/warning{
+/obj/effect/turf_decal/trimline/red/warning{
alpha = 200;
dir = 4
},
@@ -73860,7 +73860,7 @@
name = "Brig Desk";
req_access = list("brig")
},
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"uCO" = (
@@ -74009,7 +74009,7 @@
/area/station/command/gateway)
"uFq" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/smooth_corner,
/area/station/security/execution/transfer)
@@ -74130,7 +74130,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
@@ -74547,7 +74547,7 @@
/area/station/service/library/abandoned)
"uOH" = (
/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -74972,7 +74972,7 @@
dir = 5
},
/obj/machinery/computer/records/security,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/office)
"uTL" = (
@@ -75521,7 +75521,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 6
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 6
},
@@ -75591,7 +75591,7 @@
"veN" = (
/obj/machinery/computer/prisoner/management,
/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"veT" = (
@@ -75657,7 +75657,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -75905,7 +75905,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
+/obj/effect/turf_decal/trimline/red/filled/warning,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
"vke" = (
@@ -76019,10 +76019,10 @@
/turf/open/floor/iron,
/area/station/cargo/office)
"vmc" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
dir = 1
},
/turf/open/floor/iron/edge{
@@ -76058,7 +76058,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/turf/open/floor/iron/dark,
@@ -76129,7 +76129,7 @@
/turf/open/floor/iron,
/area/station/security/office)
"voE" = (
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/iron/dark/textured_corner{
@@ -76201,7 +76201,7 @@
/area/station/medical/virology)
"vqG" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner,
-/obj/effect/turf_decal/trimline/dark_blue/corner{
+/obj/effect/turf_decal/trimline/red/corner{
alpha = 200
},
/turf/open/floor/iron/smooth,
@@ -76332,7 +76332,7 @@
/area/station/cargo/sorting)
"vut" = (
/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -76397,7 +76397,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 2
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200
},
/turf/open/floor/iron/smooth_edge{
@@ -76599,7 +76599,7 @@
/area/station/science/research)
"vAt" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/obj/item/reagent_containers/spray/pepper,
/obj/item/reagent_containers/spray/pepper,
/obj/item/reagent_containers/spray/pepper,
@@ -76916,7 +76916,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/iron/dark/textured,
@@ -77310,7 +77310,7 @@
/area/station/engineering/supermatter/room)
"vPt" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/smooth_corner,
@@ -77334,7 +77334,7 @@
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"vPD" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/obj/structure/cable,
@@ -77382,7 +77382,7 @@
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"vQv" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/obj/item/storage/box/hug/plushes{
@@ -77658,7 +77658,7 @@
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/chemistry)
"vVh" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/obj/machinery/firealarm/directional/east,
@@ -78141,7 +78141,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/corner{
+/obj/effect/turf_decal/trimline/red/corner{
alpha = 200;
dir = 4
},
@@ -78222,7 +78222,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/turf/open/floor/iron/dark/smooth_corner{
@@ -78364,7 +78364,7 @@
/obj/machinery/camera/directional/north{
c_tag = "Brig East"
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark/smooth_edge,
@@ -78505,7 +78505,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 4
},
@@ -78758,10 +78758,10 @@
/area/station/service/chapel/office)
"wpZ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/obj/machinery/firealarm/directional/west,
@@ -79378,7 +79378,7 @@
dir = 8
},
/obj/effect/landmark/start/security_officer,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -79802,7 +79802,7 @@
/area/station/maintenance/fore)
"wIn" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/requests_console{
@@ -79817,7 +79817,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/corner{
+/obj/effect/turf_decal/trimline/red/corner{
dir = 1;
alpha = 200
},
@@ -79950,7 +79950,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
dir = 1;
alpha = 200
},
@@ -80075,7 +80075,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/warning{
+/obj/effect/turf_decal/trimline/red/warning{
alpha = 200;
dir = 4
},
@@ -80274,7 +80274,7 @@
/area/station/engineering/storage/tech)
"wQj" = (
/obj/structure/bed/medical/emergency,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/smooth_edge{
@@ -80639,7 +80639,7 @@
/obj/machinery/computer/warrant,
/obj/effect/turf_decal/bot_blue,
/obj/structure/sign/poster/official/report_crimes/directional/east,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -80690,7 +80690,7 @@
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/break_room)
"wYJ" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron/dark/smooth_corner,
/area/station/security/brig)
"wZa" = (
@@ -80910,13 +80910,13 @@
/area/station/tcommsat/server)
"xcU" = (
/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"xdd" = (
/obj/machinery/rnd/production/techfab/department/security,
/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/turf/open/floor/iron/dark,
@@ -80944,7 +80944,7 @@
/turf/open/floor/iron/dark/small,
/area/station/medical/morgue)
"xdo" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/item/clothing/under/rank/prisoner/protcust,
/obj/item/clothing/under/rank/prisoner/protcust,
/obj/item/clothing/under/rank/prisoner/protcust,
@@ -81256,7 +81256,7 @@
/obj/structure/table,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/assembly/flash/handheld,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/office)
"xhx" = (
@@ -81772,7 +81772,7 @@
/turf/open/floor/iron/dark,
/area/station/security/corrections_officer)
"xrr" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
},
/obj/machinery/camera/directional/west{
@@ -81795,7 +81795,7 @@
/turf/open/floor/plating,
/area/station/maintenance/port)
"xrS" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -82462,7 +82462,7 @@
"xDL" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/trimline/dark_blue/filled/end{
+/obj/effect/turf_decal/trimline/red/filled/end{
dir = 1
},
/turf/open/floor/iron/dark/small,
@@ -82560,7 +82560,7 @@
/area/station/maintenance/starboard/fore)
"xGE" = (
/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 10
},
/turf/open/floor/iron/dark,
@@ -82649,7 +82649,7 @@
/obj/structure/bed/dogbed/mcgriff,
/mob/living/basic/pet/dog/pug/mcgriff,
/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/dark_blue/full,
+/obj/effect/turf_decal/tile/red/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
"xIb" = (
@@ -82812,7 +82812,7 @@
id = "cell4";
pixel_x = 24
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/turf/open/floor/iron/dark,
@@ -83009,7 +83009,7 @@
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/nt_rep)
"xPs" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/small,
/area/station/security/checkpoint/escape)
@@ -83158,11 +83158,11 @@
/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 4
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
},
/turf/open/floor/iron/dark/small,
@@ -83247,7 +83247,7 @@
/area/station/security/prison)
"xTM" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -83280,7 +83280,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/effect/turf_decal/trimline/dark_blue/filled/line{
+/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
},
/turf/open/floor/iron/dark,
@@ -83525,7 +83525,7 @@
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 9
},
-/obj/effect/turf_decal/trimline/dark_blue/line{
+/obj/effect/turf_decal/trimline/red/line{
alpha = 200;
dir = 9
},
@@ -83657,7 +83657,7 @@
name = "Cell 2";
pixel_y = -32
},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line,
/turf/open/floor/iron/dark/smooth_edge{
dir = 1
},
@@ -83702,7 +83702,7 @@
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
"ydR" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
+/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 8
},
/turf/open/floor/iron/dark/smooth_corner{
@@ -83714,7 +83714,7 @@
/turf/open/floor/plating,
/area/station/security/prison)
"yey" = (
-/obj/effect/turf_decal/trimline/dark_blue/filled/warning{
+/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 6
},
/obj/structure/cable,
@@ -83918,7 +83918,7 @@
/area/station/hallway/secondary/exit)
"yhU" = (
/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/filled/shrink_ccw{
+/obj/effect/turf_decal/trimline/red/filled/shrink_ccw{
dir = 8
},
/turf/open/floor/iron/dark,
diff --git a/_maps/shuttles/zubbers/emergency_vortex.dmm b/_maps/shuttles/zubbers/emergency_vortex.dmm
index 8d77ecdc71c..a2f15c90943 100644
--- a/_maps/shuttles/zubbers/emergency_vortex.dmm
+++ b/_maps/shuttles/zubbers/emergency_vortex.dmm
@@ -3205,8 +3205,8 @@
/obj/item/storage/medkit/regular{
pixel_y = 3
},
-/obj/item/clothing/suit/armor/vest/alt/sec/redsec,
-/obj/item/clothing/head/helmet/sec/redsec,
+/obj/item/clothing/suit/armor/vest/alt/sec,
+/obj/item/clothing/head/helmet/sec,
/turf/open/floor/iron/dark,
/area/shuttle/escape/brig)
"LR" = (
diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm
index a76088751bf..ccca8d281f3 100644
--- a/code/game/objects/effects/decals/turfdecal/markings.dm
+++ b/code/game/objects/effects/decals/turfdecal/markings.dm
@@ -253,7 +253,7 @@
icon_state = "siding_plain_end"
/obj/effect/turf_decal/siding/red
- color = "#486091" //SKYRAT EDIT CHANGE
+ color = "#DE3A3A"
/obj/effect/turf_decal/siding/red/corner
icon_state = "siding_plain_corner"
diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
index ca091cd5019..e0fb16edcf0 100644
--- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
@@ -83,7 +83,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow)
/obj/effect/turf_decal/tile/red
name = "red tile decal"
- color = "#486091" // SKYRAT EDIT CHANGE
+ color = "#DE3A3A"
TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red)
@@ -275,7 +275,7 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/white)
/// Red trimlines
/obj/effect/turf_decal/trimline/red
- color = "#486091" //SKYRAT EDIT CHANGE
+ color = "#DE3A3A"
TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/red)
diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm
index 27bae49cf8c..b24d1d0aac4 100644
--- a/code/game/objects/items/storage/garment.dm
+++ b/code/game/objects/items/storage/garment.dm
@@ -86,7 +86,7 @@
new /obj/item/clothing/suit/armor/vest/hop/hop_formal(src)
new /obj/item/clothing/neck/mantle/hopmantle(src)
-/obj/item/storage/bag/garment/hos/PopulateContents()
+/obj/item/storage/bag/garment/hos/PopulateContents() /* BUBBER EDIT - OVERWRITTEN IN modular_zubbers\code\modules\security\sec_garment_overrides.dm
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
@@ -104,20 +104,12 @@
new /obj/item/clothing/head/hats/hos/cap(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
new /obj/item/clothing/neck/cloak/hos(src)
-//BUBBER ADDITION BEGIN
- new /obj/item/clothing/neck/cloak/hos/redsec(src)
- new /obj/item/clothing/under/rank/security/head_of_security/redsec(src)
- new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
- new /obj/item/clothing/shoes/jackboots/sec/redsec(src)
- new /obj/item/clothing/head/hos_kepi(src)
- new /obj/item/clothing/under/rank/security/peacekeeper/skirt_hos(src)
-//BUBBER ADDITION END
//Duplication from Commdrobe
new /obj/item/clothing/head/hats/warden/drill/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/roselia(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia(src)
- new /obj/item/clothing/under/rank/security/head_of_security/parade/redsec(src)
- new /obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/parade(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
new /obj/item/clothing/head/hats/hos/elofy(src)
new /obj/item/clothing/suit/armor/hos/elofy(src)
new /obj/item/clothing/gloves/elofy(src)
@@ -126,11 +118,11 @@
new /obj/item/clothing/under/rank/security/head_of_security/bunnysuit(src)
new /obj/item/clothing/suit/armor/hos_tailcoat(src)
new /obj/item/clothing/head/hats/hos/beret/navyhos(src)
- new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper(src)
new /obj/item/clothing/suit/jacket/hos/blue(src)
new /obj/item/clothing/neck/mantle/hosmantle(src)
+ */
-/obj/item/storage/bag/garment/warden/PopulateContents()
+/obj/item/storage/bag/garment/warden/PopulateContents() /* BUBBER EDIT - OVERWRITTEN IN modular_zubbers\code\modules\security\sec_garment_overrides.dm
new /obj/item/clothing/suit/armor/vest/warden(src)
new /obj/item/clothing/head/hats/warden(src)
new /obj/item/clothing/head/hats/warden/drill(src)
@@ -142,6 +134,7 @@
new /obj/item/clothing/gloves/kaza_ruk/sec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/mask/gas/sechailer(src)
+ */
/obj/item/storage/bag/garment/research_director/PopulateContents()
new /obj/item/clothing/under/rank/rnd/research_director(src)
diff --git a/code/game/objects/items/tools/painter/paintable_decals.dm b/code/game/objects/items/tools/painter/paintable_decals.dm
index cf96ee6d193..a2c330f516a 100644
--- a/code/game/objects/items/tools/painter/paintable_decals.dm
+++ b/code/game/objects/items/tools/painter/paintable_decals.dm
@@ -181,7 +181,6 @@
"Engi Yellow" = /obj/effect/turf_decal/tile/yellow::color,
"Med Blue" = /obj/effect/turf_decal/tile/blue::color,
"R&D Purple" = /obj/effect/turf_decal/tile/purple::color,
- "Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/tile/red::color,
"Service Green" = /obj/effect/turf_decal/tile/green::color,
"Custom" = "custom",
@@ -236,7 +235,6 @@
"Engi Yellow" = /obj/effect/turf_decal/siding/yellow::color,
"Med Blue" = /obj/effect/turf_decal/siding/blue::color,
"R&D Purple" = /obj/effect/turf_decal/siding/purple::color,
- "Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/siding/red::color,
"Service Green" = /obj/effect/turf_decal/siding/green::color,
"Custom" = "custom",
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 8697dea47f1..0ea5381b329 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -227,6 +227,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/helmet/sec
shoes = /obj/item/clothing/shoes/jackboots/sec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm
index 407d62764d4..81e83f8451e 100644
--- a/code/modules/research/machinery/departmental_protolathe.dm
+++ b/code/modules/research/machinery/departmental_protolathe.dm
@@ -43,5 +43,5 @@
name = "department protolathe (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
circuit = /obj/item/circuitboard/machine/protolathe/department/security
- stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
+ stripe_color = "#DE3A3A"
payment_department = ACCOUNT_SEC
diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm
index 339c98a6222..3819429a8b9 100644
--- a/code/modules/research/machinery/departmental_techfab.dm
+++ b/code/modules/research/machinery/departmental_techfab.dm
@@ -43,5 +43,5 @@
name = "department techfab (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
circuit = /obj/item/circuitboard/machine/techfab/department/security
- stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
+ stripe_color = "#DE3A3A"
payment_department = ACCOUNT_SEC
diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi
index e9948bc8ca2..746ace67300 100644
Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ
diff --git a/icons/map_icons/clothing/head/beret.dmi b/icons/map_icons/clothing/head/beret.dmi
index a8df03e5b15..1c3bbd4163e 100644
Binary files a/icons/map_icons/clothing/head/beret.dmi and b/icons/map_icons/clothing/head/beret.dmi differ
diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
index 1622ecc7e7c..030e7e6e54b 100644
--- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
@@ -1,6 +1,8 @@
// MODULAR ID TRIM ACCESS OVERRIDES GO HERE!!
//(Most) of Security has inverted IDs, with custom blue-on-black icons. This is to distinguish them from their head, who has a white-on-blue icon
+// not anymore
+/*
/datum/id_trim/job/head_of_security
subdepartment_color = COLOR_ASSEMBLY_BLACK
@@ -18,7 +20,7 @@
trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
department_color = COLOR_ASSEMBLY_BLACK
subdepartment_color = COLOR_ASSEMBLY_BLACK
-
+*/
/datum/id_trim/job/chief_engineer/New()
. = ..()
@@ -80,10 +82,10 @@
/datum/id_trim/job/corrections_officer
assignment = "Corrections Officer"
- trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
+ trim_icon = 'modular_zubbers/icons/obj/card.dmi' // BUBBER EDIT
trim_state = "trim_corrections_officer"
- department_color = COLOR_ASSEMBLY_BLACK
- subdepartment_color = COLOR_ASSEMBLY_BLACK
+ department_color = COLOR_SECURITY_RED // BUBBER EDIT
+ subdepartment_color = COLOR_SECURITY_RED // BUBBER EDIT
sechud_icon_state = SECHUD_CORRECTIONS_OFFICER
extra_access = list()
minimal_access = list(
diff --git a/modular_skyrat/master_files/code/game/objects/effects/decals/turfdecals/tilecoloring.dm b/modular_skyrat/master_files/code/game/objects/effects/decals/turfdecals/tilecoloring.dm
index 4b49d74f431..7bf81efe489 100644
--- a/modular_skyrat/master_files/code/game/objects/effects/decals/turfdecals/tilecoloring.dm
+++ b/modular_skyrat/master_files/code/game/objects/effects/decals/turfdecals/tilecoloring.dm
@@ -1,6 +1,8 @@
/// To make upstream mapping easier we overwrote the color for Red to be not red but blue for our weird bluesec
/// This re-adds a red coloring to be used by mappers in other areas.
+// No longer needed, but w/ever
+
/// Real Red Tiles
/obj/effect/turf_decal/tile/red/real_red
diff --git a/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm b/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm
index c072be9d28a..44c5dac0413 100644
--- a/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm
+++ b/modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm
@@ -100,27 +100,6 @@
icon_state = "messenger_hydroponics"
inhand_icon_state = "messenger_hydroponics"
-/obj/item/storage/backpack/messenger/sec
- name = "security messenger bag"
- desc = "A robust messenger bag for security related needs."
- icon_state = "messenger_security_black"
- inhand_icon_state = "messenger_security_black"
-
-/obj/item/storage/backpack/messenger/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/sec_messenger)
-
-/datum/atom_skin/sec_messenger
- abstract_type = /datum/atom_skin/sec_messenger
-
-/datum/atom_skin/sec_messenger/black
- preview_name = "Black Variant"
- new_icon_state = "messenger_security_black"
-
-/datum/atom_skin/sec_messenger/white
- preview_name = "White Variant"
- new_icon_state = "messenger_security_white"
-
/obj/item/storage/backpack/messenger/explorer
name = "explorer messenger bag"
desc = "A robust messenger bag for stashing your loot, as well as making a remarkably cute accessory for your drakebone armor."
diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
index 8cae9eeaacb..a7d4f7eae7f 100644
--- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
@@ -6,15 +6,7 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
-/obj/item/clothing/under/rank/security/head_of_security/skyrat
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
-
-//DEBATE MOVING *ALL* SECURITY STUFF HERE? Even overrides, at least as a like, sub-file?
-
-/*
-* SECURITY OFFICER
-*/
+// syndicate stuff uses this, gotta keep it
/obj/item/clothing/under/rank/security/skyrat/utility
name = "security utility uniform"
@@ -54,213 +46,6 @@
armor_type = /datum/armor/clothing_under/redsec_syndicate
has_sensor = NO_SENSORS
-/obj/item/clothing/under/rank/security/peacekeeper/skirt
- name = "security battle dress"
- desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt."
- worn_icon_state = "security_skirt"
- icon_state = "security_skirt"
- can_adjust = TRUE
- alt_covers_chest = FALSE
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-
-/obj/item/clothing/under/rank/security/peacekeeper/skirt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_skirt)
-
-/datum/atom_skin/security_peacekeeper_skirt
- abstract_type = /datum/atom_skin/security_peacekeeper_skirt
-
-/datum/atom_skin/security_peacekeeper_skirt/blue
- preview_name = "Blue Variant"
- new_icon_state = "security_skirt"
-
-/datum/atom_skin/security_peacekeeper_skirt/red
- preview_name = "Red Variant"
- new_icon_state = "security_skirt_red"
-
-/obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec
- name = "security battle dress"
- desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt. Now in classic security red!"
- worn_icon_state = "security_skirt_redsec"
- icon_state = "security_skirt_redsec"
- can_adjust = TRUE
- alt_covers_chest = FALSE
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-
-/obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/peacekeeper/skirt_hos
- name = "head of security battle dress"
- desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt. This version is specifically designed for the head of the security department!"
- worn_icon_state = "security_skirt_hos"
- icon_state = "security_skirt_hos"
- can_adjust = TRUE
- alt_covers_chest = FALSE
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-
-/obj/item/clothing/under/rank/security/peacekeeper/skirt_hos/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/peacekeeper/trousers
- name = "security trousers"
- desc = "Some Peacekeeper-blue combat trousers. Probably should pair it with a vest for safety."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "workpants_blue"
- body_parts_covered = GROIN|LEGS
- can_adjust = FALSE
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
- female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS
-
-/obj/item/clothing/under/rank/security/peacekeeper/trousers/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_trousers)
-
-/datum/atom_skin/security_peacekeeper_trousers
- abstract_type = /datum/atom_skin/security_peacekeeper_trousers
-
-/datum/atom_skin/security_peacekeeper_trousers/blue
- preview_name = "Blue Variant"
- new_icon_state = "workpants_blue"
-
-/datum/atom_skin/security_peacekeeper_trousers/white
- preview_name = "White Variant"
- new_icon_state = "workpants_white"
-
-/datum/atom_skin/security_peacekeeper_trousers/red
- preview_name = "Red Variant"
- new_icon_state = "workpants_red"
-
-/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts
- name = "security shorts"
- desc = "Some Peacekeeper-blue combat shorts. Definitely should pair it with a vest for safety."
- icon_state = "workshorts_blue"
-
-/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_shorts)
-
-/datum/atom_skin/security_peacekeeper_shorts
- abstract_type = /datum/atom_skin/security_peacekeeper_shorts
-
-/datum/atom_skin/security_peacekeeper_shorts/blue_short
- preview_name = "Blue Variant, Short"
- new_icon_state = "workshorts_blue"
-
-/datum/atom_skin/security_peacekeeper_shorts/blue_short_short
- preview_name = "Blue Variant, Short Short"
- new_icon_state = "workshorts_blue_short"
-
-/datum/atom_skin/security_peacekeeper_shorts/white_short
- preview_name = "White Variant, Short"
- new_icon_state = "workshorts_white"
-
-/datum/atom_skin/security_peacekeeper_shorts/white_short_short
- preview_name = "White Variant, Short Short"
- new_icon_state = "workshorts_white_short"
-
-/datum/atom_skin/security_peacekeeper_shorts/red_short
- preview_name = "Red Variant, Short"
- new_icon_state = "workshorts_red"
-
-/datum/atom_skin/security_peacekeeper_shorts/red_short_short
- preview_name = "Red Variant, Short Short"
- new_icon_state = "workshorts_red_short"
-
-/obj/item/clothing/under/rank/security/peacekeeper/jumpsuit
- name = "security jumpsuit"
- desc = "Turtleneck sweater commonly worn by Peacekeepers, attached with pants."
- icon_state = "jumpsuit_blue"
- can_adjust = TRUE
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-
-/obj/item/clothing/under/rank/security/peacekeeper/jumpsuit/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_jumpsuit)
-
-/datum/atom_skin/security_peacekeeper_jumpsuit
- abstract_type = /datum/atom_skin/security_peacekeeper_jumpsuit
-
-/datum/atom_skin/security_peacekeeper_jumpsuit/blue
- preview_name = "Blue Variant"
- new_icon_state = "jumpsuit_blue"
-
-/datum/atom_skin/security_peacekeeper_jumpsuit/red
- preview_name = "Red Variant"
- new_icon_state = "jumpsuit_red"
-
-/obj/item/clothing/under/rank/security/officer/skirt
- name = "security jumpskirt"
- desc = "Turtleneck sweater commonly worn by Peacekeepers, attached with a skirt."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "secskirt"
-
-
-/obj/item/clothing/under/rank/security/peacekeeper/shortskirt
- name = "security shortskirt"
- desc = "Plainshirted uniform commonly worn by Peacekeepers, attached with a skirt."
- icon_state = "shortskirt_blue"
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
- gets_cropped_on_taurs = FALSE
-
-/obj/item/clothing/under/rank/security/peacekeeper/shortskirt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_shortskirt)
-
-/datum/atom_skin/security_peacekeeper_shortskirt
- abstract_type = /datum/atom_skin/security_peacekeeper_shortskirt
-
-/datum/atom_skin/security_peacekeeper_shortskirt/blue
- preview_name = "Blue Variant"
- new_icon_state = "shortskirt_blue"
-
-/datum/atom_skin/security_peacekeeper_shortskirt/black
- preview_name = "Black Variant"
- new_icon_state = "shortskirt_black"
-
-/obj/item/clothing/under/rank/security/peacekeeper/miniskirt
- name = "security miniskirt"
- desc = "This miniskirt was originally featured in a gag calendar, but entered official use once they realized its potential for arid climates."
- icon_state = "miniskirt"
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
- gets_cropped_on_taurs = FALSE
- can_adjust = TRUE
- body_parts_covered = GROIN | LEGS
-
-/obj/item/clothing/under/rank/security/peacekeeper/miniskirt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_miniskirt)
-
-/datum/atom_skin/security_peacekeeper_miniskirt
- abstract_type = /datum/atom_skin/security_peacekeeper_miniskirt
-
-/datum/atom_skin/security_peacekeeper_miniskirt/blue
- preview_name = "Blue Variant"
- new_icon_state = "miniskirt"
-
-/datum/atom_skin/security_peacekeeper_miniskirt/red
- preview_name = "Red Variant"
- new_icon_state = "miniskirt_red"
-
-/datum/atom_skin/security_peacekeeper_miniskirt/black
- preview_name = "Black Variant"
- new_icon_state = "miniskirt_black"
-
-/*
-* HEAD OF SECURITY
-*/
-
/datum/armor/clothing_under/redsec_syndicate
melee = 10
fire = 50
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm
index 0354c799f4a..0394cbe2ba0 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm
@@ -325,12 +325,6 @@
item_path = /obj/item/toy/plush/skyrat/tesh
//ckeywhitelist = list("tobjv")
-/datum/loadout_item/uniform/redhosneck
- name = "Black and Red Turtleneck"
- item_path = /obj/item/clothing/under/rank/security/head_of_security/alt/roselia
- //ckeywhitelist = list("ultimarifox")
- restricted_roles = list(JOB_HEAD_OF_SECURITY)
-
/datum/loadout_item/toys/plush/roselia_plush
name = "Obscene Sergal Plushie"
item_path = /obj/item/toy/plush/skyrat/roselia
@@ -459,18 +453,6 @@
item_path = /obj/item/toy/plush/skyrat/plushie_elofy
//ckeywhitelist = list("october23") // Asked it to be public.
-/datum/loadout_item/suit/elofy
- name = "Solar Admiral Coat"
- item_path = /obj/item/clothing/suit/armor/hos/elofy
-// ckeywhitelist = list("october23")
- restricted_roles = list(JOB_HEAD_OF_SECURITY)
-
-/datum/loadout_item/head/elofy
- name = "Solar Admiral Hat"
- item_path = /obj/item/clothing/head/hats/hos/elofy
- ckeywhitelist = list("october23")
- restricted_roles = list(JOB_HEAD_OF_SECURITY)
-
/datum/loadout_item/pocket_items/transponder
name = "Broken Helian Transponder"
item_path = /obj/item/donator/transponder
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
index 197834ce94b..5562acede3c 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
@@ -428,31 +428,6 @@
* JOB-LOCKED
*/
-/datum/loadout_item/head/cowboyhat_sec
- name = "Cattleman Hat, Security"
- item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/sec
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
-
-/datum/loadout_item/head/cowboyhat_secwide
- name = "Wide-Brimmed Cattleman Hat, Security"
- item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/wide/sec
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
-
-/datum/loadout_item/head/ushanka/sec
- name = "Security Ushanka"
- item_path = /obj/item/clothing/head/costume/ushanka/sec
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
-
-/datum/loadout_item/head/navyblueofficerberet
- name = "Security Officer's Navy Blue beret"
- item_path = /obj/item/clothing/head/beret/sec/navyofficer
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
-
-/datum/loadout_item/head/navybluewardenberet
- name = "Warden's Navy Blue beret"
- item_path = /obj/item/clothing/head/beret/sec/navywarden
- restricted_roles = list(JOB_WARDEN)
-
/datum/loadout_item/head/cybergoggles_civ
name = "Type-34C Forensics Headwear"
item_path = /obj/item/clothing/head/fedora/det_hat/cybergoggles/civilian
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm b/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm
index b800f0c88a4..0a719c78a33 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm
@@ -575,35 +575,6 @@
item_path = /obj/item/clothing/suit/hooded/wintercoat/miner
// JACKETS
-/datum/loadout_item/suit/navybluejacketofficer
- name = "Security Officer's Navy Blue Formal Jacket"
- item_path = /obj/item/clothing/suit/jacket/officer/blue
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
-
-/datum/loadout_item/suit/navybluejacketwarden
- name = "Warden's Navy Blue Formal Jacket"
- item_path = /obj/item/clothing/suit/jacket/warden/blue
- restricted_roles = list(JOB_WARDEN)
-
-/datum/loadout_item/suit/navybluejackethos
- name = "Head of Security's Navy Blue Formal Jacket"
- item_path = /obj/item/clothing/suit/jacket/hos/blue
- restricted_roles = list(JOB_HEAD_OF_SECURITY)
-
-/datum/loadout_item/suit/security_jacket
- name = "Security Jacket"
- item_path = /obj/item/clothing/suit/toggle/jacket/sec
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY) //Not giving this one to COs because it's actually better than the one they spawn with
-
-/datum/loadout_item/suit/brit
- name = "High Vis Armored Vest"
- item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/brit
- restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
-
-/datum/loadout_item/suit/british_jacket
- name = "Peacekeeper Officer Coat"
- item_path = /obj/item/clothing/suit/british_officer
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
/datum/loadout_item/suit/offdep_jacket
name = "Off-Department Jacket"
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm b/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm
index c92f000cd17..df8af6cc5a7 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm
@@ -52,65 +52,6 @@
name = "Shoredress Wetsuit"
item_path = /obj/item/clothing/under/akula_wetsuit
-/datum/loadout_item/uniform/jumpsuit/security_skirt
- name = "Blue Security Battledress"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_skirt_redsec
- name = "Red Security Battledress"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_skirt_hos
- name = "HoS Security Battledress"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt_hos
- restricted_roles = list(JOB_HEAD_OF_SECURITY)
-
-/datum/loadout_item/uniform/jumpsuit/security_trousers
- name = "Security Trousers"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER
-
-/datum/loadout_item/uniform/jumpsuit/security_shorts
- name = "Security Shorts"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_jumpskirt
- name = "Security Jumpskirt"
- item_path = /obj/item/clothing/under/rank/security/officer/skirt
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_shortskirt
- name = "Security Shortskirt"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/shortskirt
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_miniskirt
- name = "Security Miniskirt"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/miniskirt
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_jumpsuit
- name = "Security Jumpsuit"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/jumpsuit
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
-
-/datum/loadout_item/uniform/jumpsuit/security_peacekeeper
- name = "Security Peacekeeper Uniform"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SECURITY_MEDIC)
-
-/datum/loadout_item/uniform/jumpsuit/imperial_police_uniform
- name = "Imperial Police Uniform"
- item_path = /obj/item/clothing/under/colonial/nri_police
- restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
-
-/datum/loadout_item/uniform/jumpsuit/disco
- name = "Superstar Cop Uniform"
- item_path = /obj/item/clothing/under/rank/security/detective/disco
-
/datum/loadout_item/uniform/jumpsuit/kim
name = "Aerostatic Suit"
item_path = /obj/item/clothing/under/rank/security/detective/kim
@@ -186,11 +127,6 @@
name = "Supply Utility Uniform"
item_path = /obj/item/clothing/under/rank/cargo/tech/skyrat/utility
-/datum/loadout_item/uniform/jumpsuit/utility_sec
- name = "Security Utility Uniform"
- item_path = /obj/item/clothing/under/rank/security/skyrat/utility
- restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
-
/datum/loadout_item/uniform/jumpsuit/utility_com
name = "Command Utility Uniform"
item_path = /obj/item/clothing/under/rank/captain/skyrat/utility
diff --git a/modular_skyrat/master_files/code/modules/mod/mod_theme.dm b/modular_skyrat/master_files/code/modules/mod/mod_theme.dm
index 92f8cd041b9..acb86382dae 100644
--- a/modular_skyrat/master_files/code/modules/mod/mod_theme.dm
+++ b/modular_skyrat/master_files/code/modules/mod/mod_theme.dm
@@ -76,148 +76,6 @@
acid = 100
wound = 15
-/datum/mod_theme/security // Security Officer
- default_skin = "security_blue"
- variants = list(
- "security" = list(
- /obj/item/clothing/head/mod = list(
- UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
- UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
- SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
- UNSEALED_COVER = HEADCOVERSMOUTH,
- SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
- UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/suit/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- SEALED_INVISIBILITY = HIDEJUMPSUIT,
- UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
- SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
- ),
- /obj/item/clothing/gloves/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/shoes/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
- SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
- ),
- ),
- "security_blue" = list(
- MOD_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/obj/clothing/modsuit/mod_clothing.dmi',
- MOD_WORN_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/mob/clothing/modsuit/mod_clothing.dmi',
- /obj/item/clothing/head/mod = list(
- UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
- UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
- SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
- UNSEALED_COVER = HEADCOVERSMOUTH,
- SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
- UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/suit/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- SEALED_INVISIBILITY = HIDEJUMPSUIT,
- UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
- SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
- ),
- /obj/item/clothing/gloves/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/shoes/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
- SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
- ),
- ),
- )
-
-/datum/mod_theme/safeguard // Head of Security
- default_skin = "safeguard_blue"
- variants = list(
- "safeguard" = list(
- /obj/item/clothing/head/mod = list(
- UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
- UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
- UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
- UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/suit/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- SEALED_INVISIBILITY = HIDEJUMPSUIT,
- UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
- SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
- ),
- /obj/item/clothing/gloves/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/shoes/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
- SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
- ),
- ),
- "safeguard_blue" = list(
- MOD_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/obj/clothing/modsuit/mod_clothing.dmi',
- MOD_WORN_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/mob/clothing/modsuit/mod_clothing.dmi',
- /obj/item/clothing/head/mod = list(
- UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
- UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
- UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
- UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/suit/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- SEALED_INVISIBILITY = HIDEJUMPSUIT,
- UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
- SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
- ),
- /obj/item/clothing/gloves/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/shoes/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
- SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
- ),
- ),
- )
-
/datum/armor/mod_theme_prototype // Charlie Station
melee = 25
bullet = 5
diff --git a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi
index 8e7094e2c72..a3acd4882dc 100644
Binary files a/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi and b/modular_skyrat/modules/aesthetics/airlock/icons/airlocks/station/security.dmi differ
diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm b/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm
index a61469563db..e48a9fdff00 100644
--- a/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm
@@ -6,6 +6,7 @@
desc = "Stunning. Menacing. Perfect for the man who gets bullied for leaving the brig."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
+ worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor_digi.dmi'
icon_state = "warden_syndie"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
index 8b33e34ea61..faff26a6455 100644
--- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
@@ -892,7 +892,7 @@
icon_state = "plasmaman_jax"
// Donation reward for Raxraus
-/obj/item/clothing/shoes/jackboots/peacekeeper/armadyne/rax
+/obj/item/clothing/shoes/jackboots/armadyne/rax
name = "tactical boots"
desc = "Tactical and sleek. This model seems to resemble Armadyne's."
@@ -1306,13 +1306,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi'
worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi'
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia
- name = "red-tinted giga HUD gar glasses"
- desc = "GIGA GAR glasses with a security hud implanted in the lens. Reminds you of a time before the color blue."
- icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/glasses.dmi'
- icon_state = "supergarsred"
- worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/eyes.dmi'
-
//Donation reward for Konstyantyn
/obj/item/clothing/accessory/badge/holo/jade
name = "jade holobadge"
@@ -1650,128 +1643,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
base_icon_state = "digicoat_interdyne"
icon_state = "digicoat_interdyne"
-/obj/item/clothing/suit/armor/hos/elofy
- name = "anime admiral coat"
- desc = "This coat is a near perfect replica of the one worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
- an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
- It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
- but hasn't had much spread outside of the Terran Government."
- icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/suit.dmi'
- icon_state = "coat_blackblue"
- inhand_icon_state = "hostrench"
- blood_overlay_type = "coat"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- cold_protection = CHEST|GROIN|LEGS|ARMS
- supports_variations_flags = NONE
-
-/obj/item/clothing/suit/armor/hos/elofy/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/anime_coat)
-
-/datum/atom_skin/anime_coat
- abstract_type = /datum/atom_skin/anime_coat
-
-/datum/atom_skin/anime_coat/black_blue
- preview_name = "Black-Blue"
- new_icon_state = "coat_blackblue"
-
-/datum/atom_skin/anime_coat/black_red
- preview_name = "Black-Red"
- new_icon_state = "coat_blackred"
-
-/datum/atom_skin/anime_coat/white_red
- preview_name = "White-Red"
- new_icon_state = "coat_whitered"
-
-/datum/atom_skin/anime_coat/white_blue
- preview_name = "White-Blue"
- new_icon_state = "coat_whiteblue"
-
-/obj/item/clothing/suit/armor/hos/elofy/examine_more(mob/user)
- . = ..()
- . += "It seems particularly soft and has subtle ballistic fibers intwined with the soft fabric that is perfectedly tailored to the body that wears it. Each golden engraving seems to reflect against your eyes with a slightly blinding flare. This is part of a full set of Luna Wolves Legion battle garb."
-
-
-/obj/item/clothing/head/hats/hos/elofy
- name = "anime admiral hat"
- desc = "This hat is a near perfect replica of the one worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
- an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
- It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
- but hasn't had much spread outside of the Terran Government."
- icon ='modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi'
- icon_state = "hat_black"
-
-/obj/item/clothing/head/hats/hos/elofy/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/anime_hat)
-
-/datum/atom_skin/anime_hat
- abstract_type = /datum/atom_skin/anime_hat
-
-/datum/atom_skin/anime_hat/white
- preview_name = "White"
- new_icon_state = "hat_white"
-
-/datum/atom_skin/anime_hat/black
- preview_name = "Black"
- new_icon_state = "hat_black"
-
-/obj/item/clothing/gloves/elofy
- name = "anime admiral gloves"
- desc = "These gloves are a near perfect replica of those worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
- an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
- It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
- but hasn't had much spread outside of the Terran Government."
- icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/gloves.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/hands.dmi'
- icon_state = "gloves_black"
-
-/obj/item/clothing/gloves/elofy/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/anime_gloves)
-
-/datum/atom_skin/anime_gloves
- abstract_type = /datum/atom_skin/anime_gloves
-
-/datum/atom_skin/anime_gloves/white
- preview_name = "White"
- new_icon_state = "gloves_white"
-
-/datum/atom_skin/anime_gloves/black
- preview_name = "Black"
- new_icon_state = "gloves_black"
-
-/obj/item/clothing/shoes/jackboots/elofy
- name = "anime admiral boots"
- desc = "These boots are a near perfect replica of those worn by Admiral Yi Sun-Sin, main character from \"Heroes of the Galactic Conflict\", \
- an animated war drama set between the Free Planetary Trade Union and the Second Galactic Empire. \
- It proved to be a sensational piece among those who appreciate animated cartoons and period war dramas, \
- but hasn't had much spread outside of the Terran Government."
- icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/shoes.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/feet.dmi'
- icon_state = "boots_blackblue"
-
-/obj/item/clothing/shoes/jackboots/elofy/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/anime_boots)
-
-/datum/atom_skin/anime_boots
- abstract_type = /datum/atom_skin/anime_boots
-
-/datum/atom_skin/anime_boots/black_red
- preview_name = "Black-Red"
- new_icon_state = "boots_blackred"
-
-/datum/atom_skin/anime_boots/white_red
- preview_name = "White-Red"
- new_icon_state = "boots_whitered"
-
-/datum/atom_skin/anime_boots/white_blue
- preview_name = "White-Blue"
- new_icon_state = "boots_whiteblue"
-
// Donation reward for grasshand
/obj/item/clothing/under/rank/civilian/chaplain/divine_archer/noble
name = "noble gambeson"
diff --git a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm
index 1d1cfc52053..69969500f06 100644
--- a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm
+++ b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/security.dm
@@ -26,8 +26,8 @@
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/toggle/jacket/sec/old/syndicate(src)
new /obj/item/clothing/mask/gas/sechailer/syndicate(src)
- new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
- new /obj/item/clothing/glasses/hud/security/sunglasses/redsec(src)
+ new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
+ new /obj/item/clothing/glasses/hud/security/sunglasses(src)
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker/PopulateContents()
..()
diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm
index 61c7c83d70e..6a4cb823750 100644
--- a/modular_skyrat/modules/mapping/code/mob_spawns.dm
+++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm
@@ -269,9 +269,9 @@
id_trim = /datum/id_trim/syndicom/skyrat/ds2/brigofficer
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/bulletproof/old
- back = /obj/item/storage/backpack/security/redsec
+ back = /obj/item/storage/backpack/security
head = /obj/item/clothing/head/helmet/swat/ds
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/flashlight/seclite
mask = /obj/item/clothing/mask/gas/syndicate
ears = /obj/item/radio/headset/syndicateciv/staff
@@ -301,8 +301,8 @@
id_trim = /datum/id_trim/syndicom/skyrat/ds2/masteratarms
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/vest/warden/syndicate
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec
- back = /obj/item/storage/backpack/satchel/sec/redsec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ back = /obj/item/storage/backpack/satchel/sec
head = /obj/item/clothing/head/hats/hos/beret/syndicate
l_pocket = /obj/item/gun/energy/e_gun/mini
r_pocket = /obj/item/flashlight/seclite
diff --git a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm
index bdf29f503ce..4bbb08455ff 100644
--- a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm
+++ b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer.dm
@@ -33,7 +33,7 @@
/obj/item/melee/baton/security/boomerang/loaded = 1
)
- family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/security_cap, /obj/item/clothing/mask/whistle)
+ family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/mask/whistle)
job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -52,7 +52,7 @@
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/sec
messenger = /obj/item/storage/backpack/messenger/sec
- head = /obj/item/clothing/head/security_garrison
+// head = /obj/item/clothing/head/security_garrison
box = /obj/item/storage/box/survival/security
belt = /obj/item/modular_computer/pda/security
diff --git a/modular_skyrat/modules/sec_haul/code/misc/vending.dm b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
index 094b4cccc3a..b6afe11b005 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
@@ -1,8 +1,4 @@
/obj/machinery/vending/security
- name = "\improper Armadyne Peacekeeper Equipment Vendor"
- desc = "An Armadyne peacekeeper equipment vendor."
- product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
- icon = 'modular_skyrat/modules/sec_haul/icons/vending/vending.dmi'
products = list(
/obj/item/restraints/handcuffs = 18,
/obj/item/restraints/handcuffs/cable/zipties = 22,
@@ -36,6 +32,9 @@
/obj/item/vending_refill/security
machine_name = "Armadyne Peacekeeper Equipment Vendor"
+/*
+
+// BUBBER EDIT - useless
/obj/machinery/vending/wardrobe/sec_wardrobe
name = "\improper Peacekeeper Outfitting Station"
@@ -47,7 +46,7 @@
vend_reply = "Good luck, Peacekeeper!"
products = list(/obj/item/clothing/suit/hooded/wintercoat/security = 5,
/obj/item/clothing/suit/toggle/jacket/sec = 5,
- /obj/item/clothing/suit/armor/vest/peacekeeper/brit = 5,
+ /obj/item/clothing/suit/armor/vest/brit = 5,
/obj/item/clothing/neck/security_cape = 5,
/obj/item/clothing/neck/security_cape/armplate = 5,
/obj/item/storage/backpack/security = 5,
@@ -56,21 +55,21 @@
/obj/item/storage/backpack/duffelbag/sec = 5,
/obj/item/clothing/under/rank/security/officer = 10,
/obj/item/clothing/under/rank/security/officer/skirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/skirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/shortskirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/jumpsuit = 10,
+ /obj/item/clothing/under/rank/security/skirt = 10,
+ /obj/item/clothing/under/rank/security/shortskirt = 10,
+ /obj/item/clothing/under/rank/security/miniskirt = 10,
+ /obj/item/clothing/under/rank/security/jumpsuit = 10,
/obj/item/clothing/under/rank/security/peacekeeper = 10,
/obj/item/clothing/under/rank/security/skyrat/utility = 3,
/obj/item/clothing/shoes/jackboots/sec = 10,
- /obj/item/clothing/head/security_garrison = 10,
- /obj/item/clothing/head/security_cap = 10,
+// /obj/item/clothing/head/security_garrison = 10,
+// /obj/item/clothing/head/security_cap = 10,
/obj/item/clothing/head/beret/sec/peacekeeper = 5,
/obj/item/clothing/head/helmet/sec/terra = 5,
/obj/item/clothing/head/hats/warden/police/patrol = 5,
/obj/item/clothing/head/costume/ushanka/sec = 10,
/obj/item/clothing/gloves/color/black/security = 10,
- /obj/item/clothing/head/helmet/sec/futuristic = 5,
+// /obj/item/clothing/head/helmet/sec/futuristic = 5,
)
premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3,
/obj/item/clothing/suit/jacket/officer/blue = 3,
@@ -81,7 +80,11 @@
/obj/item/vending_refill/wardrobe/sec_wardrobe
machine_name = "Peacekeeper Outfitting Station"
+
+*/
+
//List for the old one, for when its mapped in; curates it nicely, adds /redsec to the items, and also prevents some conflicts with the above vendor
+// antiquated, but stuff uses it
/obj/machinery/vending/wardrobe/sec_wardrobe/red
name = "\improper SecDrobe"
desc = "A vending machine for security and security-related clothing!"
@@ -89,18 +92,18 @@
vend_reply = "Thank you for using the SecDrobe!"
icon = 'icons/obj/machines/vending.dmi'
icon_state = "secdrobe"
- products = list(/obj/item/clothing/suit/hooded/wintercoat/security/redsec = 3,
- /obj/item/storage/backpack/security/redsec = 3,
- /obj/item/storage/backpack/satchel/sec/redsec = 3,
- /obj/item/storage/backpack/duffelbag/sec/redsec = 3,
- /obj/item/clothing/under/rank/security/officer/redsec = 3,
+ products = list(/obj/item/clothing/suit/hooded/wintercoat/security = 3,
+ /obj/item/storage/backpack/security = 3,
+ /obj/item/storage/backpack/satchel/sec = 3,
+ /obj/item/storage/backpack/duffelbag/sec = 3,
+ /obj/item/clothing/under/rank/security/officer = 3,
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/head/beret/sec = 3,
/obj/item/clothing/head/soft/sec = 3,
/obj/item/clothing/mask/bandana/red = 3,
/obj/item/clothing/gloves/color/black = 3,
/obj/item/clothing/under/rank/security/officer/skirt = 3,
- /obj/item/clothing/under/rank/security/skyrat/utility/redsec = 3,
+ /obj/item/clothing/under/rank/security/skyrat/utility = 3,
/obj/item/clothing/suit/toggle/jacket/sec/old = 3,
)
premium = list( /obj/item/clothing/under/rank/security/officer/formal = 5,
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
index 97b7ef36058..be9092add1c 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/under/rank/security/peacekeeper/armadyne
+/obj/item/clothing/under/rank/security/armadyne
name = "armadyne corporate uniform"
desc = "A sleek uniform worn by Armadyne corporate. Its metallic red belt buckle is made in the shape of the Armadyne logo."
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi'//This can probably be moved to centcom.dm when the suits are sorted
@@ -6,16 +6,16 @@
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom.dmi'
worn_icon_state = "armadyne_shirt" //This can probably be moved to centcom.dm when the suits are sorted
-/obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical
+/obj/item/clothing/under/rank/security/armadyne/tactical
name = "armadyne tactical uniform"
desc = "A robust tactical uniform worn by Armadyne corporate."
icon_state = "armadyne_tac"
worn_icon_state = "armadyne_tac"
-/obj/item/clothing/head/beret/sec/peacekeeper/armadyne
+/obj/item/clothing/head/beret/sec/armadyne
name = "armadyne corporate beret"
desc = "A comfy yet robust beret worn by Armadyne corporate."
- icon_state = "/obj/item/clothing/head/beret/sec/peacekeeper/armadyne"
+ icon_state = "/obj/item/clothing/head/beret/sec/armadyne"
greyscale_config = /datum/greyscale_config/beret_badge_fancy
greyscale_config_worn = /datum/greyscale_config/beret_badge_fancy/worn
greyscale_colors = "#3F3C40#5B2423#491716"
@@ -35,7 +35,7 @@
for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
qdel(reskin_component)
-/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne
+/obj/item/clothing/suit/armor/vest/armadyne
name = "armadyne jacket"
desc = "An Armadyne branded track jacket, with a thin nanocarbon lining inside for protective purposes. Worn by Armadyne corporate, or wealthy supporters."
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
@@ -44,23 +44,23 @@
worn_icon_state = "armadyne_jacket"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/Initialize(mapload)
+/obj/item/clothing/suit/armor/vest/armadyne/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_icon, "zipper")
-/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor
+/obj/item/clothing/suit/armor/vest/armadyne/armor
name = "armadyne armor vest"
desc = "A nanocarbon and high-grade polymer vest, with the worn-red Armadyne logo printed on the back. Used by Armadyne corporate when they need emergency armor."
icon_state = "armadyne_armor"
worn_icon_state = "armadyne_armor"
-/obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper/armadyne
+/obj/item/clothing/glasses/hud/security/sunglasses/armadyne
name = "armadyne hud glasses"
icon_state = "armadyne_glasses"
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
-/obj/item/clothing/gloves/combat/peacekeeper/armadyne
+/obj/item/clothing/gloves/combat/armadyne
name = "armadyne combat gloves"
desc = "Tactical and sleek. Worn by Armadyne representatives."
icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
@@ -69,7 +69,7 @@
worn_icon_state = "armadyne_gloves"
cut_type = null
-/obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
+/obj/item/clothing/shoes/jackboots/armadyne
name = "armadyne combat boots"
desc = "Tactical and sleek. Worn by Armadyne representatives."
icon = 'modular_skyrat/master_files/icons/obj/clothing/shoes.dmi'
@@ -91,14 +91,14 @@
suit_store = /obj/item/modular_computer/pda/security
ears = /obj/item/radio/headset/headset_cent/commander
- uniform = /obj/item/clothing/under/rank/security/peacekeeper/armadyne
- gloves = /obj/item/clothing/gloves/combat/peacekeeper/armadyne
- head = /obj/item/clothing/head/beret/sec/peacekeeper/armadyne
+ uniform = /obj/item/clothing/under/rank/security/armadyne
+ gloves = /obj/item/clothing/gloves/combat/armadyne
+ head = /obj/item/clothing/head/beret/sec/armadyne
neck = /obj/item/clothing/neck/tie/black
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper/armadyne
- suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/armadyne
+ suit = /obj/item/clothing/suit/armor/vest/armadyne
suit_store = /obj/item/gun/ballistic/automatic/pistol/trappiste
- shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
+ shoes = /obj/item/clothing/shoes/jackboots/armadyne
belt = /obj/item/storage/belt/security/peacekeeper/armadyne
r_pocket = /obj/item/assembly/flash/handheld
backpack_contents = list(
@@ -115,14 +115,14 @@
name = "Armadyne Corporate Security"
ears = /obj/item/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical
- gloves = /obj/item/clothing/gloves/combat/peacekeeper/armadyne
+ uniform = /obj/item/clothing/under/rank/security/armadyne/tactical
+ gloves = /obj/item/clothing/gloves/combat/armadyne
head = /obj/item/clothing/head/helmet
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper/armadyne
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/armadyne
mask = /obj/item/clothing/mask/gas/sechailer
- suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor
+ suit = /obj/item/clothing/suit/armor/vest/armadyne/armor
suit_store = /obj/item/gun/ballistic/automatic/sol_smg
- shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
+ shoes = /obj/item/clothing/shoes/jackboots/armadyne
backpack_contents = list(
/obj/item/storage/box/handcuffs,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
@@ -137,14 +137,14 @@
name = "Armadyne Corporate Security Commander"
ears = /obj/item/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical
- gloves = /obj/item/clothing/gloves/combat/peacekeeper/armadyne
- head = /obj/item/clothing/head/beret/sec/peacekeeper/armadyne
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper/armadyne
+ uniform = /obj/item/clothing/under/rank/security/armadyne/tactical
+ gloves = /obj/item/clothing/gloves/combat/armadyne
+ head = /obj/item/clothing/head/beret/sec/armadyne
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/armadyne
mask = /obj/item/clothing/mask/gas/sechailer/swat
- suit = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor
+ suit = /obj/item/clothing/suit/armor/vest/armadyne/armor
suit_store = /obj/item/gun/ballistic/automatic/sol_rifle
- shoes = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
+ shoes = /obj/item/clothing/shoes/jackboots/armadyne
belt = /obj/item/storage/belt/security/webbing
backpack_contents = list(
/obj/item/storage/box/handcuffs,
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
index bdc6b3988dd..b852225fb34 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
@@ -1,38 +1,4 @@
-/obj/item/clothing/head/beret/sec/peacekeeper
- name = "peacekeeper beret"
- desc = "A robust beret with the peacekeeper insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
- icon_state = "/obj/item/clothing/head/beret/sec/peacekeeper"
- greyscale_config = /datum/greyscale_config/beret_badge
- greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
- post_init_icon_state = "beret_badge"
- greyscale_colors = "#3F3C40#375989"
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
- armor_type = /datum/armor/head_helmet
-
-/obj/item/clothing/head/beret/sec/peacekeeper/white
- icon_state = "/obj/item/clothing/head/beret/sec/peacekeeper/white"
- greyscale_config = /datum/greyscale_config/beret
- greyscale_config_worn = /datum/greyscale_config/beret/worn
- greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari
- post_init_icon_state = "beret"
- greyscale_colors = "#EAEAEA"
-
-/obj/item/clothing/head/hats/hos/beret/peacekeeper
- name = "head of security's peacekeeper beret"
- desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction."
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
- armor_type = /datum/armor/hats_hos
-
-/obj/item/clothing/head/beret/sec/navywarden/peacekeeper
- name = "warden's peacekeeper beret"
- desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
- icon_state = "/obj/item/clothing/head/beret/sec/navywarden/peacekeeper"
- greyscale_config = /datum/greyscale_config/beret_badge_fancy
- greyscale_config_worn = /datum/greyscale_config/beret_badge_fancy/worn
- greyscale_colors = "#3f6e9e#FF0000#00AEEF"
- post_init_icon_state = "beret_badge_fancy_twist"
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
- armor_type = /datum/armor/hats_warden
+// anything here is non-sec specific or is used for armadyne, which is out-of-scope
/obj/item/clothing/head/helmet/sec/terra
name = "sol police helmet"
@@ -44,90 +10,15 @@
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
armor_type = /datum/armor/head_helmet
-/obj/item/clothing/head/hats/warden/police/patrol
- name = "police patrol cap"
- desc = "A dark colored hat with a silver badge, for the officer interested in style."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- icon_state = "policeofficerpatrolcap"
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
- armor_type = /datum/armor/head_helmet
-
-/obj/item/clothing/head/hats/warden/police/patrol/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/police_patrol_cap)
-
-/datum/atom_skin/police_patrol_cap
- abstract_type = /datum/atom_skin/police_patrol_cap
-
-/datum/atom_skin/police_patrol_cap/blue
- preview_name = "Blue Variant"
- new_icon_state = "policeofficercap"
-
-/datum/atom_skin/police_patrol_cap/black_blue
- preview_name = "Black and Blue Variant"
- new_icon_state = "policeofficerpatrolcap"
-
-/datum/atom_skin/police_patrol_cap/sillitoe
- preview_name = "Sillitoe Variant"
- new_icon_state = "policetrafficcap"
-
-/datum/atom_skin/police_patrol_cap/long_kesh
- preview_name = "Long Kesh Variant"
- new_icon_state = "corrections_officer"
-
-/datum/atom_skin/police_patrol_cap/cadet
- preview_name = "Cadet Variant"
- new_icon_state = "policecadetcap"
-
/obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper
name = "peacekeeper hud glasses"
icon_state = "peacekeeperglasses"
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
-//PEACEKEEPER UNIFORM
-/obj/item/clothing/under/rank/security/peacekeeper
- name = "peacekeeper uniform"
- desc = "A sleek peacekeeper uniform, made to a price."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "peacekeeper"
- can_adjust = TRUE
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
-
-/obj/item/clothing/under/rank/security/warden/peacekeeper
- name = "peacekeeper wardens suit"
- desc = "A formal security suit for officers complete with Armadyne belt buckle."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "peacekeeper_warden"
-
-/obj/item/clothing/under/rank/security/warden
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
-
-/obj/item/clothing/under/rank/security/head_of_security/peacekeeper
- name = "head of security's peacekeeper jumpsuit"
- desc = "A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "peacekeeper_hos"
-
//PEACEKEEPER ARMOR
-/obj/item/clothing/suit/armor/vest/peacekeeper
- name = "peacekeeper armor vest"
- desc = "A standard issue peacekeeper armor vest, versatile, lightweight, and most importantly, cheap."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
- icon_state = "peacekeeper_white"
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/suit/armor/vest/peacekeeper/black
- icon_state = "peacekeeper_black"
-
-/obj/item/clothing/suit/armor/vest/peacekeeper/brit
+/obj/item/clothing/suit/armor/vest/brit
name = "high vis armored vest"
desc = "Oi bruv, you got a loicence for that?"
icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
@@ -135,19 +26,10 @@
icon_state = "hazardbg"
worn_icon_state = "hazardbg"
-/obj/item/clothing/suit/armor/vest/peacekeeper/brit/Initialize(mapload)
+/obj/item/clothing/suit/armor/vest/brit/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_icon, "zipper")
-/obj/item/clothing/suit/armor/vest/peacekeeper/spacecoat
- name = "peacekeeper sleek coat"
- desc = "An incredibly stylish and heavy black coat made of synthetic kangaroo leather, padded with durathread and lined with kevlar."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
- icon_state = "peacekeeper_spacecoat"
- worn_icon_state = "peacekeeper_spacecoat"
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
//PEACEKEEPER GLOVES
/obj/item/clothing/gloves/combat/peacekeeper
name = "peacekeeper gloves"
@@ -166,20 +48,6 @@
armor_type = /datum/armor/none
cut_type = null
-/obj/item/clothing/gloves/tackler/peacekeeper
- name = "peacekeeper gripper gloves"
- desc = "Special gloves that manipulate the blood vessels in the wearer's hands, granting them the ability to launch headfirst into walls."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- icon_state = "peacekeeper_gripper_gloves"
-
-/obj/item/clothing/gloves/kaza_ruk/sec/peacekeeper
- name = "peacekeeper kaza ruk gloves"
- desc = "These gloves can teach you to perform Kaza Ruk using nanochips."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- icon_state = "peacekeeper_gripper_gloves"
-
//PEACEKEEPER BELTS
/obj/item/storage/belt/security/peacekeeper
name = "peacekeeper belt"
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_lockers.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_lockers.dm
deleted file mode 100644
index a2daf1e74d7..00000000000
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_lockers.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-/obj/structure/closet/secure_closet/security
- icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
-
-/obj/structure/closet/secure_closet/warden
- icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
-
-/obj/structure/closet/secure_closet/hos
- icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
diff --git a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm
index 32cc104c788..7b48b3a4c53 100644
--- a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm
+++ b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm
@@ -193,7 +193,7 @@
/datum/outfit/tarkon/sec
name = "Port Tarkon Security Outfit"
uniform = /obj/item/clothing/under/tarkon/sec
- glasses = /obj/item/clothing/glasses/hud/security/redsec
+ glasses = /obj/item/clothing/glasses/hud/security
gloves = /obj/item/clothing/gloves/tackler/combat
neck = /obj/item/clothing/neck/security_cape/tarkon
id = /obj/item/card/id/advanced/tarkon/sec
diff --git a/modular_skyrat/modules/teshari/code/teshari_clothes.dm b/modular_skyrat/modules/teshari/code/teshari_clothes.dm
index 64d23b3399e..6b9527df5aa 100644
--- a/modular_skyrat/modules/teshari/code/teshari_clothes.dm
+++ b/modular_skyrat/modules/teshari/code/teshari_clothes.dm
@@ -156,7 +156,7 @@
/obj/item/clothing/head/nanotrasen_consultant/beret
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari
-/obj/item/clothing/head/beret/sec/peacekeeper/armadyne
+/obj/item/clothing/head/beret/sec/armadyne
greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge_fancy/worn/teshari
/obj/item/clothing/head/beret/sec/peacekeeper
diff --git a/modular_skyrat/modules/vox_sprites/code/head.dm b/modular_skyrat/modules/vox_sprites/code/head.dm
index 67b9ee7b904..6e7d07deb5a 100644
--- a/modular_skyrat/modules/vox_sprites/code/head.dm
+++ b/modular_skyrat/modules/vox_sprites/code/head.dm
@@ -73,13 +73,13 @@
/obj/item/clothing/head/nanotrasen_consultant/beret
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
-/obj/item/clothing/head/beret/sec/peacekeeper/armadyne
+/obj/item/clothing/head/beret/sec/armadyne
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge_fancy/worn/vox
/obj/item/clothing/head/beret/sec/peacekeeper
greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox
-/obj/item/clothing/head/beret/sec/peacekeeper/white
+/obj/item/clothing/head/beret/sec/white
greyscale_config_worn_vox = null
/obj/item/clothing/head/beret/sec/navywarden/peacekeeper
diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm
index a71f61dbc62..464e1e36f26 100644
--- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm
+++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm
@@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/storage/belt/plant = 5,
/obj/item/storage/belt/security = 1,
/obj/item/storage/belt/security/peacekeeper = 1,
- /obj/item/storage/belt/security/redsec = 1,
+ /obj/item/storage/belt/security = 1,
/obj/item/storage/belt/security/webbing = 1,
/obj/item/storage/belt/utility = 200,
/obj/item/storage/belt/utility/full = 25,
diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm
index ab052a87bb4..96ca6e8d8bb 100644
--- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm
+++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm
@@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE
/obj/item/clothing/glasses/science = 25,
/obj/item/clothing/glasses/hud/security = 10,
/obj/item/clothing/glasses/hud/gun_permit = 25,
- /obj/item/clothing/glasses/hud/security/redsec = 5,
+ /obj/item/clothing/glasses/hud/security = 5,
/obj/item/clothing/glasses/meson/engine = 25,
/obj/item/clothing/glasses/meson/engine/tray = 25,
/obj/item/clothing/glasses/sunglasses/reagent = 1,
diff --git a/modular_zubbers/code/modules/cargo/packs/security.dm b/modular_zubbers/code/modules/cargo/packs/security.dm
index e8b7064303c..1763cec5a2c 100644
--- a/modular_zubbers/code/modules/cargo/packs/security.dm
+++ b/modular_zubbers/code/modules/cargo/packs/security.dm
@@ -95,6 +95,7 @@
/datum/supply_pack/security/armory/laser_carbine
cost = CARGO_CRATE_VALUE * 7
+/* ugly takyon sprites - readd later VIROWIP
/datum/supply_pack/security/combine
name = "Civil Protection Uniforms"
desc = "Extra supplies we got from some weird old guy in a blue suit. Contains six uniforms, \
@@ -110,3 +111,4 @@
)
crate_name = "benefactor supply crate"
discountable = SUPPLY_PACK_RARE_DISCOUNTABLE
+*/
diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm
index 0f2133072b6..89be1ab4f52 100644
--- a/modular_zubbers/code/modules/clothing/head/helmet.dm
+++ b/modular_zubbers/code/modules/clothing/head/helmet.dm
@@ -645,67 +645,6 @@
armor_type = /datum/armor/head_helmet
strip_delay = 60
-//BEGIN HAT SPRITES BY APRIL
-
-/obj/item/clothing/head/security_kepi
- name = "security kepi"
- desc = "Bonjour, inspecteur. A kepi police cap first popularized by planetary police on Pluto. This one appears armored."
- icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
- icon_state = "kepi_sec_red"
- armor_type = /datum/armor/head_helmet
- strip_delay = 60
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/head/security_kepi/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_kepi)
-
-/datum/atom_skin/security_kepi
- abstract_type = /datum/atom_skin/security_kepi
-
-/datum/atom_skin/security_kepi/red
- preview_name = "Red Security Kepi"
- new_icon_state = "kepi_sec_red"
-
-/datum/atom_skin/security_kepi/blue
- preview_name = "Blue Security Kepi"
- new_icon_state = "kepi_sec_blue"
-
-/datum/atom_skin/security_kepi/white
- preview_name = "White Security Kepi"
- new_icon_state = "kepi_sec_white"
-
-/datum/atom_skin/security_kepi/black
- preview_name = "Black Security Kepi"
- new_icon_state = "kepi_sec_black"
-
-/obj/item/clothing/head/hos_kepi
- name = "HoS kepi"
- desc = "Bonjour, commandante. A kepi for the Head of Security. It has a embroidered pattern going around it. This one appears well armored."
- icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
- icon_state = "kepi_sec_red_hos"
- armor_type = /datum/armor/hats_hos
- strip_delay = 60
-
-/obj/item/clothing/head/hos_kepi/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_kepi)
-
-/datum/atom_skin/hos_kepi
- abstract_type = /datum/atom_skin/hos_kepi
-
-/datum/atom_skin/hos_kepi/red
- preview_name = "Red HoS Kepi"
- new_icon_state = "kepi_sec_red_hos"
-
-/datum/atom_skin/hos_kepi/blue
- preview_name = "Blue HoS Kepi"
- new_icon_state = "kepi_sec_blue_hos"
-
-// END HATS ADDED BY APRIL
-
/obj/item/clothing/head/helmet/elder_atmosian
desc = "The pinnacle of atmospherics equipment, an expensive modified atmospherics fire helmet plated in one of the most luxurous and durable metals known to man. Providing full atmos coverage without the heavy materials to slow the user down, it also offers far greater protection to most sources of damage, even offering great protection against gases, and other nasty things that try to get into your face."
icon = 'modular_zubbers/icons/obj/clothing/head/helmet.dmi'
diff --git a/modular_zubbers/code/modules/clothing/head/jobs.dm b/modular_zubbers/code/modules/clothing/head/jobs.dm
index 1ab32c0e799..2d59342bb63 100644
--- a/modular_zubbers/code/modules/clothing/head/jobs.dm
+++ b/modular_zubbers/code/modules/clothing/head/jobs.dm
@@ -40,23 +40,5 @@
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
greyscale_colors = "#3E3E48#FFFFFF"
-/obj/item/clothing/head/security_beanie
- name = "security beanie"
- desc = "A robust beanie with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
- icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
- icon_state = "beanie_sec"
- armor_type = /datum/armor/beanie_sec
-
/obj/item/clothing/head/utility/surgerycap
flags_inv = null
-
-/datum/armor/beanie_sec
- melee = 30
- bullet = 25
- laser = 25
- energy = 35
- bomb = 25
- fire = 20
- acid = 50
- wound = 4
diff --git a/modular_zubbers/code/modules/clothing/suits/armor.dm b/modular_zubbers/code/modules/clothing/suits/armor.dm
index 5fad582c855..f172920f49a 100644
--- a/modular_zubbers/code/modules/clothing/suits/armor.dm
+++ b/modular_zubbers/code/modules/clothing/suits/armor.dm
@@ -114,46 +114,3 @@
fire = 100
acid = 50
wound = 25
-
-//MetroCop armor, by HL13 station.
-/obj/item/clothing/suit/armor/vest/alt/sec/metrocop
- name = "metrocop armor"
- desc = "Pick up that can. Uses advanced GigaSlop brand Matrixes to allow alternative variants!"
- icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
- icon_state = "civilprotection"
-
-/obj/item/clothing/suit/armor/vest/alt/sec/metrocop/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/metrocop_armor)
-
-/datum/atom_skin/metrocop_armor
- abstract_type = /datum/atom_skin/metrocop_armor
-
-/datum/atom_skin/metrocop_armor/metro_cop
- preview_name = "Metro Cop"
- new_icon_state = "civilprotection"
-
-/datum/atom_skin/metrocop_armor/metro_coat
- preview_name = "MetroCop Coat"
- new_icon_state = "cp_trenchcoat"
-
-/datum/atom_skin/metrocop_armor/medic
- preview_name = "Medic"
- new_icon_state = "medicalofficer"
-
-/datum/atom_skin/metrocop_armor/red_trim
- preview_name = "Red Trim"
- new_icon_state = "dv_vest"
-
-/datum/atom_skin/metrocop_armor/overwatch_white
- preview_name = "White Overwatch"
- new_icon_state = "overwatch_white"
-
-/datum/atom_skin/metrocop_armor/overwatch
- preview_name = "Overwatch"
- new_icon_state = "overwatch"
-
-/datum/atom_skin/metrocop_armor/overwatch_red
- preview_name = "Red Overwatch"
- new_icon_state = "overwatch_red"
diff --git a/modular_zubbers/code/modules/clothing/under/misc.dm b/modular_zubbers/code/modules/clothing/under/misc.dm
index b0f17db48ab..0951c66ab87 100644
--- a/modular_zubbers/code/modules/clothing/under/misc.dm
+++ b/modular_zubbers/code/modules/clothing/under/misc.dm
@@ -290,17 +290,6 @@
//SECURITY
-/obj/item/clothing/under/rank/security/security_bunnysuit
- desc = "The staple of any bunny themed security officers. The red coloring helps to hide any blood that may stain this."
- name = "security bunnysuit"
- icon_state = "bunnysuit_sec"
- icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/under/bunnysuits.dmi'
- worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/bunnysuits_digi.dmi'
- body_parts_covered = CHEST|GROIN|LEGS
- alt_covers_chest = TRUE
-
-
/obj/item/clothing/under/rank/security/security_assistant_bunnysuit
desc = "The staple of any bunny themed security assistants. Can't lost respect you don't have!"
name = "security assistant's bunnysuit"
@@ -311,19 +300,6 @@
body_parts_covered = CHEST|GROIN|LEGS
alt_covers_chest = TRUE
-
-
-/obj/item/clothing/under/rank/security/warden_bunnysuit
- desc = "The staple of any bunny themed wardens. The more formal security bunny suit for a less combat focused job."
- name = "warden's bunnysuit"
- icon_state = "bunnysuit_warden"
- icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/under/bunnysuits.dmi'
- worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/bunnysuits_digi.dmi'
- body_parts_covered = CHEST|GROIN|LEGS
- alt_covers_chest = TRUE
-
-
/obj/item/clothing/under/rank/security/brig_phys_bunnysuit
desc = "The staple of any bunny themed brig physicians. The rejected alternative to an already discontinued alternate uniform, now sold at a premium!"
name = "brig physician's bunnysuit"
@@ -366,17 +342,6 @@
body_parts_covered = CHEST|GROIN|LEGS
alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/security/head_of_security/bunnysuit
- desc = "The staple of any bunny themed security commanders. Includes kevlar weave stockings and a gilded tail."
- name = "Head of Security's bunnysuit"
- icon_state = "bunnysuit_hos"
- icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/under/bunnysuits.dmi'
- worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/bunnysuits_digi.dmi'
- body_parts_covered = CHEST|GROIN|LEGS
- alt_covers_chest = TRUE
-
//SERVICE
/obj/item/clothing/under/rank/civilian/hop_bunnysuit
diff --git a/modular_zubbers/code/modules/clothing/under/security.dm b/modular_zubbers/code/modules/clothing/under/security.dm
index 4941731266f..2f06a333f16 100644
--- a/modular_zubbers/code/modules/clothing/under/security.dm
+++ b/modular_zubbers/code/modules/clothing/under/security.dm
@@ -21,44 +21,6 @@
worn_icon = 'modular_zubbers/icons/mob/clothing/under/maidsec.dmi'
worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/maidsec_d.dmi'
-//Metro Cops
-
-/obj/item/clothing/under/rank/security/metrocop //Sprite done by HL13 Station
- name = "civil protection uniform"
- desc = "Standard issue uniforms for Civil Protection forces. Uses advanced GigaSlop brand Matrixes to allow alternative variants!"
- icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
- icon_state = "civilprotection"
- inhand_icon_state = null
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/security/metrocop/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/metrocop)
-
-/datum/atom_skin/metrocop
- abstract_type = /datum/atom_skin/metrocop
-
-/datum/atom_skin/metrocop/metro
- preview_name = "MetroCop"
- new_icon_state = "civilprotection"
-
-/datum/atom_skin/metrocop/red
- preview_name = "Red"
- new_icon_state = "divisionallead"
-
-/datum/atom_skin/metrocop/overwatch_white
- preview_name = "White Overwatch"
- new_icon_state = "overwatch_white"
-
-/datum/atom_skin/metrocop/overwatch
- preview_name = "Overwatch"
- new_icon_state = "overwatch"
-
-/datum/atom_skin/metrocop/overwatch_red
- preview_name = "Red Overwatch"
- new_icon_state = "overwatch_red"
-
//MGS stuff sprited by Crumpaloo for onlyplateau, please credit when porting, which you obviously have permission to do.
/obj/item/clothing/under/rank/security/snake
name = "stealth suit"
@@ -81,3 +43,10 @@
greyscale_colors = "#A53228#333333#292929"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
can_adjust = FALSE
+
+/*
+
+ // VIROSEC
+
+*/
+
diff --git a/modular_zubbers/code/modules/goofsec/code/department_guards.dm b/modular_zubbers/code/modules/goofsec/code/department_guards.dm
index bf91199dc5a..d713cb2f68c 100644
--- a/modular_zubbers/code/modules/goofsec/code/department_guards.dm
+++ b/modular_zubbers/code/modules/goofsec/code/department_guards.dm
@@ -8,6 +8,5 @@
/obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly = 1,
/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue = 1,
/obj/item/clothing/suit/toggle/jacket/sec/medical = 1,
- /obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 1,
/obj/item/clothing/glasses/hud/medsechud = 1,
), src)
diff --git a/modular_zubbers/code/modules/jobs/job_types/security_officer.dm b/modular_zubbers/code/modules/jobs/job_types/security_officer.dm
index 567bf6ecfec..db3fac5ab37 100644
--- a/modular_zubbers/code/modules/jobs/job_types/security_officer.dm
+++ b/modular_zubbers/code/modules/jobs/job_types/security_officer.dm
@@ -4,11 +4,3 @@
family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec/peacekeeper)
-
-/datum/outfit/job/security
- head = /obj/item/clothing/head/security_garrison
- suit_store = /obj/item/gun/energy/e_gun/advtaser
- glasses = /obj/item/clothing/glasses/hud/security
- backpack_contents = list(
- /obj/item/evidencebag = 1,
- /obj/item/flashlight/seclite = 1)
diff --git a/modular_zubbers/code/modules/loadout/categories/accessories.dm b/modular_zubbers/code/modules/loadout/categories/accessories.dm
index dd9b8ffecd2..c8b9cf91e0e 100644
--- a/modular_zubbers/code/modules/loadout/categories/accessories.dm
+++ b/modular_zubbers/code/modules/loadout/categories/accessories.dm
@@ -20,17 +20,8 @@
name = "Orange Armband"
item_path = /obj/item/clothing/accessory/armband/engine/nonsec
-/datum/loadout_item/accessory/armband/blue
- name = "Blue Armband"
- item_path = /obj/item/clothing/accessory/armband/deputy/lopland/nonsec
-
/datum/loadout_item/accessory/armband/security
name = "Security Armband"
- item_path = /obj/item/clothing/accessory/armband/deputy/lopland
- restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
-
-/datum/loadout_item/accessory/armband/security/deputy
- name = "Security Deputy Armband"
item_path = /obj/item/clothing/accessory/armband/deputy
restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
diff --git a/modular_zubbers/code/modules/loadout/categories/glasses.dm b/modular_zubbers/code/modules/loadout/categories/glasses.dm
index 1a7ddd48f7e..a77b80d8b81 100644
--- a/modular_zubbers/code/modules/loadout/categories/glasses.dm
+++ b/modular_zubbers/code/modules/loadout/categories/glasses.dm
@@ -184,12 +184,6 @@
item_path = /obj/item/clothing/glasses/hud/ar/projector/science
restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD)
-/datum/loadout_item/glasses/hud/redgigagar
- name = "Red-tinted Giga HUD Gar Glasses"
- item_path = /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia
- //ckeywhitelist = list("ultimarifox")
- restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER)
-
/*
* SHADES
*/
diff --git a/modular_zubbers/code/modules/loadout/categories/gloves.dm b/modular_zubbers/code/modules/loadout/categories/gloves.dm
index 8cd6f7ec204..5ec0f9b1579 100644
--- a/modular_zubbers/code/modules/loadout/categories/gloves.dm
+++ b/modular_zubbers/code/modules/loadout/categories/gloves.dm
@@ -115,11 +115,6 @@
item_path = /obj/item/clothing/gloves/color/black/security
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/gloves/combat/peacekeeper/armadyne
- name = "Armadyne Combat Gloves"
- item_path = /obj/item/clothing/gloves/combat/peacekeeper/armadyne
- restricted_roles = list(ALL_JOBS_SEC)
-
/datum/loadout_item/gloves/frontier_colonist
name = "Frontier Gloves"
item_path = /obj/item/clothing/gloves/frontier_colonist/loadout
@@ -143,11 +138,6 @@
item_path = /obj/item/clothing/gloves/mikugloves
//ckeywhitelist = list("grandvegeta")
-/datum/loadout_item/gloves/elofy
- name = "Solar Admiral Gloves"
- item_path = /obj/item/clothing/gloves/elofy
-// ckeywhitelist = list("october23")
-
/datum/loadout_item/gloves/hypnoring_sharkenning
name = "Suspiciously Glossy Ring"
item_path = /obj/item/clothing/gloves/ring/hypno/sharkenning
diff --git a/modular_zubbers/code/modules/loadout/categories/heads.dm b/modular_zubbers/code/modules/loadout/categories/heads.dm
index 375c5356a2d..82949ffe72c 100644
--- a/modular_zubbers/code/modules/loadout/categories/heads.dm
+++ b/modular_zubbers/code/modules/loadout/categories/heads.dm
@@ -22,21 +22,6 @@
item_path = /obj/item/clothing/head/helmet/abductor/fake
donator_only = TRUE //Dono item for MyphicBowser
-/datum/loadout_item/head/hats/warden/drill
- name = "Warden's Campaign Hat"
- item_path = /obj/item/clothing/head/hats/warden/drill
- restricted_roles = list(JOB_WARDEN)
-
-/datum/loadout_item/head/hats/warden/police/patrol
- name = "Police Patrol Cap"
- item_path = /obj/item/clothing/head/hats/warden/police/patrol
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/head/helmet/sec/futuristic
- name = "Futuristic Security Helmet"
- item_path = /obj/item/clothing/head/helmet/sec/futuristic
- restricted_roles = list(ALL_JOBS_SEC)
-
/datum/loadout_item/head/sombrero
name = "Sombrero"
item_path = /obj/item/clothing/head/costume/sombrero
@@ -65,18 +50,15 @@
donator_only = TRUE
restricted_roles = list(JOB_NT_REP)
-/datum/loadout_item/head/security_garrison
- name = "Security Garrison Cap"
- item_path = /obj/item/clothing/head/security_garrison
+// SECOFF
+
+/datum/loadout_item/head/security_helmet
+ name = "Security Helmet"
+ item_path = /obj/item/clothing/head/helmet/sec
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/head/security_cap
+/datum/loadout_item/head/head/soft/sec
name = "Security Cap"
- item_path = /obj/item/clothing/head/security_cap
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/head/security_cap/soft
- name = "Security Soft Cap"
item_path = /obj/item/clothing/head/soft/sec
restricted_roles = list(ALL_JOBS_SEC)
@@ -85,64 +67,75 @@
item_path = /obj/item/clothing/head/soft/veteran
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/head/security_cap/colonial
- name = "Imperial Police Cap"
- item_path = /obj/item/clothing/head/hats/colonial/nri_police
- restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT)
-
/datum/loadout_item/head/security_beanie
name = "Security Beanie"
item_path = /obj/item/clothing/head/security_beanie
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/head/beret/sec/peacekeeper
- name = "Peacekeeper Beret"
- item_path = /obj/item/clothing/head/beret/sec/peacekeeper
+/datum/loadout_item/head/beret/sec/viro
+ name = "Security Beret"
+ item_path = /obj/item/clothing/head/beret/sec/viro
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/head/beret/sec/peacekeeper/white
- name = "Peacekeeper White Beret"
- item_path = /obj/item/clothing/head/beret/sec/peacekeeper/white
- restricted_roles = list(ALL_JOBS_SEC)
+// WARDEN
-/datum/loadout_item/head/helmet/sec/terra
- name = "Sol Police Helmet"
- item_path = /obj/item/clothing/head/helmet/sec/terra
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/head/hats/warden/viro
+ name = "Warden's Service Cap"
+ item_path = /obj/item/clothing/head/hats/warden/viro
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/head/hats/warden/police/patrol
- name = "Warden's Police Cap"
- item_path = /obj/item/clothing/head/hats/warden/police/patrol
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/head/hats/warden/viro/alt
+ name = "Warden's Service Cap"
+ item_path = /obj/item/clothing/head/hats/warden/viro/alt
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/head/helmet/sec/redsec
- name = "Security Red Helmet"
- item_path = /obj/item/clothing/head/helmet/sec/redsec
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/head/hats/warden/drill/viro
+ name = "Warden's Campaign Cover"
+ item_path = /obj/item/clothing/head/hats/warden/drill/viro
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/head/helmet/nri_police
- name = "Imperial Police Helmet"
- item_path = /obj/item/clothing/head/helmet/nri_police
- restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT)
+/datum/loadout_item/head/hats/warden/viro/beret
+ name = "Warden's Beret"
+ item_path = /obj/item/clothing/head/hats/warden/viro/beret
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/head/hats/security_kepi
- name = "Security Kepi"
- item_path = /obj/item/clothing/head/security_kepi
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/head/hats/soft/sec/warden
+ name = "Warden's Cap"
+ item_path = /obj/item/clothing/head/soft/sec/warden
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/head/beret/sec/peacekeeper/armadyne
- name = "Armadyne Corporate Beret"
- item_path = /obj/item/clothing/head/beret/sec/peacekeeper/armadyne
- restricted_roles = list(ALL_JOBS_SEC)
+// HOS
-/datum/loadout_item/head/helmet/sec/peacekeeper/security_medic
- name = "Security Medic Helmet"
- item_path = /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic
- restricted_roles = list(JOB_SECURITY_MEDIC)
+/datum/loadout_item/head/hats/hos/cap
+ name = "Head of Security's Cap"
+ item_path = /obj/item/clothing/head/hats/hos/cap
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
-/datum/loadout_item/head/beret/sec/peacekeeper/security_medic
+/datum/loadout_item/head/hats/hos/cap/beret
+ name = "Head of Security's Beret"
+ item_path = /obj/item/clothing/head/hats/hos/cap/beret
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+/datum/loadout_item/head/helmet/sec/hos
+ name = "Head of Security's Helmet"
+ item_path = /obj/item/clothing/head/helmet/sec/hos
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+/datum/loadout_item/head/hats/soft/sec/hos
+ name = "Head of Security's Cap"
+ item_path = /obj/item/clothing/head/soft/sec/hos
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+/datum/loadout_item/head/hats/hos/cap/beret
+ name = "Head of Security's Cowboy Hat"
+ item_path = /obj/item/clothing/head/hats/hos/cap/cowboy
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+//
+
+/datum/loadout_item/head/beret/sec/security_medic
name = "Security Medic Beret"
- item_path = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic
+ item_path = /obj/item/clothing/head/beret/sec/security_medic
restricted_roles = list(JOB_SECURITY_MEDIC)
/datum/loadout_item/head/lace_bow
@@ -179,3 +172,12 @@
name = "Skull Helmet"
item_path = /obj/item/clothing/head/helmet/skull/fake
+/datum/loadout_item/head/security_cap/colonial
+ name = "Imperial Police Cap"
+ item_path = /obj/item/clothing/head/hats/colonial/nri_police
+ restricted_roles = list(JOB_CUSTOMS_AGENT)
+
+/datum/loadout_item/head/helmet/nri_police
+ name = "Imperial Police Helmet"
+ item_path = /obj/item/clothing/head/helmet/nri_police
+ restricted_roles = list(JOB_CUSTOMS_AGENT)
diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm
index 7116ba19344..4e5a23ea57b 100644
--- a/modular_zubbers/code/modules/loadout/categories/neck.dm
+++ b/modular_zubbers/code/modules/loadout/categories/neck.dm
@@ -17,16 +17,6 @@
name = "Crow Feather Cloak"
item_path = /obj/item/clothing/neck/binary
-/datum/loadout_item/neck/security_cape
- name = "Security Cape"
- item_path = /obj/item/clothing/neck/security_cape
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/neck/security_cape/armplate
- name = "Security Gauntlet"
- item_path = /obj/item/clothing/neck/security_cape/armplate
- restricted_roles = list(ALL_JOBS_SEC)
-
/datum/loadout_item/neck/pauldron
name = "Lieutenant Commander's Pauldron"
item_path = /obj/item/clothing/neck/pauldron
diff --git a/modular_zubbers/code/modules/loadout/categories/shoes.dm b/modular_zubbers/code/modules/loadout/categories/shoes.dm
index a0f67eded22..eb893542357 100644
--- a/modular_zubbers/code/modules/loadout/categories/shoes.dm
+++ b/modular_zubbers/code/modules/loadout/categories/shoes.dm
@@ -43,26 +43,10 @@
name = "High-Heel Jackboots"
item_path = /obj/item/clothing/shoes/jackboots/heel
-/datum/loadout_item/shoes/boots/jackboots/rax_armadyne_boots
- name = "Tactical Boots"
- item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne/rax
- //ckeywhitelist = list("raxraus")
- restricted_roles = list(ALL_JOBS_SEC)
-
/datum/loadout_item/shoes/boots/jackboots/kneeboots
name = "Knee Boots"
item_path = /obj/item/clothing/shoes/jackboots/knee
-/datum/loadout_item/shoes/boots/jackboots/peacekeeper
- name = "Armadyne Combat Boots"
- item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/shoes/boots/jackboots/gogo_boots
- name = "Tactical Go-Go boots"
- item_path = /obj/item/clothing/shoes/jackboots/gogo_boots
- restricted_roles = list(ALL_JOBS_SEC)
-
/datum/loadout_item/shoes/boots/diesel_m
name = "Male Diesel Boots"
item_path = /obj/item/clothing/shoes/jackboots/diesel_m
@@ -87,11 +71,6 @@
name = "Black Jackboots"
item_path = /obj/item/clothing/shoes/jackboots/black
-/datum/loadout_item/shoes/boots/elofy
- name = "Solar Admiral Boots"
- item_path = /obj/item/clothing/shoes/jackboots/elofy
-// ckeywhitelist = list("october23")
-
/*
* MISC BOOTS
*/
diff --git a/modular_zubbers/code/modules/loadout/categories/suit.dm b/modular_zubbers/code/modules/loadout/categories/suit.dm
index d2b2a6bfb6e..53aaff530fa 100644
--- a/modular_zubbers/code/modules/loadout/categories/suit.dm
+++ b/modular_zubbers/code/modules/loadout/categories/suit.dm
@@ -24,76 +24,79 @@
name = "Pirate Coat"
item_path = /obj/item/clothing/suit/costume/pirate
-/datum/loadout_item/suit/hooded/wintercoat/security
- name = "Security Winter Coat"
- item_path = /obj/item/clothing/suit/hooded/wintercoat/security
+// OFFICER
+
+/datum/loadout_item/suit/armor/vest/sec/viro
+ name = "Security Plate Carrier"
+ item_path = /obj/item/clothing/suit/armor/vest/alt/sec/viro
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/suit/hooded/wintercoat/security/redsec
- name = "Security Red Winter Coat"
- item_path = /obj/item/clothing/suit/hooded/wintercoat/security/redsec
+/datum/loadout_item/suit/armor/vest/sec/viro/heavy
+ name = "Security Heavy Vest"
+ item_path = /obj/item/clothing/suit/armor/vest/alt/sec/viro/heavyvest
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/suit/toggle/jacket/sec/old
- name = "Security Red Jacket"
- item_path = /obj/item/clothing/suit/toggle/jacket/sec/old
+/datum/loadout_item/suit/armor/vest/sec/viro/leatherjacket
+ name = "Security Leather Jacket"
+ item_path = /obj/item/clothing/suit/armor/vest/alt/sec/viro/leatherjacket
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/suit/secjacket
- name = "High-Vis Security Jacket"
- item_path = /obj/item/clothing/suit/armor/vest/secjacket/blue
+/datum/loadout_item/suit/armor/vest/sec/viro/softshell
+ name = "Security Softshell"
+ item_path = /obj/item/clothing/suit/armor/vest/alt/sec/viro/softshell
restricted_roles = list(ALL_JOBS_SEC)
-/datum/loadout_item/suit/secjacket/bomber
- name = "Security Bomber Jacket"
- item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/sec
- restricted_roles = list(ALL_JOBS_SEC)
+// WARDEN
-/datum/loadout_item/suit/jacket/officer/tan
- name = "Tan Security Blazer"
- item_path = /obj/item/clothing/suit/jacket/officer/tan
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/suit/armor/vest/warden
+ name = "Warden's Jacket"
+ item_path = /obj/item/clothing/suit/armor/vest/warden
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/suit/armor/vest/secjacket
- name = "Security Jacket"
- item_path = /obj/item/clothing/suit/armor/vest/secjacket
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/suit/armor/vest/warden/alt
+ name = "Warden's Armoured Jacket"
+ item_path = /obj/item/clothing/suit/armor/vest/warden/alt
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/suit/armor/vest/peacekeeper/armadyne
- name = "Armadyne Jacket"
- item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/suit/armor/vest/warden/alt/winter
+ name = "Warden's Winter Jacket"
+ item_path = /obj/item/clothing/suit/armor/vest/warden/alt/winter
+ restricted_roles = list(JOB_WARDEN)
-/datum/loadout_item/suit/armor/vest/peacekeeper/armadyne/armor
- name = "Armadyne Armor Vest"
- item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor
- restricted_roles = list(ALL_JOBS_SEC)
+// HEAD OF SECURITY
-/datum/loadout_item/suit/armor/vest/nri_police
- name = "Imperial Police Vest"
- item_path = /obj/item/clothing/suit/armor/vest/nri_police
- restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT)
+/datum/loadout_item/suit/armor/hos
+ name = "Head of Security's Leather Greatcoat"
+ item_path = /obj/item/clothing/suit/armor/hos
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
-/datum/loadout_item/suit/jacket/fedsec
- name = "Modern Security Federation Jacket"
- item_path = /obj/item/clothing/suit/fedcoat/modern/sec
- restricted_roles = list(ALL_JOBS_SEC)
+/datum/loadout_item/suit/armor/hos/trenchcoat
+ name = "Head of Security's Leather Trenchcoat"
+ item_path = /obj/item/clothing/suit/armor/hos/trenchcoat
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
-/datum/loadout_item/suit/jacket/corrections_officer
- name = "Correction's Officer's Blazer"
- item_path = /obj/item/clothing/suit/toggle/jacket/corrections_officer
- restricted_roles = list(JOB_CORRECTIONS_OFFICER, JOB_WARDEN)
+/datum/loadout_item/suit/armor/hos/overcoat
+ name = "Head of Security's Overcoat"
+ item_path = /obj/item/clothing/suit/armor/hos/overcoat
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+/datum/loadout_item/suit/armor/hos/trenchcoat/winter
+ name = "Head of Security's Winter Trenchcoat"
+ item_path = /obj/item/clothing/suit/armor/hos/trenchcoat/winter
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+/datum/loadout_item/suit/armor/hos/vest
+ name = "Head of Security's Plate Carrier"
+ item_path = /obj/item/clothing/suit/armor/hos/vest
+ restricted_roles = list(JOB_HEAD_OF_SECURITY)
+
+//
/datum/loadout_item/suit/jacket/security_medic
name = "Security Medic Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic
restricted_roles = list(JOB_SECURITY_MEDIC)
-/datum/loadout_item/suit/jacket/security_medic
- name = "Security Medic's Blue Labcoat"
- item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue
- restricted_roles = list(JOB_SECURITY_MEDIC)
-
// Silver Jacket Mk2 but for all of Command
/datum/loadout_item/suit/lt3_armor/New()
restricted_roles += list(JOB_HEAD_OF_SECURITY, JOB_BLUESHIELD, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_ENGINEER, JOB_CAPTAIN, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER)
diff --git a/modular_zubbers/code/modules/loadout/categories/under.dm b/modular_zubbers/code/modules/loadout/categories/under.dm
index 1fa7d07e187..d1416c0c13a 100644
--- a/modular_zubbers/code/modules/loadout/categories/under.dm
+++ b/modular_zubbers/code/modules/loadout/categories/under.dm
@@ -1,15 +1,9 @@
//Title Capitalization for names please!!!
-/datum/loadout_item/uniform/security/hecu
- name = "Urban Camouflage BDU"
- item_path = /obj/item/clothing/under/rank/security/officer/hecu
- donator_only = TRUE
- restricted_roles = list(ALL_JOBS_SEC, JOB_BLUESHIELD)
-
/datum/loadout_item/uniform/security/camo
name = "Armored Camouflage Uniform"
item_path = /obj/item/clothing/under/rank/security/camo
- restricted_roles = list(ALL_JOBS_SEC, JOB_BLUESHIELD)
+ restricted_roles = list(JOB_BLUESHIELD)
/datum/loadout_item/uniform/camo
name = "Camouflage Uniform"
@@ -25,44 +19,19 @@
item_path = /obj/item/clothing/under/rank/nanotrasen_consultant/stripper
restricted_roles = list(JOB_NT_REP)
-/datum/loadout_item/uniform/medrscrubs
- name = "Security Medic's Scrubs"
- item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec
- restricted_roles = list(JOB_SECURITY_MEDIC)
-
-/datum/loadout_item/uniform/security/officer/redsec
- name = "Security Red Uniform"
- item_path = /obj/item/clothing/under/rank/security/officer/redsec
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/uniform/security/peacekeeper/armadyne
- name = "Armadyne Corporate Uniform"
- item_path =/obj/item/clothing/under/rank/security/peacekeeper/armadyne
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/uniform/security/utility/redsec
- name = "Security Red Utility Uniform"
- item_path = /obj/item/clothing/under/rank/security/skyrat/utility/redsec
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/uniform/security/officer/formal
- name = "Security Officer's Formal Uniform"
- item_path = /obj/item/clothing/under/rank/security/officer/formal
- restricted_roles = list(ALL_JOBS_SEC)
-
-/datum/loadout_item/uniform/security/peacekeeper/security_medic
+/datum/loadout_item/uniform/security/security_medic
name = "Security Medic Turtleneck"
- item_path =/obj/item/clothing/under/rank/security/peacekeeper/security_medic
+ item_path =/obj/item/clothing/under/rank/security/security_medic
restricted_roles = list(JOB_SECURITY_MEDIC)
-/datum/loadout_item/uniform/security/peacekeeper/security_medic/skirt
+/datum/loadout_item/uniform/security/security_medic/skirt
name = "Security Medic Skirtleneck"
- item_path =/obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt
+ item_path =/obj/item/clothing/under/rank/security/security_medic/skirt
restricted_roles = list(JOB_SECURITY_MEDIC)
-/datum/loadout_item/uniform/security/peacekeeper/security_medic/alternate
+/datum/loadout_item/uniform/security/security_medic/alternate
name = "Security Medic Jumpsuit"
- item_path = /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate
+ item_path = /obj/item/clothing/under/rank/security/security_medic/alternate
restricted_roles = list(JOB_SECURITY_MEDIC)
/datum/loadout_item/uniform/security/corrections_officer
diff --git a/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm b/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm
index 0a833ce991e..ec367deb287 100644
--- a/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm
+++ b/modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm
@@ -1,51 +1,3 @@
/datum/loadout_item/accessory/armband_security/New()
. = ..()
restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/head/cowboyhat_sec/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/head/cowboyhat_secwide/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/head/ushanka/sec/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/head/navyblueofficerberet/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/suit/navybluejacketofficer/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/suit/security_jacket/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/suit/brit/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/suit/rax_peacekeeper_jacket/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/under/jumpsuit/rax_banded_uniform/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/under/jumpsuit/security_trousers/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/under/jumpsuit/security_peacekeeper/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
-
-/datum/loadout_item/under/jumpsuit/utility_sec/New()
- . = ..()
- restricted_roles |= JOB_SECURITY_MEDIC
diff --git a/modular_zubbers/code/modules/security/icons/card.dmi b/modular_zubbers/code/modules/security/icons/card.dmi
new file mode 100644
index 00000000000..cf74d73796c
Binary files /dev/null and b/modular_zubbers/code/modules/security/icons/card.dmi differ
diff --git a/modular_zubbers/code/modules/security/loadouts.dm b/modular_zubbers/code/modules/security/loadouts.dm
index 8163c3f1c27..658f7d03b26 100644
--- a/modular_zubbers/code/modules/security/loadouts.dm
+++ b/modular_zubbers/code/modules/security/loadouts.dm
@@ -1,13 +1,15 @@
/datum/outfit/job/security
+ uniform = /obj/item/clothing/under/rank/security/officer/viro
+ head = /obj/item/clothing/head/soft/sec
+ suit = /obj/item/clothing/suit/armor/vest/alt/sec/viro
suit_store = /obj/item/flashlight/seclite
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/security_voucher/primary = 1,
/obj/item/security_voucher/utility = 1
)
- head = /obj/item/clothing/head/security_garrison
- glasses = /obj/item/clothing/glasses/hud/security
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
/datum/outfit/job/corrections_officer
suit_store = /obj/item/flashlight/seclite
@@ -32,7 +34,8 @@
/datum/outfit/job/warden
- suit = /obj/item/clothing/suit/armor/vest/warden
+ head = /obj/item/clothing/head/hats/warden/drill/viro
+ suit = /obj/item/clothing/suit/armor/vest/warden/alt
suit_store = /obj/item/flashlight/seclite
backpack_contents = list(
/obj/item/evidencebag = 1,
@@ -42,6 +45,7 @@
//Brigmed is in it's own file
/datum/outfit/job/hos
+ head = /obj/item/clothing/head/hats/hos/cap/beret
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/melee/baton/security/loaded/hos = 1,
diff --git a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm
index 96a51b7d239..78a8e4e6bd2 100644
--- a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm
+++ b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm
@@ -1,138 +1,406 @@
/*
-* Security clothing reskins and such.
- Redsec items at the bottom tbd.
+ // HATS
*/
-/*
-* ACCESSORIES
-*/
+// OFFICER
-/obj/item/clothing/accessory/armband/deputy/lopland/nonsec
- name = "blue armband"
- desc = "An armband, worn to signify proficiency in a skill or association with a department. This one is blue."
+/obj/item/clothing/head/helmet/sec
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "security_helmet"
+ base_icon_state = "security_helmet"
+ worn_icon_muzzled = null
+ hair_mask = /datum/hair_mask/standard_hat_middle
-/obj/item/clothing/accessory/armband/deputy/lopland
- icon = 'modular_skyrat/master_files/icons/obj/clothing/accessories.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/accessories.dmi'
- icon_state = "armband_lopland"
- desc = "A Peacekeeper-blue armband, showing the wearer to be certified by Lopland as a top-of-their-class Security Officer."
+/obj/item/clothing/mask/bandana/sec
+ name = "red bandana"
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "security_bandana"
+ post_init_icon_state = "security_bandana"
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_config_inhand_left = /datum/greyscale_config/bandana/inhands_left
+ greyscale_config_inhand_right = /datum/greyscale_config/bandana/inhands_right
+ greyscale_colors = "#c41521"
+ armor_type = /datum/armor/cosmetic_sec
+
+/obj/item/clothing/head/beret/sec/viro
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "security_beret"
+ post_init_icon_state = "security_beret"
+ greyscale_config = null
+ greyscale_config_worn = null
+ greyscale_colors = null
+ armor_type = /datum/armor/cosmetic_sec
+
+/obj/item/clothing/head/soft/sec
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "secsoft"
+ soft_type = "sec"
+
+/obj/item/clothing/head/security_beanie
+ name = "security beanie"
+ desc = "A robust beanie with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "security_beanie"
+ armor_type = /datum/armor/cosmetic_sec
+ hair_mask = /datum/hair_mask/standard_hat_low
+
+// WARDEN
+
+/obj/item/clothing/head/hats/warden/viro // too many subtypes, who would've guessed?
+ name = "\proper the Warden's service cap"
+ desc = "It's a special armored hat issued to the Warden of Nanotrasen Corporate Security. Protects the head from impacts."
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "warden_cap"
+ hair_mask = /datum/hair_mask/standard_hat_middle
+
+/obj/item/clothing/head/hats/warden/viro/alt
+ icon_state = "warden_cap_red"
+
+/obj/item/clothing/head/hats/warden/drill/viro
+ name = "\proper the Warden's campaign cover"
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "wardendrill"
+ hair_mask = /datum/hair_mask/standard_hat_low
+
+/obj/item/clothing/head/hats/warden/viro/beret // not greyscaled so its easier to do this then make it a subtype of regular berets
+ name = "\proper the Warden's beret"
+ desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
+ icon_state = "warden_beret"
+
+/obj/item/clothing/head/soft/sec/warden
+ name = "\proper the Warden's cap"
+ desc = "An armoured grey baseball cap, attached on front is the Warden's insignia, a deep-red patch emblazoned with a jailcell, with words around stating '/WARDEN CORRECTIONALS - NANOTRASEN CORPORATE SECURITY'/"
+ icon_state = "wardensoft"
+ soft_type = "warden"
+ armor_type = /datum/armor/hats_warden
+
+// HOS
+
+/obj/item/clothing/head/hats/hos/cap
+ name = "\proper the Head of Security's service cap"
+ icon = 'icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "hoscap"
+ hair_mask = /datum/hair_mask/standard_hat_low
+
+/obj/item/clothing/head/hats/hos/cap/beret // so jank
+ name = "\proper the Head of Security's beret"
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "hos_beret"
+ hair_mask = /datum/hair_mask/standard_hat_middle
+
+/obj/item/clothing/head/helmet/sec/hos
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "hos_helmet"
+ base_icon_state = "hos_helmet"
+ armor_type = /datum/armor/hats_hos
+
+/obj/item/clothing/head/soft/sec/hos
+ name = "\proper the Head of Security's cap"
+ desc = "An armoured black baseball cap, attached on front are embroided yellow letters stating '/HEAD OF SECURITY'/"
+ icon_state = "hossoft"
+ soft_type = "hos"
+ armor_type = /datum/armor/hats_hos
+
+/obj/item/clothing/head/hats/hos/cap/cowboy
+ name = "\proper the Head of Security's cowboy hat"
+ desc = "An armoured cattleman's hat, emblazoned with the Head of Security's insignia attached to a red band that goes around the hat."
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "hos_cowboy"
+ hair_mask = /datum/hair_mask/standard_hat_middle
/*
-* BACKPACKS
+ // UNIFORMS
*/
-/obj/item/storage/backpack/security
- icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
- lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi'
- righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi'
- icon_state = "backpack_security_black"
- inhand_icon_state = "backpack_security_black"
-/obj/item/storage/backpack/security/Initialize(mapload)
+// OFFICER
+
+/obj/item/clothing/under/rank/security/officer/viro // theres too many subtypes so we just snowflake
+ name = "security uniform"
+ desc = "Standard-issue Security department uniform, given to members of Nanotrasen Corporate Security."
+ icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
+ icon_state = "security_uniform"
+ female_sprite_flags = NO_FEMALE_UNIFORM
+
+/obj/item/clothing/under/rank/security/officer/viro/skirt
+ name = "security jumpskirt"
+ desc = "A padded jumpskirt made out of wind-resistant, slightly water-repellent materials for Nanotrasen Corporate Security."
+ icon_state = "security_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+ gets_cropped_on_taurs = FALSE
+
+/obj/item/clothing/under/rank/security/officer/viro/jumpsuit
+ name = "security jumpsuit"
+ desc = "The previous standard-issue attire for officers, technically antiquated but still popular with utilitarian officers."
+ icon_state = "security_jumpsuit"
+ alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/security/officer/formal
+ name = "security officer formals"
+ icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
+ icon_state = "security_formals"
+ female_sprite_flags = NO_FEMALE_UNIFORM
+
+/obj/item/clothing/under/rank/security/officer/formal/skirt
+ name = "security officer's formal skirt"
+ icon_state = "security_formals_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+ gets_cropped_on_taurs = FALSE
+
+/obj/item/clothing/under/rank/security/officer/viro/lowcut
+ name = "security summer uniform"
+ desc = "An alternative to the standard Security uniform, with an incredibly low-cut collar and cut sleeves."
+ icon_state = "security_lowcut"
+
+/obj/item/clothing/under/rank/security/officer/viro/bodysuit
+ name = "security bodysuit"
+ desc = "Designed out of synthetic leather that automatically seals around the user to reduce overheating and snagging issues that arise while inside a MODsuit. \
+ While the bodysuit was only designed to be used while inside of and operating a MODsuit, the bodysuit found a niche with certain... eccentric officers."
+ icon_state = "security_bodysuit"
+ can_adjust = FALSE
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ female_sprite_flags = FEMALE_UNIFORM_FULL
+ strip_delay = 80
+
+/obj/item/clothing/under/rank/security/officer/viro/bodysuit/equipped(mob/living/affected_mob, slot) // stolen from the lustwish catsuit lol
. = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_backpack)
+ var/mob/living/carbon/human/affected_human = affected_mob
+ if(src == affected_human.w_uniform)
+ if(affected_mob.gender == FEMALE)
+ icon_state = "security_bodysuit_female"
+ else
+ icon_state = "security_bodysuit_male"
-/datum/atom_skin/security_backpack
- abstract_type = /datum/atom_skin/security_backpack
+ affected_mob.update_worn_undersuit()
-/datum/atom_skin/security_backpack/black
- preview_name = "Black Variant"
- new_icon_state = "backpack_security_black"
+// WARDEN
-/datum/atom_skin/security_backpack/white
- preview_name = "White Variant"
- new_icon_state = "backpack_security_white"
+/obj/item/clothing/under/rank/security/warden
+ name = "\proper the Warden's uniform"
+ desc = "Standard-issue Security department uniform, given to the Warden of Nanotrasen Corporate Security."
+ icon_state = "warden_uniform"
+ icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
+ female_sprite_flags = NO_FEMALE_UNIFORM
-/datum/atom_skin/security_backpack/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/storage/backpack.dmi'
- new_worn_icon = 'icons/mob/clothing/back/backpack.dmi'
- new_icon_state = "backpack-security"
+/obj/item/clothing/under/rank/security/warden/skirt
+ name = "\proper the Warden's jumpskirt"
+ desc = "A padded jumpskirt made out of wind-resistant, slightly water-repellent materials for the Warden of Nanotrasen Corporate Security."
+ icon_state = "warden_skirt"
+ female_sprite_flags = NO_FEMALE_UNIFORM
+ gets_cropped_on_taurs = FALSE
-/datum/atom_skin/security_backpack/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/back/backpack.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
- new_icon_state = "backpack-security"
+/obj/item/clothing/under/rank/security/warden/grey
+ icon = 'icons/obj/clothing/under/security.dmi'
+ worn_icon = 'icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi'
-/obj/item/storage/backpack/satchel/sec
- icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
- lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi'
- righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi'
- icon_state = "satchel_security_black"
- inhand_icon_state = "satchel_security_black"
+/obj/item/clothing/under/rank/security/warden/formal
+ name = "\proper the Warden's formals"
+ icon_state = "wardenblueclothes"
-/obj/item/storage/backpack/satchel/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_satchel)
+/obj/item/clothing/under/rank/security/warden/formal/skirt
+ name = "\proper the Warden's formal skirt"
+ icon_state = "wardenblueclothes_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ female_sprite_flags = NO_FEMALE_UNIFORM
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+ gets_cropped_on_taurs = FALSE
-/datum/atom_skin/security_satchel
- abstract_type = /datum/atom_skin/security_satchel
-/datum/atom_skin/security_satchel/black
- preview_name = "Black Variant"
- new_icon_state = "satchel_security_black"
+// HOS
-/datum/atom_skin/security_satchel/white
- preview_name = "White Variant"
- new_icon_state = "satchel_security_white"
+/obj/item/clothing/under/rank/security/head_of_security
+ name = "\proper the Head of Security's uniform"
+ desc = "Standard-issue Security department uniform, given to the Head of Security of Nanotrasen Corporate Security."
+ icon_state = "hos_uniform"
+ icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
+ female_sprite_flags = NO_FEMALE_UNIFORM
-/datum/atom_skin/security_satchel/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/storage/backpack.dmi'
- new_worn_icon = 'icons/mob/clothing/back/backpack.dmi'
- new_icon_state = "satchel-security"
+/obj/item/clothing/under/rank/security/head_of_security/skirt
+ name = "\proper the Head of Security's jumpskirt"
+ desc = "A padded jumpskirt made out of wind-resistant, slightly water-repellent materials for the Head of Security for Nanotrasen Corporate Security."
+ icon_state = "hos_skirt"
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-/datum/atom_skin/security_satchel/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/back/backpack.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
- new_icon_state = "satchel-security"
+/obj/item/clothing/under/rank/security/head_of_security/grey
+ icon = 'icons/obj/clothing/under/security.dmi'
+ worn_icon = 'icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi'
-/obj/item/storage/backpack/duffelbag/sec
- icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
- lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi'
- righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi'
- icon_state = "duffel_security_black"
- inhand_icon_state = "duffel_security_black"
+/obj/item/clothing/under/rank/security/head_of_security/alt
+ name = "\proper the Head of Security's turtleneck"
+ icon_state = "hosalt"
+ inhand_icon_state = "bl_suit"
-/obj/item/storage/backpack/duffelbag/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_duffel)
+/obj/item/clothing/under/rank/security/head_of_security/alt/skirt
+ name = "\proper the Head of Security's skirtleneck"
+ icon_state = "hosalt_skirt"
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+ gets_cropped_on_taurs = FALSE
+ female_sprite_flags = NO_FEMALE_UNIFORM
-/datum/atom_skin/security_duffel
- abstract_type = /datum/atom_skin/security_duffel
+/obj/item/clothing/under/rank/security/head_of_security/parade
+ icon = 'icons/obj/clothing/under/security.dmi'
+ worn_icon = 'icons/mob/clothing/under/security.dmi'
+ worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi'
-/datum/atom_skin/security_duffel/black
- preview_name = "Black Variant"
- new_icon_state = "duffel_security_black"
+/obj/item/clothing/under/rank/security/head_of_security/formal
+ name = "\proper the Head of Security's formals"
+ icon_state = "hosblueclothes"
-/datum/atom_skin/security_duffel/white
- preview_name = "White Variant"
- new_icon_state = "duffel_security_white"
-
-/datum/atom_skin/security_duffel/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/storage/backpack.dmi'
- new_worn_icon = 'icons/mob/clothing/back/backpack.dmi'
- new_icon_state = "duffel-security"
-
-/datum/atom_skin/security_duffel/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/back/backpack.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
- new_icon_state = "duffel-security"
+/obj/item/clothing/under/rank/security/head_of_security/formal/skirt
+ name = "\proper the Head of Security's formal skirt"
+ icon_state = "hosblueclothes_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+ gets_cropped_on_taurs = FALSE
/*
-* BELTS
+ // ARMORS
*/
+
+/obj/item/clothing/suit/armor/vest/alt/sec/viro // too many subtypes
+ name = "security plate carrier"
+ icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+ icon_state = "sec_platecarrier"
+
+/obj/item/clothing/suit/armor/vest/alt/sec/viro/heavyvest
+ name = "security heavy vest"
+ desc = "An alternate armour vest for Security employees, featuring more coverage at the cost of weight."
+ body_parts_covered = CHEST|GROIN|ARMS
+ cold_protection = CHEST|GROIN|ARMS
+ heat_protection = CHEST|GROIN|ARMS
+ icon_state = "sec_heavyvest"
+
+/obj/item/clothing/suit/armor/vest/alt/sec/viro/leatherjacket
+ name = "security leather jacket"
+ desc = "Made out of synthetic leather materials, this jacket is designed for formal events, but is applicable for general use with it's ceramic-woven leather."
+ icon_state = "sec_leatherjacket"
+ body_parts_covered = CHEST|GROIN|ARMS
+ cold_protection = CHEST|GROIN|ARMS
+ heat_protection = CHEST|GROIN|ARMS
+
+/obj/item/clothing/suit/armor/vest/alt/sec/viro/softshell
+ name = "security softshell"
+ desc = "A windproof, rainproof, insulation jacket made for Security — with an internal sweater sewn into the collar of the suit, the sweater keeps the wearer insulated while allowing the jacket to be unzipped."
+ icon_state = "sec_softshell"
+ body_parts_covered = CHEST|GROIN|ARMS
+ cold_protection = CHEST|GROIN|ARMS
+ heat_protection = CHEST|GROIN|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+
+// WARDEN
+
+/obj/item/clothing/suit/armor/vest/warden
+ name = "\proper the Warden's jacket"
+ icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+ desc = "A grey armored jacket with red shoulder designations and '/Warden/' stitched into one of the chest pockets."
+ icon_state = "warden_alt"
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/suit/armor/vest/warden/alt
+ name = "\proper the Warden's armoured jacket"
+ desc = "A grey jacket with silver rank pips and body armor strapped on top."
+ icon_state = "warden_jacket"
+
+/obj/item/clothing/suit/armor/vest/warden/alt/winter
+ name = "\proper the Warden's winter jacket"
+ desc = "A modification of the Warden's standard armoured jacket, made out of synthetic cotton woven with ceramic, and lined with faux-fur. For the cozy Warden."
+ icon_state = "warden_winterjacket"
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+
+// HOS
+
+/obj/item/clothing/suit/armor/hos
+ name = "\proper the Head of Security's leather greatcoat"
+ icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+ icon_state = "hos_greatcoat"
+ worn_icon_digi = null
+
+/obj/item/clothing/suit/armor/hos/trenchcoat
+ name = "\proper the Head of Security's leather trenchcoat"
+ icon_state = "hos_leathercoat"
+
+/obj/item/clothing/suit/armor/hos/overcoat
+ name = "\proper the Head of Security's overcoat"
+ icon_state = "hos_overcoat"
+
+/obj/item/clothing/suit/armor/hos/trenchcoat/winter
+ name = "\proper the Head of Security's winter trenchcoat"
+ icon_state = "hos_wintercoat"
+
+/obj/item/clothing/suit/armor/hos/vest
+ name = "\proper the Head of Security's plate carrier"
+ desc = "Specially issued plate carrier for Security command staff. On the front is an embroided patch, that in big yellow letters says: \"HEAD OF SECURITY\""
+ icon_state = "hos_platecarrier"
+ body_parts_covered = CHEST|GROIN
+ cold_protection = CHEST|GROIN
+ heat_protection = CHEST|GROIN
+
+/obj/item/clothing/suit/armor/hos/hos_formal // so annoying
+ icon = 'icons/obj/clothing/suits/armor.dmi'
+ worn_icon = 'icons/mob/clothing/suits/armor.dmi'
+
+/*
+ // GLOVES
+*/
+
+/obj/item/clothing/gloves/color/black/security
+ icon = 'modular_zubbers/icons/obj/clothing/gloves.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/hands.dmi'
+ icon_state = "sec_gloves"
+
+/obj/item/clothing/gloves/color/black/security/blu
+ icon_state = "sec_gloves"
+
+/obj/item/clothing/gloves/tackler/security //Can't just overwrite tackler, as there's a ton of subtypes that we'd then need to account for. This is easier. MUCH easier.
+ icon = 'modular_zubbers/icons/obj/clothing/gloves.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/hands.dmi'
+ icon_state = "sec_gloves"
+
+/obj/item/clothing/gloves/kaza_ruk/sec
+ worn_icon = 'modular_zubbers/icons/mob/clothing/hands.dmi'
+ icon_state = "fightgloves"
+
+/*
+ // BELTS
+*/
+
/obj/item/storage/belt/security
- icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi'
- icon_state = "belt_white"
- worn_icon_state = "belt_white"
+ icon = 'modular_zubbers/icons/obj/clothing/belt.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/belt.dmi'
+ icon_state = "security"
+ content_overlays = FALSE
+ alternate_worn_layer = LOW_NECK_LAYER // so it goes under things like the HOS' trenchcoats
/obj/item/storage/belt/security/Initialize(mapload)
. = ..()
@@ -141,1350 +409,131 @@
/datum/atom_skin/security_belt
abstract_type = /datum/atom_skin/security_belt
-/datum/atom_skin/security_belt/black
- preview_name = "Black Variant"
- new_icon_state = "belt_black"
-
-/datum/atom_skin/security_belt/blue
- preview_name = "Blue Variant"
- new_icon_state = "belt_blue"
-
-/datum/atom_skin/security_belt/white
- preview_name = "White Variant"
- new_icon_state = "belt_white"
-
-/datum/atom_skin/security_belt/slim
- preview_name = "Slim Variant"
- new_icon_state = "belt_slim"
-
/datum/atom_skin/security_belt/red
preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/belts.dmi'
- new_worn_icon = 'icons/mob/clothing/belt.dmi'
new_icon_state = "security"
-/datum/atom_skin/security_belt/armadyne
- preview_name = "Armadyne Variant"
- new_icon_state = "armadyne_belt"
-
-/datum/atom_skin/security_belt/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/belt.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/belt.dmi'
- new_icon_state = "security"
-
-/datum/atom_skin/security_belt/basic
- preview_name = "Basic Security"
- new_icon_state = "security"
-
-/datum/atom_skin/security_belt/peacekeeper
- preview_name = "Peacekeeper"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/belt.dmi'
- new_icon_state = "peacekeeperbelt"
-
-/obj/item/storage/belt/security/webbing/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_webbing)
-
-/datum/atom_skin/security_webbing
- abstract_type = /datum/atom_skin/security_webbing
-/datum/atom_skin/security_webbing/red
- preview_name = "Red Variant"
- new_icon_state = "securitywebbing"
-
-/datum/atom_skin/security_webbing/black
- preview_name = "Black Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi'
- new_icon_state = "armadyne_webbing"
-
-/datum/atom_skin/security_webbing/blue
- preview_name = "Blue Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi'
- new_icon_state = "peacekeeper_webbing"
-
-///Enables you to quickdraw weapons from security holsters
-/datum/storage/security/open_storage(datum/source, mob/user)
- var/atom/resolve_parent = parent
- if(!resolve_parent)
- return
- if(isobserver(user))
- show_contents(user)
- return
-
- if(!resolve_parent.IsReachableBy(user))
- resolve_parent.balloon_alert(user, "can't reach!")
- return FALSE
-
- if(!isliving(user) || user.incapacitated)
- return FALSE
-
- var/obj/item/gun/gun_to_draw = locate() in real_location
- if(!gun_to_draw)
- return ..()
- resolve_parent.add_fingerprint(user)
- attempt_remove(gun_to_draw, get_turf(user))
- playsound(resolve_parent, 'modular_skyrat/modules/sec_haul/sound/holsterout.ogg', 50, TRUE, -5)
- INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), gun_to_draw)
- user.visible_message(span_warning("[user] draws [gun_to_draw] from [resolve_parent]!"), span_notice("You draw [gun_to_draw] from [resolve_parent]."))
-
-/*
-* GLASSES
-*/
-/obj/item/clothing/glasses/hud/security
- icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
- icon_state = "security_hud"
- glass_colour_type = /datum/client_colour/glass_colour/lightblue
-
-/obj/item/clothing/glasses/hud/security/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_hud_glasses)
-
-/datum/atom_skin/security_hud_glasses
- abstract_type = /datum/atom_skin/security_hud_glasses
-
-/datum/atom_skin/security_hud_glasses/blue
- preview_name = "Blue Variant"
- new_icon_state = "security_hud"
-
-/datum/atom_skin/security_hud_glasses/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'icons/mob/clothing/eyes.dmi'
- new_icon_state = "securityhud"
-
-/obj/item/clothing/glasses/hud/security/sunglasses
- icon_state = "security_hud_black"
- glass_colour_type = /datum/client_colour/glass_colour/blue
-
-/obj/item/clothing/glasses/hud/security/sunglasses/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_hud_sunglasses)
-
-/datum/atom_skin/security_hud_sunglasses
- abstract_type = /datum/atom_skin/security_hud_sunglasses
-
-/datum/atom_skin/security_hud_sunglasses/dark_tint
- preview_name = "Dark-Tint Variant"
- new_icon_state = "security_hud_black"
-
-/datum/atom_skin/security_hud_sunglasses/light_tint
- preview_name = "Light-Tint Variant"
- new_icon_state = "security_hud_blue"
-
-/datum/atom_skin/security_hud_sunglasses/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'icons/mob/clothing/eyes.dmi'
- new_icon_state = "sunhudsec"
-
-/datum/atom_skin/security_hud_sunglasses/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/eyes.dmi'
- new_icon_state = "sunhudsec"
-
-/datum/atom_skin/security_hud_sunglasses/blue_goggles
- preview_name = "Blue Goggles Variant"
- new_icon_state = "peacekeeperglasses"
-
-/datum/atom_skin/security_hud_sunglasses/red_goggles
- preview_name = "Red Goggles Variant"
- new_icon_state = "armadyne_glasses"
-
-/datum/atom_skin/security_hud_sunglasses/pink_goggles
- preview_name = "Pink Goggles Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/eyes.dmi'
- new_icon_state = "secgogpink"
-
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
- icon_state = "security_eyepatch"
- base_icon_state = "security_eyepatch"
-
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_hud_eyepatch)
-
-/datum/atom_skin/security_hud_eyepatch
- abstract_type = /datum/atom_skin/security_hud_eyepatch
-
-/datum/atom_skin/security_hud_eyepatch/red
- preview_name = "Red Eyepatch"
- new_icon = 'icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'icons/mob/clothing/eyes.dmi'
- new_icon_state = "hudpatch"
-
-/datum/atom_skin/security_hud_eyepatch/blue
- preview_name = "Blue Eyepatch"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
- new_icon_state = "hudpatch"
-
-/datum/atom_skin/security_hud_eyepatch/pink
- preview_name = "Pink Eyepatch"
- new_icon = 'modular_zubbers/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/eyes.dmi'
- new_icon_state = "hudpatch"
-
-/datum/atom_skin/security_hud_eyepatch/fake_blindfold
- preview_name = "Fake Blindfold"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
- new_icon_state = "secfold"
-
-/obj/item/clothing/glasses/hud/eyepatch/sec
- name = "security eyepatch HUD"
- desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes."
- clothing_traits = list(TRAIT_SECURITY_HUD)
- glass_colour_type = /datum/client_colour/glass_colour/blue
-
-/obj/item/clothing/glasses/hud/eyepatch/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_hud_eyepatch_simple)
-
-/datum/atom_skin/security_hud_eyepatch_simple
- abstract_type = /datum/atom_skin/security_hud_eyepatch_simple
-
-/datum/atom_skin/security_hud_eyepatch_simple/blue
- preview_name = "Blue Eyepatch"
- new_icon_state = "hudpatch"
-
-/datum/atom_skin/security_hud_eyepatch_simple/red
- preview_name = "Red Eyepatch"
- new_icon = 'icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'icons/mob/clothing/eyes.dmi'
- new_icon_state = "hudpatch"
-
-/datum/atom_skin/security_hud_eyepatch_simple/fake_blindfold
- preview_name = "Fake Blindfold"
- new_icon_state = "secfold"
-
-/obj/item/clothing/glasses/hud/eyepatch/sec/blindfold
- name = "sec blindfold HUD"
- desc = "a fake blindfold with a security HUD inside, helps you look like blind justice. This won't provide the same protection that you'd get from sunglasses."
- icon_state = "secfold"
- base_icon_state = "secfold"
-
-/obj/item/clothing/glasses/hud/eyepatch/sec/blindfold/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/glasses/hud/security/night
- icon = 'icons/obj/clothing/glasses.dmi'
- worn_icon = 'icons/mob/clothing/eyes.dmi'
-
-/obj/item/clothing/glasses/hud/security/night/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_hud_gars)
-
-/datum/atom_skin/security_hud_gars
- abstract_type = /datum/atom_skin/security_hud_gars
-
-/datum/atom_skin/security_hud_gars/red
- preview_name = "Red Gars"
- new_icon_state = "gar_sec"
-
-/datum/atom_skin/security_hud_gars/blue
- preview_name = "Blue Gars"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
- new_icon_state = "gar_sec"
-
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_hud_gars_giga)
-
-/datum/atom_skin/security_hud_gars_giga
- abstract_type = /datum/atom_skin/security_hud_gars_giga
-
-/datum/atom_skin/security_hud_gars_giga/red
- preview_name = "Red Gars"
- new_icon_state = "gigagar_sec"
-
-/datum/atom_skin/security_hud_gars_giga/blue
- preview_name = "Blue Gars"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
- new_icon_state = "gigagar_sec"
-
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia
-
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* HEAD
-*/
-
-//Standard helmet
-/obj/item/clothing/head/helmet/sec
- icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/helmet.dmi'
- icon_state = "security_helmet"
- base_icon_state = "security_helmet"
- clothing_flags = SNUG_FIT | STACKABLE_HELMET_EXEMPT
- dog_fashion = null
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/head/helmet/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_helmet)
-
-/datum/atom_skin/security_helmet
- abstract_type = /datum/atom_skin/security_helmet
-
-/datum/atom_skin/security_helmet/white
- preview_name = "White Variant"
- new_icon_state = "security_helmet"
-
-/datum/atom_skin/security_helmet/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/head/helmet.dmi'
- new_worn_icon = 'icons/mob/clothing/head/helmet.dmi'
- new_icon_state = "helmet"
-
-/obj/item/clothing/head/helmet/sec/click_alt(mob/user)
- flipped_visor = !flipped_visor
- balloon_alert(user, "visor flipped")
- // base_icon_state is modified for seclight attachment component
- base_icon_state = "[initial(base_icon_state)][flipped_visor ? "-novisor" : ""]"
- icon_state = base_icon_state
- if (flipped_visor)
- flags_cover &= ~HEADCOVERSEYES | PEPPERPROOF
- else
- flags_cover |= HEADCOVERSEYES | PEPPERPROOF
- update_appearance()
- return CLICK_ACTION_SUCCESS
-
-
-/obj/item/clothing/head/helmet/sec/futuristic
- icon_state = "security_helmet_future"
- base_icon_state = "security_helmet_future"
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/head/helmet/sec/futuristic/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_helmet_future)
-
-/datum/atom_skin/security_helmet_future
- abstract_type = /datum/atom_skin/security_helmet_future
-
-/datum/atom_skin/security_helmet_future/white
- preview_name = "White Variant"
- new_icon_state = "security_helmet_future"
-
-/datum/atom_skin/security_helmet_future/blue
- preview_name = "Blue Variant"
- new_icon_state = "security_helmet_future_blue"
-
-/datum/atom_skin/security_helmet_future/red
- preview_name = "Red Variant"
- new_icon_state = "security_helmet_future_red"
-
-/obj/item/clothing/head/helmet/sec/futuristic/click_alt(mob/user)
- flipped_visor = !flipped_visor
- balloon_alert(user, "visor flipped")
- // base_icon_state is modified for seclight attachment component
- base_icon_state = "[initial(base_icon_state)][flipped_visor ? "-novisor" : ""]"
- icon_state = base_icon_state
- if (flipped_visor)
- flags_cover &= ~HEADCOVERSEYES | PEPPERPROOF
- else
- flags_cover |= HEADCOVERSEYES | PEPPERPROOF
- update_appearance()
- return CLICK_ACTION_SUCCESS
-
-//Beret replacement
-/obj/item/clothing/head/security_garrison
- name = "security garrison cap"
- desc = "A robust garrison cap with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- icon_state = "garrison_black"
- armor_type = /datum/armor/head_helmet
- strip_delay = 60
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/head/security_garrison/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_garrison_cap)
-
-/datum/atom_skin/security_garrison_cap
- abstract_type = /datum/atom_skin/security_garrison_cap
-
-/datum/atom_skin/security_garrison_cap/black
- preview_name = "Black Variant"
- new_icon_state = "garrison_black"
-
-/datum/atom_skin/security_garrison_cap/blue
- preview_name = "Blue Variant"
- new_icon_state = "garrison_blue"
-
-/obj/item/clothing/head/security_cap
- name = "security cap"
- desc = "A robust cap with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- icon_state = "security_cap_black"
- armor_type = /datum/armor/head_helmet
- strip_delay = 60
- dog_fashion = null
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/head/security_cap/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_cap)
-
-/datum/atom_skin/security_cap
- abstract_type = /datum/atom_skin/security_cap
-
-/datum/atom_skin/security_cap/black
- preview_name = "Black Variant"
- new_icon_state = "security_cap_black"
-
-/datum/atom_skin/security_cap/blue
- preview_name = "Blue Variant"
- new_icon_state = "security_cap_blue"
-
-/datum/atom_skin/security_cap/white
- preview_name = "White Variant"
- new_icon_state = "security_cap_white"
-
-/datum/atom_skin/security_cap/sol
- preview_name = "Sol Variant"
- new_icon_state = "policesoft"
-
-/datum/atom_skin/security_cap/sillitoe
- preview_name = "Sillitoe Variant"
- new_icon_state = "policetrafficsoft"
-
-/datum/atom_skin/security_cap/cadet
- preview_name = "Cadet Variant"
- new_icon_state = "policecadetsoft"
-
-/obj/item/clothing/head/hats/warden
- icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- icon_state = "policehelm"
-
-/obj/item/clothing/head/hats/warden/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/warden_hat)
-
-/datum/atom_skin/warden_hat
- abstract_type = /datum/atom_skin/warden_hat
-
-/datum/atom_skin/warden_hat/blue
- preview_name = "Blue Cap"
- new_icon_state = "policehelm"
-
-/datum/atom_skin/warden_hat/sol
- preview_name = "Sol Cap"
- new_icon_state = "policewardencap"
-
-/datum/atom_skin/warden_hat/red
- preview_name = "Red Cap"
- new_icon_state = "wardenhat"
-
-/obj/item/clothing/head/hats/warden/red
-
-/obj/item/clothing/head/hats/warden/red/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/head/hats/warden/drill
-
-/obj/item/clothing/head/hats/warden/drill/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/head/hats/hos/cap/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_cap)
-
-/datum/atom_skin/hos_cap
- abstract_type = /datum/atom_skin/hos_cap
-
-/datum/atom_skin/hos_cap/red
- preview_name = "Red Cap"
- new_icon_state = "hoscap"
-
-/datum/atom_skin/hos_cap/blue
- preview_name = "Blue Cap"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- new_icon_state = "hoscap_blue"
-
-/datum/atom_skin/hos_cap/sol
- preview_name = "Sol Cap"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- new_icon_state = "policechiefcap"
-
-/datum/atom_skin/hos_cap/sheriff
- preview_name = "Sheriff Hat"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- new_icon_state = "cowboyhat_black"
-
-/datum/atom_skin/hos_cap/wide_sheriff
- preview_name = "Wide Sheriff Hat"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- new_icon_state = "cowboy_black"
-
-/obj/item/clothing/head/hats/hos/cap/syndicate
-
-/obj/item/clothing/head/hats/hos/cap/syndicate/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* NECK
-*/
-/obj/item/clothing/neck/cloak/hos
- icon = 'modular_skyrat/master_files/icons/obj/clothing/neck.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/neck.dmi'
- icon_state = "hoscloak_blue"
-
-/obj/item/clothing/neck/cloak/hos/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_cloak)
-
-/datum/atom_skin/hos_cloak
- abstract_type = /datum/atom_skin/hos_cloak
-
-/datum/atom_skin/hos_cloak/blue
- preview_name = "Blue Cape"
- new_icon_state = "hoscloak_blue"
-
-/datum/atom_skin/hos_cloak/red
- preview_name = "Red Cape"
- new_icon_state = "hoscloak"
-
-//Not technically an override but oh well
-/obj/item/clothing/neck/security_cape
- name = "security cape"
- desc = "A fashionable cape worn by security officers."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/neck.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/neck.dmi'
- icon_state = "cape_black"
- inhand_icon_state = "" //no unique inhands
- ///Decides the shoulder it lays on, false = RIGHT, TRUE = LEFT
- var/swapped = FALSE
-
-/obj/item/clothing/neck/security_cape/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_cape)
-
-/datum/atom_skin/security_cape
- abstract_type = /datum/atom_skin/security_cape
-
-/datum/atom_skin/security_cape/black
- preview_name = "Black Variant"
- new_icon_state = "cape_black"
-
-/datum/atom_skin/security_cape/blue
- preview_name = "Blue Variant"
- new_icon_state = "cape_blue"
-
-/datum/atom_skin/security_cape/white
- preview_name = "White Variant"
- new_icon_state = "cape_white"
-
-/datum/atom_skin/security_cape/red
- preview_name = "Red Variant"
- new_icon_state = "cape_red"
-
-/obj/item/clothing/neck/security_cape/armplate
- name = "security gauntlet"
- desc = "A fashionable full-arm gauntlet worn by security officers. The gauntlet itself is made of plastic, and provides no protection, but it looks cool as hell."
- icon_state = "armplate_black"
-
-/obj/item/clothing/neck/security_cape/armplate/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_armplate)
-
-/datum/atom_skin/security_armplate
- abstract_type = /datum/atom_skin/security_armplate
-
-/datum/atom_skin/security_armplate/black
- preview_name = "Black Variant"
- new_icon_state = "armplate_black"
-
-/datum/atom_skin/security_armplate/blue
- preview_name = "Blue Variant"
- new_icon_state = "armplate_blue"
-
-/datum/atom_skin/security_armplate/capeless
- preview_name = "Capeless Variant"
- new_icon_state = "armplate"
-
-/datum/atom_skin/security_armplate/red
- preview_name = "Red Variant"
- new_icon_state = "armplate_red"
-
-/obj/item/clothing/neck/security_cape/click_alt(mob/user)
- swapped = !swapped
- to_chat(user, span_notice("You swap which arm [src] will lay over."))
- update_appearance()
- return CLICK_ACTION_SUCCESS
-
-/obj/item/clothing/neck/security_cape/update_appearance(updates)
- . = ..()
- if(swapped)
- worn_icon_state = icon_state
- else
- worn_icon_state = "[icon_state]_left"
-
- usr.update_worn_neck()
-
-/*
-* GLOVES
-*/
-/obj/item/clothing/gloves/color/black/security
- name = "security gloves"
- desc = "A pair of security gloves."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- icon_state = "gloves_white"
-
-/obj/item/clothing/gloves/color/black/security/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_gloves)
-
-/datum/atom_skin/security_gloves
- abstract_type = /datum/atom_skin/security_gloves
-
-/datum/atom_skin/security_gloves/black
- preview_name = "Black Variant"
- new_icon_state = "gloves_black"
-
-/datum/atom_skin/security_gloves/blue
- preview_name = "Blue Variant"
- new_icon_state = "gloves_blue"
-
-/datum/atom_skin/security_gloves/white
- preview_name = "White Variant"
- new_icon_state = "gloves_white"
-
-/datum/atom_skin/security_gloves/armadyne
- preview_name = "Armadyne Variant"
- new_icon_state = "armadyne_gloves"
-
-/datum/atom_skin/security_gloves/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/gloves.dmi'
- new_worn_icon = 'icons/mob/clothing/hands.dmi'
- new_icon_state = "sec"
-
-/datum/atom_skin/security_gloves/peacekeeper
- preview_name = "Peacekeeper Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- new_icon_state = "peacekeeper_gloves"
-
-/datum/atom_skin/security_gloves/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/gloves.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/hands.dmi'
- new_icon_state = "sec_gloves"
-
-/obj/item/clothing/gloves/color/black/security/blu // Wait why these a subtype of black?!? Who did this
- icon = 'icons/obj/clothing/gloves.dmi'
- worn_icon = 'icons/mob/clothing/hands.dmi'
-
-/obj/item/clothing/gloves/tackler/security //Can't just overwrite tackler, as there's a ton of subtypes that we'd then need to account for. This is easier. MUCH easier.
- icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- icon_state = "tackle_blue"
-
-/obj/item/clothing/gloves/tackler/security/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_tackler_gloves)
-
-/datum/atom_skin/security_tackler_gloves
- abstract_type = /datum/atom_skin/security_tackler_gloves
-
-/datum/atom_skin/security_tackler_gloves/black
- preview_name = "Black Variant"
- new_icon_state = "combat"
-
-/datum/atom_skin/security_tackler_gloves/blue
- preview_name = "Blue Variant"
- new_icon_state = "tackle_blue"
-
-/datum/atom_skin/security_tackler_gloves/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/gloves.dmi'
- new_worn_icon = 'icons/mob/clothing/hands.dmi'
- new_icon_state = "gorilla"
-
-/obj/item/clothing/gloves/tackler/combat
- icon = 'icons/obj/clothing/gloves.dmi'
- worn_icon = 'icons/mob/clothing/hands.dmi'
- icon_state = "gorilla"
-
-/obj/item/clothing/gloves/tackler/combat/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/combat_tackler_gloves)
-
-/datum/atom_skin/combat_tackler_gloves
- abstract_type = /datum/atom_skin/combat_tackler_gloves
-
-/datum/atom_skin/combat_tackler_gloves/black
- preview_name = "Black Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- new_icon_state = "combat"
-
-/datum/atom_skin/combat_tackler_gloves/blue
- preview_name = "Blue Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- new_icon_state = "tackle_blue"
-
-/datum/atom_skin/combat_tackler_gloves/red
- preview_name = "Red Variant"
- new_icon_state = "gorilla"
-
-/obj/item/clothing/gloves/kaza_ruk/sec
- icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
- icon_state = "fightgloves_blue"
-
-/obj/item/clothing/gloves/kaza_ruk/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_kaza_ruk_gloves)
-
-/datum/atom_skin/security_kaza_ruk_gloves
- abstract_type = /datum/atom_skin/security_kaza_ruk_gloves
-
-/datum/atom_skin/security_kaza_ruk_gloves/black
- preview_name = "Black Variant"
- new_icon_state = "fightgloves_black"
-
-/datum/atom_skin/security_kaza_ruk_gloves/blue
- preview_name = "Blue Variant"
- new_icon_state = "fightgloves_blue"
-
-/datum/atom_skin/security_kaza_ruk_gloves/red
- preview_name = "Red Variant"
- new_icon_state = "fightgloves"
-
-/datum/atom_skin/security_kaza_ruk_gloves/white
- preview_name = "White Variant"
- new_icon_state = "fightgloves_white"
-
-/*
-* SUITS
-*/
-/obj/item/clothing/suit/armor/vest/alt/sec
- name = "armored security vest"
- desc = "A Type-II-AD-P armored vest that provides decent protection against most types of damage."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
- icon_state = "vest_white"
-
-/obj/item/clothing/suit/armor/vest/alt/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_armor_vest_alt)
-
-/datum/atom_skin/security_armor_vest_alt
- abstract_type = /datum/atom_skin/security_armor_vest_alt
-
-/datum/atom_skin/security_armor_vest_alt/black
- preview_name = "Black Variant"
- new_icon_state = "vest_black"
-
-/datum/atom_skin/security_armor_vest_alt/blue
- preview_name = "Blue Variant"
- new_icon_state = "vest_blue"
-
-/datum/atom_skin/security_armor_vest_alt/white
- preview_name = "White Variant"
- new_icon_state = "vest_white"
-
-/datum/atom_skin/security_armor_vest_alt/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/suits/armor.dmi'
- new_worn_icon = 'icons/mob/clothing/suits/armor.dmi'
- new_icon_state = "armor_sec"
-
-/datum/atom_skin/security_armor_vest_alt/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
- new_icon_state = "armor_sec"
-
-/datum/atom_skin/security_armor_vest_alt/armadyne
- preview_name = "Armadyne Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
- new_icon_state = "armadyne_armor"
-
-/obj/item/clothing/suit/armor/hos
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/armor/hos/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_armor)
-
-/datum/atom_skin/hos_armor
- abstract_type = /datum/atom_skin/hos_armor
-
-/datum/atom_skin/hos_armor/greatcoat
- preview_name = "Greatcoat"
- new_icon = 'icons/obj/clothing/suits/armor.dmi'
- new_worn_icon = 'icons/mob/clothing/suits/armor.dmi'
- new_icon_state = "hos"
-
-/datum/atom_skin/hos_armor/trenchcoat
- preview_name = "Trenchcoat"
- new_icon = 'icons/obj/clothing/suits/armor.dmi'
- new_worn_icon = 'icons/mob/clothing/suits/armor.dmi'
- new_icon_state = "hostrench"
-
-/datum/atom_skin/hos_armor/trenchcloak
- preview_name = "Trenchcloak"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
- new_icon_state = "trenchcloak"
-
-/datum/atom_skin/hos_armor/white
- preview_name = "White"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
- new_icon_state = "peacekeeper_trench_hos_white"
-
-/obj/item/clothing/suit/armor/hos/trenchcoat/winter
-
-/obj/item/clothing/suit/armor/hos/trenchcoat/winter/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-//Standard Bulletproof Vest
-/obj/item/clothing/suit/armor/bulletproof
- desc = "A Type-III-AD-P heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-//Riot Armor
-/obj/item/clothing/suit/armor/riot
- icon_state = "riot_ad" //replaces the NT on the back
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
-
-/obj/item/clothing/suit/armor/riot/knight //This needs to be sent back to its original .dmis
- icon = 'icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'icons/mob/clothing/suits/armor.dmi'
-
-//DETECTIVE
-
-/obj/item/clothing/suit/cowboyvest
- name = "blonde cowboy vest"
- desc = "A white cream vest lined with... fur, of all things, for desert weather. There's a small deer head logo sewn into the vest."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
- icon_state = "cowboy_vest"
- body_parts_covered = CHEST|ARMS
- cold_protection = CHEST|ARMS
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- heat_protection = CHEST|ARMS
-
-/obj/item/clothing/suit/jacket/det_suit/cowboyvest
- name = "blonde cowboy vest"
- desc = "A white cream vest lined with... fur, of all things, for desert weather. There's a small deer head logo sewn into the vest."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi'
- icon_state = "cowboy_vest"
- body_parts_covered = CHEST|ARMS
- cold_protection = CHEST|ARMS
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- heat_protection = CHEST|ARMS
-
-//Warden's Vest
-/obj/item/clothing/suit/armor/vest/warden/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/warden_armor)
-
-/datum/atom_skin/warden_armor
- abstract_type = /datum/atom_skin/warden_armor
-
-/datum/atom_skin/warden_armor/red
- preview_name = "Red Variant"
- new_icon_state = "warden_jacket"
-
-/datum/atom_skin/warden_armor/blue
- preview_name = "Blue Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- new_icon_state = "vest_warden"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
-
-/datum/atom_skin/warden_armor/black
- preview_name = "Black Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- new_icon_state = "peacekeeper_trench_warden"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
-
-/datum/atom_skin/warden_armor/edgy
- preview_name = "Edgy Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- new_icon_state = "warden_syndie"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
-
-/datum/atom_skin/warden_armor/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
- new_icon_state = "warden_jacket"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
-
-/datum/atom_skin/warden_armor/basic
- preview_name = "Basic Warden Armor"
- new_icon = 'icons/obj/clothing/suits/armor.dmi'
- new_icon_state = "warden_alt"
- new_worn_icon = 'icons/mob/clothing/suits/armor.dmi'
-
-/obj/item/clothing/suit/armor/vest/warden/alt //un-overrides this since its sprite is TG
- icon = 'icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'icons/mob/clothing/suits/armor.dmi'
-
-/obj/item/clothing/suit/armor/vest/warden/alt/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-//Security Wintercoat (and hood)
-/obj/item/clothing/head/hooded/winterhood/security
- desc = "A blue, armour-padded winter hood. Definitely not bulletproof, especially not the part where your face goes." //God dammit TG stop putting color in the desc of items like this
- icon = 'modular_skyrat/master_files/icons/obj/clothing/head/winterhood.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/winterhood.dmi'
- icon_state = "winterhood_security"
-
-/obj/item/clothing/suit/hooded/wintercoat/security
- name = "security winter coat" //TG has this as a Jacket now, so unless we update ours, this needs to be re-named as Coat
- desc = "A blue, armour-padded winter coat. It glitters with a mild ablative coating and a robust air of authority. The zipper tab is a small \"Lopland\" logo."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/wintercoat.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/wintercoat.dmi'
- icon_state = "coatsecurity_winter"
-
-/obj/item/clothing/suit/armor/hos/hos_formal
- icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi'
- icon_state = "hosformal_blue"
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
-
-/obj/item/clothing/suit/armor/hos/hos_formal/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* UNDER
-*/
-//Officer
-/obj/item/clothing/under/rank/security/officer
- desc = "A tactical security uniform for officers, complete with a Lopland belt buckle."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "security_black"
- alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/security/officer/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_officer_uniform)
-
-/datum/atom_skin/security_officer_uniform
- abstract_type = /datum/atom_skin/security_officer_uniform
-
-/datum/atom_skin/security_officer_uniform/black
+/datum/atom_skin/security_belt/black // why doesn't this work ????
preview_name = "Black Variant"
new_icon_state = "security_black"
-/datum/atom_skin/security_officer_uniform/blue
- preview_name = "Blue Variant"
- new_icon_state = "security_blue"
+/obj/item/storage/belt/security/webbing
+ icon = 'modular_zubbers/icons/obj/clothing/belt.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/belt.dmi'
+ icon_state = "security_webbing"
+ worn_icon_state = "security_webbing"
+ alternate_worn_layer = BELT_LAYER
-/datum/atom_skin/security_officer_uniform/white
- preview_name = "White Variant"
- new_icon_state = "security_white"
-/datum/atom_skin/security_officer_uniform/sol
- preview_name = "Sol Variant"
- new_icon_state = "policealt"
+/*
+ // SHOES
+*/
-/datum/atom_skin/security_officer_uniform/cadet
- preview_name = "Cadet Variant"
- new_icon_state = "policecadetalt"
+/obj/item/clothing/shoes/jackboots/sec
+ name = "security boots"
+ icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi'
+ worn_icon_digi = 'modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi'
+ icon_state = "jackboots_sec"
-/datum/atom_skin/security_officer_uniform/red
- preview_name = "Red Variant"
- new_icon_state = "rsecurity"
-
-/datum/atom_skin/security_officer_uniform/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "rsecurity"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
-
-/datum/atom_skin/security_officer_uniform/armadyne
- preview_name = "Armadyne Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi'
- new_icon_state = "armadyne_shirt"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom.dmi'
-
-/datum/atom_skin/security_officer_uniform/armadyne_tac
- preview_name = "Armadyne Tac Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi'
- new_icon_state = "armadyne_tac"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom.dmi'
-
-/datum/atom_skin/security_officer_uniform/lopland
- preview_name = "Lopland Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi'
- new_icon_state = "lopland_shirt"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom.dmi'
-
-/datum/atom_skin/security_officer_uniform/lopland_tac
- preview_name = "Lopland Tac Variant"
- new_icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi'
- new_icon_state = "lopland_tac"
- new_worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom.dmi'
-
-/obj/item/clothing/under/rank/security/officer/formal
-
-/obj/item/clothing/under/rank/security/officer/formal/Initialize(mapload)
+/obj/item/clothing/shoes/jackboots/sec/Initialize(mapload)
. = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_jackboots, infinite = TRUE)
-/obj/item/clothing/under/rank/security/officer/skirt
- alt_covers_chest = FALSE
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- alt_covers_chest = TRUE
+/datum/atom_skin/security_jackboots
+ abstract_type = /datum/atom_skin/security_jackboots
-/obj/item/clothing/under/rank/security/officer/skirt/Initialize(mapload)
+/datum/atom_skin/security_jackboots/bloused
+ preview_name = "Bloused"
+ new_icon_state = "jackboots_sec"
+
+/datum/atom_skin/security_jackboots/unbloused
+ preview_name = "Unbloused"
+ new_icon_state = "jackboots_sec_unbloused"
+
+/*
+ // MASK
+*/
+
+/obj/item/clothing/mask/gas/sechailer
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/mask.dmi'
+ worn_icon_muzzled = 'modular_zubbers/icons/mob/clothing/head/mask_muzzled.dmi'
+
+/obj/item/clothing/mask/gas/sechailer/swat
+ flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDEEYES | HIDEEARS | HIDESNOUT
+
+/obj/item/clothing/mask/gas/sechailer/swat/spacepol
+ icon = 'icons/obj/clothing/masks.dmi'
+ worn_icon = 'icons/mob/clothing/mask.dmi'
+ worn_icon_muzzled = 'modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi'
+
+/*
+ // NECK
+*/
+
+// HOS
+
+/obj/item/clothing/neck/cloak/hos // still ugly but i tried
+ icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi'
+
+/*
+ // BACKPACKS
+*/
+
+/obj/item/storage/backpack/security
+ worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
+ icon_state = "backpack-security"
+
+/obj/item/storage/backpack/satchel/sec
+ worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
+ icon_state = "satchel-security"
+
+/obj/item/storage/backpack/duffelbag/sec
+ worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
+ icon_state = "duffel-security"
+
+/obj/item/storage/backpack/messenger/sec
+ icon = 'icons/obj/storage/backpack.dmi' // yeah i dont know either
+ worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi'
+ icon_state = "messenger_security"
+
+
+ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' // fucking kill me
+ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
+
+
+/*
+ // EYES
+*/
+
+/obj/item/clothing/glasses/hud/security/sunglasses
+ icon = 'modular_zubbers/icons/obj/clothing/glasses.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/eyes.dmi'
+
+/obj/item/clothing/glasses/hud/security/sunglasses/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_officer_skirt)
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_sunglasses)
-/datum/atom_skin/security_officer_skirt
- abstract_type = /datum/atom_skin/security_officer_skirt
+/datum/atom_skin/security_sunglasses
+ abstract_type = /datum/atom_skin/security_sunglasses
-/datum/atom_skin/security_officer_skirt/red
+/datum/atom_skin/security_sunglasses/red
preview_name = "Red Variant"
- new_icon_state = "secskirt"
+ new_icon_state = "sunhudsec"
-/datum/atom_skin/security_officer_skirt/blue
- preview_name = "Blue Variant"
- new_icon_state = "jumpskirt_blue"
-
-/datum/atom_skin/security_officer_skirt/black
+/datum/atom_skin/security_sunglasses/black
preview_name = "Black Variant"
- new_icon_state = "jumpskirt_black"
+ new_icon_state = "sunhudsec_blk"
-/datum/atom_skin/security_officer_skirt/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "secskirt"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
+/obj/item/clothing/glasses/hud/security/sunglasses/gars
+ icon = 'icons/obj/clothing/glasses.dmi'
+ worn_icon = 'icons/mob/clothing/eyes.dmi'
-/obj/item/clothing/under/rank/security/officer/skirt/blue
- name = "security jumpskirt"
- desc = "Turtleneck sweater commonly worn by Peacekeepers, attached with a skirt."
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "jumpskirt_blue"
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
- gets_cropped_on_taurs = FALSE
- alt_covers_chest = TRUE
+/*
+ // PRISONER (why is this here ?)
+*/
-/obj/item/clothing/under/rank/security/officer/skirt/blue/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_officer_jumpskirt)
-
-/datum/atom_skin/security_officer_jumpskirt
- abstract_type = /datum/atom_skin/security_officer_jumpskirt
-
-/datum/atom_skin/security_officer_jumpskirt/blue
- preview_name = "Blue Variant"
- new_icon_state = "jumpskirt_blue"
-
-/datum/atom_skin/security_officer_jumpskirt/black
- preview_name = "Black Variant"
- new_icon_state = "jumpskirt_black"
-
-/datum/atom_skin/security_officer_jumpskirt/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "secskirt"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
-
-// DETECTIVE
-/obj/item/clothing/under/rank/security/detective/cowboy
- name = "blonde cowboy uniform"
- desc = "A blue shirt and dark jeans, with a pair of spurred cowboy boots to boot."
- icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi' //Donator item-ish? See the /armorless one below it
- worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi'
- worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi'
- icon_state = "cowboy_uniform"
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/security/detective/cowboy/armorless //Donator variant, just uses the sprite.
- armor_type = /datum/armor/clothing_under
-
-/obj/item/clothing/under/rank/security/detective/runner
- name = "runner sweater"
- desc = "\"You look lonely.\""
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "runner"
- can_adjust = FALSE
-
-//Warden
-/obj/item/clothing/under/rank/security/warden
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "warden_black"
-
-/obj/item/clothing/under/rank/security/warden/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/warden_uniform)
-
-/datum/atom_skin/warden_uniform
- abstract_type = /datum/atom_skin/warden_uniform
-
-/datum/atom_skin/warden_uniform/black
- preview_name = "Black Variant"
- new_icon_state = "warden_black"
-
-/datum/atom_skin/warden_uniform/blue
- preview_name = "Blue Variant"
- new_icon_state = "peacekeeper_warden"
-
-/datum/atom_skin/warden_uniform/sol
- preview_name = "Sol Variant"
- new_icon_state = "policewardenalt"
-
-/datum/atom_skin/warden_uniform/red
- preview_name = "Red Variant"
- new_icon_state = "rwarden"
-
-/datum/atom_skin/warden_uniform/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "rwarden"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
-
-/obj/item/clothing/under/rank/security/warden/skirt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/warden_skirt)
-
-/datum/atom_skin/warden_skirt
- abstract_type = /datum/atom_skin/warden_skirt
-
-/datum/atom_skin/warden_skirt/red
- preview_name = "Red Variant"
- new_icon_state = "rwarden_skirt"
-
-/datum/atom_skin/warden_skirt/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "rwarden_skirt"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
-
-/obj/item/clothing/under/rank/security/warden/formal
-
-/obj/item/clothing/under/rank/security/warden/formal/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-//HoS
-/obj/item/clothing/under/rank/security/head_of_security
- icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
- icon_state = "hos_black"
-
-/obj/item/clothing/under/rank/security/head_of_security/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_uniform)
-
-/datum/atom_skin/hos_uniform
- abstract_type = /datum/atom_skin/hos_uniform
-
-/datum/atom_skin/hos_uniform/black
- preview_name = "Black Variant"
- new_icon_state = "hos_black"
-
-/datum/atom_skin/hos_uniform/blue
- preview_name = "Blue Variant"
- new_icon_state = "peacekeeper_hos"
-
-/datum/atom_skin/hos_uniform/sol
- preview_name = "Sol Variant"
- new_icon_state = "policechiefalt"
-
-/datum/atom_skin/hos_uniform/red
- preview_name = "Red Variant"
- new_icon_state = "rhos"
-
-/datum/atom_skin/hos_uniform/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "rhos"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
-
-/obj/item/clothing/under/rank/security/head_of_security/skirt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_skirt)
-
-/datum/atom_skin/hos_skirt
- abstract_type = /datum/atom_skin/hos_skirt
-
-/datum/atom_skin/hos_skirt/red
- preview_name = "Red Variant"
- new_icon_state = "rhos_skirt"
-
-/datum/atom_skin/hos_skirt/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
- new_icon_state = "rhos_skirt"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi'
-
-/obj/item/clothing/under/rank/security/head_of_security/parade
- icon_state = "hos_parade_male_blue"
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_parade_male)
-
-/datum/atom_skin/hos_parade_male
- abstract_type = /datum/atom_skin/hos_parade_male
-
-/datum/atom_skin/hos_parade_male/blue
- preview_name = "Blue Variant"
- new_icon_state = "hos_parade_male_blue"
-
-/datum/atom_skin/hos_parade_male/red
- preview_name = "Red Variant"
- new_icon_state = "hos_parade_male"
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/female
- icon_state = "hos_parade_fem_blue"
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/female/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_parade_female)
-
-/datum/atom_skin/hos_parade_female
- abstract_type = /datum/atom_skin/hos_parade_female
-
-/datum/atom_skin/hos_parade_female/blue
- preview_name = "Blue Variant"
- new_icon_state = "hos_parade_fem_blue"
-
-/datum/atom_skin/hos_parade_female/red
- preview_name = "Red Variant"
- new_icon_state = "hos_parade_fem"
-
-/obj/item/clothing/under/rank/security/head_of_security/alt
- icon_state = "hosalt_blue"
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_alt)
-
-/datum/atom_skin/hos_alt
- abstract_type = /datum/atom_skin/hos_alt
-
-/datum/atom_skin/hos_alt/blue
- preview_name = "Blue Variant"
- new_icon_state = "hosalt_blue"
-
-/datum/atom_skin/hos_alt/red
- preview_name = "Red Variant"
- new_icon_state = "hosalt"
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/skirt
- icon_state = "hosalt_skirt_blue"
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/skirt/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/hos_alt_skirt)
-
-/datum/atom_skin/hos_alt_skirt
- abstract_type = /datum/atom_skin/hos_alt_skirt
-
-/datum/atom_skin/hos_alt_skirt/blue
- preview_name = "Blue Variant"
- new_icon_state = "hosalt_skirt_blue"
-
-/datum/atom_skin/hos_alt_skirt/red
- preview_name = "Red Variant"
- new_icon_state = "hosalt_skirt"
-
-/obj/item/clothing/under/rank/security/head_of_security/peacekeeper
-
-/obj/item/clothing/under/rank/security/head_of_security/peacekeeper/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/bunnysuit
-
-/obj/item/clothing/under/rank/security/head_of_security/bunnysuit/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/roselia
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/roselia/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/grey
-
-/obj/item/clothing/under/rank/security/head_of_security/grey/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-// PRISONER
-
-
-/// PRISONER
/obj/item/clothing/under/rank/prisoner/protcust
name = "protective custody prisoner jumpsuit"
desc = "A mustard coloured prison jumpsuit, often worn by former Security members, informants and former CentCom employees. Its suit sensors are stuck in the \"Fully On\" position."
@@ -1569,447 +618,66 @@
greyscale_colors = "#5c0000ff"
/*
-* FEET
+ // DETECTIVE
*/
-//Adds reskins and special footstep noises
-/obj/item/clothing/shoes/jackboots/sec
- name = "security jackboots"
- desc = "Lopland's Peacekeeper-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
- icon_state = "security_boots"
- icon = 'modular_skyrat/master_files/icons/obj/clothing/shoes.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/feet.dmi'
- clothing_traits = list(TRAIT_SILENT_FOOTSTEPS) // We have other footsteps.
-/obj/item/clothing/shoes/jackboots/sec/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/squeak, list('modular_skyrat/master_files/sound/effects/footstep1.ogg'=1,'modular_skyrat/master_files/sound/effects/footstep2.ogg'=1, 'modular_skyrat/master_files/sound/effects/footstep3.ogg'=1), 100)
- AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_jackboots)
+/obj/item/clothing/under/rank/security/detective/cowboy
+ name = "blonde cowboy uniform"
+ desc = "A blue shirt and dark jeans, with a pair of spurred cowboy boots to boot."
+ icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi' //Donator item-ish? See the /armorless one below it
+ worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi'
+ worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi'
+ icon_state = "cowboy_uniform"
+ can_adjust = FALSE
-/datum/atom_skin/security_jackboots
- abstract_type = /datum/atom_skin/security_jackboots
+/obj/item/clothing/under/rank/security/detective/cowboy/armorless //Donator variant, just uses the sprite.
+ armor_type = /datum/armor/clothing_under
-/datum/atom_skin/security_jackboots/blue_trim
- preview_name = "Blue-Trimmed Variant"
- new_icon_state = "security_boots"
-
-/datum/atom_skin/security_jackboots/white_trim
- preview_name = "White-Trimmed Variant"
- new_icon_state = "security_boots_white"
-
-/datum/atom_skin/security_jackboots/full_white
- preview_name = "Full White Variant"
- new_icon_state = "security_boots_fullwhite"
-
-/datum/atom_skin/security_jackboots/red
- preview_name = "Red Variant"
- new_icon = 'icons/obj/clothing/shoes.dmi'
- new_icon_state = "jackboots_sec"
- new_worn_icon = 'icons/mob/clothing/feet.dmi'
-
-/datum/atom_skin/security_jackboots/pink
- preview_name = "Pink Variant"
- new_icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi'
- new_icon_state = "jackboots_sec"
- new_worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi'
-
-/datum/atom_skin/security_jackboots/armadyne
- preview_name = "Armadyne Variant"
- new_icon_state = "armadyne_boots"
+/obj/item/clothing/under/rank/security/detective/runner
+ name = "runner sweater"
+ desc = "\"You look lonely.\""
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
+ icon_state = "runner"
+ can_adjust = FALSE
/*
-* A bunch of re-overrides so that admins can keep using some redsec stuff; not all of them have this though!
+ // ANTIQUATED
*/
+//Not technically an override but oh well
+/obj/item/clothing/neck/security_cape
+ name = "security cape"
+ desc = "A fashionable cape worn by security officers."
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/neck.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/neck.dmi'
+ icon_state = "cape_black"
+ inhand_icon_state = "" //no unique inhands
+ ///Decides the shoulder it lays on, false = RIGHT, TRUE = LEFT
+ var/swapped = FALSE
+
+/obj/item/clothing/neck/security_cape/armplate // wanted to kill this item but stuff relies on it so i cant
+ name = "security gauntlet"
+ desc = "A fashionable full-arm gauntlet worn by security officers. The gauntlet itself is made of plastic, and provides no protection, but it looks cool as hell."
+ icon_state = "armplate_black"
+
+
/*
-* EYES
+ // ANTIQUATED GLASSES
*/
-/obj/item/clothing/glasses/hud/security/redsec
- icon = 'icons/obj/clothing/glasses.dmi'
- worn_icon = 'icons/mob/clothing/eyes.dmi'
- icon_state = "securityhud"
+/obj/item/clothing/glasses/hud/eyepatch/sec
+ name = "security eyepatch HUD"
+ desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes."
+ clothing_traits = list(TRAIT_SECURITY_HUD)
glass_colour_type = /datum/client_colour/glass_colour/red
-
-/obj/item/clothing/glasses/hud/security/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/glasses/hud/security/sunglasses/redsec
- icon = 'icons/obj/clothing/glasses.dmi'
- worn_icon = 'icons/mob/clothing/eyes.dmi'
- icon_state = "sunhudsec"
- glass_colour_type = /datum/client_colour/glass_colour/darkred
-
-/obj/item/clothing/glasses/hud/security/sunglasses/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec
- icon = 'icons/obj/clothing/glasses.dmi'
- worn_icon = 'icons/mob/clothing/eyes.dmi'
- icon_state = "hudpatch"
- base_icon_state = "hudpatch"
-
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/glasses/hud/security/night/redsec
- icon = 'icons/obj/clothing/glasses.dmi'
- worn_icon = 'icons/mob/clothing/eyes.dmi'
- icon_state = "securityhudnight"
-
-/obj/item/clothing/glasses/hud/security/night/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* NECK
-*/
-
-/obj/item/clothing/neck/cloak/hos/redsec
- icon = 'icons/obj/clothing/cloaks.dmi'
- worn_icon = 'icons/mob/clothing/neck.dmi'
- icon_state = "hoscloak"
-
-/obj/item/clothing/neck/cloak/hos/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* BACK
-*/
-
-/obj/item/storage/backpack/security/redsec
- icon = 'icons/obj/storage/backpack.dmi'
- worn_icon = 'icons/mob/clothing/back/backpack.dmi'
- icon_state = "backpack-security"
-
-/obj/item/storage/backpack/security/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/storage/backpack/satchel/sec/redsec
- icon = 'icons/obj/storage/backpack.dmi'
- worn_icon = 'icons/mob/clothing/back/backpack.dmi'
- icon_state = "satchel-security"
-
-/obj/item/storage/backpack/satchel/sec/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/storage/backpack/duffelbag/sec/redsec
- icon = 'icons/obj/storage/backpack.dmi'
- worn_icon = 'icons/mob/clothing/back/backpack.dmi'
- icon_state = "duffel-security"
-
-/obj/item/storage/backpack/duffelbag/sec/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* BELT + HOLSTERS
-*/
-
-/obj/item/storage/belt/security/redsec
- icon = 'icons/obj/clothing/belts.dmi'
- worn_icon = 'icons/mob/clothing/belt.dmi'
- icon_state = "security"
- inhand_icon_state = "security"
- worn_icon_state = "security"
-
-/obj/item/storage/belt/security/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/storage/belt/holster
- desc = "A rather plain but still cool looking holster that can hold a handgun, and some ammo."
-
-/datum/storage/holster
- max_slots = 3
- max_total_storage = 16
-
-/datum/storage/holster/New(atom/parent, max_slots, max_specific_storage, max_total_storage, list/holdables)
- if(length(holdables))
- return ..()
-
- holdables = list(
- /obj/item/gun/ballistic/automatic/pistol,
- /obj/item/ammo_box/magazine, // Just magazine, because the sec-belt can hold these aswell
- /obj/item/gun/ballistic/revolver,
- /obj/item/ammo_box/speedloader/c38, // Revolver speedloaders.
- /obj/item/ammo_box/speedloader/c357,
- /obj/item/ammo_box/speedloader/strilka310,
- /obj/item/gun/energy/e_gun/mini,
- /obj/item/gun/energy/disabler,
- /obj/item/gun/ballistic/revolver,
- /obj/item/food/grown/banana,
- /obj/item/gun/energy/dueling,
- /obj/item/gun/energy/laser/thermal,
- /obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
- /obj/item/gun/energy/laser/captain,
- /obj/item/gun/energy/e_gun/hos,
- )
-
- return ..()
-
-/obj/item/storage/belt/holster/detective
- name = "detective's holster"
- desc = "A holster able to carry handguns and extra ammo, thanks to an additional hand-sewn pouch. WARNING: Badasses only."
-
-/datum/storage/holster/detective
- max_slots = 4
-
-/datum/storage/holster/detective/New(atom/parent, max_slots, max_specific_storage, max_total_storage, list/holdables)
- if(length(holdables))
- return ..()
-
- holdables = list(
- /obj/item/gun/ballistic/automatic/pistol,
- /obj/item/ammo_box/magazine, // Just magazine, because the sec-belt can hold these aswell
- /obj/item/gun/ballistic/revolver,
- /obj/item/ammo_box/speedloader/c38, // Revolver speedloaders.
- /obj/item/ammo_box/speedloader/c357,
- /obj/item/ammo_box/speedloader/strilka310,
- /obj/item/gun/energy/e_gun/mini,
- /obj/item/gun/energy/disabler,
- /obj/item/gun/ballistic/revolver,
- /obj/item/food/grown/banana,
- /obj/item/gun/energy/dueling,
- /obj/item/gun/energy/laser/thermal,
- /obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
- /obj/item/gun/energy/laser/captain,
- /obj/item/gun/energy/e_gun/hos,
- )
-
- return ..()
-
-/datum/storage/holster/energy
- max_specific_storage = WEIGHT_CLASS_NORMAL
-
-/datum/storage/holster/energy/New(atom/parent, max_slots, max_specific_storage, max_total_storage, list/holdables)
- if(length(holdables))
- return ..()
-
- holdables = list(
- /obj/item/gun/energy/e_gun/mini,
- /obj/item/gun/energy/disabler,
- /obj/item/gun/energy/dueling,
- /obj/item/food/grown/banana,
- /obj/item/gun/energy/laser/thermal,
- /obj/item/gun/energy/recharge/ebow,
- /obj/item/gun/energy/laser/captain,
- /obj/item/gun/energy/e_gun/hos,
- /obj/item/gun/ballistic/automatic/pistol/plasma_marksman,
- /obj/item/gun/ballistic/automatic/pistol/plasma_thrower,
- /obj/item/ammo_box/magazine/recharge/plasma_battery,
- )
-
- return ..()
-
-/*
-* HEAD
-*/
-
-/obj/item/clothing/head/helmet/sec/redsec
- icon = 'icons/obj/clothing/head/helmet.dmi'
- worn_icon = 'icons/mob/clothing/head/helmet.dmi'
- icon_state = "helmet"
- base_icon_state = "helmet"
- actions_types = null
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
- flags_cover = HEADCOVERSEYES
- flags_inv = HIDEHAIR
-
-/obj/item/clothing/head/hats/hos/cap/red
- icon = 'icons/obj/clothing/head/hats.dmi'
- worn_icon = 'icons/mob/clothing/head/hats.dmi'
- icon_state = "hoscap"
- base_icon_state = "hoscap"
-
-/obj/item/clothing/head/hats/hos/cap/red/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* UNIFORM
-*/
-
-/obj/item/clothing/under/rank/security/officer/redsec
- icon_state = "rsecurity"
-
-/obj/item/clothing/under/rank/security/officer/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/officer/skirt/redsec
- icon_state = "secskirt"
-
-/obj/item/clothing/under/rank/security/officer/skirt/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/warden/redsec
- icon_state = "rwarden"
-
-/obj/item/clothing/under/rank/security/warden/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/warden/skirt/redsec
- icon_state = "rwarden_skirt"
-
-/obj/item/clothing/under/rank/security/warden/skirt/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/redsec
- icon_state = "rhos"
-
-/obj/item/clothing/under/rank/security/head_of_security/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/skirt/redsec
- icon_state = "rhos_skirt"
-
-/obj/item/clothing/under/rank/security/head_of_security/skirt/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/redsec
- icon_state = "hos_parade_male"
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec
- icon_state = "hos_parade_fem"
-
-/obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/redsec
- icon_state = "hosalt"
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/skirt/redsec
- icon_state = "hosalt_skirt"
-
-/obj/item/clothing/under/rank/security/head_of_security/alt/skirt/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* WINTER COAT
-*/
-
-/obj/item/clothing/head/hooded/winterhood/security/redsec
- desc = "A red, armour-padded winter hood. Definitely not bulletproof, especially not the part where your face goes."
- icon = 'icons/obj/clothing/head/winterhood.dmi'
- worn_icon = 'icons/mob/clothing/head/winterhood.dmi'
- icon_state = "hood_security"
-
-/obj/item/clothing/suit/hooded/wintercoat/security/redsec
- name = "security winter jacket"
- desc = "A red, armour-padded winter coat. It glitters with a mild ablative coating and a robust air of authority. The zipper tab is a pair of jingly little handcuffs that get annoying after the first ten seconds."
- icon = 'icons/obj/clothing/suits/wintercoat.dmi'
- worn_icon = 'icons/mob/clothing/suits/wintercoat.dmi'
- icon_state = "coatsecurity"
- hoodtype = /obj/item/clothing/head/hooded/winterhood/security/redsec
-
-/*
-* ARMOR
-*/
-
-/obj/item/clothing/suit/armor/vest/alt/sec/redsec
- desc = "A Type I armored vest that provides decent protection against most types of damage."
- icon = 'icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'icons/mob/clothing/suits/armor.dmi'
- icon_state = "armor_sec"
-
-/obj/item/clothing/suit/armor/vest/alt/sec/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/obj/item/clothing/suit/armor/hos/hos_formal/redsec
- icon = 'icons/obj/clothing/suits/armor.dmi'
- worn_icon = 'icons/mob/clothing/suits/armor.dmi'
- icon_state = "hosformal"
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
-
-/obj/item/clothing/suit/armor/hos/hos_formal/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-/*
-* FEET
-*/
-/obj/item/clothing/shoes/jackboots/sec/redsec
- name = "jackboots"
- desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
- icon_state = "jackboots_sec"
- icon = 'icons/obj/clothing/shoes.dmi'
- worn_icon = 'icons/mob/clothing/feet.dmi'
-
-/obj/item/clothing/shoes/jackboots/sec/redsec/Initialize(mapload)
- . = ..()
- var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
- for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
- qdel(reskin_component)
-
-//Finally, a few description changes for items that couldn't get a resprite.
-/obj/item/clothing/head/bio_hood/security
- desc = "A hood that protects the head and face from biological contaminants. This is a slightly outdated model from Nanotrasen Securities - you can hardly see through the foggy visor's ageing red. Hopefully it's still up to spec..."
-
-/obj/item/clothing/suit/bio_suit/security
- desc = "A suit that protects against biological contamination. This is a slightly outdated model from Nanotrasen Securities, using their red color-scheme and even outdated labelling. Hopefully it's still up to spec..."
+ icon = 'modular_zubbers/icons/obj/clothing/glasses.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/eyes.dmi'
+
+/obj/item/clothing/glasses/hud/eyepatch/sec/blindfold
+ name = "sec blindfold HUD"
+ desc = "a fake blindfold with a security HUD inside, helps you look like blind justice. This won't provide the same protection that you'd get from sunglasses."
+ icon_state = "secfold"
+ base_icon_state = "secfold"
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/glasses.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/eyes.dmi'
diff --git a/modular_zubbers/code/modules/security/sec_garment_overrides.dm b/modular_zubbers/code/modules/security/sec_garment_overrides.dm
new file mode 100644
index 00000000000..5c1bade574a
--- /dev/null
+++ b/modular_zubbers/code/modules/security/sec_garment_overrides.dm
@@ -0,0 +1,38 @@
+/obj/item/storage/bag/garment/warden/PopulateContents()
+ new /obj/item/clothing/under/rank/security/warden(src)
+ new /obj/item/clothing/under/rank/security/warden/skirt(src)
+ new /obj/item/clothing/under/rank/security/warden/formal(src)
+ new /obj/item/clothing/under/rank/security/warden/formal/skirt(src)
+ new /obj/item/clothing/head/hats/warden/viro(src)
+ new /obj/item/clothing/head/hats/warden/viro/alt(src)
+ new /obj/item/clothing/head/hats/warden/viro/beret(src)
+ new /obj/item/clothing/head/hats/warden/drill/viro(src)
+ new /obj/item/clothing/head/soft/sec/warden(src)
+ new /obj/item/clothing/suit/armor/vest/warden/alt(src)
+ new /obj/item/clothing/suit/armor/vest/warden(src)
+ new /obj/item/clothing/suit/armor/vest/warden/alt/winter(src)
+ new /obj/item/clothing/gloves/kaza_ruk/sec(src)
+ new /obj/item/clothing/glasses/hud/security/sunglasses(src)
+ new /obj/item/clothing/mask/gas/sechailer(src)
+
+/obj/item/storage/bag/garment/hos/PopulateContents()
+ new /obj/item/clothing/under/rank/security/head_of_security(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/parade(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/formal(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/formal/skirt(src)
+ new /obj/item/clothing/head/hats/hos/cap(src)
+ new /obj/item/clothing/head/hats/hos/cap/beret(src)
+ new /obj/item/clothing/head/helmet/sec/hos(src)
+ new /obj/item/clothing/head/soft/sec/hos(src)
+ new /obj/item/clothing/head/hats/hos/cap/cowboy(src)
+ new /obj/item/clothing/suit/armor/hos(src)
+ new /obj/item/clothing/suit/armor/hos/trenchcoat(src)
+ new /obj/item/clothing/suit/armor/hos/trenchcoat/winter(src)
+ new /obj/item/clothing/suit/armor/hos/overcoat(src)
+ new /obj/item/clothing/suit/armor/hos/vest(src)
+ new /obj/item/clothing/neck/cloak/hos(src)
+ new /obj/item/clothing/mask/gas/sechailer/swat(src)
+ new /obj/item/clothing/shoes/sneakers/brown(src)
diff --git a/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm
index 22948eb2d52..4dc0b58aa3c 100644
--- a/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm
+++ b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm
@@ -54,7 +54,7 @@
icon_state = "secmed_vest_blue"
worn_icon_state = "secmed_vest_blue"
-/obj/item/clothing/suit/armor/vest/peacekeeper/security_medic
+/obj/item/clothing/suit/armor/vest/security_medic
name = "security medic armor vest"
desc = "A security medic's armor vest, with little pockets for little things."
icon = 'modular_zubbers/icons/obj/clothing/suits/armor.dmi'
@@ -64,7 +64,7 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
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, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/applicator/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit)
-/obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate
+/obj/item/clothing/under/rank/security/security_medic/alternate
name = "security medic uniform"
desc = "A lightly armored uniform worn by Nanotrasen's Asset Protection Medical Corps."
icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
@@ -73,7 +73,7 @@
worn_icon_state = "security_medic_jumpsuit"
worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
-/obj/item/clothing/under/rank/security/peacekeeper/security_medic
+/obj/item/clothing/under/rank/security/security_medic
name = "security medic turtleneck"
desc = "A comfy turtleneck with a white armband, denoting the wearer as a security medic."
icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi'
@@ -82,7 +82,7 @@
worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt
+/obj/item/clothing/under/rank/security/security_medic/skirt
name = "security medic skirtleneck"
desc = "A comfy turtleneck with a white armband and brown skirt, denoting the wearer as a security medic."
icon_state = "security_medic_turtleneck_skirt"
@@ -90,15 +90,15 @@
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/head/beret/sec/peacekeeper/security_medic
+/obj/item/clothing/head/beret/sec/security_medic
name = "security medic beret"
desc = "A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
- icon_state = "/obj/item/clothing/head/beret/sec/peacekeeper/security_medic"
+ icon_state = "/obj/item/clothing/head/beret/sec/security_medic"
greyscale_colors = "#3F3C40#870E12"
post_init_icon_state = "beret_badge_med"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/head/helmet/sec/peacekeeper/security_medic
+/obj/item/clothing/head/helmet/sec/security_medic
name = "security medic helmet"
desc = "A standard issue combat helmet for security medics. Has decent tensile strength and armor. Keep your head down."
icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi'
diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm
index 90183461520..4f95a52f679 100644
--- a/modular_zubbers/code/modules/security/secmed/security_medic.dm
+++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm
@@ -53,13 +53,13 @@
suit_store = /obj/item/flashlight/seclite
belt = /obj/item/modular_computer/pda/security
ears = /obj/item/radio/headset/headset_medsec
- uniform = /obj/item/clothing/under/rank/security/peacekeeper/security_medic
+ uniform = /obj/item/clothing/under/rank/security/security_medic
gloves = /obj/item/clothing/gloves/latex/nitrile
shoes = /obj/item/clothing/shoes/jackboots/sec
glasses = /obj/item/clothing/glasses/hud/medsechud
- suit = /obj/item/clothing/suit/armor/vest/peacekeeper/security_medic
+ suit = /obj/item/clothing/suit/armor/vest/security_medic
l_hand = /obj/item/storage/medkit/brute
- head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic
+ head = /obj/item/clothing/head/beret/sec/security_medic
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/sec
@@ -123,11 +123,11 @@
new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue(src)
new /obj/item/clothing/suit/hazardvest/security_medic(src)
new /obj/item/clothing/suit/hazardvest/security_medic/blue(src)
- new /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic(src)
+ new /obj/item/clothing/head/helmet/sec/security_medic(src)
new /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec(src)
- new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate(src)
- new /obj/item/clothing/under/rank/security/peacekeeper/security_medic(src)
- new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt(src)
+ new /obj/item/clothing/under/rank/security/security_medic/alternate(src)
+ new /obj/item/clothing/under/rank/security/security_medic(src)
+ new /obj/item/clothing/under/rank/security/security_medic/skirt(src)
/obj/structure/closet/secure_closet/security_medic
name = "security medic's locker"
diff --git a/modular_zubbers/code/modules/vending/clothesmate.dm b/modular_zubbers/code/modules/vending/clothesmate.dm
index 27511fa272d..f42edcf8f47 100644
--- a/modular_zubbers/code/modules/vending/clothesmate.dm
+++ b/modular_zubbers/code/modules/vending/clothesmate.dm
@@ -49,7 +49,6 @@
/obj/item/clothing/glasses/welding/steampunk_goggles = 5,
/obj/item/clothing/gloves/bracer/wraps = 5,
/obj/item/clothing/gloves/cat = 5,
- /obj/item/clothing/gloves/elofy = 5,
/obj/item/clothing/gloves/fingerless/blutigen_wraps = 5,
/obj/item/clothing/gloves/skyy = 5,
/obj/item/clothing/mask/gas/nightlight = 5,
@@ -202,7 +201,6 @@
/obj/item/clothing/shoes/horseshoe = 5,
/obj/item/clothing/shoes/jackboots/diesel_f = 5,
/obj/item/clothing/shoes/jackboots/diesel_m = 5,
- /obj/item/clothing/shoes/jackboots/elofy = 5,
/obj/item/clothing/shoes/jackboots/knee = 5,
/obj/item/clothing/shoes/jackboots/netra = 5,
/obj/item/clothing/shoes/jackboots/recolorable = 5,
diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm
index 78b7086bb6b..e5ece901279 100644
--- a/modular_zubbers/code/modules/vending/comdrobe.dm
+++ b/modular_zubbers/code/modules/vending/comdrobe.dm
@@ -173,40 +173,20 @@
access_lists["[ACCESS_HOS]"] = list(
/obj/item/clothing/head/hats/hos/cap = 1,
- /obj/item/clothing/head/hats/hos/beret/navyhos = 1,
/obj/item/clothing/head/hats/hos/beret = 1,
- /obj/item/clothing/head/hats/warden/drill/hos = 1,
- /obj/item/clothing/head/hats/hos/elofy = 1,
- /obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1,
+ /obj/item/clothing/under/rank/security/head_of_security = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt/skirt = 1,
- /obj/item/clothing/under/rank/security/head_of_security/grey = 1,
- /obj/item/clothing/under/rank/security/head_of_security/alt/roselia = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/female = 1,
- /obj/item/clothing/under/rank/security/head_of_security/redsec = 1,
- /obj/item/clothing/under/rank/security/head_of_security/parade/redsec = 1,
- /obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec = 1,
- /obj/item/clothing/under/rank/security/peacekeeper/skirt_hos = 1,
- /obj/item/clothing/suit/jacket/hos/blue = 1,
/obj/item/clothing/suit/armor/hos = 1,
/obj/item/clothing/suit/armor/hos/trenchcoat = 1,
/obj/item/clothing/suit/armor/hos/trenchcoat/winter = 1,
- /obj/item/clothing/suit/armor/vest/leather = 1,
- /obj/item/clothing/suit/armor/hos/hos_formal = 1,
+ /obj/item/clothing/suit/armor/hos/overcoat = 1,
+ /obj/item/clothing/suit/armor/hos/vest = 1,
/obj/item/clothing/neck/cloak/hos = 1,
- /obj/item/clothing/neck/cloak/hos/redsec = 1,
- /obj/item/clothing/neck/mantle/hosmantle = 1,
- /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch = 1,
- /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga = 1,
- /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia = 1,
- /obj/item/clothing/gloves/elofy = 1,
/obj/item/clothing/mask/gas/sechailer/swat = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
- /obj/item/clothing/shoes/jackboots/elofy = 1,
- /obj/item/clothing/head/playbunnyears/hos = 1,
- /obj/item/clothing/under/rank/security/head_of_security/bunnysuit = 1,
- /obj/item/clothing/suit/armor/hos_tailcoat = 1,
)
access_lists["[ACCESS_QM]"] = list(
diff --git a/modular_zubbers/code/modules/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm
deleted file mode 100644
index 30e624d3de6..00000000000
--- a/modular_zubbers/code/modules/vending/multisec.dm
+++ /dev/null
@@ -1,173 +0,0 @@
-/obj/machinery/vending/wardrobe/sec_wardrobe
- name = "\improper MultiSec Outfitting Station"
- desc = "A vending machine stocked with a multitude of security outfits, including standardized uniforms in multiple colors and general equipment. Now with more Multi!"
- icon = 'modular_zubbers/icons/obj/machines/vending.dmi'
- icon_state = "multisec"
- light_mask = null
- products = list() // Overriding this to the default to prevent any issues when building the product menu
- product_categories = list(
- list(
- "name" = "Blue",
- "icon" = "shield-halved",
- "products" = list(
- /obj/item/clothing/suit/hooded/wintercoat/security = 6,
- /obj/item/clothing/suit/toggle/jacket/sec = 6,
- /obj/item/clothing/suit/armor/vest/secjacket/blue = 6,
- /obj/item/clothing/suit/armor/vest/peacekeeper/brit = 6,
- /obj/item/clothing/neck/security_cape = 6,
- /obj/item/clothing/neck/security_cape/armplate = 6,
- /obj/item/storage/backpack/security = 6,
- /obj/item/storage/backpack/satchel/sec = 6,
- /obj/item/storage/backpack/duffelbag/sec = 6,
- /obj/item/storage/backpack/duffelbag/sec = 6,
- /obj/item/clothing/under/rank/security/officer = 10,
- /obj/item/clothing/under/rank/security/officer/skirt/blue = 10,
- /obj/item/clothing/under/rank/security/peacekeeper = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/skirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/shortskirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 10,
- /obj/item/clothing/under/rank/security/officer/blueshirt = 10,
- /obj/item/clothing/under/rank/security/peacekeeper/trousers = 5,
- /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts = 5,
- /obj/item/clothing/under/rank/security/skyrat/utility = 6,
- /obj/item/clothing/shoes/jackboots/sec = 10,
- /obj/item/clothing/head/security_garrison = 10,
- /obj/item/clothing/head/security_cap = 10,
- /obj/item/clothing/head/beret/sec/peacekeeper = 6,
- /obj/item/clothing/head/beret/sec/peacekeeper/white = 6,
- /obj/item/clothing/head/helmet/sec/terra = 6,
- /obj/item/clothing/head/hats/warden/police/patrol = 6,
- /obj/item/clothing/head/costume/ushanka/sec/blue = 10,
- /obj/item/clothing/gloves/color/black/security = 10,
- /obj/item/clothing/head/helmet/sec/futuristic = 6,
- /obj/item/clothing/suit/armor/vest/collared_vest = 6, //added by Bangle
- ),
- ),
- list(
- "name" = "Red",
- "icon" = "shield",
- "products" = list(
- /obj/item/clothing/suit/hooded/wintercoat/security/redsec = 6,
- /obj/item/storage/backpack/security/redsec = 6,
- /obj/item/storage/backpack/satchel/sec/redsec = 6,
- /obj/item/storage/backpack/duffelbag/sec/redsec = 6,
- /obj/item/clothing/under/rank/security/officer/redsec = 6,
- /obj/item/clothing/under/rank/security/peacekeeper/armadyne = 6,
- /obj/item/clothing/under/rank/security/camo = 6,
- /obj/item/clothing/shoes/jackboots = 6,
- /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6,
- /obj/item/clothing/shoes/jackboots/gogo_boots = 6,
- /obj/item/clothing/head/helmet/sec/redsec = 6,
- /obj/item/clothing/head/beret/sec = 6,
- /obj/item/clothing/head/security_kepi = 6,
- /obj/item/clothing/head/beret/sec/peacekeeper/armadyne = 6,
- /obj/item/clothing/head/soft/sec = 6,
- /obj/item/clothing/head/security_beanie = 6,
- /obj/item/clothing/head/costume/ushanka/sec = 10,
- /obj/item/clothing/head/playbunnyears/security = 6,
- /obj/item/clothing/under/rank/security/security_bunnysuit = 6,
- /obj/item/clothing/suit/armor/security_tailcoat = 6,
- /obj/item/clothing/neck/tie/bunnytie/security = 6,
- /obj/item/clothing/head/playbunnyears/security/assistant = 6,
- /obj/item/clothing/under/rank/security/security_assistant_bunnysuit = 6,
- /obj/item/clothing/suit/armor/security_tailcoat/assistant = 6,
- /obj/item/clothing/neck/tie/bunnytie/security_assistant = 6,
- /obj/item/clothing/mask/bandana/red = 6,
- /obj/item/clothing/neck/pauldron = 6,
- /obj/item/clothing/neck/pauldron/commander = 6,
- /obj/item/clothing/neck/pauldron/captain = 6,
- /obj/item/clothing/gloves/color/black = 6,
- /obj/item/clothing/gloves/combat/peacekeeper/armadyne = 6,
- /obj/item/clothing/under/rank/security/officer/skirt = 6,
- /obj/item/clothing/under/rank/security/skyrat/utility/redsec = 6,
- /obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec = 6,
- /obj/item/clothing/suit/toggle/jacket/sec/old = 6,
- /obj/item/clothing/suit/armor/vest/secjacket = 6,
- /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne = 6,
- /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor = 6,
- /obj/item/clothing/suit/armor/vest/caligram_parka_vest_tan = 6,
- /obj/item/clothing/suit/toggle/jacket/zubber/bomber/sec = 6,
- ),
- ),
- list(
- "name" = "Medic",
- "icon" = "notes-medical",
- "products" = list(
- /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic = 3,
- /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue = 3,
- /obj/item/clothing/suit/hazardvest/security_medic = 3,
- /obj/item/clothing/suit/hazardvest/security_medic/blue = 3,
- /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic = 3,
- /obj/item/clothing/head/beret/sec/peacekeeper/security_medic = 3,
- /obj/item/clothing/head/playbunnyears/brig_phys = 3,
- /obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3,
- /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/doctor_tailcoat = 3,
- /obj/item/clothing/neck/tie/bunnytie/brig_phys = 3,
- /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec = 3,
- /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate = 3,
- /obj/item/clothing/under/rank/security/peacekeeper/security_medic = 3,
- /obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt = 3,
- )
- ),
- list(
- "name" = "Corrections",
- "icon" = "handcuffs",
- "products" = list(
- /obj/item/clothing/under/rank/security/corrections_officer = 2, //If, or more likely when the Brig Officers abandon them, you can now get 'em here! Yay! Wahoo!
- /obj/item/clothing/under/rank/security/corrections_officer/skirt = 2,
- /obj/item/clothing/under/rank/security/corrections_officer/sweater = 2,
- /obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt = 2,
- /obj/item/clothing/suit/toggle/jacket/corrections_officer = 2,
- /obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners.
- /obj/item/clothing/head/playbunnyears/prisoner = 6,
- /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 6,
- /obj/item/clothing/neck/tie/bunnytie/prisoner = 6,
- ),
- ),
- )
- premium = list(
- /obj/item/clothing/under/rank/security/officer/formal = 6,
- /obj/item/clothing/suit/jacket/officer/blue = 6,
- /obj/item/clothing/head/beret/sec/navyofficer = 6,
- /obj/item/clothing/suit/jacket/officer/tan = 6,
- /obj/item/clothing/accessory/badge/holo = 10, //I know there's a box of them but, why not have more, eh?
- /obj/item/clothing/accessory/badge/holo/cord = 10,
- /obj/item/clothing/head/helmet/blueshirt = 3,
- /obj/item/clothing/suit/armor/vest/blueshirt = 3,
- /obj/item/riding_saddle/leather/peacekeeper = 3,
- )
-
-//CONTRABAND: Basically for less serious/hard to cat stuff like the Cowboy and Bluecoat stuff. And for stuff that shouldn't be easy to get like HUD varients.
-
-
- contraband = list(
- /obj/item/clothing/under/colonial/nri_police = 3,
- /obj/item/clothing/suit/british_officer = 3,
- /obj/item/clothing/head/cowboy/skyrat/cattleman/sec = 3,
- /obj/item/clothing/head/cowboy/skyrat/cattleman/wide/sec = 3,
- /obj/item/clothing/head/fedora/det_hat/cybergoggles = 3,
- /obj/item/clothing/head/helmet/metrocophelmet = 6,
- /obj/item/clothing/suit/armor/vest/alt/sec/metrocop = 6,
- /obj/item/clothing/gloves/color/black/security/metrocop = 6,
- /obj/item/clothing/under/rank/security/metrocop = 6,
- /obj/item/clothing/shoes/jackboots/combine = 6,
- /obj/item/clothing/glasses/hud/eyepatch/sec = 3, //No flash protection on the eyepatches, so they're worse than the sunnies.
- /obj/item/clothing/glasses/hud/eyepatch/sec/blindfold = 3, //Ditto
- /obj/item/clothing/glasses/hud/ar/aviator/security = 3, //Printable, but you have to choose between HUD and flash protection.
- /obj/item/clothing/glasses/hud/ar/projector/security = 3,
- /obj/item/clothing/mask/gas/half_mask = 3,
- /obj/item/clothing/head/hats/caphat/parade/fedcap/sec = 3,
- /obj/item/clothing/suit/fedcoat/modern/sec = 3,
- /obj/item/clothing/head/soft/veteran = 1,
- /obj/item/clothing/head/helmet/toggleable/justice = 1, //More than one of these in the Vendor and they'll get annoying fast. Hence why Justice2 isn't here.
- /obj/item/clothing/head/bandana/snake/sec = 1, //There's only room for one Boss, and one Snake.
- /obj/item/clothing/under/rank/security/snake = 1,
- /obj/item/clothing/gloves/color/black/security/snake = 1,
- /obj/item/clothing/shoes/jackboots/snake = 1,
- )
-
- payment_department = ACCOUNT_SEC
-
-
-/obj/item/vending_refill/wardrobe/sec_wardrobe
- machine_name = "MultiSec Outfitting Station"
diff --git a/modular_zubbers/code/modules/vending/secdrobe.dm b/modular_zubbers/code/modules/vending/secdrobe.dm
new file mode 100644
index 00000000000..88dc2bf4dbc
--- /dev/null
+++ b/modular_zubbers/code/modules/vending/secdrobe.dm
@@ -0,0 +1,88 @@
+/obj/machinery/vending/wardrobe/sec_wardrobe
+ products = list() // Overriding this to the default to prevent any issues when building the product menu
+ product_categories = list(
+ list(
+ "name" = "Red",
+ "icon" = "shield",
+ "products" = list(
+ /obj/item/clothing/under/rank/security/officer/viro = 6,
+ /obj/item/clothing/under/rank/security/officer/viro/skirt = 6,
+ /obj/item/clothing/under/rank/security/officer/viro/jumpsuit = 6,
+ /obj/item/clothing/under/rank/security/officer/formal = 6,
+ /obj/item/clothing/under/rank/security/officer/formal/skirt = 6,
+ /obj/item/clothing/under/rank/security/officer/viro/lowcut = 6,
+ /obj/item/clothing/under/rank/security/officer/viro/bodysuit = 6,
+ /obj/item/clothing/suit/armor/vest/alt/sec/viro = 6,
+ /obj/item/clothing/suit/armor/vest/alt/sec/viro/heavyvest = 6,
+ /obj/item/clothing/suit/armor/vest/alt/sec/viro/leatherjacket = 6,
+ /obj/item/clothing/suit/armor/vest/alt/sec/viro/softshell = 6,
+ /obj/item/clothing/head/helmet/sec = 6,
+ /obj/item/clothing/head/beret/sec/viro = 6,
+ /obj/item/clothing/head/soft/sec = 6,
+ /obj/item/clothing/head/security_beanie = 6,
+ /obj/item/clothing/mask/bandana/sec = 6,
+ /obj/item/clothing/gloves/color/black = 6,
+ /obj/item/clothing/gloves/color/black/security = 6,
+ /obj/item/storage/backpack/security/ = 6,
+ /obj/item/storage/backpack/satchel/sec = 6,
+ /obj/item/storage/backpack/duffelbag/sec = 6,
+ /obj/item/storage/backpack/messenger/sec = 6,
+ /obj/item/clothing/shoes/jackboots = 6,
+ /obj/item/clothing/shoes/jackboots/sec = 6,
+
+ ),
+ ),
+ list(
+ "name" = "Medic",
+ "icon" = "notes-medical",
+ "products" = list(
+ /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic = 3,
+ /obj/item/clothing/suit/hazardvest/security_medic = 3,
+ /obj/item/clothing/head/helmet/sec/security_medic = 3,
+ /obj/item/clothing/head/beret/sec/security_medic = 3,
+ /obj/item/clothing/head/playbunnyears/brig_phys = 3,
+ /obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3,
+ /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/doctor_tailcoat = 3,
+ /obj/item/clothing/neck/tie/bunnytie/brig_phys = 3,
+ /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec = 3,
+ /obj/item/clothing/under/rank/security/security_medic/alternate = 3,
+ /obj/item/clothing/under/rank/security/security_medic = 3,
+ /obj/item/clothing/under/rank/security/security_medic/skirt = 3,
+ )
+ ),
+ list(
+ "name" = "Corrections",
+ "icon" = "handcuffs",
+ "products" = list(
+ /obj/item/clothing/under/rank/security/corrections_officer = 2, //If, or more likely when the Brig Officers abandon them, you can now get 'em here! Yay! Wahoo!
+ /obj/item/clothing/under/rank/security/corrections_officer/skirt = 2,
+ /obj/item/clothing/under/rank/security/corrections_officer/sweater = 2,
+ /obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt = 2,
+ /obj/item/clothing/suit/toggle/jacket/corrections_officer = 2,
+ /obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners.
+ /obj/item/clothing/head/playbunnyears/prisoner = 6,
+ /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 6,
+ /obj/item/clothing/neck/tie/bunnytie/prisoner = 6,
+ ),
+ ),
+ )
+ premium = list(
+ /obj/item/clothing/accessory/badge/holo = 10, //I know there's a box of them but, why not have more, eh?
+ /obj/item/clothing/accessory/badge/holo/cord = 10,
+ /obj/item/riding_saddle/leather/peacekeeper = 3,
+ )
+
+//CONTRABAND: Basically for less serious/hard to cat stuff like the Cowboy and Bluecoat stuff. And for stuff that shouldn't be easy to get like HUD varients.
+
+
+ contraband = list(
+ /obj/item/clothing/mask/gas/half_mask = 3,
+ /obj/item/clothing/head/soft/veteran = 1,
+ /obj/item/clothing/head/helmet/toggleable/justice = 1, //More than one of these in the Vendor and they'll get annoying fast. Hence why Justice2 isn't here.
+ )
+
+ payment_department = ACCOUNT_SEC
+
+
+/obj/item/vending_refill/wardrobe/sec_wardrobe
+ machine_name = "SecDrobe Outfitting Station"
diff --git a/modular_zubbers/icons/mob/clothing/back/backpack.dmi b/modular_zubbers/icons/mob/clothing/back/backpack.dmi
index a25bd4750e6..4545d3cf9c3 100644
Binary files a/modular_zubbers/icons/mob/clothing/back/backpack.dmi and b/modular_zubbers/icons/mob/clothing/back/backpack.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/belt.dmi b/modular_zubbers/icons/mob/clothing/belt.dmi
index c8e6f9becc7..a7be21d2876 100644
Binary files a/modular_zubbers/icons/mob/clothing/belt.dmi and b/modular_zubbers/icons/mob/clothing/belt.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/eyes.dmi b/modular_zubbers/icons/mob/clothing/eyes.dmi
index 8987ab45da5..9eb5e9499c5 100644
Binary files a/modular_zubbers/icons/mob/clothing/eyes.dmi and b/modular_zubbers/icons/mob/clothing/eyes.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/feet/feet.dmi b/modular_zubbers/icons/mob/clothing/feet/feet.dmi
index 05e92a5bf06..222a92d42f5 100644
Binary files a/modular_zubbers/icons/mob/clothing/feet/feet.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi b/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi
index be304fb7eef..1463b77b1c4 100644
Binary files a/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet_digi.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi b/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi
index 9ee9293d37a..0bd2c8f48fb 100644
Binary files a/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi and b/modular_zubbers/icons/mob/clothing/gloves/gloves.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/hands.dmi b/modular_zubbers/icons/mob/clothing/hands.dmi
index 74a429154ce..60ca0ca3b67 100644
Binary files a/modular_zubbers/icons/mob/clothing/hands.dmi and b/modular_zubbers/icons/mob/clothing/hands.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/head/hats.dmi b/modular_zubbers/icons/mob/clothing/head/hats.dmi
index ebee63c7d2e..24e89612e72 100644
Binary files a/modular_zubbers/icons/mob/clothing/head/hats.dmi and b/modular_zubbers/icons/mob/clothing/head/hats.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/head/mask.dmi b/modular_zubbers/icons/mob/clothing/head/mask.dmi
index 23e77508635..77562869da1 100644
Binary files a/modular_zubbers/icons/mob/clothing/head/mask.dmi and b/modular_zubbers/icons/mob/clothing/head/mask.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/head/mask_muzzled.dmi b/modular_zubbers/icons/mob/clothing/head/mask_muzzled.dmi
new file mode 100644
index 00000000000..32b5c7f80d3
Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/head/mask_muzzled.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/neck/neck.dmi b/modular_zubbers/icons/mob/clothing/neck/neck.dmi
index 385590136d3..cf8d2defb75 100644
Binary files a/modular_zubbers/icons/mob/clothing/neck/neck.dmi and b/modular_zubbers/icons/mob/clothing/neck/neck.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/suits/armor.dmi b/modular_zubbers/icons/mob/clothing/suits/armor.dmi
index 1acfbc0fabf..124fa493c82 100644
Binary files a/modular_zubbers/icons/mob/clothing/suits/armor.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi
index b2022207360..6f7ce97520a 100644
Binary files a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi and b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/under/security.dmi b/modular_zubbers/icons/mob/clothing/under/security.dmi
index 01c9e8458cc..2d6980b195a 100644
Binary files a/modular_zubbers/icons/mob/clothing/under/security.dmi and b/modular_zubbers/icons/mob/clothing/under/security.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/under/security_digi.dmi b/modular_zubbers/icons/mob/clothing/under/security_digi.dmi
index d0d22225a54..da744aaf5d7 100644
Binary files a/modular_zubbers/icons/mob/clothing/under/security_digi.dmi and b/modular_zubbers/icons/mob/clothing/under/security_digi.dmi differ
diff --git a/modular_zubbers/icons/obj/card.dmi b/modular_zubbers/icons/obj/card.dmi
index 623b71e7301..7b3390f467e 100644
Binary files a/modular_zubbers/icons/obj/card.dmi and b/modular_zubbers/icons/obj/card.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/back/backpack.dmi b/modular_zubbers/icons/obj/clothing/back/backpack.dmi
index bab1e4e2e22..4a34cba7e54 100644
Binary files a/modular_zubbers/icons/obj/clothing/back/backpack.dmi and b/modular_zubbers/icons/obj/clothing/back/backpack.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/belt.dmi b/modular_zubbers/icons/obj/clothing/belt.dmi
index a05c0bdb5ac..ca4dcfe88fa 100644
Binary files a/modular_zubbers/icons/obj/clothing/belt.dmi and b/modular_zubbers/icons/obj/clothing/belt.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/feet/feet.dmi b/modular_zubbers/icons/obj/clothing/feet/feet.dmi
index c13c11941fc..6443f13f6c6 100644
Binary files a/modular_zubbers/icons/obj/clothing/feet/feet.dmi and b/modular_zubbers/icons/obj/clothing/feet/feet.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/glasses.dmi b/modular_zubbers/icons/obj/clothing/glasses.dmi
index 2f13bf2db40..0e1422ce259 100644
Binary files a/modular_zubbers/icons/obj/clothing/glasses.dmi and b/modular_zubbers/icons/obj/clothing/glasses.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/gloves.dmi b/modular_zubbers/icons/obj/clothing/gloves.dmi
index de18f9c1a04..9e3b1d019b6 100644
Binary files a/modular_zubbers/icons/obj/clothing/gloves.dmi and b/modular_zubbers/icons/obj/clothing/gloves.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/head/hats.dmi b/modular_zubbers/icons/obj/clothing/head/hats.dmi
index b64264df38c..6fc293e9a2e 100644
Binary files a/modular_zubbers/icons/obj/clothing/head/hats.dmi and b/modular_zubbers/icons/obj/clothing/head/hats.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/neck/neck.dmi b/modular_zubbers/icons/obj/clothing/neck/neck.dmi
index 33d661208e0..8c94cb7629a 100644
Binary files a/modular_zubbers/icons/obj/clothing/neck/neck.dmi and b/modular_zubbers/icons/obj/clothing/neck/neck.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/suits/armor.dmi b/modular_zubbers/icons/obj/clothing/suits/armor.dmi
index ebff7f2777c..748e15d16aa 100644
Binary files a/modular_zubbers/icons/obj/clothing/suits/armor.dmi and b/modular_zubbers/icons/obj/clothing/suits/armor.dmi differ
diff --git a/modular_zubbers/icons/obj/clothing/under/security.dmi b/modular_zubbers/icons/obj/clothing/under/security.dmi
index 4a2368f5f83..343c2767567 100644
Binary files a/modular_zubbers/icons/obj/clothing/under/security.dmi and b/modular_zubbers/icons/obj/clothing/under/security.dmi differ
diff --git a/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm b/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm
index c3993453203..9578217f8de 100644
--- a/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm
+++ b/modular_zubbers/maps/offstation/dauntless/mob_spawns.dm
@@ -262,14 +262,14 @@
id_trim = /datum/id_trim/syndicom/bubberstation/dauntless/brigofficer
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/bulletproof/old
- back = /obj/item/storage/backpack/security/redsec
+ back = /obj/item/storage/backpack/security
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/storage/box/survival = 1,
/obj/item/crowbar = 1,
)
head = /obj/item/clothing/head/helmet/swat/ds
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
mask = /obj/item/clothing/mask/gas/syndicate
ears = /obj/item/radio/headset/syndicateciv/staff
@@ -322,8 +322,8 @@
id_trim = /datum/id_trim/syndicom/bubberstation/dauntless/masteratarms
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/vest/warden/syndicate
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec
- back = /obj/item/storage/backpack/satchel/sec/redsec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ back = /obj/item/storage/backpack/satchel/sec
head = /obj/item/clothing/head/hats/hos/beret/syndicate
r_pocket = /obj/item/flashlight/seclite
implants = list(
diff --git a/modular_zubbers/maps/offstation/persistence/mob_spawns.dm b/modular_zubbers/maps/offstation/persistence/mob_spawns.dm
index 3df2c80aa92..4815537da78 100644
--- a/modular_zubbers/maps/offstation/persistence/mob_spawns.dm
+++ b/modular_zubbers/maps/offstation/persistence/mob_spawns.dm
@@ -282,7 +282,7 @@
id_trim = /datum/id_trim/syndicom/bubberstation/persistence/brigofficer
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/bulletproof/old
- back = /obj/item/storage/backpack/security/redsec
+ back = /obj/item/storage/backpack/security
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/storage/box/survival = 1,
@@ -290,7 +290,7 @@
/obj/item/choice_beacon/syndicateoffstation = 1,
)
head = /obj/item/clothing/head/helmet/swat/ds
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
mask = /obj/item/clothing/mask/gas/syndicate
ears = /obj/item/radio/headset/syndicateciv/staff
@@ -354,8 +354,8 @@
id_trim = /datum/id_trim/syndicom/bubberstation/persistence/masteratarms
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
suit = /obj/item/clothing/suit/armor/vest/warden/syndicate
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec
- back = /obj/item/storage/backpack/satchel/sec/redsec
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ back = /obj/item/storage/backpack/satchel/sec
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/crowbar = 1,
diff --git a/modular_zubbers/modules/virosec/airlocks/station/security.dmi b/modular_zubbers/modules/virosec/airlocks/station/security.dmi
new file mode 100644
index 00000000000..b7b6ef5cf5e
Binary files /dev/null and b/modular_zubbers/modules/virosec/airlocks/station/security.dmi differ
diff --git a/modular_zubbers/modules/virosec/clothing/mob/armor.dmi b/modular_zubbers/modules/virosec/clothing/mob/armor.dmi
new file mode 100644
index 00000000000..c711e9858e3
Binary files /dev/null and b/modular_zubbers/modules/virosec/clothing/mob/armor.dmi differ
diff --git a/modular_zubbers/modules/virosec/clothing/mob/hats.dmi b/modular_zubbers/modules/virosec/clothing/mob/hats.dmi
new file mode 100644
index 00000000000..57558ccaf39
Binary files /dev/null and b/modular_zubbers/modules/virosec/clothing/mob/hats.dmi differ
diff --git a/modular_zubbers/modules/virosec/clothing/mob/security.dmi b/modular_zubbers/modules/virosec/clothing/mob/security.dmi
new file mode 100644
index 00000000000..0211d73dd7b
Binary files /dev/null and b/modular_zubbers/modules/virosec/clothing/mob/security.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 04e593b29d1..77e7e14b422 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8678,7 +8678,6 @@
#include "modular_skyrat\modules\sec_haul\code\peacekeeper\armadyne_clothing.dm"
#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_clothing.dm"
#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_hammer.dm"
-#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_lockers.dm"
#include "modular_skyrat\modules\sec_haul\code\technode\all_nodes.dm"
#include "modular_skyrat\modules\self_actualization_device\code\self_actualization_device.dm"
#include "modular_skyrat\modules\server_overflow\code\chat_link.dm"
@@ -9762,6 +9761,7 @@
#include "modular_zubbers\code\modules\security\loadouts.dm"
#include "modular_zubbers\code\modules\security\maid_sec.dm"
#include "modular_zubbers\code\modules\security\sec_clothing_overrides.dm"
+#include "modular_zubbers\code\modules\security\sec_garment_overrides.dm"
#include "modular_zubbers\code\modules\security\sec_vouchers_vendor.dm"
#include "modular_zubbers\code\modules\security\securty_holosign.dm"
#include "modular_zubbers\code\modules\security\space_law_book.dm"
@@ -9917,7 +9917,7 @@
#include "modular_zubbers\code\modules\vending\lustwish.dm"
#include "modular_zubbers\code\modules\vending\medical.dm"
#include "modular_zubbers\code\modules\vending\megaseed.dm"
-#include "modular_zubbers\code\modules\vending\multisec.dm"
+#include "modular_zubbers\code\modules\vending\secdrobe.dm"
#include "modular_zubbers\code\modules\vending\vending.dm"
#include "modular_zubbers\code\modules\vending\wardrobe.dm"
#include "modular_zubbers\code\modules\vetted\examine.dm"