diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
index ca4dc1c33263..7943cf93372e 100644
--- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -1525,8 +1525,8 @@
pixel_x = -7;
pixel_y = 2
},
-/obj/item/clothing/under/rank/command/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
+/obj/item/clothing/under/clip/officer,
+/obj/item/clothing/head/helmet/bulletproof/x11/clip,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
index cce6027b6053..a503d55e1292 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
@@ -41,6 +41,25 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew)
+"aE" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/cigarettes/cigars{
+ pixel_x = 8
+ },
+/obj/item/lighter{
+ pixel_x = -11;
+ pixel_y = 5
+ },
+/obj/item/ammo_box/a762_40/inteq{
+ pixel_x = 5;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
"aX" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
/obj/machinery/door/poddoor{
@@ -980,6 +999,32 @@
/obj/item/storage/toolbox/ammo/c9mm,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
+"va" = (
+/obj/structure/closet/secure_closet/wall{
+ dir = 4;
+ icon_door = "solgov_wall";
+ icon_state = "solgov_wall";
+ name = "vanguard's locker";
+ pixel_x = -28;
+ req_access_txt = "58"
+ },
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/belt/military/assault,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/megaphone/command,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/suit/armor/hos/inteq,
+/obj/item/clothing/head/beret/sec/hos/inteq,
+/obj/item/radio/headset/inteq/alt/captain,
+/obj/item/areaeditor/shuttle,
+/obj/item/shield/riot/tele,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
"ve" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/corner/opaque/yellow,
@@ -1352,6 +1397,49 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
+"Ek" = (
+/obj/item/ammo_box/magazine/co9mm{
+ pixel_x = 5
+ },
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm{
+ pixel_x = -5
+ },
+/obj/item/ammo_box/magazine/co9mm{
+ pixel_x = 5
+ },
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/ammo_box/magazine/co9mm{
+ pixel_x = -5
+ },
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
+ pixel_y = 5
+ },
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
+ pixel_y = -5
+ },
+/obj/item/ammo_box/magazine/skm_762_40{
+ pixel_x = -7
+ },
+/obj/item/ammo_box/magazine/skm_762_40{
+ pixel_x = 7
+ },
+/obj/item/gun/ballistic/automatic/assault/skm/inteq{
+ pixel_x = -5
+ },
+/obj/structure/closet/secure_closet/wall{
+ dir = 1;
+ icon_state = "sec_wall";
+ name = "weapons lockup";
+ pixel_y = -28;
+ req_one_access_txt = "58"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
"EC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -2807,7 +2895,7 @@ ib
ib
GB
mw
-Ix
+va
Ki
of
NI
@@ -2826,9 +2914,9 @@ ib
ib
ib
Yj
-Zy
+aE
DB
-nD
+Ek
pe
ne
Pk
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index d4bd622b8f0e..209466a1b2ef 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -6366,6 +6366,15 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
+"bpl" = (
+/obj/structure/closet/crate/bin,
+/obj/structure/sign/clip{
+ pixel_y = 28
+ },
+/obj/machinery/light/directional/east,
+/obj/item/reagent_containers/food/snacks/pancakes/blueberry,
+/turf/open/floor/plasteel,
+/area/centcom)
"bsD" = (
/obj/structure/table/reinforced,
/obj/item/folder,
@@ -6518,16 +6527,6 @@
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel,
/area/centcom/control)
-"bIJ" = (
-/obj/structure/sign/minutemen{
- pixel_y = -28
- },
-/obj/machinery/light/directional/west,
-/obj/machinery/telecomms/relay/preset/minutemen{
- autolinkers = list("relay")
- },
-/turf/open/floor/plasteel,
-/area/centcom)
"bMY" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 1
@@ -6570,28 +6569,6 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
-"bRF" = (
-/obj/structure/table/reinforced,
-/obj/structure/sign/poster/minutemen/bard{
- pixel_y = -32
- },
-/obj/item/ammo_box/magazine/p16{
- pixel_x = -5;
- pixel_y = 6
- },
-/obj/item/ammo_box/magazine/p16{
- pixel_x = 1;
- pixel_y = 2
- },
-/obj/item/ammo_casing{
- pixel_x = 7;
- pixel_y = 7
- },
-/obj/item/ammo_casing{
- pixel_x = 11
- },
-/turf/open/floor/plasteel,
-/area/centcom)
"bRK" = (
/obj/structure/table/reinforced,
/obj/item/taperecorder,
@@ -7395,6 +7372,20 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
+"dGh" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = 5
+ },
+/obj/item/clothing/head/clip/slouch{
+ pixel_y = 8;
+ pixel_x = -4
+ },
+/obj/item/pen/fourcolor{
+ pixel_x = 5
+ },
+/turf/open/floor/plasteel,
+/area/centcom)
"dGq" = (
/obj/machinery/computer/med_data{
dir = 8
@@ -7434,15 +7425,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"dKW" = (
-/obj/structure/closet/crate/bin,
-/obj/structure/sign/minutemen{
- pixel_y = 28
- },
-/obj/machinery/light/directional/east,
-/obj/item/reagent_containers/food/snacks/pancakes/blueberry,
-/turf/open/floor/plasteel,
-/area/centcom)
"dMa" = (
/obj/item/radio{
pixel_x = 5;
@@ -9108,20 +9090,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/plasteel,
/area/centcom/supply)
-"hba" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = 5
- },
-/obj/item/clothing/head/cowboy/sec/minutemen{
- pixel_y = 8;
- pixel_x = -4
- },
-/obj/item/pen/fourcolor{
- pixel_x = 5
- },
-/turf/open/floor/plasteel,
-/area/centcom)
"hbh" = (
/obj/structure/table/wood,
/obj/item/phone{
@@ -9611,26 +9579,6 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
-"igC" = (
-/obj/structure/sign/minutemen{
- pixel_y = -28
- },
-/obj/structure/table/reinforced,
-/obj/item/clothing/head/helmet/bulletproof/minutemen{
- pixel_x = -1;
- pixel_y = 8
- },
-/obj/item/clothing/head/helmet/bulletproof/minutemen{
- pixel_x = 3;
- pixel_y = 11
- },
-/obj/machinery/light/directional/east,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
- pixel_x = -9;
- pixel_y = 3
- },
-/turf/open/floor/plasteel,
-/area/centcom)
"igW" = (
/obj/structure/bed/roller,
/obj/machinery/iv_drip,
@@ -9965,6 +9913,18 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
+"iMC" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+ pixel_x = 8;
+ pixel_y = 3
+ },
+/obj/structure/sign/clip{
+ pixel_y = 28
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel,
+/area/centcom)
"iNA" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/corner/opaque/red,
@@ -10424,6 +10384,22 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"jRf" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
+ pixel_x = 2
+ },
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
+ pixel_x = -1;
+ pixel_y = -6
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel,
+/area/centcom)
"jTw" = (
/obj/machinery/vending/hydroseeds,
/obj/effect/turf_decal/corner/opaque/green{
@@ -10688,14 +10664,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"kkC" = (
-/obj/structure/table/reinforced,
-/obj/structure/sign/poster/minutemen/gold{
- pixel_y = 32
- },
-/obj/machinery/fax/admin/minutemen,
-/turf/open/floor/plasteel,
-/area/centcom)
"kkV" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 4
@@ -11448,18 +11416,6 @@
},
/turf/open/floor/plasteel,
/area/tdome/arena_source)
-"lQr" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp{
- pixel_x = 8;
- pixel_y = 3
- },
-/obj/structure/sign/minutemen{
- pixel_y = 28
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel,
-/area/centcom)
"lQv" = (
/obj/effect/turf_decal/corner/opaque/brown,
/obj/effect/turf_decal/corner/opaque/brown{
@@ -11559,6 +11515,24 @@
},
/turf/open/floor/plasteel,
/area/centcom)
+"man" = (
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/assault/skm/inteq{
+ pixel_y = 3
+ },
+/obj/item/gun/ballistic/automatic/assault/skm/inteq{
+ pixel_y = -1;
+ pixel_x = -5
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel,
+/area/centcom)
"mbm" = (
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -12581,24 +12555,6 @@
},
/turf/open/floor/plasteel/dark,
/area/tdome/tdomeobserve)
-"odH" = (
-/obj/effect/turf_decal/corner/opaque/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/brown{
- dir = 8
- },
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/assault/skm/inteq{
- pixel_y = 3
- },
-/obj/item/gun/ballistic/automatic/assault/skm/inteq{
- pixel_y = -1;
- pixel_x = -5
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
-/area/centcom)
"odV" = (
/obj/structure/chair/office{
dir = 8
@@ -13652,6 +13608,14 @@
},
/turf/open/floor/plasteel/white,
/area/tdome/tdomeobserve)
+"qap" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/poster/clip/gold{
+ pixel_y = 32
+ },
+/obj/machinery/fax/admin/minutemen,
+/turf/open/floor/plasteel,
+/area/centcom)
"qdG" = (
/obj/effect/turf_decal/corner/transparent/neutral,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -14312,7 +14276,7 @@
/area/centcom/control)
"rvC" = (
/obj/structure/table/reinforced,
-/obj/item/radio/headset/minutemen/alt/captain{
+/obj/item/radio/headset/clip/alt/captain{
pixel_y = 2;
pixel_x = 1
},
@@ -14393,6 +14357,28 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"rIP" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/poster/clip/bard{
+ pixel_y = -32
+ },
+/obj/item/ammo_box/magazine/p16{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/obj/item/ammo_box/magazine/p16{
+ pixel_x = 1;
+ pixel_y = 2
+ },
+/obj/item/ammo_casing{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/obj/item/ammo_casing{
+ pixel_x = 11
+ },
+/turf/open/floor/plasteel,
+/area/centcom)
"rJp" = (
/obj/item/storage/firstaid/regular,
/obj/structure/table,
@@ -14650,6 +14636,26 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"slo" = (
+/obj/structure/sign/clip{
+ pixel_y = -28
+ },
+/obj/structure/table/reinforced,
+/obj/item/clothing/head/helmet/bulletproof/x11/clip{
+ pixel_x = -1;
+ pixel_y = 8
+ },
+/obj/item/clothing/head/helmet/bulletproof/x11/clip{
+ pixel_x = 3;
+ pixel_y = 11
+ },
+/obj/machinery/light/directional/east,
+/obj/item/reagent_containers/food/drinks/bottle/rum{
+ pixel_x = -9;
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel,
+/area/centcom)
"slp" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
@@ -15189,22 +15195,6 @@
},
/turf/open/floor/plasteel,
/area/centcom/supply)
-"tvO" = (
-/obj/effect/turf_decal/corner/opaque/brown{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
- pixel_x = 2
- },
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
- pixel_x = -1;
- pixel_y = -6
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
-/area/centcom)
"tyg" = (
/obj/effect/turf_decal/corner/opaque/blue{
dir = 1
@@ -16252,6 +16242,16 @@
},
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
+"wbr" = (
+/obj/structure/sign/clip{
+ pixel_y = -28
+ },
+/obj/machinery/light/directional/west,
+/obj/machinery/telecomms/relay/preset/minutemen{
+ autolinkers = list("relay")
+ },
+/turf/open/floor/plasteel,
+/area/centcom)
"wbx" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/item/weldingtool/experimental,
@@ -26673,11 +26673,11 @@ psm
aPu
aaa
hzJ
-lQr
+iMC
moE
qVq
qVq
-bIJ
+wbr
hzJ
aaa
aaa
@@ -26930,7 +26930,7 @@ eqM
aPu
aaa
hzJ
-hba
+dGh
wad
pTR
gaU
@@ -27187,7 +27187,7 @@ unc
iSo
aaa
hzJ
-kkC
+qap
pvW
iWI
hBf
@@ -27448,7 +27448,7 @@ qVq
tGR
kiC
bUH
-bRF
+rIP
hzJ
aaa
aaa
@@ -27701,11 +27701,11 @@ gsx
aPu
aaa
hzJ
-dKW
+bpl
qVq
qVq
aIF
-igC
+slo
hzJ
aaa
aaa
@@ -30781,7 +30781,7 @@ nYZ
mGE
rUa
mGE
-odH
+man
aPu
aaa
eAJ
@@ -31809,7 +31809,7 @@ lKP
sQw
rjV
sQw
-tvO
+jRf
aPu
aaa
eAJ
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index 29ac7afbc657..987c9f970948 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -1197,6 +1197,13 @@
},
/turf/open/floor/plasteel/tech,
/area/outpost/crew/cryo)
+"eF" = (
+/obj/structure/table/glass,
+/obj/machinery/fax/admin/outpost{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/outpost/operations)
"eH" = (
/obj/structure/railing/wood{
dir = 4
@@ -3783,6 +3790,9 @@
},
/turf/open/floor/concrete/tiles,
/area/outpost/hallway/central)
+"nV" = (
+/turf/closed/indestructible/fakeglass,
+/area/outpost/engineering/atmospherics)
"nX" = (
/turf/open/floor/wood,
/area/outpost/crew/bar)
@@ -10091,6 +10101,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned/ridged,
/area/outpost/crew/canteen)
+"Jj" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/item/radio/intercom/directional/north{
+ icon_state = "clip_headset"
+ },
+/turf/open/floor/plasteel/tech,
+/area/outpost/cargo/office)
"Jm" = (
/obj/effect/turf_decal/siding/wood/corner,
/obj/effect/turf_decal/siding/wood/corner{
@@ -10973,22 +10999,6 @@
},
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/engineering/atmospherics)
-"Mg" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/decal/cleanable/generic,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/item/radio/intercom/directional/north{
- icon_state = "cmm_headset"
- },
-/turf/open/floor/plasteel/tech,
-/area/outpost/cargo/office)
"Mi" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -12127,6 +12137,12 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/outpost/crew/library)
+"Qk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/closed/indestructible/fakeglass,
+/area/outpost/engineering/atmospherics)
"Ql" = (
/obj/structure/rack,
/obj/effect/turf_decal/box/corners,
@@ -13488,12 +13504,6 @@
},
/turf/open/floor/plating,
/area/outpost/maintenance/fore)
-"UX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/closed/indestructible/fakeglass,
-/area/outpost/engineering/atmospherics)
"UY" = (
/obj/structure/table/wood,
/obj/item/trash/plate{
@@ -13593,9 +13603,6 @@
},
/turf/open/floor/plasteel/rockvault,
/area/outpost/operations)
-"Vm" = (
-/turf/closed/indestructible/fakeglass,
-/area/outpost/engineering/atmospherics)
"Vn" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -13803,13 +13810,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/wood,
/area/outpost/hallway/central)
-"We" = (
-/obj/structure/table/glass,
-/obj/machinery/fax/admin/outpost{
- pixel_y = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/outpost/operations)
"Wi" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -23407,11 +23407,11 @@ Zp
Zp
pU
vD
-Vm
+nV
my
LO
CE
-Vm
+nV
QU
pU
Qq
@@ -23530,11 +23530,11 @@ Zp
Zp
pU
rP
-Vm
+nV
my
LO
CE
-Vm
+nV
qc
pU
dX
@@ -23653,11 +23653,11 @@ Zp
Zp
pU
vD
-Vm
+nV
my
mz
ye
-Vm
+nV
QU
pU
dU
@@ -23809,7 +23809,7 @@ cX
Mt
Mt
lS
-Mg
+Jj
TR
ex
RR
@@ -23899,11 +23899,11 @@ Zp
Zp
pU
lr
-Vm
+nV
my
mz
ye
-Vm
+nV
QA
pU
gP
@@ -24022,11 +24022,11 @@ Zp
Zp
pU
ui
-Vm
+nV
my
mz
ye
-Vm
+nV
qp
pU
Hh
@@ -24145,11 +24145,11 @@ Zp
Zp
pU
lr
-Vm
+nV
my
mz
ye
-Vm
+nV
QA
pU
OA
@@ -24391,11 +24391,11 @@ Zp
Zp
pU
Di
-Vm
+nV
my
mz
PE
-Vm
+nV
tj
pU
NA
@@ -24514,11 +24514,11 @@ Zp
Zp
pU
BH
-Vm
+nV
MZ
Ck
ye
-Vm
+nV
tj
pU
vk
@@ -24637,11 +24637,11 @@ Zp
Zp
pU
Tu
-Vm
+nV
ke
hO
bW
-Vm
+nV
tj
pU
gP
@@ -24761,9 +24761,9 @@ Zp
pU
pU
pU
-Vm
-UX
-Vm
+nV
+Qk
+nV
pU
pU
pU
@@ -26241,7 +26241,7 @@ EN
wS
wS
aG
-We
+eF
Ke
wS
cH
diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json
index 852e422343fb..79c924cc3480 100644
--- a/_maps/ship_config_schema.json
+++ b/_maps/ship_config_schema.json
@@ -71,7 +71,7 @@
"ACLF",
"GEC",
"DONK",
- "COLONIAL MINUTEMEN",
+ "CLIP MINUTEMEN",
"SAINT-ROUMAIN",
"INSTALLATION",
"SOLGOV",
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index ef0e3a0ade97..fd498f15872c 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -329,6 +329,35 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
+"dB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/closet/wall/blue{
+ dir = 4;
+ name = "Janitorial Closet";
+ pixel_x = -28
+ },
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/soap/deluxe,
+/obj/item/reagent_containers/glass/rag,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/clothing/head/soft/purple{
+ pixel_x = 5
+ },
+/obj/item/clothing/shoes/galoshes{
+ pixel_x = 7;
+ pixel_y = -8
+ },
+/obj/item/storage/box/mousetraps{
+ pixel_y = -3;
+ pixel_x = -9
+ },
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
"dC" = (
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 1
@@ -3325,30 +3354,6 @@
},
/turf/open/floor/carpet/nanoweave,
/area/ship/hallway/central)
-"FF" = (
-/obj/structure/closet/cabinet,
-/obj/item/clothing/suit/toggle/lawyer/burgundy{
- pixel_y = -3
- },
-/obj/item/clothing/head/beanie/stripedgreen{
- pixel_x = 2;
- pixel_y = -5
- },
-/obj/item/clothing/glasses/regular/hipster,
-/obj/machinery/button/door{
- id = "beluga_dorm1_window";
- pixel_x = 10;
- pixel_y = -23;
- dir = 1
- },
-/obj/machinery/light/small/directional/west,
-/obj/item/clothing/under/suit/charcoal,
-/obj/item/clothing/glasses/monocle,
-/obj/item/clothing/shoes/laceup{
- pixel_y = -11
- },
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew)
"FH" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/hallway/central)
@@ -3426,35 +3431,6 @@
},
/turf/open/floor/carpet/nanoweave/orange,
/area/ship/security)
-"Hb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/closet/wall/blue{
- dir = 4;
- name = "Janitorial Closet";
- pixel_x = -28
- },
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/soap/deluxe,
-/obj/item/reagent_containers/glass/rag,
-/obj/item/clothing/gloves/color/latex/nitrile/evil,
-/obj/item/clothing/head/soft/purple{
- pixel_x = 5
- },
-/obj/item/clothing/shoes/galoshes{
- pixel_x = 7;
- pixel_y = -8
- },
-/obj/item/storage/box/mousetraps{
- pixel_y = -3;
- pixel_x = -9
- },
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/crew/dorm)
"Hc" = (
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/light/directional/north,
@@ -3964,6 +3940,30 @@
},
/turf/open/floor/carpet/nanoweave,
/area/ship/crew/library)
+"Lj" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/toggle/lawyer/burgundy{
+ pixel_y = -3
+ },
+/obj/item/clothing/head/beanie/stripedgreen{
+ pixel_x = 2;
+ pixel_y = -5
+ },
+/obj/item/clothing/glasses/regular/hipster,
+/obj/machinery/button/door{
+ id = "beluga_dorm1_window";
+ pixel_x = 10;
+ pixel_y = -23;
+ dir = 1
+ },
+/obj/machinery/light/small/directional/west,
+/obj/item/clothing/under/suit/charcoal,
+/obj/item/clothing/glasses/monocle,
+/obj/item/clothing/shoes/laceup{
+ pixel_y = -11
+ },
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew)
"Lr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -4538,29 +4538,6 @@
},
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
-"RW" = (
-/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/structure/closet/wall/red{
- dir = 1;
- name = "Officer's Locker";
- pixel_y = -28
- },
-/obj/item/clothing/shoes/combat,
-/obj/item/storage/belt/security/webbing/inteq,
-/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
-/obj/item/clothing/mask/gas/sechailer/inteq,
-/obj/item/clothing/under/syndicate/inteq/skirt,
-/obj/item/clothing/under/syndicate/inteq,
-/obj/item/clothing/head/beret/sec/inteq,
-/obj/item/clothing/gloves/tackler/combat,
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 7;
- pixel_y = -3
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
"Sd" = (
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -4995,6 +4972,29 @@
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering)
+"WG" = (
+/obj/effect/turf_decal/siding/wideplating/dark,
+/obj/structure/closet/wall/red{
+ dir = 1;
+ name = "Officer's Locker";
+ pixel_y = -28
+ },
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/belt/security/webbing/inteq,
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/head/beret/sec/inteq,
+/obj/item/clothing/gloves/tackler/combat,
+/obj/item/reagent_containers/spray/pepper{
+ pixel_x = 7;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/trimline/opaque/yellow/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
"WS" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -5726,7 +5726,7 @@ aF
Iw
pH
mr
-Hb
+dB
TG
Go
Kn
@@ -5737,7 +5737,7 @@ bF
TV
Ey
xe
-FF
+Lj
bF
Sv
"}
@@ -6071,7 +6071,7 @@ GY
Sy
eJ
iX
-RW
+WG
OE
Sv
Sv
@@ -6092,7 +6092,7 @@ fV
fX
pk
Zl
-RW
+WG
OE
Sv
Sv
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index dff7c4ef280f..7c3816f580e0 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -719,7 +719,7 @@
/area/ship/security)
"hx" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
@@ -4295,9 +4295,9 @@
name = "equipment locker";
req_access_txt = "148"
},
-/obj/item/clothing/mask/gas/sechailer/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq,
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 04f3c4641754..f264dfbf6bb6 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1901,7 +1901,7 @@
/area/ship/hallway/central)
"ml" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/military/assault,
@@ -3601,7 +3601,7 @@
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/shoes/combat,
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/clothing/gloves/combat,
/obj/item/megaphone/cargo{
name = "engineering megaphone"
@@ -7511,7 +7511,7 @@
name = "equipment locker";
req_access_txt = "1"
},
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/storage/box/handcuffs,
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index b3467f7433df..7a9737ea5891 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -508,29 +508,16 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
-"em" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/airlock/command{
- name = "Bridge";
- dir = 8;
- req_access = list(19)
- },
-/obj/structure/cable{
- icon_state = "4-8"
+"el" = (
+/obj/docking_port/mobile{
+ can_move_docking_ports = 1;
+ dir = 2;
+ name = "valor docking port";
+ port_direction = 8;
+ preferred_direction = 4
},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/maintenance/port)
"ew" = (
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
@@ -684,20 +671,6 @@
/obj/item/storage/firstaid/regular,
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/crew/office)
-"fQ" = (
-/obj/structure/bed/dogbed{
- name = "Picket's bed";
- anchored = 1;
- desc = "A comfy-looking dog bed. Despite the name, the owner is a cat."
- },
-/mob/living/simple_animal/pet/cat{
- dir = 4;
- name = "Picket";
- desc = "Guardian of the bridge and the Honorable Corpsman's bedsheets."
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/carpet/blue,
-/area/ship/bridge)
"gb" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 10
@@ -987,6 +960,21 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
+"iW" = (
+/obj/structure/table,
+/obj/item/phone{
+ pixel_x = -14
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/jukebox/boombox{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
"jj" = (
/obj/effect/turf_decal/box/corners{
dir = 8
@@ -1132,15 +1120,28 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/starboard)
-"kv" = (
-/obj/structure/bed,
-/obj/item/bedsheet/cmo{
- name = "honorable corpsman's bedsheet";
- desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Picket."
+"kx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
},
-/obj/structure/curtain/cloth,
-/obj/machinery/light/directional/west,
-/turf/open/floor/carpet/blue,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/airlock/command{
+ dir = 8;
+ name = "Bridge";
+ req_access = list(19)
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ky" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
@@ -1363,21 +1364,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
-"ml" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "valor_cargo"
- },
-/obj/machinery/power/shieldwallgen/atmos{
- dir = 1;
- id = "valor_holo";
- anchored = 1
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/cargo)
"mp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -1538,29 +1524,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/medical)
-"nx" = (
-/obj/structure/railing{
- dir = 6
- },
-/obj/item/target{
- pixel_y = 10;
- pixel_x = -9
- },
-/obj/item/target/alien{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/item/target{
- pixel_x = -8;
- pixel_y = 2
- },
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/borderfloor{
- dir = 4
- },
-/obj/structure/rack,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
"nz" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -1683,6 +1646,21 @@
"oO" = (
/turf/closed/wall/mineral/plastitanium,
/area/ship/crew/office)
+"oS" = (
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "valor_cargo"
+ },
+/obj/machinery/power/shieldwallgen/atmos{
+ anchored = 1;
+ dir = 1;
+ id = "valor_holo"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
"pa" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -1985,6 +1963,24 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/security)
+"sb" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/machinery/light/directional/south,
+/obj/structure/sign/poster/contraband/tools{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/corner_techfloor_gray/full,
+/obj/machinery/cell_charger,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
"sc" = (
/obj/structure/rack,
/obj/machinery/firealarm/directional/east,
@@ -2157,6 +2153,29 @@
},
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
+"tf" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/item/chair/plastic,
+/obj/item/chair/plastic{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/chair/plastic{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/obj/item/chair/plastic{
+ pixel_x = -3;
+ pixel_y = 8
+ },
+/obj/structure/rack,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
"tj" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/cable{
@@ -2309,6 +2328,20 @@
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
+"vd" = (
+/obj/machinery/door/poddoor{
+ dir = 4;
+ id = "valor_cargo"
+ },
+/obj/machinery/power/shieldwallgen/atmos{
+ anchored = 1;
+ id = "valor_holo"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
"vh" = (
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/inteq,
@@ -2358,18 +2391,6 @@
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
-"vI" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/smartfridge/bloodbank/preloaded{
- pixel_y = 32;
- density = 0
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/medical)
"vK" = (
/obj/machinery/cryopod{
dir = 1
@@ -2392,6 +2413,19 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/crew/canteen)
+"wb" = (
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/structure/table,
+/obj/item/storage/box/cups{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
"wc" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2534,6 +2568,29 @@
/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
+"xr" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/folder/white{
+ pixel_x = -15;
+ pixel_y = -1
+ },
+/obj/item/pen,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/item/toy/figure/paramedic{
+ name = "Corpsman action figure";
+ pixel_x = -13;
+ pixel_y = 14
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/office)
"xs" = (
/obj/machinery/iv_drip,
/obj/machinery/light/directional/south,
@@ -2743,6 +2800,18 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/medical)
+"zC" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/machinery/smartfridge/bloodbank/preloaded{
+ density = 0;
+ pixel_y = 32
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/medical)
"zD" = (
/obj/machinery/computer/operating{
dir = 4
@@ -2904,6 +2973,19 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
+"Au" = (
+/obj/structure/rack,
+/obj/item/roller,
+/obj/item/roller{
+ pixel_x = -1;
+ pixel_y = 8
+ },
+/obj/item/roller{
+ pixel_x = 1;
+ pixel_y = 16
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
"Av" = (
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
@@ -2972,6 +3054,23 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
+"AT" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/bag/tray{
+ pixel_x = -1;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+ pixel_x = 6;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/food/snacks/burger/plain{
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
"AV" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
@@ -3227,14 +3326,32 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/medical)
-"DR" = (
-/obj/machinery/door/airlock/hatch{
- name = "Cargo Bay"
+"DQ" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/item/flashlight/lamp{
+ pixel_x = -13;
+ pixel_y = 10
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"DR" = (
+/obj/machinery/door/airlock/hatch{
+ name = "Cargo Bay"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
@@ -3735,23 +3852,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
-"IQ" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/storage/bag/tray{
- pixel_y = 5;
- pixel_x = -1
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
- pixel_x = 6;
- pixel_y = 8
- },
-/obj/item/reagent_containers/food/snacks/burger/plain{
- pixel_y = 3;
- pixel_x = -4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
"Jd" = (
/obj/effect/turf_decal/borderfloor{
dir = 1
@@ -3799,21 +3899,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
-"Jz" = (
-/obj/structure/table,
-/obj/item/phone{
- pixel_x = -14
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/jukebox/boombox{
- pixel_y = 2;
- pixel_x = 3
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
"JC" = (
/obj/machinery/door/poddoor{
dir = 4;
@@ -3840,6 +3925,16 @@
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
+"JT" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 15;
+ height = 15;
+ name = "valor dock";
+ width = 15
+ },
+/turf/template_noop,
+/area/template_noop)
"Kh" = (
/turf/open/floor/carpet/blue,
/area/ship/bridge)
@@ -3927,18 +4022,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
-"KC" = (
-/obj/structure/table,
-/obj/item/folder{
- pixel_y = 4;
- pixel_x = -3
- },
-/obj/item/folder/blue{
- pixel_x = 2
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
"KD" = (
/obj/machinery/iv_drip,
/turf/open/floor/plasteel/white,
@@ -4016,6 +4099,38 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
+"Lq" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband/table{
+ dir = 4;
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ dir = 8;
+ id = "valor_bridge";
+ name = "Bridge Shutters";
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/obj/machinery/button/door{
+ dir = 8;
+ id = "valor_external";
+ name = "External Shutters";
+ pixel_x = -9;
+ pixel_y = -4
+ },
+/obj/item/radio/intercom/table{
+ dir = 4;
+ pixel_x = 4;
+ pixel_y = -6
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
"Ls" = (
/obj/effect/turf_decal/techfloor{
dir = 4
@@ -4142,24 +4257,6 @@
},
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/cargo)
-"MS" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/item/flashlight/lamp{
- pixel_y = 10;
- pixel_x = -13
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
"Nh" = (
/turf/closed/wall/mineral/plastitanium,
/area/ship/cargo)
@@ -4182,30 +4279,6 @@
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew/canteen)
-"Nu" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
- pixel_x = -28;
- req_access = list(19);
- name = "honorable corpsman's locker"
- },
-/obj/item/clothing/shoes/combat,
-/obj/item/megaphone/command,
-/obj/item/clothing/under/syndicate/inteq/corpsman,
-/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
-/obj/item/clothing/suit/armor/hos/inteq,
-/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
-/obj/item/storage/backpack/messenger/med,
-/obj/item/clothing/head/beret/sec/brig_phys{
- icon_state = "beret_med";
- name = "honorable corpsman beret";
- desc = "A beret made out of white reinforced fabric with a lue cross emblazoned on it. Smells faintly of blood and gauze."
- },
-/obj/item/clothing/glasses/hud/health/sunglasses,
-/obj/item/storage/box/hypospray/CMO,
-/obj/item/clothing/gloves/color/latex/nitrile,
-/turf/open/floor/carpet/blue,
-/area/ship/bridge)
"NA" = (
/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
/obj/effect/turf_decal/siding/thinplating/dark,
@@ -4279,24 +4352,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/ship/hallway/port)
-"NT" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/machinery/light/directional/south,
-/obj/structure/sign/poster/contraband/tools{
- pixel_x = -32
- },
-/obj/effect/turf_decal/corner_techfloor_gray/full,
-/obj/machinery/cell_charger,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
"NZ" = (
/obj/effect/turf_decal/siding/thinplating/dark,
/obj/structure/cable{
@@ -4307,6 +4362,29 @@
/obj/effect/turf_decal/trimline/opaque/brown/line,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
+"Oc" = (
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/megaphone/command,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/suit/armor/hos/inteq,
+/obj/item/clothing/head/beret/sec/hos/inteq,
+/obj/structure/closet/secure_closet/wall{
+ dir = 4;
+ icon_door = "solgov_wall";
+ icon_state = "solgov_wall";
+ name = "vanguard's locker";
+ pixel_x = -28;
+ req_access = list(58)
+ },
+/obj/item/storage/lockbox/medal/sec,
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/head/inteq_peaked,
+/turf/open/floor/carpet/orange,
+/area/ship/bridge)
"Od" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 4
@@ -4349,6 +4427,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
+"Oz" = (
+/obj/structure/table,
+/obj/item/folder{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/obj/item/folder/blue{
+ pixel_x = 2
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
"OC" = (
/obj/structure/bed,
/obj/structure/curtain,
@@ -4366,38 +4456,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
-"OE" = (
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom/wideband/table{
- dir = 4;
- pixel_x = 4;
- pixel_y = 8
- },
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/effect/turf_decal/corner/opaque/brown{
- dir = 4
- },
-/obj/machinery/button/door{
- pixel_x = -9;
- dir = 8;
- pixel_y = 8;
- name = "Bridge Shutters";
- id = "valor_bridge"
- },
-/obj/machinery/button/door{
- pixel_x = -9;
- dir = 8;
- pixel_y = -4;
- id = "valor_external";
- name = "External Shutters"
- },
-/obj/item/radio/intercom/table{
- dir = 4;
- pixel_x = 4;
- pixel_y = -6
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
"OK" = (
/obj/machinery/iv_drip/saline,
/turf/open/floor/plasteel/patterned/ridged,
@@ -4652,36 +4710,6 @@
"Rh" = (
/turf/closed/wall/mineral/plastitanium,
/area/ship/security)
-"Rj" = (
-/obj/structure/toilet/secret{
- secret_type = "/obj/item/toy/plush/moth";
- dir = 8
- },
-/turf/open/floor/plasteel/patterned/brushed,
-/area/ship/crew/canteen)
-"Rz" = (
-/obj/effect/turf_decal/box/corners{
- dir = 8
- },
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
-/obj/item/chair/plastic,
-/obj/item/chair/plastic{
- pixel_y = 3;
- pixel_x = -3
- },
-/obj/item/chair/plastic{
- pixel_y = 6;
- pixel_x = 2
- },
-/obj/item/chair/plastic{
- pixel_y = 8;
- pixel_x = -3
- },
-/obj/structure/rack,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
"RA" = (
/obj/item/storage/backpack/messenger/inteq,
/obj/item/storage/backpack/messenger/inteq,
@@ -4708,6 +4736,37 @@
/obj/structure/rack,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
+"RR" = (
+/obj/structure/closet/secure_closet/wall{
+ dir = 4;
+ name = "honorable corpsman's locker";
+ pixel_x = -28;
+ req_access = list(19)
+ },
+/obj/item/clothing/shoes/combat,
+/obj/item/megaphone/command,
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/suit/armor/hos/inteq,
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/clothing/head/beret/sec/brig_phys{
+ desc = "A beret made out of white reinforced fabric with a lue cross emblazoned on it. Smells faintly of blood and gauze.";
+ icon_state = "beret_med";
+ name = "honorable corpsman beret"
+ },
+/obj/item/clothing/glasses/hud/health/sunglasses,
+/obj/item/storage/box/hypospray/CMO,
+/obj/item/clothing/gloves/color/latex/nitrile,
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
+"RT" = (
+/obj/structure/toilet/secret{
+ dir = 8;
+ secret_type = "/obj/item/toy/plush/moth"
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew/canteen)
"Sd" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/light/directional/south,
@@ -4792,6 +4851,29 @@
"Tw" = (
/turf/closed/wall/mineral/plastitanium,
/area/ship/hallway/central)
+"TB" = (
+/obj/structure/railing{
+ dir = 6
+ },
+/obj/item/target{
+ pixel_x = -9;
+ pixel_y = 10
+ },
+/obj/item/target/alien{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/target{
+ pixel_x = -8;
+ pixel_y = 2
+ },
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/borderfloor{
+ dir = 4
+ },
+/obj/structure/rack,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
"TC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4816,19 +4898,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
-"TS" = (
-/obj/effect/turf_decal/corner/opaque/brown{
- dir = 8
- },
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/structure/table,
-/obj/item/storage/box/cups{
- pixel_y = 7;
- pixel_x = -3
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
"TW" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
@@ -4846,20 +4915,6 @@
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
-"Ug" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "valor_cargo"
- },
-/obj/machinery/power/shieldwallgen/atmos{
- id = "valor_holo";
- anchored = 1
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/cargo)
"Ui" = (
/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 1
@@ -4903,16 +4958,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
-"Uv" = (
-/obj/docking_port/stationary{
- height = 15;
- width = 15;
- name = "valor dock";
- dwidth = 15;
- dir = 8
- },
-/turf/template_noop,
-/area/template_noop)
"Uz" = (
/obj/machinery/power/smes/engineering{
charge = 1e+006
@@ -5066,29 +5111,16 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
-"Wd" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/folder/white{
- pixel_x = -15;
- pixel_y = -1
- },
-/obj/item/pen,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/item/toy/figure/paramedic{
- pixel_x = -13;
- pixel_y = 14;
- name = "Corpsman action figure"
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
+"Wo" = (
+/obj/structure/bed,
+/obj/item/bedsheet/cmo{
+ desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Picket.";
+ name = "honorable corpsman's bedsheet"
},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/office)
+/obj/structure/curtain/cloth,
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
"Wp" = (
/obj/machinery/door/airlock/hatch{
name = "Port Hallway"
@@ -5389,6 +5421,20 @@
},
/turf/open/floor/plating,
/area/ship/maintenance/port)
+"Zc" = (
+/obj/structure/bed/dogbed{
+ anchored = 1;
+ desc = "A comfy-looking dog bed. Despite the name, the owner is a cat.";
+ name = "Picket's bed"
+ },
+/mob/living/simple_animal/pet/cat{
+ desc = "Guardian of the bridge and the Honorable Corpsman's bedsheets.";
+ dir = 4;
+ name = "Picket"
+ },
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/carpet/blue,
+/area/ship/bridge)
"Zd" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
@@ -5414,19 +5460,6 @@
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
-"Zr" = (
-/obj/structure/rack,
-/obj/item/roller,
-/obj/item/roller{
- pixel_y = 8;
- pixel_x = -1
- },
-/obj/item/roller{
- pixel_y = 16;
- pixel_x = 1
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
"Zu" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/security)
@@ -5459,7 +5492,7 @@
/area/ship/crew/dorm)
(1,1,1) = {"
-xU
+el
MK
MK
MK
@@ -5474,7 +5507,7 @@ Td
Td
Td
Td
-Uv
+JT
Td
Td
Td
@@ -5529,7 +5562,7 @@ cu
pL
wS
Pb
-NT
+sb
cu
Td
Td
@@ -5537,13 +5570,13 @@ Td
Td
Td
Nh
-Ug
+vd
JC
JC
JC
JC
JC
-ml
+oS
Nh
Td
Td
@@ -5610,7 +5643,7 @@ OM
OM
UO
LH
-Rz
+tf
xj
Td
Td
@@ -5726,7 +5759,7 @@ LI
Zu
kK
LR
-MS
+DQ
FZ
hl
NM
@@ -5858,7 +5891,7 @@ LI
tZ
Xx
Gm
-Wd
+xr
Hg
tS
HC
@@ -5876,7 +5909,7 @@ HL
ec
xg
xj
-Zr
+Au
Re
OK
LI
@@ -5934,7 +5967,7 @@ Sh
Hw
ux
ct
-nx
+TB
AM
NG
dO
@@ -5979,7 +6012,7 @@ Yx
Io
mt
LI
-vI
+zC
Ye
mw
mw
@@ -6232,7 +6265,7 @@ HK
Jh
Av
VB
-KC
+Oz
zL
Us
Tu
@@ -6364,12 +6397,12 @@ HK
Jh
Av
Av
-Jz
+iW
UC
EL
-IQ
+AT
ET
-TS
+wb
HK
Ct
Td
@@ -6431,7 +6464,7 @@ dI
nk
nk
nk
-em
+kx
nk
nk
nk
@@ -6463,10 +6496,10 @@ Nn
ni
nk
AG
-ze
+Oc
ND
-Nu
-kv
+RR
+Wo
nk
nZ
HQ
@@ -6499,10 +6532,10 @@ bS
Am
KY
Kh
-fQ
+Zc
nk
wa
-Rj
+RT
HK
Td
Td
@@ -6596,7 +6629,7 @@ Td
jS
nk
zi
-OE
+Lq
fK
nk
jS
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index 66630781a4bd..68f9b5a41063 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -139,7 +139,7 @@
/obj/structure/bed,
/obj/structure/curtain/bounty,
/obj/item/bedsheet/brown,
-/obj/structure/sign/poster/minutemen/lanchester{
+/obj/structure/sign/poster/clip/lanchester{
pixel_y = -32
},
/turf/open/floor/carpet/black,
@@ -1938,7 +1938,7 @@
/area/ship/maintenance/starboard)
"DP" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
@@ -2190,7 +2190,7 @@
/obj/item/clothing/head/helmet/swat/inteq,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/melee/baton/loaded,
diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm
index cff10d5446b4..ff37ec89e5bc 100644
--- a/_maps/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/shuttles/pirate/pirate_ember.dmm
@@ -2243,37 +2243,6 @@
},
/turf/open/floor/plating,
/area/ship/engineering)
-"le" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/clothing/gloves/krav_maga/combatglovesplus,
-/obj/item/clothing/under/syndicate/camo,
-/obj/item/clothing/under/syndicate/camo,
-/obj/item/clothing/neck/scarf/black,
-/obj/item/clothing/neck/cloak/hos,
-/obj/item/clothing/mask/bandana/black{
- pixel_x = 1;
- pixel_y = -4
- },
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/suit/armor/vest/marine/medium,
-/obj/item/storage/belt/military,
-/obj/item/clothing/shoes/cowboy/black,
-/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/closet/secure_closet{
- anchored = 1;
- icon_state = "hos";
- name = "master at arm's locker";
- req_access_txt = "3"
- },
-/obj/item/gun/ballistic/automatic/pistol/APS,
-/obj/item/ammo_box/magazine/pistolm9mm,
-/obj/item/clothing/mask/gas/atmos{
- name = "tactical gas mask";
- desc = "Improved gas mask utilized by pirates. Still not very good at blocking gas flow, but it's flameproof!"
- },
-/turf/open/floor/carpet/black,
-/area/ship/security)
"lf" = (
/obj/structure/table/wood/poker,
/obj/effect/decal/cleanable/dirt,
@@ -3019,6 +2988,21 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/incinerator)
+"oM" = (
+/obj/structure/table/reinforced{
+ color = "#c1b6a5"
+ },
+/obj/item/book/manual/wiki/hacking{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/efuel{
+ pixel_x = -7;
+ pixel_y = 3
+ },
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plating/rust,
+/area/ship/engineering/communications)
"oN" = (
/obj/structure/railing{
dir = 2;
@@ -3632,6 +3616,29 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ship/hallway/central)
+"rV" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/trashcart,
+/obj/item/trash/candy,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/item/book/manual/wiki/ghetto_chemistry{
+ pixel_x = 6;
+ pixel_y = -5
+ },
+/obj/item/trash/sosjerky,
+/obj/item/storage/portable_chem_mixer{
+ pixel_x = -1;
+ pixel_y = -3
+ },
+/obj/item/trash/syndi_cakes{
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/obj/item/trash/energybar{
+ pixel_y = -6
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/fore)
"rW" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 8
@@ -4776,6 +4783,37 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/hallway/fore)
+"wV" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/clothing/gloves/krav_maga/combatglovesplus,
+/obj/item/clothing/under/syndicate/camo,
+/obj/item/clothing/under/syndicate/camo,
+/obj/item/clothing/neck/scarf/black,
+/obj/item/clothing/neck/cloak/hos,
+/obj/item/clothing/mask/bandana/black{
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/suit/armor/vest/marine/medium,
+/obj/item/storage/belt/military,
+/obj/item/clothing/shoes/cowboy/black,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/closet/secure_closet{
+ anchored = 1;
+ icon_state = "hos";
+ name = "master at arm's locker";
+ req_access_txt = "3"
+ },
+/obj/item/gun/ballistic/automatic/pistol/APS,
+/obj/item/ammo_box/magazine/pistolm9mm,
+/obj/item/clothing/mask/gas/atmos{
+ name = "tactical gas mask";
+ desc = "Improved gas mask utilized by pirates. Still not very good at blocking gas flow, but it's flameproof!"
+ },
+/turf/open/floor/carpet/black,
+/area/ship/security)
"wZ" = (
/obj/effect/turf_decal/industrial/warning{
dir = 8;
@@ -5724,45 +5762,6 @@
icon_state = "panelscorched"
},
/area/ship/hallway/central)
-"BX" = (
-/obj/structure/closet/secure_closet{
- icon_state = "sec";
- name = "equipment locker";
- req_access_txt = "1"
- },
-/obj/effect/turf_decal/techfloor,
-/obj/item/clothing/mask/bandana/black{
- pixel_x = 1;
- pixel_y = -4
- },
-/obj/item/clothing/mask/bandana/black{
- pixel_x = 1;
- pixel_y = -4
- },
-/obj/item/clothing/mask/bandana/black{
- pixel_x = 1;
- pixel_y = -4
- },
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military/army,
-/obj/item/storage/belt/military/army,
-/obj/item/clothing/head/helmet/old{
- pixel_x = 7
- },
-/obj/item/clothing/head/helmet/old{
- pixel_x = 7;
- pixel_y = -4
- },
-/obj/item/clothing/suit/armor/riot,
-/obj/machinery/light_switch{
- pixel_y = 24
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/security/armory)
"BZ" = (
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -8365,6 +8364,45 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/hallway/fore)
+"Mn" = (
+/obj/structure/closet/secure_closet{
+ icon_state = "sec";
+ name = "equipment locker";
+ req_access_txt = "1"
+ },
+/obj/effect/turf_decal/techfloor,
+/obj/item/clothing/mask/bandana/black{
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/obj/item/clothing/mask/bandana/black{
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/obj/item/clothing/mask/bandana/black{
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military/army,
+/obj/item/storage/belt/military/army,
+/obj/item/clothing/head/helmet/old{
+ pixel_x = 7
+ },
+/obj/item/clothing/head/helmet/old{
+ pixel_x = 7;
+ pixel_y = -4
+ },
+/obj/item/clothing/suit/armor/riot,
+/obj/machinery/light_switch{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/security/armory)
"Mo" = (
/obj/effect/turf_decal/industrial/traffic,
/obj/effect/turf_decal/industrial/traffic{
@@ -8671,29 +8709,6 @@
},
/turf/open/floor/carpet/nanoweave,
/area/ship/security)
-"NT" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/crate/trashcart,
-/obj/item/trash/candy,
-/obj/effect/decal/cleanable/vomit/old,
-/obj/item/book/manual/wiki/ghetto_chemistry{
- pixel_x = 6;
- pixel_y = -5
- },
-/obj/item/trash/sosjerky,
-/obj/item/storage/portable_chem_mixer{
- pixel_x = -1;
- pixel_y = -3
- },
-/obj/item/trash/syndi_cakes{
- pixel_x = -4;
- pixel_y = 3
- },
-/obj/item/trash/energybar{
- pixel_y = -6
- },
-/turf/open/floor/plating,
-/area/ship/maintenance/fore)
"NW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
@@ -9356,21 +9371,6 @@
color = "#808080"
},
/area/ship/engineering/atmospherics)
-"Ry" = (
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
- },
-/obj/item/book/manual/wiki/hacking{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/efuel{
- pixel_x = -7;
- pixel_y = 3
- },
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plating/rust,
-/area/ship/engineering/communications)
"RB" = (
/obj/effect/turf_decal/techfloor/corner{
dir = 8
@@ -11212,7 +11212,7 @@ Ds
Yv
YH
uO
-Ry
+oM
fH
ws
ws
@@ -12120,7 +12120,7 @@ KY
Yh
Ht
jY
-le
+wV
ni
Iv
Gw
@@ -12239,7 +12239,7 @@ um
ys
UY
TI
-BX
+Mn
kc
fm
By
@@ -12566,7 +12566,7 @@ ln
ln
IL
yM
-NT
+rV
IL
tu
je
diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm
index 3e32e2694bc6..9a42bbd165ec 100644
--- a/_maps/shuttles/subshuttles/minutemen_crux.dmm
+++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm
@@ -88,7 +88,8 @@
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"k" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
/obj/machinery/door/poddoor{
id = "crux_windows"
},
@@ -232,19 +233,25 @@
/obj/effect/turf_decal/techfloor/hole{
dir = 4
},
-/obj/machinery/power/port_gen/pacman,
+/obj/machinery/power/port_gen/pacman{
+ anchored = 1
+ },
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/cable{
icon_state = "0-5"
},
/obj/effect/decal/cleanable/greenglow,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -21
+ },
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/bridge)
"I" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
},
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 28
},
/obj/structure/cable{
@@ -274,9 +281,7 @@
/obj/machinery/power/terminal{
dir = 8
},
-/obj/structure/cable{
- icon_state = "0-1"
- },
+/obj/structure/cable,
/obj/structure/cable{
icon_state = "1-4"
},
@@ -363,7 +368,7 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 10
},
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = -32
},
/obj/structure/cable{
@@ -372,11 +377,14 @@
/turf/open/floor/plasteel,
/area/ship/bridge)
"X" = (
-/obj/structure/guncase,
/obj/structure/window/reinforced,
/obj/effect/turf_decal/techfloor{
dir = 9
},
+/obj/structure/closet/crate,
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/sheet/mineral/plasma/twenty,
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"Y" = (
@@ -443,7 +451,7 @@ L
w
"}
(6,1,1) = {"
-k
+w
w
h
v
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 4ed95e1631d5..6ed57b97a96a 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -16,6 +16,20 @@
/obj/machinery/power/terminal,
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
+"ah" = (
+/obj/item/clothing/under/syndicate/combat,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/effect/turf_decal/techfloor{
+ dir = 10
+ },
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/under/syndicate/skirt,
+/obj/structure/closet/syndicate{
+ desc = "It's a basic storage unit.";
+ name = "uniform closet"
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ship/hallway/central)
"am" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 6
@@ -984,22 +998,6 @@
/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
/turf/open/floor/pod/dark,
/area/ship/security/armory)
-"jh" = (
-/obj/effect/turf_decal/corner_techfloor_grid{
- dir = 5
- },
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/closet/crate/secure/loot,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
"jp" = (
/obj/effect/turf_decal/arrows{
dir = 8
@@ -2793,6 +2791,22 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
+"BL" = (
+/obj/effect/turf_decal/corner_techfloor_grid{
+ dir = 5
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/closet/crate/secure/loot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
"BP" = (
/obj/structure/sign/syndicate,
/turf/closed/wall/mineral/plastitanium,
@@ -3592,20 +3606,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating/rust,
/area/ship/maintenance/starboard)
-"Iv" = (
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/under/syndicate/skirt,
-/obj/structure/closet/syndicate{
- desc = "It's a basic storage unit.";
- name = "uniform closet"
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ship/hallway/central)
"IE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt,
@@ -5660,7 +5660,7 @@ Dl
JB
bS
tC
-jh
+BL
KE
Vq
Or
@@ -5720,7 +5720,7 @@ Dd
RN
Ye
OG
-Iv
+ah
VR
Eg
xP
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index c554df3a280f..cd8297197a40 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -7724,7 +7724,7 @@
pixel_y = 12
},
/obj/structure/rack,
-/obj/item/clothing/suit/armor/riot/minutemen{
+/obj/item/clothing/suit/armor/riot/clip{
desc = "Designed to protect against close range attacks. This one is painted black.";
pixel_y = 1;
pixel_x = 5
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index a5195f26623d..79f178820285 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -160,6 +160,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
/obj/item/gun/ballistic,
/obj/item/gun/energy,
/obj/item/gun/grenadelauncher,
+ /obj/item/flamethrower,
/obj/item/kitchen/knife/combat,
/obj/item/melee/baton,
/obj/item/melee/classic_baton/telescopic,
diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index aafe4d312aa4..333840868132 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -266,7 +266,7 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list(
"Inteq Risk Management Group" = list(
"IRMV",
),
- "Colonial Minutemen" = list(
+ "CLIP Minutemen" = list(
"CMSV",
"CMGSV",
),
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 43af3bc2b3ec..ff11057704c4 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -142,46 +142,53 @@
/datum/ert/solgov/inspector/New()
mission = "Conduct a routine review on [station_name()]'s vessels."
-// Minutemen
+// CLIP
/datum/ert/minutemen
+ teamsize = 5
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/minutemen/leader
+ /// TODO: figure out a way to fill in at least one rifleman first
+ roles = list(/datum/antagonist/ert/minutemen, /datum/antagonist/ert/minutemen/corpsman = 1, /datum/antagonist/ert/minutemen/engi = 1, /datum/antagonist/ert/minutemen/gunner = 1)
+ mission = "Keep the peace in sector affairs"
+ rename_team = "CLIP Minutemen Squadron"
+ polldesc = "a CLIP Minutemen squadron"
+ ert_template = /datum/map_template/shuttle/subshuttles/crux
+
+//quick infantry - for use when you need to throw minutemen somewhere fast but dont want ANY preperation at all
+/datum/ert/minutemen/quick
teamsize = 4
opendoors = FALSE
leader_role = /datum/antagonist/ert/minutemen/leader
roles = list(/datum/antagonist/ert/minutemen)
- mission = "Keep the peace in sector affairs"
- rename_team = "Generic Minutemen Team"
- polldesc = "a Minutemen emergency team"
+ mission = "Resolve the conflict at hand"
+ polldesc = "a CLIP Minutemen emergency team"
random_names = TRUE
- ert_template = /datum/map_template/shuttle/subshuttles/crux
/datum/ert/minutemen/bard
leader_role = /datum/antagonist/ert/minutemen/bard/leader
- roles = list(/datum/antagonist/ert/minutemen/bard)
- rename_team = "Minutemen BARD Team"
- polldesc = "a Minutemen biohazard removal team"
+ roles = list(/datum/antagonist/ert/minutemen/bard, /datum/antagonist/ert/minutemen/bard/medic = 1, /datum/antagonist/ert/minutemen/bard/flamer = 1)
+ rename_team = "CLIP Minutemen BARD Squadron"
+ polldesc = "a CLIP Minutemen biohazard removal team"
/datum/ert/minutemen/riot
teamsize = 6
leader_role = /datum/antagonist/ert/minutemen/riot/leader
roles = list(/datum/antagonist/ert/minutemen/riot)
- rename_team = "Minutemen Riot Control Team"
- polldesc = "a Minutemen riot control team"
+ rename_team = "CLIP Minutemen Riot Control Squadron"
+ polldesc = "a CLIP Minutemen riot control team"
-/datum/ert/minutemen/piratehunters
- leader_role = /datum/antagonist/ert/minutemen/piratehunters/leader
- roles = list(/datum/antagonist/ert/minutemen/piratehunters)
- mission = "Eliminate pirate presence within the sector."
- rename_team = "Minutemen Pirate Hunter Team"
- polldesc = "a fireteam of Minutemen pirate hunters"
+/datum/ert/minutemen/eva
+ leader_role = /datum/antagonist/ert/minutemen/eva/leader
+ roles = list(/datum/antagonist/ert/minutemen/eva)
/datum/ert/minutemen/inspector
teamsize = 1
leader_role = /datum/antagonist/ert/official/minutemen
roles = list(/datum/antagonist/ert/official/minutemen)
- rename_team = "Minutemen GOLD Inspector"
- polldesc = "a Minutemen inspector"
+ rename_team = "CLIP Minutemen GOLD Inspector"
+ polldesc = "a CLIP Minutemen inspector"
// Syndicate
diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm
index 1af8988aae9b..2496ee41c874 100644
--- a/code/game/machinery/telecomms/machines/bus.dm
+++ b/code/game/machinery/telecomms/machines/bus.dm
@@ -72,7 +72,7 @@
autolinkers = list("processor4", "inteq", "receiverB", "messaging")
/obj/machinery/telecomms/bus/preset_five
- id = "CMM Communications Bus"
+ id = "CLIP Communications Bus"
network = "tcommsat"
freq_listening = list(FREQ_MINUTEMEN, FREQ_COMMON)
autolinkers = list("processor5", "minutemen", "messaging")
diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm
index 827e350468f8..86bc02438d95 100644
--- a/code/game/machinery/telecomms/machines/processor.dm
+++ b/code/game/machinery/telecomms/machines/processor.dm
@@ -54,7 +54,7 @@
autolinkers = list("processor4")
/obj/machinery/telecomms/processor/preset_five
- id = "CMM Communications Processor"
+ id = "CLIP Communications Processor"
network = "tcommsat"
autolinkers = list("processor5")
diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm
index 773faec875f4..60797eaee992 100644
--- a/code/game/machinery/telecomms/machines/relay.dm
+++ b/code/game/machinery/telecomms/machines/relay.dm
@@ -85,8 +85,8 @@
/obj/machinery/telecomms/relay/preset/minutemen
freq_listening = list(FREQ_COMMAND, FREQ_MINUTEMEN, FREQ_COMMON)
- id = "CMM Relay"
- network = "cmm_commnet"
+ id = "CLIP Relay"
+ network = "clip_commnet"
/obj/machinery/telecomms/relay/preset/solgov
freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV, FREQ_COMMON)
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index ce8ad22d6b1e..664d45b5b1c1 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -89,7 +89,7 @@
autolinkers = list("syndicate", "broadcasterB")
/obj/machinery/telecomms/server/presets/minutemen
- id = "CMM Server"
+ id = "CLIP Server"
freq_listening = list(FREQ_MINUTEMEN, FREQ_COMMON)
autolinkers = list("minutemen", "broadcasterA")
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index 350cf3df4afe..303578fd3160 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -17,8 +17,8 @@
/obj/mecha/combat/durand/cmm
desc = "Устаревший боевой экзоскелет, позаимствованный с заброшенных объектов Nanotrasen, теперь поставляется подразделению CMM-BARD по борьбе с ксенофауной."
name = "\improper Paladin"
- icon_state = "cmmdurand"
- wreckage = /obj/structure/mecha_wreckage/durand/cmm
+ icon_state = "clipdurand"
+ wreckage = /obj/structure/mecha_wreckage/durand/clip
armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
//TODO: Custom melee backlash shield with no projectile protection
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 20625a1aba46..e95ba59fb285 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -567,11 +567,11 @@
desc = "Изготовленный на заказ легкий навесной комплект CMM для автономного силового погрузчика 'Рипли' MK-I, позволяющий преобразовать его в мобильную и вместительную конструкцию Mk-IV. Этот набор нельзя снять после его применения."
icon_state = "cmmupgrade"
source_mech = list(/obj/mecha/working/ripley, /obj/mecha/working/ripley/mining)
- result_mech = /obj/mecha/working/ripley/cmm
+ result_mech = /obj/mecha/working/ripley/clip
/obj/item/mecha_parts/mecha_equipment/conversion_kit/paladin
name = "CMM Paladin Conversion Kit"
desc = "Изготовленный на заказ комплект для переоборудования боевого экзоскелета Дюранда в специализированный экзоскелет Паладина против ксенофауны."
icon_state = "cmmupgrade"
source_mech = list(/obj/mecha/combat/durand)
- result_mech = /obj/mecha/combat/durand/cmm
+ result_mech = /obj/mecha/combat/durand/clip
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index bf11c24b0d88..27c680120fae 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -153,9 +153,9 @@
/obj/item/mecha_parts/part/ripley_left_leg,
/obj/item/mecha_parts/part/ripley_right_leg)
-/obj/structure/mecha_wreckage/ripley/cmm
+/obj/structure/mecha_wreckage/ripley/clip
name = "\improper Rogue wreckage"
- icon_state = "cmmripley-broken"
+ icon_state = "clipripley-broken"
/obj/structure/mecha_wreckage/ripley/mkii
name = "\improper Ripley MK-II wreckage"
@@ -200,9 +200,9 @@
/obj/item/mecha_parts/part/durand_left_leg,
/obj/item/mecha_parts/part/durand_right_leg)
-/obj/structure/mecha_wreckage/durand/cmm
+/obj/structure/mecha_wreckage/durand/clip
name = "\improper Paladin wreckage"
- icon_state = "cmmdurand-broken"
+ icon_state = "clipdurand-broken"
/obj/structure/mecha_wreckage/phazon
name = "\improper Phazon wreckage"
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 2ef07992eb26..40783ecbb204 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -166,13 +166,13 @@
var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
scanner.attach(src)
-/obj/mecha/working/ripley/cmm
- desc = "An APLU utility mech, refitted with a lightweight pressurized cockpit and more powerful servos by the CMM. While it preserves the Mk. I's speed, the overdriven motors tend to strain its power supply."
- name = "\improper CMM APLU Mk-IV \"Rogue\""
- icon_state = "cmmripley"
- base_icon_state = "cmmripley"
+/obj/mecha/working/ripley/clip
+ desc = "An APLU utility mech, refitted with a lightweight pressurized cockpit and more powerful servos by the CLIP. While it preserves the Mk. I's speed, the overdriven motors tend to strain its power supply."
+ name = "\improper CLIP APLU Mk-IV \"Rogue\""
+ icon_state = "clipripley"
+ base_icon_state = "clipripley"
step_energy_drain = 15 //overdriven servos are less efficient
- wreckage = /obj/structure/mecha_wreckage/ripley/cmm
+ wreckage = /obj/structure/mecha_wreckage/ripley/clip
enclosed = TRUE
enter_delay = 20 //slower than a mk. I, faster than the armored Ripleys
silicon_icon_state = null
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index a86a74c2c3d4..a50e72d9fcb7 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -56,8 +56,8 @@
icon_state = "rolled_solgov"
/obj/item/poster/random_minutemen
- name = "random cmm poster"
- poster_type = /obj/structure/sign/poster/minutemen/random
+ name = "random clip poster"
+ poster_type = /obj/structure/sign/poster/clip/random
icon_state = "rolled_legit"
/obj/item/poster/random_rilena
@@ -261,7 +261,7 @@
/obj/structure/sign/poster/contraband/lusty_xenomorph
name = "Lusty Xenomorph"
- desc = "A heretical poster depicting the titular star of an equally heretical book. Wow, this would be extremely offensive to anyone in the CMM."
+ desc = "A heretical poster depicting the titular star of an equally heretical book. Wow, this would be extremely offensive to anyone in CLIP."
icon_state = "poster_xeno" //i dont even know how to redo this one
/obj/structure/sign/poster/contraband/syndicate_recruitment
@@ -427,7 +427,7 @@
/obj/structure/sign/poster/contraband/backdoor_xeno_babes_6
name = "Backdoor Xeno Babes 6"
- desc = "... You don't even know where to start with this. Wow, this would be extremely offensive to anyone in the CMM."
+ desc = "... You don't even know where to start with this. Wow, this would be extremely offensive to anyone in CLIP."
icon_state = "poster_xeno_maid"
/obj/structure/sign/poster/contraband/robustmore_drinkfoods
@@ -938,54 +938,54 @@
desc = "SUNS, best known for it's diverse variety of top students from various solarian universities, dealing with internal fighting via dueling with swords, and being sued by Nanotrasen for trademark infrigement on their old name \"NSV.\""
icon_state = "poster-solgov_suns"
-//CMM poster pool. This is quite limited, so don't use more than 3 random ones at once. Expect to see these on CMM ships.
+//CLIP poster pool. This is quite limited, so don't use more than 3 random ones at once. Expect to see these on CLIP ships.
-/obj/structure/sign/poster/minutemen
- poster_item_name = "cmm poster"
- poster_item_desc = "A poster that is produced within the CMM. It comes with adhesive backing, for easy pinning to any vertical surface."
+/obj/structure/sign/poster/clip
+ poster_item_name = "clip poster"
+ poster_item_desc = "A poster that is produced within CLIP. It comes with adhesive backing, for easy pinning to any vertical surface."
poster_item_icon_state = "rolled_legit"
-/obj/structure/sign/poster/minutemen/random
- name = "random cmm poster"
- icon_state = "random_cmm"
+/obj/structure/sign/poster/clip/random
+ name = "random clip poster"
+ icon_state = "random_clip"
never_random = TRUE
- random_basetype = /obj/structure/sign/poster/minutemen
+ random_basetype = /obj/structure/sign/poster/clip
random_type = POSTER_SUBTYPES
-/obj/structure/sign/poster/minutemen/enlist
+/obj/structure/sign/poster/clip/enlist
name = "Enlist"
- desc = "\"Do your part for not just the CMM, but Luna Town, Lanchester City, Serene, Star City, Ryunosuke, Lanshuka, Radinska, New Kalixcis, and all of your families! Plus, finance your future; It's a win/win to enlist in the CMM!\""
- icon_state = "poster-cmm_enlist"
+ desc = "\"Do your part for not just CLIP, but Luna Town, Lanchester City, Serene, Star City, Ryunosuke, Lanshuka, Radinska, New Kalixcis, and all of your families! Plus, finance your future; It's a win/win to enlist in the CMM!\""
+ icon_state = "poster-clip_enlist"
-/obj/structure/sign/poster/minutemen/bard
+/obj/structure/sign/poster/clip/bard
name = "CMM-BARD"
desc = "A poster made by soldiers to recruit people into the BARD, depecting a \"Sergeant Clues\" mowing down waves and waves of xenofauna, and them exploding into blood. Something tells you that service is a lot less interesting than this."
- icon_state = "poster-cmm_bard"
+ icon_state = "poster-clip_bard"
-/obj/structure/sign/poster/minutemen/gold
- name = "CMM-GOLD"
- desc = "A poster listing job positions open in the CMM GOLD and asking for applications, listing important but uninteresting benifits like health insurance and such."
- icon_state = "poster-cmm_gold"
+/obj/structure/sign/poster/clip/gold
+ name = "CLIP-GOLD"
+ desc = "A poster listing job positions open in the CLIP GOLD and asking for applications, listing important but uninteresting benifits like health insurance and such."
+ icon_state = "poster-clip_gold"
-/obj/structure/sign/poster/minutemen/lunatown
+/obj/structure/sign/poster/clip/lunatown
name = "Luna-Town"
- desc = "Luna-town, the second planet of the Kanler-332 system. The capital of the Colonial Minutemen and the Milita. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, including the capital city itself and the remains of the UNSV Lichtenstein, famous for bringing the CMM from the brink into what it is today."
- icon_state = "poster-cmm_luna"
+ desc = "Luna-town, one of the many moons of the gas giant Maxin. The capital of the Confederated League of Independent Planets. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, including the capital city itself and the remains of the UNSV Lichtenstein, famous for bringing CLIP from the brink into what it is today."
+ icon_state = "poster-clip_luna"
-/obj/structure/sign/poster/minutemen/maxin
+/obj/structure/sign/poster/clip/maxin
name = "Maxin"
desc = "Maxin, the fourth planet of the Kanler-332 system. It's many moons including Lanchester City make it a popular sightseeing attraction for those enroute to Lanchester City."
- icon_state = "poster-cmm_maxin"
+ icon_state = "poster-clip_maxin"
-/obj/structure/sign/poster/minutemen/lanchester
+/obj/structure/sign/poster/clip/lanchester
name = "Lanchester City"
- desc = "Luna-town, one of the many moons of the gas giant Maxin. A moon well known for it's numerous, massive factories. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, such as crashed Frontiersmen ships and the massive entertainment industry."
- icon_state = "poster-cmm_lanchester"
+ desc = "Lanchester City, one of the many moons of the gas giant Maxin. A moon well known for it's numerous, massive factories. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, such as crashed Frontiersmen ships and the massive entertainment industry."
+ icon_state = "poster-clip_lanchester"
-/obj/structure/sign/poster/minutemen/serene
+/obj/structure/sign/poster/clip/serene
name = "Serene"
desc = "Serene, the fifth planet of the Druja system. Covered with a thick sheet of snow, the atmosphere has been described as \"Breathable, if it weren't so darn cold.\" This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, such as old Frontiersmen War sites and Xenofauna war sites."
- icon_state = "poster-cmm_serene"
+ icon_state = "poster-clip_serene"
// Syndicate posters. Since syndicate are dived lorewise, this would only make sense on pre-split ships.
/obj/structure/sign/poster/syndicate
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index b0286bf63a1a..82542e3a3d4b 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -1031,13 +1031,13 @@
/obj/structure/mecha_wreckage/ripley = 15,
/obj/structure/mecha_wreckage/ripley/firefighter = 9,
/obj/structure/mecha_wreckage/ripley/mkii = 9,
- /obj/structure/mecha_wreckage/ripley/cmm = 9
+ /obj/structure/mecha_wreckage/ripley/clip = 9
)
/obj/effect/spawner/lootdrop/waste/mechwreck/rare
loot = list(
/obj/structure/mecha_wreckage/durand = 12.5,
- /obj/structure/mecha_wreckage/durand/cmm = 12.5,
+ /obj/structure/mecha_wreckage/durand/clip = 12.5,
/obj/structure/mecha_wreckage/odysseus = 25,
/obj/structure/mecha_wreckage/gygax = 25
)
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 9d244ce74cda..0904cdef3676 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -42,7 +42,7 @@
/obj/item/encryptionkey/minutemen
name = "minutemen encryption key"
- icon_state = "cmm_cypherkey"
+ icon_state = "clip_cypherkey"
channels = list(RADIO_CHANNEL_MINUTEMEN = 1)
/obj/item/encryptionkey/inteq
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 56a551a80068..c3ba01c7c2e9 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -148,32 +148,32 @@ GLOBAL_LIST_INIT(channel_tokens, list(
. = ..()
AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
-//minutemen
-/obj/item/radio/headset/minutemen
+//clip
+/obj/item/radio/headset/clip
name = "minutemen radio headset"
- desc = "Used by militias flying the five stars of the Colonial Minutemen."
- icon_state = "cmm_headset"
+ desc = "Used by militias flying the five stars of the CLIP Minutemen."
+ icon_state = "clip_headset"
keyslot = new /obj/item/encryptionkey/minutemen
-/obj/item/radio/headset/minutemen/captain
+/obj/item/radio/headset/clip/captain
name = "minuteman officer radio headset"
- desc = "Used by the Colonial Minutemen's enlisted officers."
+ desc = "Used by the CLIP Minutemen's enlisted officers."
keyslot2 = new /obj/item/encryptionkey/heads/captain
command = TRUE
-/obj/item/radio/headset/minutemen/alt
+/obj/item/radio/headset/clip/alt
name = "minutemen bowman headset"
- desc = "Used by militias flying the five stars of the Colonial Minutemen. Protects ears from flashbangs."
- icon_state = "cmm_headset_alt"
- item_state = "cmm_headset_alt"
+ desc = "Used by militias flying the five stars of the CLIP Minutemen. Protects ears from flashbangs."
+ icon_state = "clip_headset_alt"
+ item_state = "clip_headset_alt"
-/obj/item/radio/headset/minutemen/alt/captain
+/obj/item/radio/headset/clip/alt/captain
name = "minuteman officer bowman headset"
- desc = "Used by the Colonial Minutemen's enlisted officers. Protects ears from flashbangs."
+ desc = "Used by the CLIP Minutemen's enlisted officers. Protects ears from flashbangs."
keyslot2 = new /obj/item/encryptionkey/heads/captain
command = TRUE
-/obj/item/radio/headset/minutemen/alt/ComponentInitialize()
+/obj/item/radio/headset/clip/alt/ComponentInitialize()
. = ..()
AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 1dcaff71eeea..1f4e1a5b44a6 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -131,11 +131,6 @@
icon_state = "securitypack"
item_state = "securitypack"
-/obj/item/storage/backpack/security/cmm
- name = "cmm backpack"
- desc = "It's a very blue backpack."
- icon_state = "cmmpack"
-
/obj/item/storage/backpack/captain
name = "captain's backpack"
desc = "It's a special backpack made exclusively for Nanotrasen officers."
@@ -285,11 +280,6 @@
icon_state = "satchel-sec"
item_state = "satchel-sec"
-/obj/item/storage/backpack/satchel/sec/cmm
- name = "cmm satchel"
- desc = "A robust satchel for anti-piracy related needs."
- icon_state = "satchel-cmm"
-
/obj/item/storage/backpack/satchel/explorer
name = "explorer satchel"
desc = "A robust satchel for stashing your loot."
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 10d3531b68d3..157f9c611f30 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -434,6 +434,27 @@
item_state = "militarywebbing"
resistance_flags = FIRE_PROOF
+ unique_reskin = list(
+ "None" = "militarywebbing",
+ "Desert" = "militarywebbing_desert",
+ "Woodland" = "militarywebbing_woodland",
+ "Snow" = "militarywebbing_snow",
+ "Urban" = "militarywebbing_urban",
+ )
+ unique_reskin = null
+
+//this might seem obtuse instead of setting allow_post_reskins to TRUE, but reskin menu would open every time on alt click, which is not good for this
+/obj/item/storage/belt/military/examine(mob/user)
+ . = ..()
+ if(unique_reskin && current_skin)
+ . += "You can Ctrl-Click [src] to reskin it again after skinning it."
+
+/obj/item/storage/belt/military/CtrlClick(mob/user)
+ . = ..()
+ if(isliving(user) && in_range(src, user))
+ current_skin = null
+ to_chat(user, "You can reskin [src] again wtih Alt-Click.")
+
/obj/item/storage/belt/military/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
@@ -449,24 +470,6 @@
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/m556(src)
-/obj/item/storage/belt/military/minutemen
- name = "minutemen tactical webbing"
- desc = "A set of tactical webbing worn by the Colonial Minutemen of the frontier."
- icon_state = "cmmwebbing"
- item_state = "cmmwebbing"
-
-/obj/item/storage/belt/military/minutemen/p16/PopulateContents()
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/p16(src)
-
-/obj/item/storage/belt/military/minutemen/gal/PopulateContents()
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/gal(src)
-
-/obj/item/storage/belt/military/minutemen/cm5/PopulateContents()
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/smgm9mm(src)
-
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
@@ -520,6 +523,7 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "grenadebeltnew"
item_state = "grenadebeltnew"
+ unique_reskin = null
/obj/item/storage/belt/military/abductor/full/PopulateContents()
new /obj/item/screwdriver/abductor(src)
@@ -535,6 +539,7 @@
desc = "A belt used by military forces."
icon_state = "grenadebeltold"
item_state = "grenadebeltol"
+ unique_reskin = null
/obj/item/storage/belt/military/assault
name = "assault belt"
@@ -542,10 +547,7 @@
icon_state = "assault"
item_state = "assault"
supports_variations = VOX_VARIATION
-
-/obj/item/storage/belt/military/assault/minutemen/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/ammo_box/magazine/p16(src)
+ unique_reskin = null
/obj/item/storage/belt/military/assault/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 7b1710cd8960..e9bc325bef88 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -170,6 +170,19 @@
/obj/item/storage/box/survival/medical
mask_type = /obj/item/clothing/mask/breath/medical
+/obj/item/storage/box/survival/clip
+ internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel
+
+/obj/item/storage/box/survival/clip/PopulateContents()
+ . = ..()
+ new /obj/item/radio/off(src)
+
+/obj/item/storage/box/survival/clip/balaclava
+ mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava
+
+/obj/item/storage/box/survival/clip/balaclava
+ internal_type = /obj/item/tank/internals/emergency_oxygen/double
+
/obj/item/storage/box/gloves
name = "box of latex gloves"
desc = "Contains sterile latex gloves."
@@ -774,6 +787,13 @@
for(var/i in 1 to 7)
new /obj/item/light/bulb(src)
+/obj/item/storage/box/flares
+ name = "box of flares"
+ illustration = "firecracker"
+
+/obj/item/storage/box/flares/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/flashlight/flare(src)
/obj/item/storage/box/deputy
name = "box of deputy armbands"
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index f295bfab8950..688122b2c23c 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -364,7 +364,7 @@
current_skin = pick
icon_state = unique_reskin[pick]
to_chat(M, "[src] is now skinned as '[pick].'")
- update_icon_state()
+ update_appearance()
/**
* Checks if we are allowed to interact with a radial menu for reskins
diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm
index 5b6c209190bb..48a26493ae29 100644
--- a/code/game/objects/structures/signs/_signs.dm
+++ b/code/game/objects/structures/signs/_signs.dm
@@ -249,11 +249,11 @@
icon = 'icons/obj/solgov_logos.dmi'
icon_state = "solgovflag-left"
-// colonial minutemen seal
-/obj/structure/sign/minutemen
- name = "Banner of the Colonial Minutemen"
- desc = "A seal representing the many colonies comprising the Colonial Minutemen."
- icon_state = "minutemen"
+// clip seal
+/obj/structure/sign/clip
+ name = "Banner of the Confederated League of Independent Planets"
+ desc = "A seal representing the many colonies comprising the League."
+ icon_state = "clip"
//Numeral signs
diff --git a/code/game/say.dm b/code/game/say.dm
index 47e5e0b1dee3..396447b13bb3 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -5,7 +5,7 @@
*/
GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_NANOTRASEN]" = "ntradio",
- "[FREQ_MINUTEMEN]" = "cmmradio",
+ "[FREQ_MINUTEMEN]" = "clipradio",
"[FREQ_INTEQ]" = "irmgradio",
"[FREQ_PIRATE]" = "pirradio",
"[FREQ_COMMAND]" = "comradio",
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index af596c972ca1..ae621e17d479 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -72,7 +72,7 @@
if (RADIO_CHANNEL_SYNDICATE)
sender = input("From what branch?", "Syndicate") as null|anything in list("Syndicate High Command", "The Anti-Corporation Liberation Front", "The Gorlex Marauders", "Donk! Corporation", "Cybersun Virtual Solutions", "The Galactic Engineer's Concordat", "The Naturalienwissenschaftlicher Studentenverbindungs-Verband")
if (RADIO_CHANNEL_MINUTEMEN)
- sender = input("From what division?", "Minutemen") as null|anything in list("Colonial Minutemen Headquarters", "The Galactic Optium Labor Divison", "The Biohazard Assesment and Removal Division")
+ sender = input("From what division?", "Minutemen") as null|anything in list("CLIP Minutemen Headquarters", "The Galactic Optium Labor Divison", "The Biohazard Assesment and Removal Division")
if (RADIO_CHANNEL_INTEQ)
sender = "Inteq Risk Management"
if ("Outpost")
diff --git a/code/modules/antagonists/ert/minutemen.dm b/code/modules/antagonists/ert/minutemen.dm
index 3799e36bff28..069ab6625c32 100644
--- a/code/modules/antagonists/ert/minutemen.dm
+++ b/code/modules/antagonists/ert/minutemen.dm
@@ -3,70 +3,88 @@
// ********************************************************************
/datum/antagonist/ert/minutemen
- name = "Minutemen Infantry"
- outfit = /datum/outfit/job/minutemen/ert
+ name = "CLIP Minutemen"
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/armed
role = "Minuteman"
/datum/antagonist/ert/minutemen/greet()
- to_chat(owner, "You are the [name].")
- var/missiondesc = "You stand shoulder to shoulder with your fellow colonists in the Colonial Minutemen within [station_name()].
"
+ to_chat(owner, "You are \the [role].")
+ var/missiondesc = "You serve in the armed forced of the Confederated League of Independent Planets (CLIP), an independent government. You are being deployed to the sector of [station_name()].
"
if(leader) //If Squad Leader
- missiondesc += "Lead your team to ensure the completion of your objectives."
+ missiondesc += "Lead your squad to complete all objectives."
else
- missiondesc += "Follow orders given to you by your Sergent."
+ missiondesc += "Follow orders given to you by your Leader, the Sergent."
if(deathsquad)
- missiondesc += "Leave no witnesses."
+ missiondesc += "You have been given the order to fire at will."
missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
/datum/antagonist/ert/minutemen/leader
- name = "Minutemen Leader"
+ name = "CLIP Minutemen Field Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/minutemen/ert/leader
+ outfit = /datum/outfit/job/clip/minutemen/grunt/lead
role = "Sergeant"
+/datum/antagonist/ert/minutemen/corpsman
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
+ role = "Field Corpsman"
+
+/datum/antagonist/ert/minutemen/engi
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
+ role = "Field Engineer"
+
+/datum/antagonist/ert/minutemen/gunner
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
+ role = "Field Gunner"
+
/datum/antagonist/ert/minutemen/bard
name = "BARD Infantry"
- outfit = /datum/outfit/job/minutemen/ert/bard
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard
role = "Minuteman"
+/datum/antagonist/ert/minutemen/bard/flamer
+ name = "BARD Flamethrower Infantry"
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
+
+/datum/antagonist/ert/minutemen/bard/medic
+ name = "BARD Corpsman"
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
+ role = "Corpsman"
+
/datum/antagonist/ert/minutemen/bard/leader
name = "BARD Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/minutemen/ert/bard/leader
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
role = "Sergeant"
/datum/antagonist/ert/minutemen/riot
name = "Riot Officer"
- outfit = /datum/outfit/job/minutemen/ert/riot
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot
role = "Minuteman"
/datum/antagonist/ert/minutemen/riot/leader
name = "Riot Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/minutemen/ert/riot/leader
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
role = "Sergeant"
/datum/antagonist/ert/official/minutemen
name = "GOLD Inspector"
- outfit = /datum/outfit/job/minutemen/ert/inspector
+ outfit = /datum/outfit/job/clip/investigator
role = "Lieutenant"
/datum/antagonist/ert/official/minutemen/greet()
to_chat(owner, "You are the GOLD Inspector.")
- if (ert_team)
- to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the Colonial League. Your task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the Colonial League. Your task: [ert_team.mission.explanation_text]")
+ to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Government. Your task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/minutemen/piratehunters
- name = "Pirate Hunter"
- outfit = /datum/outfit/job/minutemen/ert/pirate_hunter
+/datum/antagonist/ert/minutemen/eva
+ name = "CLIP Minutemen"
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
role = "Minuteman"
-/datum/antagonist/ert/minutemen/piratehunters/leader
- name = "Pirate Hunter Leader"
+/datum/antagonist/ert/minutemen/eva/leader
+ name = "CLIP Minutemen Field Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/minutemen/ert/pirate_hunter/leader
+ outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
role = "Sergeant"
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 3e1225bb54fa..2f30764d769f 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -118,7 +118,7 @@
"stamp-vanguard" = 'icons/stamp_icons/large_stamp-vanguard.png',
"stamp-maa" = 'icons/stamp_icons/large_stamp-maa.png',
"stamp-artificer" = 'icons/stamp_icons/large_stamp-artificer.png',
- "stamp-cmm" = 'icons/stamp_icons/large_stamp-cmm.png',
+ "stamp-clip" = 'icons/stamp_icons/large_stamp-clip.png',
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
index c4608f693b80..e184a8372627 100644
--- a/code/modules/cargo/packs/mechs.dm
+++ b/code/modules/cargo/packs/mechs.dm
@@ -75,7 +75,7 @@ Build Your Own Suit
/datum/supply_pack/mech/durand_parts
name = "Durand construction kit"
- desc = "The kit to a bulky suit most frequently used by the Colonial Minutemen, older models tend to find themselves disassembled and sold off."
+ desc = "The kit to a bulky suit most frequently used by the CLIP Minutemen, older models tend to find themselves disassembled and sold off."
cost = 15000
contains = list(
/obj/item/mecha_parts/chassis/durand,
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
new file mode 100644
index 000000000000..82e1fdee68b0
--- /dev/null
+++ b/code/modules/clothing/factions/clip.dm
@@ -0,0 +1,427 @@
+//under
+
+/obj/item/clothing/under/clip
+ name = "clip deck worker jumpsuit"
+ desc = "A jumpsuit worn by deck workers in the CLIP Minutemen Navy vessels."
+
+ icon = 'icons/obj/clothing/faction/clip/uniforms.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/uniforms.dmi'
+
+ icon_state = "clip_deck"
+ item_state = "b_suit"
+
+ alt_covers_chest = TRUE
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ dying_key = DYE_REGISTRY_UNDER //??? // it's for washing machines don't worry about it
+
+ can_adjust = FALSE
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION // a new record!
+
+/obj/item/clothing/under/clip/minutemen
+ name = "clip minutemen fatigues"
+ desc = "Fatigues worn by the CLIP Minutemen's enlisted."
+
+ icon_state = "clip_minuteman"
+
+ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
+ strip_delay = 50
+
+ can_adjust = FALSE
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
+
+/obj/item/clothing/under/clip/formal
+ name = "formal clip outfit"
+ desc = "A formal outfit containing a white shirt and navy slacks issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal"
+
+ armor = null
+ supports_variations = null
+
+/obj/item/clothing/under/clip/formal/alt
+ name = "formal clip outfit"
+ desc = "A formal outfit containing a white shirt and a navy skirt issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal_skirt"
+
+/obj/item/clothing/under/clip/formal/with_shirt/Initialize()
+ . = ..()
+ var/obj/item/clothing/accessory/clip_formal_overshirt/accessory = new (src)
+ attach_accessory(accessory)
+
+/obj/item/clothing/under/clip/formal/with_shirt/alt //because of how fucking skirt code works...
+ name = "formal clip outfit"
+ desc = "A formal outfit containing a white shirt and a navy skirt issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal_skirt"
+
+/obj/item/clothing/under/clip/medic
+ name = "medical clip uniform"
+ desc = "A uniform with navy slacks and a CLIP blue buttondown shirt. The shoulder markings have a medical symbol. "
+
+ icon_state = "clip_medic"
+
+/obj/item/clothing/under/clip/officer
+ name = "clip minutemen officer uniform"
+ desc = "A uniform used by higher ranking officers of the CLIP Minutemen."
+ icon_state = "clip_officer"
+ item_state = "g_suit"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/clip/officer/alt
+ name = "clip minutemen officer uniform"
+ desc = "A uniform with a pencil skirt used by higher ranking officers of the CLIP Minutemen."
+ icon_state = "clip_officer_skirt"
+
+//suit
+/obj/item/clothing/suit/toggle/lawyer/clip
+ name = "CLIP Minutemen suit jacket"
+ desc = "An enterprising dress jacket used by officers of the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "suitjacket_clip"
+ item_state = "suitjacket_navy"
+
+/obj/item/clothing/suit/toggle/lawyer/clip/Initialize()
+ . = ..()
+ if(!allowed)
+ allowed = GLOB.security_vest_allowed //it's hop-equivalent gear after all
+
+/obj/item/clothing/suit/toggle/lawyer/clip/fo
+ name = "CLIP Minutemen First Officer suit jacket"
+ desc = "An enterprising dress jacket used by First Officer of CLIP Minutemen vessels."
+
+ icon_state = "suitjacket_clip_command"
+ item_state = "suitjacket_clip_command"
+
+//armor
+
+/obj/item/clothing/suit/armor/vest/capcarapace/clip
+ name = "CLIP Minutemen general coat"
+ desc = "A very fancy coat used by generals of the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_general"
+ item_state = "clip_general"
+
+/obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral
+ name = "CLIP Minutemen admiral trenchcoat"
+ desc = "A very fancy trenchcoat used by admirals of the CLIP Minutemen."
+
+ icon_state = "clip_admiral"
+ item_state = "clip_admiral"
+
+/obj/item/clothing/suit/armor/riot/clip
+ name = "black riot suit"
+ desc = "Designed to protect against close range attacks. This one is painted black. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific by some CLIP members."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+ icon_state = "riot_clip"
+
+/obj/item/clothing/suit/armor/clip_trenchcoat
+ name = "\improper CLIP trenchcoat"
+ desc = "A CLIP trenchcoat. Despite it's reputation as a officer coat, it's actually issued to the entire CLIP government and it's branches. Has a lot of pockets."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_trenchcoat"
+ item_state = "trenchcoat_solgov"
+ body_parts_covered = CHEST|LEGS|ARMS
+ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+ cold_protection = CHEST|LEGS|ARMS
+ heat_protection = CHEST|LEGS|ARMS
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/suit/armor/clip_capcoat
+ name = "\improper CLIP Minutemen captain's coat"
+ desc = "A well-made coat used by CLIP Minutemen captains. It's thick padding stops some hazards for its user."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_captaincoat"
+ item_state = "clip_captaincoat"
+ body_parts_covered = CHEST|LEGS|ARMS
+ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
+ cold_protection = CHEST|LEGS|ARMS
+ heat_protection = CHEST|LEGS|ARMS
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+//spacesuits
+/obj/item/clothing/suit/space/hardsuit/security/independent/clip //TODO: replace
+ name = "\improper CMM Patroller hardsuit"
+ desc = "A hardsuit used by the CLIP Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "hardsuit-clip-patrol"
+ hardsuit_type = "hardsuit-clip-patrol"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/clip
+
+/obj/item/clothing/head/helmet/space/hardsuit/security/independent/clip //TODO: replace
+ name = "\improper CMM Patroller hardsuit helmet"
+ desc = "A hardsuit used by the CLIP Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "hardsuit0-clip-patrol"
+ hardsuit_type = "clip-patrol"
+
+/obj/item/clothing/suit/space/hardsuit/clip_spotter
+ name = "CM-490 'Spotter' Combat Hardsuit"
+ desc = "CLIP's standard EVA combat hardsuit. Due to CLIP's doctrine on range, it doesn't have advanced components that allow swift movement, and thus slows down the user despite the heavy armor."
+
+ icon = 'icons/obj/clothing/faction/clip/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi'
+
+ icon_state = "clip_spotter"
+ hardsuit_type = "clip_spotter"
+
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clip_spotter
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+
+ resistance_flags = null
+ slowdown = 1
+
+/obj/item/clothing/head/helmet/space/hardsuit/clip_spotter
+ name = "CM-490 'Spotter' Combat Hardsuit Helmet"
+ desc = "CLIP's standard EVA combat hardsuit. Due to CLIP's doctrine on range, it doesn't have advanced components that allow swift movement, and thus slows down the user despite the heavy armor."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "hardsuit0-clip_spotter"
+ hardsuit_type = "clip_spotter"
+
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
+ resistance_flags = null
+
+
+//hats
+/obj/item/clothing/head/clip
+ name = "\improper CLIP Minutemen service cap"
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and volunteers, it's sometimes used by occasionally by some Minutemen."
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+// lefthand_file = 'icons/mob/inhands/faction/clip/gezena_lefthand.dmi'
+// righthand_file = 'icons/mob/inhands/faction/clip/gezena_righthand.dmi'
+ icon_state = "clip_cap"
+ item_state = "bluecloth"
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/head/clip/corpsman
+ name = "\improper CLIP Minutemen corpsman cap"
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. This one is in corpsman colors."
+ icon_state = "clip_mediccap"
+ item_state = "whitecloth"
+
+/obj/item/clothing/head/clip/slouch
+ name = "CLIP Minutemen slouch hat"
+ desc = "A commanding slouch hat used by the CLIP Minutemen."
+ icon_state = "clip_slouch_hat"
+
+/obj/item/clothing/head/clip/slouch/officer
+ name = "CLIP Minutemen officer's slouch hat"
+ desc = "A commanding slouch hat adorned with a officer's badge, used by the CLIP Minutemen."
+ icon_state = "clip_officer_hat"
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ strip_delay = 60
+
+/obj/item/clothing/head/clip/boonie
+ name = "CLIP Minutemen boonie hat"
+ desc = "A wide brimmed cap to keep yourself cool during blistering hot weather."
+ icon_state = "clip_boonie"
+
+/obj/item/clothing/head/clip/bicorne
+ name = "general's bicorne"
+ desc = "A fancy bicorne used by generals of the CLIP Minutemen."
+ icon_state = "clip_general_hat"
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/head/helmet/bulletproof/x11/clip
+ name = "\improper Minutemen X11 Helmet"
+ desc = "A bulletproof helmet worn by members of the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "clip_x11"
+ allow_post_reskins = FALSE
+ unique_reskin = null
+
+/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc
+ name = "\improper Minutemen Vehicle Crewman M10 Helmet"
+ desc = "A light bulletproof helmet worn by Vehicle Crewmen of the CLIP Minutemen. The ear padding protects the ears from loud noises and the microphone automatically connects with a headset."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "clip_m10_vc"
+ allow_post_reskins = FALSE
+ unique_reskin = null
+
+/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_HEAD))
+
+/obj/item/clothing/head/helmet/riot/clip
+ name = "\improper Minutemen riot helmet"
+ desc = "Designed to protect against close range attacks. Mainly used by the CMM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+ icon_state = "riot_clip"
+
+//GOLD
+/obj/item/clothing/head/fedora/det_hat/clip
+ name = "GOLD fedora"
+ desc = "A hat issued by the GOLD division of the CLIP Minutemen. Designed to look fashionable and more casual than standard CLIP attire."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "clip_fedora"
+ item_state = "detective"
+
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //dets hat is armored for some reaon
+
+/obj/item/clothing/head/flatcap/clip
+ name = "GOLD flatcap"
+ desc = "A hat issued by the GOLD division of the CLIP Minutemen. An office worker's hat."
+
+ icon = 'icons/obj/clothing/faction/clip/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
+
+ icon_state = "flatcap_clip"
+ item_state = "detective"
+//mask
+
+/obj/item/clothing/mask/gas/clip
+ name = "CM-20 gas mask"
+ desc = "A close-fitting gas mask that can be connected to an air supply. Created in 420 FS during the Xenofauna war after it was discovered that 20 year old gas masks weren't going cut it against Xenofauna. Standard issue for every Minuteman, but rarely used; it's mostly used as a deterrence against chemical attacks."
+
+ icon = 'icons/obj/clothing/faction/clip/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/mask.dmi'
+
+ icon_state = "clip-gasmask"
+ strip_delay = 60
+
+//gloves
+
+/obj/item/clothing/gloves/color/latex/nitrile/clip
+ name = "long white nitrile gloves"
+ desc = "Thick sterile gloves that reach up to the elbows. Transfers combat medic knowledge into the user via nanochips."
+
+ icon = 'icons/obj/clothing/faction/clip/hands.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/hands.dmi'
+
+ icon_state = "nitrile_clip"
+ item_state = "nitrile_clip"
+
+//boots
+
+//belt
+/obj/item/storage/belt/military/clip
+ name = "CLIP Minutemen chest rig"
+ desc = "A chest rig worn by the CLIP Minutemen."
+
+ icon = 'icons/obj/clothing/faction/clip/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/belt.dmi'
+
+ icon_state = "clipwebbing"
+ item_state = "clipwebbing"
+
+ unique_reskin = null
+
+/obj/item/storage/belt/military/clip/p16/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/p16(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/gal/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/gal(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/cm5/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm9mm(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/cm15/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/ammo_box/magazine/cm15_mag(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/e50/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/stock_parts/cell/gun/large(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/screwdriver/nuke(src)
+
+/obj/item/storage/belt/military/clip/engi/PopulateContents()
+ new /obj/item/screwdriver/power(src)
+ new /obj/item/crowbar/power(src)
+ new /obj/item/weldingtool/experimental(src)
+ new /obj/item/multitool(src)
+ new /obj/item/construction/rcd/combat(src)
+ new /obj/item/extinguisher/mini(src)
+ new /obj/item/stack/cable_coil(src)
+
+/obj/item/storage/belt/military/clip/flamer/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/reagent_containers/glass/beaker/large/fuel(src)
+ new /obj/item/ammo_box/magazine/co9mm(src)
+
+/obj/item/storage/belt/medical/webbing/clip
+ name = "medical webbing"
+ desc = "A chest rig worn by corpsmen of the CLIP Minutemen ."
+
+ icon = 'icons/obj/clothing/faction/clip/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/clip/belt.dmi'
+
+ icon_state = "clip-medwebbing"
+
+/obj/item/storage/belt/medical/webbing/clip/prefilled/PopulateContents()
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/stack/medical/splint(src)
+
+//back
+/obj/item/storage/backpack/security/clip
+ name = "clip backpack"
+ desc = "It's a very blue backpack."
+
+ icon_state = "clippack"
+
+/obj/item/storage/backpack/satchel/sec/clip
+ name = "clip satchel"
+ desc = "A robust satchel for anti-piracy related needs."
+ icon_state = "satchel-clip"
+
+
+//neck
+
+//accessories
+
+/obj/item/clothing/accessory/clip_formal_overshirt
+ name = "\improper CLIP overshirt"
+ desc = "A standard issue shirt designed to be worn over the formal uniform's undershirt."
+ icon_state = "clip_formal_overshirt"
+ icon = 'icons/obj/clothing/accessories.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/accessories.dmi'
+ minimize_when_attached = FALSE
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 1b3b5b3f8137..f96d23fa9ba2 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -12,7 +12,7 @@
strip_delay = 60
clothing_flags = SNUG_FIT
flags_cover = HEADCOVERSEYES
- flags_inv = HIDEHAIR
+ //flags_inv = HIDEHAIR // nah
dog_fashion = /datum/dog_fashion/head/helmet
@@ -207,13 +207,14 @@
can_flashlight = TRUE
dog_fashion = null
allow_post_reskins = TRUE
- unique_reskin = list("Urban" = "helmetalt",
+ unique_reskin = list(
+ "None" = "helmetalt",
"Desert" = "helmetalt_desert",
"Woodland" = "helmetalt_woodland",
"Snow" = "helmetalt_snow",
+ "Urban" = "helmetalt_urban",
)
-
/obj/item/clothing/head/helmet/marine
name = "tactical combat helmet"
desc = "A tactical black helmet, sealed from outside hazards with a plate of reinforced glass."
@@ -274,12 +275,6 @@
visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
dog_fashion = null
-/obj/item/clothing/head/helmet/riot/minutemen
- name = "\improper Minutemen riot helmet"
- desc = "Designed to protect against close range attacks. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
- icon_state = "riot_minutemen"
-
-
/obj/item/clothing/head/helmet/justice
name = "helmet of justice"
desc = "WEEEEOOO. WEEEEEOOO. WEEEEOOOO."
@@ -510,14 +505,6 @@
icon_state = "inteq_helmet"
can_flashlight = TRUE
-/obj/item/clothing/head/helmet/bulletproof/minutemen
- name = "\improper Minutemen ballistic helmet"
- desc = "A bulletproof helmet that is worn by members of the Colonial Minutemen."
- icon_state = "antichristhelm"
- allow_post_reskins = TRUE
- unique_reskin = null
- armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-
/obj/item/clothing/head/solgov
name = "\improper SolGov officer's cap"
desc = "A blue cap worn by high-ranking officers of SolGov."
@@ -575,10 +562,12 @@
icon_state = "m10helm"
can_flashlight = TRUE
dog_fashion = null
- unique_reskin = list("Urban" = "m10helm",
+ unique_reskin = list(
+ "None" = "m10helm",
"Desert" = "m10helm_desert",
"Woodland" = "m10helm_woodland",
"Snow" = "m10helm_snow",
+ "Urban" = "m10helm_urban",
)
/obj/item/clothing/head/helmet/bulletproof/x11
@@ -588,10 +577,12 @@
can_flashlight = TRUE
dog_fashion = null
allow_post_reskins = TRUE
- unique_reskin = list("Urban" = "x11helm",
+ unique_reskin = list(
+ "None" = "x11helm",
"Desert" = "x11helm_desert",
"Woodland" = "x11helm_woodland",
"Snow" = "x11helm_snow",
+ "Urban" = "x11helm_urban",
)
/obj/item/clothing/head/helmet/bulletproof/x11/frontier
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index b8d71ca3570c..988335a13043 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -43,11 +43,6 @@
name = "captain's hat"
icon_state = "captain_nt"
-/obj/item/clothing/head/caphat/minutemen
- name = "general's bicorne"
- desc = "A fancy bicorne used by generals of the Colonial Minutemen."
- icon_state = "minuteman_general_hat"
-
/obj/item/clothing/head/caphat/frontier
name = "\improper Frontiersmen commander's cap"
desc = "An imposing peaked cap, meant for a commander of the Frontiersmen."
@@ -108,8 +103,10 @@
. = ..()
new /obj/item/reagent_containers/food/drinks/flask/det(src)
-/obj/item/clothing/head/fedora/det_hat/examine(mob/user)
- . = ..()
+/obj/item/clothing/head/fedora/det_hat/examine_more(mob/user)
+ if(!in_range(src, user) || !isobserver(user)) //hide the easter egg a little more
+ . = "You try to examine [src] closer, but you're too far away."
+ return
. += "Alt-click to take a candy corn."
/obj/item/clothing/head/fedora/det_hat/AltClick(mob/user)
@@ -153,11 +150,6 @@
armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
-/obj/item/clothing/head/cowboy/sec/minutemen
- name = "colonial minutmen officer's slouch hat"
- desc = "A commanding slouch hat adorned with a officer's badge, used by the Colonial Minutemen."
- icon_state = "minuteman_officer_hat"
-
/obj/item/clothing/head/cowboy/sec/roumain
name = "hunter's hat"
desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass."
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 48b88dd7f601..66e329a0e9c6 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -46,26 +46,36 @@
slot_flags = ITEM_SLOT_MASK|ITEM_SLOT_NECK
custom_price = 150
var/blown_sound = 'sound/misc/whistle.ogg'
+ actions_types = list(/datum/action/item_action/halt)
+ COOLDOWN_DECLARE(whistle_cooldown)
+
+/datum/action/item_action/halt
+ name = "Blow on the whistle!"
/obj/item/clothing/mask/whistle/ui_action_click(mob/user, action)
- if(cooldown < world.time - 100)
- usr.audible_message("HALT!")
- playsound(src, blown_sound, 20, FALSE, 4)
- cooldown = world.time
+ if(!COOLDOWN_FINISHED(src, whistle_cooldown))
+ return
+ user.audible_message("[user] blows on the [src]!")
+ playsound(src, blown_sound, 80, FALSE, 4)
+ COOLDOWN_START(src, whistle_cooldown, 5 SECONDS)
-/obj/item/clothing/mask/gas/sechailer/inteq
- name = "balaclava"
- desc = "A fancy balaclava, while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!"
- icon_state = "inteq_balaclava"
- item_state = "inteq_balaclava"
- strip_delay = 60
- alternate_worn_layer = BODY_LAYER
- flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
+/obj/item/clothing/mask/whistle/trench
+ name = "trench whistle"
+ desc = "A long and unusual looking whistle that makes a distinctive sound. Useful for charging into fortified positions with low chances of survival."
+ icon_state = "whistle"
+ item_state = "whistle"
+ blown_sound = 'sound/misc/trenchwhistle.ogg'
-/obj/item/clothing/mask/gas/sechailer/minutemen
+/obj/item/clothing/mask/gas/sechailer/balaclava
name = "combat balaclava"
- desc = "A surprisingly advanced balaclava equipped with internals tubing. Widely used by frontier militias."
- icon_state = "rus_balaclava"
- item_state = "rus_balaclava"
+ desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!"
+ icon_state = "combat_balaclava"
+ item_state = "combat_balaclava"
strip_delay = 60
+ alternate_worn_layer = BODY_LAYER
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
+
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
+ icon_state = "inteq_balaclava"
+ item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index 2fa4316b6448..f0fd3bb81eb2 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -2,7 +2,7 @@
name = "ERT - Frontiersman Basic"
head = /obj/item/clothing/head/beret/sec/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
suit_store = /obj/item/gun/ballistic/rifle/illestren
uniform = /obj/item/clothing/under/rank/security/officer/frontier
@@ -49,7 +49,7 @@
if(prob(30))
mask = pickweight(list(
/obj/item/clothing/mask/gas = 5,
- /obj/item/clothing/mask/gas/sechailer/minutemen = 5,
+ /obj/item/clothing/mask/gas/sechailer/balaclava = 5,
/obj/item/clothing/mask/breath = 5,
/obj/item/clothing/mask/whistle = 3))
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index c5ef123a21cf..feb7b440d8fa 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -3,7 +3,7 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index 8acb733e48f0..63d0a302de7a 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -1,74 +1,76 @@
-/datum/outfit/job/minutemen/ert
- name = "ERT - Minuteman"
- jobtype = /datum/job/officer
- job_icon = "securityofficerOld"
+/datum/outfit/job/clip/minutemen/grunt/dressed/bard
+ name = "ERT - CLIP Minuteman BARD Specialist"
+ job_icon = "clip_cmm2"
- head = /obj/item/clothing/head/helmet/bulletproof/minutemen
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
- ears = /obj/item/radio/headset/minutemen/alt
- back = /obj/item/storage/backpack/security/cmm
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- id = /obj/item/card/id
- belt = /obj/item/storage/belt/military/minutemen/p16
+ suit = /obj/item/clothing/suit/armor/vest/marine/heavy
+ suit_store = /obj/item/gun/ballistic/shotgun/bulldog/minutemen
+ mask = /obj/item/clothing/mask/gas/clip
+ head = /obj/item/clothing/head/helmet/riot/clip
+ belt = /obj/item/storage/belt/military/clip/cm15
+ glasses = /obj/item/clothing/glasses/hud/health/night
r_pocket = /obj/item/kitchen/knife/combat
- l_pocket = /obj/item/flashlight/seclite
+ l_pocket = /obj/item/extinguisher/mini
- box = /obj/item/storage/box/survival/security
+ backpack_contents = list(
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/storage/box/flares = 1
+ )
-/datum/outfit/job/minutemen/ert/leader
- name = "ERT - Minuteman Sergeant"
- job_icon = "lieutenant"
+/datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
+ name = "ERT - CLIP Minuteman BARD Medical Specialist"
- ears = /obj/item/radio/headset/minutemen/alt/captain
- back = /obj/item/storage/backpack/satchel/sec/cmm
- head = /obj/item/clothing/head/beret/command
+ suit = /obj/item/clothing/suit/armor/vest/marine
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
+ belt = /obj/item/storage/belt/medical/webbing/clip/prefilled
+ r_pocket = /obj/item/grenade/smokebomb
+ l_pocket = /obj/item/reagent_containers/hypospray/combat
-/datum/outfit/job/minutemen/ert/bard
- name = "ERT - Minuteman (BARD)"
- job_icon = "securityofficerOld"
+ backpack_contents = list(
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/defibrillator/compact/loaded = 1,
+ /obj/item/storage/firstaid/advanced = 1,
+ /obj/item/ammo_box/magazine/smgm9mm = 2
+ )
+
+/datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
+ name = "ERT - CLIP Minuteman BARD Flamethrower Specialist"
suit = /obj/item/clothing/suit/armor/vest/marine/medium
- suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
- head = /obj/item/clothing/head/helmet/riot/minutemen
- belt = /obj/item/storage/belt/military/minutemen/cm5
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- r_pocket = /obj/item/grenade/smokebomb
- l_pocket = /obj/item/extinguisher/mini
- r_hand = /obj/item/kitchen/knife/combat
- l_hand = /obj/item/reagent_containers/hypospray/medipen/stimpack
+ suit_store = /obj/item/flamethrower/full/tank
+ belt = /obj/item/storage/belt/military/clip/flamer
+ r_pocket = /obj/item/grenade/chem_grenade/incendiary
+ l_pocket = /obj/item/tank/internals/emergency_oxygen/engi
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
- /obj/item/flashlight/flare = 2
+ /obj/item/extinguisher = 1,
+ /obj/item/gun/ballistic/automatic/pistol/commander = 1 // replace commander with the cm23 when it is implemented
)
-/datum/outfit/job/minutemen/ert/bard/leader
- name = "ERT - Minuteman Sergeant (BARD)"
- job_icon = "lieutenant"
+/datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
+ name = "ERT - CLIP Minuteman BARD Specialist Sergeant"
+ job_icon = "clip_cmm3"
- belt = /obj/item/storage/belt/military/assault/minutemen
- uniform = /obj/item/clothing/under/rank/command/minutemen
- suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- glasses = /obj/item/clothing/glasses/hud/security/night
+ belt = /obj/item/storage/belt/military/clip/e50
+ uniform = /obj/item/clothing/under/clip/officer
+ suit = /obj/item/clothing/suit/armor/vest/marine
+ suit_store = /obj/item/gun/energy/laser/e50
r_pocket = /obj/item/grenade/c4
l_pocket = /obj/item/reagent_containers/hypospray/medipen/stimpack
backpack_contents = list(
- /obj/item/flashlight/flare = 3,
+ /obj/item/storage/box/flares = 1,
/obj/item/grenade/c4 = 2,
/obj/item/flashlight/seclite = 1
)
-/datum/outfit/job/minutemen/ert/riot
- name = "ERT - Minuteman (Riot Officer)"
+/datum/outfit/job/clip/minutemen/grunt/dressed/riot
+ name = "ERT - CLIP Minuteman Riot Officer"
job_icon = "securityofficerOld"
- suit = /obj/item/clothing/suit/armor/riot/minutemen
- head = /obj/item/clothing/head/helmet/riot/minutemen
+ suit = /obj/item/clothing/suit/armor/riot/clip
+ head = /obj/item/clothing/head/helmet/riot/clip
l_hand = /obj/item/melee/baton/loaded
back = /obj/item/shield/riot
belt = /obj/item/gun/ballistic/automatic/smg/cm5/no_mag
@@ -78,46 +80,24 @@
backpack_contents = null
box = null
-/datum/outfit/job/minutemen/ert/riot/leader
- name = "ERT - Minutemen Sergeant (Riot Officer)"
+ backpack = null
+ duffelbag = null
+ courierbag = null
+ satchel = null
+
+/datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
+ name = "ERT - CLIP Minutemen Riot Officer Sergeant"
job_icon = "lieutenant"
- ears = /obj/item/radio/headset/minutemen/alt/captain
+ ears = /obj/item/radio/headset/clip/alt/captain
back = /obj/item/shield/riot/flash
-/datum/outfit/job/minutemen/ert/inspector
- name = "ERT - Inspector (Minutemen GOLD)"
- jobtype = /datum/job/head_of_personnel
- job_icon = "minutemen"
-
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- mask = null
- belt = /obj/item/clipboard
- glasses = /obj/item/clothing/glasses/sunglasses
- uniform = /obj/item/clothing/under/rank/command/minutemen
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- suit_store = null
- ears = /obj/item/radio/headset/minutemen/alt/captain
- back = /obj/item/storage/backpack/satchel/leather
- id = /obj/item/card/id/silver
-
- l_pocket = null
- r_pocket = null
-
-/datum/outfit/job/minutemen/ert/pirate_hunter
- name = "ERT - Minuteman (Pirate Hunter)"
- job_icon = "securityofficerOld"
-
+/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+ name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
head = null
- suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
-
-/datum/outfit/job/minutemen/ert/pirate_hunter/leader
- name = "ERT - Minutemen Sergeant (Pirate Hunter)"
- job_icon = "lieutenant"
-
- uniform = /obj/item/clothing/under/rank/command/minutemen
- ears = /obj/item/radio/headset/minutemen/alt/captain
- belt = /obj/item/storage/belt/military/minutemen/gal
- suit_store = /obj/item/gun/ballistic/automatic/gal
+ suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
- backpack_contents = list(/obj/item/ammo_box/magazine/gal=4)
+/datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
+ name = "CLIP Minutemen - Field Sergeant (Spotter Hardsuit)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index 99d4f2e5d129..7f76b9d0513a 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -9,7 +9,7 @@
ears = /obj/item/radio/headset/syndicate/alt
gloves = /obj/item/clothing/gloves/color/black
id = /obj/item/card/id/syndicate_command/crew_id
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
head = /obj/item/clothing/head/helmet/operator
back = /obj/item/storage/backpack/security
belt = /obj/item/storage/belt/military/c20r
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
index 7e97c7341fe7..351dbf67790a 100644
--- a/code/modules/clothing/outfits/factions/frontiersmen.dm
+++ b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -160,7 +160,7 @@
accessory = /obj/item/clothing/accessory/armband
head = /obj/item/clothing/head/beret/sec/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
suit = null
uniform = /obj/item/clothing/under/rank/security/officer/frontier
shoes = /obj/item/clothing/shoes/combat
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index 326633430172..a49e0c6036d6 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -46,7 +46,7 @@
head = /obj/item/clothing/head/beret/sec/hos/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
belt = /obj/item/storage/belt/security/webbing/inteq
suit = /obj/item/clothing/suit/armor/hos/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
@@ -84,7 +84,7 @@
ears = /obj/item/radio/headset/inteq
uniform = /obj/item/clothing/under/syndicate/inteq/artificer
head = /obj/item/clothing/head/hardhat/white
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
@@ -132,7 +132,7 @@
head = /obj/item/clothing/head/helmet/inteq
suit = /obj/item/clothing/suit/armor/vest/alt
belt = /obj/item/storage/belt/security/webbing/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
@@ -191,7 +191,7 @@
head = /obj/item/clothing/head/warden/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
belt = /obj/item/storage/belt/military/assault
suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index 0b991268c408..103e36624c24 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -1,89 +1,77 @@
//top outfit of everything Minuteman. Touch at own risk.
-/datum/outfit/job/minutemen
- name = "Minutemen - Base Outfit"
+/datum/outfit/job/clip
+ name = "CLIP - Base Outfit"
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ jobtype = /datum/job/assistant
+ uniform = /obj/item/clothing/under/clip
alt_uniform = null
- faction_icon = "bg_minutemen"
+ faction_icon = "bg_clip"
- backpack = /obj/item/storage/backpack/security/cmm
- satchel = /obj/item/storage/backpack/satchel/sec/cmm
- duffelbag = /obj/item/storage/backpack/duffelbag //to-do: bug rye for cmm duffles // rye. rye. give me 20 pound bag of ice
- satchel = /obj/item/storage/backpack/messenger //and these
+ box = /obj/item/storage/box/survival/clip
- box = /obj/item/storage/box/survival
+// var/list/selectable_alt_titles = list()
-/datum/outfit/job/minutemen/post_equip(mob/living/carbon/human/H, visualsOnly)
+/datum/outfit/job/clip/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(visualsOnly)
return
H.faction |= list(FACTION_PLAYER_MINUTEMAN)
+/* if(selectable_alt_titles)
+ var/selection = input(H, "Select an alternative name for your role.", "Job Title", alt_title) as null|anything in selectable_alt_titles)
+ if(!selection)
+ return
+
+ var/obj/item/card/id/W = H.wear_id
+ if(W)
+ W.assignment = alt_title
+*/
-///assistant
+// Base CLIP
-/datum/outfit/job/minutemen/assistant
- name = "Minutemen - Volunteer"
+/datum/outfit/job/clip/assistant
+ name = "CLIP - Volunteer"
job_icon = "assistant"
jobtype = /datum/job/assistant
+ // selectable_alt_titles = list("Volunteer","Civillian")
r_pocket = /obj/item/radio
-///captains
-
-/datum/outfit/job/minutemen/captain
- name = "Minutemen - Captain"
+/datum/outfit/job/clip/captain
+ name = "CLIP - Captain"
job_icon = "captain"
jobtype = /datum/job/captain
+ uniform = /obj/item/clothing/under/clip/formal
+ alt_uniform = /obj/item/clothing/under/clip/formal/with_shirt
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip
+ alt_suit = null
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+ head = /obj/item/clothing/head/clip/slouch
id = /obj/item/card/id/gold
- gloves = /obj/item/clothing/gloves/color/captain
-
+ ears = /obj/item/radio/headset/clip/alt/captain
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/laceup
+// accessory = /obj/item/clothing/accessory/medal/gold/captain
backpack = /obj/item/storage/backpack/captain
satchel = /obj/item/storage/backpack/satchel/cap
duffelbag = /obj/item/storage/backpack/duffelbag/captain
courierbag = /obj/item/storage/backpack/messenger/com
- accessory = /obj/item/clothing/accessory/medal/gold/captain
-
- ears = /obj/item/radio/headset/minutemen/alt/captain
- uniform = /obj/item/clothing/under/rank/command/minutemen
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- alt_suit = null
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
-
- shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- backpack = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/storage/box/ids=1,\
- /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
-
-/datum/outfit/job/minutemen/captain/general
- name = "Minutemen - General"
-
- head = /obj/item/clothing/head/caphat/minutemen
- ears = /obj/item/radio/headset/minutemen/alt/captain
- uniform = /obj/item/clothing/under/rank/command/minutemen
- suit = /obj/item/clothing/suit/armor/vest/capcarapace/minutemen
- shoes = /obj/item/clothing/shoes/combat
-
- box = /obj/item/storage/box/survival/engineer/radio
- backpack = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1)
-
-///chemist
+ backpack_contents = list(
+ /obj/item/storage/box/ids = 1,
+ /obj/item/melee/classic_baton/telescopic = 1,
+ /obj/item/modular_computer/tablet/preset/advanced = 1)
-/datum/outfit/job/minutemen/chemist
- name = "Minutemen - Chemical Scientist"
+/datum/outfit/job/clip/chemist
+ name = "CLIP - Pharmacist"
job_icon = "chemist"
jobtype = /datum/job/chemist
glasses = /obj/item/clothing/glasses/science
shoes = /obj/item/clothing/shoes/sneakers/white
- suit = /obj/item/clothing/suit/toggle/labcoat/chemist
backpack = /obj/item/storage/backpack/chemistry
satchel = /obj/item/storage/backpack/satchel/chem
@@ -93,99 +81,321 @@
box = /obj/item/storage/box/survival/medical
chameleon_extras = /obj/item/gun/syringe
-///Chief Engineer
-
-/datum/outfit/job/minutemen/ce
- name = "Minutemen - Foreman"
- job_icon = "chiefengineer"
+/datum/outfit/job/clip/ce
+ name = "CLIP - Foreman"
+ job_icon = "clip_navy3"
jobtype = /datum/job/chief_engineer
id = /obj/item/card/id/silver
+ gloves = /obj/item/clothing/gloves/color/yellow
+ belt = /obj/item/storage/belt/utility/full
+ shoes = /obj/item/clothing/shoes/workboots
+ head = /obj/item/clothing/head/hardhat/white
+ ears = /obj/item/radio/headset/clip
+ uniform = /obj/item/clothing/under/clip
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip
+ alt_suit = null
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel/eng
duffelbag = /obj/item/storage/backpack/duffelbag/engineering
courierbag = /obj/item/storage/backpack/messenger/engi
-
box = /obj/item/storage/box/survival/engineer
-
- chameleon_extras = /obj/item/stamp/ce
-
-
- ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- alt_suit = null
- gloves = /obj/item/clothing/gloves/combat
- belt = /obj/item/storage/belt/utility/full
- shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- backpack = /obj/item/storage/backpack
backpack_contents = list(
/obj/item/melee/classic_baton/telescopic=1,
/obj/item/modular_computer/tablet/preset/advanced = 1
)
-/// Head Of Personnel
-
-/datum/outfit/job/minutemen/head_of_personnel
- name = "Minutemen - Bridge Officer"
- job_icon = "headofpersonnel"
+/datum/outfit/job/clip/first_officer
+ name = "CLIP - First Officer"
+ job_icon = "clip_navy4"
jobtype = /datum/job/head_of_personnel
id = /obj/item/card/id/silver
+ ears = /obj/item/radio/headset/clip/alt
+ uniform = /obj/item/clothing/under/clip/formal
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip/fo
+ alt_suit = null
+
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/clip/slouch/officer
backpack = /obj/item/storage/backpack/captain
satchel = /obj/item/storage/backpack/satchel/cap
duffelbag = /obj/item/storage/backpack/duffelbag/captain
courierbag = /obj/item/storage/backpack/messenger/com
- chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
+ backpack_contents = list(
+ /obj/item/storage/box/ids=1,
+ /obj/item/melee/classic_baton/telescopic=1,
+ /obj/item/modular_computer/tablet/preset/advanced = 1)
- ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- alt_suit = null
+ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
- shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- backpack = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/storage/box/ids=1,\
- /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
-
-/// Medical Doctor
-/datum/outfit/job/minutemen/doctor
- name = "Minutemen - Field Medic"
+/datum/outfit/job/clip/doctor
+ name = "CLIP - Doctor"
job_icon = "medicaldoctor"
jobtype = /datum/job/doctor
l_hand = /obj/item/storage/firstaid/medical
+
+ box = /obj/item/storage/box/survival/medical
+ chameleon_extras = /obj/item/gun/syringe
+ accessory = /obj/item/clothing/accessory/armband/medblue
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ head = /obj/item/clothing/head/beret/med
+ suit = /obj/item/clothing/suit/toggle/labcoat
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip
suit_store = /obj/item/flashlight/pen
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
courierbag = /obj/item/storage/backpack/messenger/med
- box = /obj/item/storage/box/survival/medical
+
+/datum/outfit/job/clip/scientist
+ name = "CLIP - Researcher"
+ job_icon = "scientist"
+ jobtype = /datum/job/scientist
+
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+/datum/outfit/job/clip/miner
+ name = "CLIP - Industrial Miner"
+ job_icon = "shaftminer"
+ jobtype = /datum/job/mining
+
+ l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
+ uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
+ alt_uniform = null
+ alt_suit = /obj/item/clothing/suit/toggle/hazard
+
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/combat
+
+ backpack_contents = list(
+ /obj/item/flashlight/seclite=1,
+ /obj/item/stack/marker_beacon/ten=1,
+ /obj/item/weldingtool=1,
+ /obj/item/clothing/mask/gas/clip=1
+ )
+
+/datum/outfit/job/clip/mechanic
+ name = "CLIP - Mechanic"
+ job_icon = "stationengineer"
+ jobtype = /datum/job/engineer
+
+ gloves = /obj/item/clothing/gloves/color/yellow
+ belt = /obj/item/storage/belt/utility/full/engi
+ shoes = /obj/item/clothing/shoes/workboots
+ r_pocket = /obj/item/t_scanner
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ uniform = /obj/item/clothing/under/clip
+ accessory = /obj/item/clothing/accessory/armband/engine
+ head = /obj/item/clothing/head/hardhat/dblue
+ suit = /obj/item/clothing/suit/hazardvest
+
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+/datum/outfit/job/clip/investigator
+ name = "CLIP GOLD - Investigator"
+ jobtype = /datum/job/detective
+ job_icon = "detective"
+
+ head = /obj/item/clothing/head/fedora/det_hat/clip
+ belt = /obj/item/clipboard
+ uniform = /obj/item/clothing/under/clip/formal
+ suit = /obj/item/clothing/suit/armor/clip_trenchcoat
+ ears = /obj/item/radio/headset/alt
+ shoes = /obj/item/clothing/shoes/jackboots
+ gloves = /obj/item/clothing/gloves/color/black
+
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+
+ l_pocket = /obj/item/toy/crayon/white
+ r_pocket = /obj/item/radio
+
+ backpack_contents = list(/obj/item/storage/box/evidence=1,\
+ /obj/item/detective_scanner=1,\
+ /obj/item/melee/classic_baton=1)
+
+/datum/outfit/job/clip/bureaucrat
+ name = "CLIP GOLD - Bureaucrat"
+ job_icon = "scribe"
+ jobtype = /datum/job/lawyer
+
+ head = /obj/item/clothing/head/flatcap/clip
+ uniform = /obj/item/clothing/under/clip/formal/with_shirt
+ shoes = /obj/item/clothing/shoes/laceup
+
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+
+ r_pocket = /obj/item/radio
+
+// Colonial League Minutemen
+
+/datum/outfit/job/clip/minutemen
+ name = "CLIP Minutemen - Base Outfit"
+
+ jobtype = /datum/job/assistant
+ uniform = /obj/item/clothing/under/clip/minutemen
+
+ backpack = /obj/item/storage/backpack/security/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+ box = /obj/item/storage/box/survival/clip/balaclava
+
+/datum/outfit/job/clip/minutemen/deckhand
+ name = "CLIP Minutemen - Deckhand"
+ job_icon = "clip_navy1"
+ jobtype = /datum/job/assistant
+ uniform = /obj/item/clothing/under/clip
+ shoes = /obj/item/clothing/shoes/sneakers/black
+
+ r_pocket = /obj/item/radio
+
+/datum/outfit/job/clip/minutemen/captain
+ name = "CLIP Minutemen - Captain"
+ job_icon = "clip_navy5"
+ jobtype = /datum/job/captain
+
+ id = /obj/item/card/id/gold
+ gloves = /obj/item/clothing/gloves/color/captain
+ accessory = /obj/item/clothing/accessory/medal/gold/captain
+ ears = /obj/item/radio/headset/clip/alt/captain
+ uniform = /obj/item/clothing/under/clip/officer
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/armor/clip_capcoat
+ alt_suit = null
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/clip/slouch/officer
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ backpack_contents = list(/obj/item/storage/box/ids=1,
+ /obj/item/melee/classic_baton/telescopic=1,
+ /obj/item/modular_computer/tablet/preset/advanced = 1)
+
+/datum/outfit/job/clip/minutemen/captain/general
+ name = "CLIP Minutemen - General"
+ job_icon = "clip_cmm6"
+
+ head = /obj/item/clothing/head/clip/slouch/officer
+ ears = /obj/item/radio/headset/clip/alt/captain
+ uniform = /obj/item/clothing/under/clip/officer
+ suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip
+ shoes = /obj/item/clothing/shoes/combat
+
+ box = /obj/item/storage/box/survival/engineer/radio
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1)
+
+/datum/outfit/job/clip/minutemen/captain/general/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ var/obj/item/card/id/W = H.wear_id
+ if(W)
+ W.registered_name = H.real_name
+ W.assignment = "General"
+ W.update_label()
+
+/datum/outfit/job/clip/minutemen/captain/general/admiral // for flavor, might remove outright
+ name = "CLIP Minutemen - Admiral"
+ job_icon = "clip_navy6"
+
+ head = /obj/item/clothing/head/clip/bicorne
+ suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral
+
+/datum/outfit/job/clip/minutemen/captain/general/admiral/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ var/obj/item/card/id/W = H.wear_id
+ if(W)
+ W.registered_name = H.real_name
+ W.assignment = "Admiral"
+ W.update_label()
+
+///chemist
+
+/datum/outfit/job/clip/minutemen/chemist
+ name = "CLIP Minutemen - Chemist"
+ job_icon = "clip_navy2"
+ jobtype = /datum/job/chemist
+
+ glasses = /obj/item/clothing/glasses/science
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/chemist
+ uniform = /obj/item/clothing/under/clip/medic
+
+ backpack = /obj/item/storage/backpack/chemistry
+ satchel = /obj/item/storage/backpack/satchel/chem
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/chem
chameleon_extras = /obj/item/gun/syringe
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- accessory = /obj/item/clothing/accessory/armband/medblue
+/datum/outfit/job/clip/minutemen/head_of_personnel
+ name = "CLIP Minutemen - Bridge Officer"
+ job_icon = "clip_navy3"
+ jobtype = /datum/job/head_of_personnel
+
+ id = /obj/item/card/id/silver
+ head = /obj/item/clothing/head/clip/slouch
+ ears = /obj/item/radio/headset/clip/alt
+ uniform = /obj/item/clothing/under/clip/formal
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip
+ alt_suit = null
+ shoes = /obj/item/clothing/shoes/combat
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1)
+
+/datum/outfit/job/clip/minutemen/doctor
+ name = "CLIP Minutemen - Corpsman"
+ job_icon = "clip_navy2"
+ jobtype = /datum/job/doctor
+
+ l_hand = /obj/item/storage/firstaid/medical
+
+ backpack = /obj/item/storage/backpack/security/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+ uniform = /obj/item/clothing/under/clip/medic
shoes = /obj/item/clothing/shoes/sneakers/white
- head = /obj/item/clothing/head/beret/med
+ head = /obj/item/clothing/head/clip/corpsman
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip
suit = null
suit_store = null
-///paramedic
-/datum/outfit/job/minutemen/paramedic
- name = "Minutemen - BARD Combat Medic"
+/datum/outfit/job/clip/minutemen/paramedic
+ name = "CLIP Minutemen - BARD Combat Medic"
job_icon = "paramedic"
jobtype = /datum/job/paramedic
-
uniform = /obj/item/clothing/under/rank/medical/paramedic/emt
head = /obj/item/clothing/head/soft/paramedic
suit = /obj/item/clothing/suit/armor/vest
@@ -202,151 +412,249 @@
box = /obj/item/storage/box/survival/medical
-///roboticist
-/datum/outfit/job/minutemen/roboticist
- name = "Minutemen - Mech Technician"
- job_icon = "roboticist"
+///vehicle crew
+
+/datum/outfit/job/clip/minutemen/vehicle_crew
+ name = "CLIP Minutemen - Vehicle Crewman"
+ job_icon = "clip_mech1"
jobtype = /datum/job/roboticist
belt = /obj/item/storage/belt/utility/full
- backpack = /obj/item/storage/backpack/science
- satchel = /obj/item/storage/backpack/satchel/tox
- courierbag = /obj/item/storage/backpack/messenger/tox
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ uniform = /obj/item/clothing/under/clip
+ shoes = /obj/item/clothing/shoes/jackboots
+ ears = /obj/item/radio/headset/clip
+ suit = null
+/datum/outfit/job/clip/minutemen/vehicle_pilot
+ name = "CLIP Minutemen - Vehicle Pilot"
+ job_icon = "clip_mech2"
+ jobtype = /datum/job/mining
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ head = /obj/item/clothing/head/helmet/bulletproof/m10/clip_vc
+ uniform = /obj/item/clothing/under/clip/minutemen
shoes = /obj/item/clothing/shoes/combat
- ears = /obj/item/radio/headset/minutemen
- suit = /obj/item/clothing/suit/toggle/labcoat/science
- alt_suit = /obj/item/clothing/suit/toggle/suspenders/gray
+ ears = /obj/item/radio/headset/clip
-///scientist
-/datum/outfit/job/minutemen/scientist
- name = "Minutemen - Scientist"
- job_icon = "scientist"
- jobtype = /datum/job/scientist
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ gloves = /obj/item/clothing/gloves/fingerless
+ glasses = /obj/item/clothing/glasses/hud/diagnostic
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- backpack = /obj/item/storage/backpack/security/cmm
+/datum/outfit/job/clip/minutemen/vehicle_pilot/commander
+ name = "CLIP Minutemen - Vehicle Commander"
+ job_icon = "clip_mech3"
- shoes = /obj/item/clothing/shoes/sneakers/white
- suit = /obj/item/clothing/suit/toggle/labcoat/science
- alt_suit = /obj/item/clothing/suit/toggle/suspenders/blue
+ suit = /obj/item/clothing/suit/jacket/miljacket
+ glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
- backpack = /obj/item/storage/backpack/science
- satchel = /obj/item/storage/backpack/satchel/tox
- courierbag = /obj/item/storage/backpack/messenger/tox
+/datum/outfit/job/clip/minutemen/vehicle_crew/coordinator
+ name = "CLIP Minutemen - Vehicle Traffic Coordinator"
+ job_icon = "clip_mech4"
+ jobtype = /datum/job/roboticist
+
+ belt = null
-//security officers
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ head = /obj/item/clothing/head/clip/slouch
+ uniform = /obj/item/clothing/under/clip/minutemen
+ shoes = /obj/item/clothing/shoes/combat
+ suit = /obj/item/clothing/suit/hazardvest
+
+/datum/outfit/job/clip/minutemen/engineer
+ name = "CLIP Minutemen - Engineer"
+ job_icon = "clip_navy2"
+ jobtype = /datum/job/engineer
+
+ belt = /obj/item/storage/belt/utility/full/engi
+ shoes = /obj/item/clothing/shoes/workboots
+ r_pocket = /obj/item/t_scanner
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ uniform = /obj/item/clothing/under/clip
+ head = /obj/item/clothing/head/clip
+ suit = /obj/item/clothing/suit/hazardvest
-/datum/outfit/job/minutemen/security
- name = "Minutemen - Minuteman"
- job_icon = "securityofficer"
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+//grunts - for erts as well
+
+/obj/item/twenty_pounds_of_ice
+ name = "20 pounds of ice"
+ desc = "It feels cold and heavy."
+ icon_state = "20_lb_ice"
+ w_class = WEIGHT_CLASS_NORMAL
+
+/datum/outfit/job/clip/minutemen/grunt
+ name = "CLIP Minutemen - Minuteman"
jobtype = /datum/job/officer
+ job_icon = "clip_cmm2"
+ ears = /obj/item/radio/headset/alt
+ box = /obj/item/storage/box/survival/clip/balaclava
+ shoes = null
- head = /obj/item/clothing/head/helmet/bulletproof/minutemen
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ backpack = /obj/item/storage/backpack/security/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/security/clip //to-do: bug rye for clip duffles // rye. rye. give me 20 pound bag of ice //done
+
+/datum/outfit/job/clip/minutemen/grunt/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(H.ckey == "meemofcourse")
+ H.equip_to_slot_if_possible(new /obj/item/twenty_pounds_of_ice, ITEM_SLOT_HANDS, FALSE, FALSE)
+
+
+/datum/outfit/job/clip/minutemen/grunt/reserve
+ name = "CLIP Minutemen - Reservist"
+ job_icon = "clip_cmm1"
+ jobtype = /datum/job/assistant
+
+ head = /obj/item/clothing/head/clip
+ shoes = /obj/item/clothing/shoes/combat
+
+/datum/outfit/job/clip/minutemen/grunt/dressed
+ name = "CLIP Minutemen - Minuteman (Dressed)"
+
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/clip
suit = /obj/item/clothing/suit/armor/vest/bulletproof
alt_suit = null
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ uniform = /obj/item/clothing/under/clip/minutemen
alt_uniform = null
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/radio/headset/alt
+ gloves = /obj/item/clothing/gloves/color/black
- belt = /obj/item/storage/belt/military/minutemen
+ belt = /obj/item/storage/belt/military/clip
l_pocket = /obj/item/flashlight/seclite
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- box = /obj/item/storage/box/survival/engineer/radio
- backpack_contents = null
-/datum/outfit/job/minutemen/security/armed
- name = "Minutemen - Minuteman (Armed)"
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1)
+
+/datum/outfit/job/clip/minutemen/grunt/dressed/armed
+ name = "CLIP Minutemen - Minuteman (Armed - CM-16)"
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/minutemen/p16
+ belt = /obj/item/storage/belt/military/clip/p16
-/datum/outfit/job/minutemen/security/mech_pilot
- name = "Minutemen - Mech Pilot"
+/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4 //f4 is rename of GAL, don't wanna repath upon adding the clip guns though, if i forget to remove this during then, fucking yell at me
+ name = "CLIP Minutemen - Minuteman (Armed - CM-GAL)"
- suit = /obj/item/clothing/suit/armor/vest/alt
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- glasses = /obj/item/clothing/glasses/hud/diagnostic
+ suit_store = /obj/item/gun/ballistic/automatic/gal
+ belt = /obj/item/storage/belt/military/clip/gal
-///miners
+/datum/outfit/job/clip/minutemen/grunt/dressed/armed/cm5
+ name = "CLIP Minutemen - Minuteman (Armed - CM-5)"
-/datum/outfit/job/minutemen/miner
- name = "Minutemen - Industrial Miner"
- job_icon = "shaftminer"
- jobtype = /datum/job/mining
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
+ belt = /obj/item/storage/belt/military/clip/cm5
- l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
- uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
- alt_uniform = null
- alt_suit = /obj/item/clothing/suit/toggle/hazard
+//ert outfits, i suppose you could use these for non-ert roles although i highly discourage it
- gloves = /obj/item/clothing/gloves/color/black
- shoes = /obj/item/clothing/shoes/combat
- backpack_contents = list(
- /obj/item/flashlight/seclite=1,
- /obj/item/stack/marker_beacon/ten=1,
- /obj/item/weldingtool=1
- )
+/datum/outfit/job/clip/minutemen/grunt/dressed/engi
+ name = "CLIP Minutemen - Field Engineer (Dressed)"
+ jobtype = /datum/job/engineer
-///engineers
+ accessory = /obj/item/clothing/accessory/armband/engine
+ belt = /obj/item/storage/belt/military/clip/engi
-/datum/outfit/job/minutemen/engineer
- name = "Minutemen - Mechanic"
- job_icon = "stationengineer"
- jobtype = /datum/job/engineer
+/datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
+ name = "CLIP Minutemen - Field Engineer (Armed - CM-16)"
- belt = /obj/item/storage/belt/utility/full/engi
- shoes = /obj/item/clothing/shoes/workboots
- r_pocket = /obj/item/t_scanner
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chili_macaroni=1, /obj/item/grenade/c4=2, /obj/item/ammo_box/magazine/p16=3)
- backpack = /obj/item/storage/backpack/industrial
- satchel = /obj/item/storage/backpack/satchel/eng
- duffelbag = /obj/item/storage/backpack/duffelbag/engineering
- courierbag = /obj/item/storage/backpack/messenger/engi
+/datum/outfit/job/clip/minutemen/grunt/dressed/med
+ name = "CLIP Minutemen - Field Corpsman (Dressed)"
+ jobtype = /datum/job/doctor
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- accessory = /obj/item/clothing/accessory/armband/engine
- head = /obj/item/clothing/head/hardhat/dblue
- suit = /obj/item/clothing/suit/hazardvest
+ accessory = /obj/item/clothing/accessory/armband/medblue
+ belt = /obj/item/storage/belt/medical/webbing/clip/prefilled
- box = /obj/item/storage/box/survival/engineer
- backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+/datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
+ name = "CLIP Minutemen - Field Corpsman (Armed - CM-5)"
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
-///warden
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/smgm9mm=3)
-/datum/outfit/job/minutemen/warden
- name = "Minutemen - Field Commander"
- job_icon = "warden"
- jobtype = /datum/job/warden
+/obj/item/storage/belt/military/clip/gunner/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/ammo_box/magazine/skm_762_40/extended(src)
+ new /obj/item/grenade/frag(src)
+
+/datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
+ name = "CLIP Minutemen - Field Gunner (Armed - SKM-24u)" //See above, replace with CLIP LMG when added
- glasses = /obj/item/clothing/glasses/sunglasses
- ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
accessory = /obj/item/clothing/accessory/armband
- head = /obj/item/clothing/head/cowboy/sec/minutemen
+ belt = /obj/item/storage/belt/military/clip/gunner
+ suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1)
+
+///lead, i guess you could reuse this for "Brig Officer"
+
+/datum/outfit/job/clip/minutemen/grunt/lead
+ name = "CLIP Minutemen - Field Sergeant"
+ job_icon = "clip_cmm3"
+ jobtype = /datum/job/warden
+
+ ears = /obj/item/radio/headset/clip/alt
+ uniform = /obj/item/clothing/under/clip/minutemen
+ gloves = /obj/item/clothing/gloves/combat
+ head = /obj/item/clothing/head/clip/slouch
suit = /obj/item/clothing/suit/armor/vest/bulletproof
- belt = /obj/item/storage/belt/military/minutemen
+ belt = /obj/item/storage/belt/military/clip
shoes = /obj/item/clothing/shoes/combat
l_pocket = /obj/item/flashlight/seclite
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- box = /obj/item/storage/box/survival/engineer/radio
- backpack = /obj/item/storage/backpack
- backpack_contents = null
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1)
-/datum/outfit/job/minutemen/warden/armed
- name = "Minutemen - Field Commander (Armed)"
+/datum/outfit/job/clip/minutemen/grunt/lead/armed
+ name = "CLIP Minutemen - Field Sergeant (Armed)"
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/minutemen/p16
+ belt = /obj/item/storage/belt/military/clip/p16
+ //replace commander with the cm23 when its impemented, see the cm-f4 above
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
+
+/datum/outfit/job/clip/minutemen/grunt/commander
+ name = "CLIP Minutemen - Field Commander"
+ job_icon = "clip_cmm4"
+ jobtype = /datum/job/hos
+
+ ears = /obj/item/radio/headset/clip/alt
+ uniform = /obj/item/clothing/under/clip/officer
+
+ head = /obj/item/clothing/head/clip/slouch/officer
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip
+
+ shoes = /obj/item/clothing/shoes/combat
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+/datum/outfit/job/clip/minutemen/grunt/major
+ name = "CLIP Minutemen - Major"
+ job_icon = "clip_cmm5"
+ jobtype = /datum/job/captain
+
+ ears = /obj/item/radio/headset/clip/alt
+ uniform = /obj/item/clothing/under/clip/officer
- backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1, /obj/item/gun/energy/e_gun/advtaser=1)
+ head = /obj/item/clothing/head/clip/slouch/officer
+ suit = /obj/item/clothing/suit/armor/clip_trenchcoat
+
+ shoes = /obj/item/clothing/shoes/combat
+
+ glasses = /obj/item/clothing/glasses/sunglasses
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 50200f5a44ac..c11ce0f05c51 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -1100,12 +1100,6 @@
icon_state = "hardsuit0-frontier"
hardsuit_type = "frontier"
-/obj/item/clothing/head/helmet/space/hardsuit/security/independent/minutemen
- name = "\improper CMM Patroller hardsuit helmet"
- desc = "A hardsuit used by the Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels."
- icon_state = "hardsuit0-cmm-patrol"
- hardsuit_type = "cmm-patrol"
-
/obj/item/clothing/suit/space/hardsuit/security/independent
icon_state = "hardsuit-independent-sec"
name = "security hardsuit"
@@ -1124,13 +1118,6 @@
hardsuit_type = "hardsuit_frontier"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/frontier
-/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
- name = "\improper CMM Patroller hardsuit"
- desc = "A hardsuit used by the Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels."
- icon_state = "hardsuit-cmm-patrol"
- hardsuit_type = "hardsuit-cmm-patrol"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/minutemen
-
//Mining
/obj/item/clothing/head/helmet/space/hardsuit/mining/independent
name = "mining hardsuit helmet"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index c3787de67e83..953899ca40ce 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -178,12 +178,6 @@
icon_state = "carapace_formal"
item_state = "bio_suit"
-/obj/item/clothing/suit/armor/vest/capcarapace/minutemen
- name = "Colonial Minutemen general coat"
- desc = "A very fancy coat used by generals of the Colonial Minutemen."
- icon_state = "carapace_minutemen"
- item_state = "carapace_minutemen"
-
/obj/item/clothing/suit/armor/vest/capcarapace/duster
name = "captain's duster"
desc = "A long, commanding coat worn over a surprisingly sleek set of armor and decorated with gold embroidery. Ideal for protecting its wearer from rain, sun, dust, mutineers, pirates, bears, hordes of angry legions, and so on."
@@ -204,12 +198,6 @@
strip_delay = 80
equip_delay_other = 60
-/obj/item/clothing/suit/armor/riot/minutemen
- name = "black riot suit"
- desc = "Designed to protect against close range attacks. This one is painted black. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
- icon_state = "riot_minutemen"
-
-
/obj/item/clothing/suit/armor/bone
name = "bone armor"
desc = "A tribal armor plate, crafted from animal bone."
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 12a44cbbd252..0db75bbb1921 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -159,17 +159,6 @@
icon_state = "suitjacket_charcoal"
item_state = "suitjacket_charcoal"
-/obj/item/clothing/suit/toggle/lawyer/minutemen
- name = "minutemen suit jacket"
- desc = "An enterprising dress jacket used by officers of the Colonial Minutemen."
- icon_state = "suitjacket_minuteman"
- item_state = "suitjacket_navy"
-
-/obj/item/clothing/suit/toggle/lawyer/minutemen/Initialize()
- . = ..()
- if(!allowed)
- allowed = GLOB.security_vest_allowed //it's hop-equivalent gear after all
-
/obj/item/clothing/suit/toggle/lawyer/cmo
name = "light blue suit jacket"
desc = "A foppish dress jacket."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 77b7297f4c69..126e34db4f4a 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -446,7 +446,7 @@
/obj/item/clothing/suit/jacket/miljacket
name = "military jacket"
- desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
+ desc = "A canvas jacket styled after traditional military garb. Feels sturdy, yet comfortable."
icon_state = "militaryjacket"
item_state = "militaryjacket"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio)
diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
index 231c62eb2895..55b20b328ac8 100644
--- a/code/modules/clothing/under/jobs/command.dm
+++ b/code/modules/clothing/under/jobs/command.dm
@@ -110,11 +110,3 @@
icon_state = "captain_nt_skirt"
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
-
-//Minuteman
-/obj/item/clothing/under/rank/command/minutemen
- name = "colonial minutemen officer uniform"
- desc = "A uniform used by officers of the Colonial Minutemen."
- icon_state = "minuteman_officer"
- item_state = "g_suit"
- can_adjust = FALSE
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index de9cb15258e5..cf08ad4ed4c6 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -270,14 +270,6 @@
desc = "A dark colored uniform worn by private military engineers."
icon_state = "military_eng"
-/obj/item/clothing/under/rank/security/officer/minutemen
- name = "colonial minutemen jumpsuit"
- desc = "A jumpsuit worn by low ranking members of the Colonial Minutemen."
- icon_state = "minuteman"
- item_state = "b_suit"
- can_adjust = FALSE
- supports_variations = DIGITIGRADE_VARIATION
-
/obj/item/clothing/under/rank/security/officer/camo
name = "fatigues"
desc = "A combat uniform most often worn by mercenaries and TPLRC soldiers. Features polychromatic design to adjust to different environments."
@@ -291,6 +283,10 @@
"Snow" = "camo_snow",
)
+/obj/item/storage/belt/military/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+
/obj/item/clothing/under/rank/security/officer/frontier
name = "\improper Frontiersmen uniform"
desc = "Worn by members of the Frontiersmen pirate fleet. It's very uncomfortable to move around in."
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index e41aaa6fe917..41381a2d3aa1 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -63,7 +63,7 @@
list(fax_name = "IRMG Mothership", fax_id = "inteq", color = "yellow", emag_needed = FALSE),
list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE),
list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE),
- list(fax_name = "Colonial League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE),
+ list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE),
list(fax_name = "Syndicate Coalition Coordination Center", fax_id = "syndicate", color = "red", emag_needed = FALSE),
list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
)
@@ -529,7 +529,7 @@
/obj/machinery/fax/admin/minutemen
name = "CLIP HiComm Fax Machine"
- fax_name = "Colonial League Leadership"
+ fax_name = "Confederated League Leadership"
admin_fax_id = "minutemen"
/obj/machinery/fax/admin/roumain
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 9d22b169c01a..42ce0b39ee79 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -135,9 +135,9 @@
icon_state = "stamp-artificer"
dye_color = DYE_QM
-/obj/item/stamp/cmm
- name = "Colonial Minutemen rubber stamp"
- icon_state = "stamp-cmm"
+/obj/item/stamp/clip
+ name = "CLIP Minutemen rubber stamp"
+ icon_state = "stamp-clip"
dye_color = DYE_FO
/obj/item/stamp/gold
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index 087d0e425402..d0b69480a106 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -100,7 +100,7 @@
/obj/item/gun/ballistic/automatic/assault/p16/minutemen
name = "\improper CM-16"
- desc = "The standard-issue rifle of the Colonial Minutemen and an extensively modified reproduction of the P-16. Chambered in 5.56mm."
+ desc = "The standard-issue rifle of CLIP and an extensively modified reproduction of the P-16. Chambered in 5.56mm."
icon_state = "cm16"
item_state = "cm16"
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index dd063fe9dc66..ec57fd588021 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -149,7 +149,7 @@
/obj/item/gun/ballistic/automatic/gal
name = "\improper CM-GAL-S"
- desc = "The standard issue DMR of the CMM. Dates back to the Xenofauna War, this particular model is in a carbine configuration, and, as such, is shorter than the standard model. Chambered in .308."
+ desc = "The standard issue DMR of CLIP. Dates back to the Xenofauna War, this particular model is in a carbine configuration, and, as such, is shorter than the standard model. Chambered in .308."
icon = 'icons/obj/guns/48x32guns.dmi'
fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
icon_state = "gal"
@@ -169,7 +169,7 @@
/obj/item/gun/ballistic/automatic/gal/inteq
name = "\improper SsG-04"
- desc = "A marksman rifle purchased from the Colonial Minutemen and modified to suit IRMG's needs. Chambered in .308."
+ desc = "A marksman rifle purchased from CLIP and modified to suit IRMG's needs. Chambered in .308."
icon_state = "gal-inteq"
item_state = "gal-inteq"
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index bed5a58d99a8..32d9c209deb8 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -255,7 +255,7 @@
/obj/item/gun/ballistic/shotgun/bulldog/minutemen //TODO: REPATH
name = "\improper CM-15"
- desc = "A standard-issue shotgun of the Colonial Minutemen, most often used by boarding crews. Only compatible with specialized 8-round magazines."
+ desc = "A standard-issue shotgun of CLIP, most often used by boarding crews. Only compatible with specialized 8-round magazines."
icon = 'icons/obj/guns/48x32guns.dmi'
mag_type = /obj/item/ammo_box/magazine/cm15_mag
icon_state = "cm15"
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index 008ff2381427..17760a4bce91 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -259,7 +259,7 @@
/obj/item/gun/ballistic/automatic/smg/cm5
name = "\improper CM-5"
- desc = "The standard issue SMG of the CMM. One of the few firearm designs that were left mostly intact from the designs found on the UNSV Lichtenstein. Chambered in 9mm."
+ desc = "The standard issue SMG of CLIP. One of the few firearm designs that were left mostly intact from the designs found on the UNSV Lichtenstein. Chambered in 9mm."
icon_state = "cm5"
item_state = "cm5"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
@@ -280,6 +280,22 @@
fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
icon_state = "aks74u"
item_state = "aks74u"
+/obj/item/gun/ballistic/automatic/smg/cm5/compact
+ name = "\improper CM-5c"
+ desc = "The compact conversion of the CM-5. While not exactly restricted, it is looked down upon due to CLIP's doctrine on medium-longrange combat, however it excels at close range and is very lightweight. You feel like this gun is mildly unfinished. Chambered in 9mm."
+ w_class = WEIGHT_CLASS_NORMAL
+ spread = 25
+ spread_unwielded = 40
+
+ recoil = 1
+ recoil_unwielded = 2
+ wield_delay = 0.2 SECONDS
+ wield_slowdown = 0.15
+
+/obj/item/gun/ballistic/automatic/smg/cm5/compact/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/automatic_fire, 0.8 SECONDS)
+
/obj/item/gun/ballistic/automatic/smg/skm_carbine
name = "\improper SKM-24v"
desc = "The SKM-24v was a carbine modification of the SKM-24 during the Frontiersmen War. This, however, is just a shoddy imitation of that carbine, effectively an SKM-24 with a sawed down barrel and a folding wire stock. Can be fired with the stock folded, though accuracy suffers. Chambered in 4.6x30mm."
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index e5f5f22db67a..6682a9ba7943 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -213,6 +213,9 @@
name = "epinephrine reserve tank"
list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
+/obj/item/reagent_containers/glass/beaker/large/fuel
+ list_reagents = list(/datum/reagent/fuel = 100)
+
/obj/item/reagent_containers/glass/beaker/synthflesh
list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 59e1ab844544..9bdc513289e1 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -149,16 +149,16 @@ other types of metals and chemistry for reagents).
blueprints[1] = new /datum/design/disposable_gun()
blueprints[2] = new /datum/design/pizza_disposable_gun()
-/obj/item/disk/design_disk/cmm_mechs
- name = "design disk - CMM mecha modifications"
- desc = "A design disk containing specifications for CMM-custom mecha conversions."
+/obj/item/disk/design_disk/clip_mechs
+ name = "design disk - CLIP mecha modifications"
+ desc = "A design disk containing specifications for CLIP-custom mecha conversions."
color = "#57b8f0"
max_blueprints = 2
-/obj/item/disk/design_disk/cmm_mechs/Initialize()
+/obj/item/disk/design_disk/clip_mechs/Initialize()
. = ..()
- blueprints[1] = new /datum/design/cmm_ripley_upgrade()
- blueprints[2] = new /datum/design/cmm_durand_upgrade()
+ blueprints[1] = new /datum/design/clip_ripley_upgrade()
+ blueprints[2] = new /datum/design/clip_durand_upgrade()
/obj/item/disk/design_disk/ammo_c9mm
name = "Design Disk - 9mm Ammo"
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index bd801e60995e..dfd373dcd3d7 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -569,18 +569,18 @@
category = list("Phazon")
//Exosuit Equipment
-/datum/design/cmm_ripley_upgrade
+/datum/design/clip_ripley_upgrade
name = "Ripley MK-I to MK-IV conversion kit"
- id = "cmm_ripley_upgrade"
+ id = "clip_ripley_upgrade"
build_type = AUTOLATHE
- build_path = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/cmm
+ build_path = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip
materials = list(/datum/material/iron=10000,/datum/material/plasma=10000)
construction_time = 100
category = list("Exosuit Equipment")
-/datum/design/cmm_durand_upgrade
+/datum/design/clip_durand_upgrade
name = "Durand to Paladin conversion kit"
- id = "cmm_durand_upgrade"
+ id = "clip_durand_upgrade"
build_type = AUTOLATHE
build_path = /obj/item/mecha_parts/mecha_equipment/conversion_kit/paladin
materials = list(/datum/material/iron=10000,/datum/material/plasma=10000)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 9c4f7c376425..549f6f744f1f 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -541,3 +541,56 @@
/obj/item/vending_refill/wardrobe/cent_wardrobe
machine_name = "CentDrobe"
light_color = LIGHT_COLOR_ELECTRIC_GREEN
+
+
+/obj/machinery/vending/wardrobe/clip_wardrobe
+ name = "\improper CLIPDrobe"
+ desc = "A very special vending machine that somehow vends every piece of clothing used by the Confederated League! Wow! You get the feeling this is meant for debugging."
+ icon_state = "clipdrobe"
+ product_ads = "Coast guard in style!"
+ vend_reply = "Thank you for using the CLIPDrobe!"
+ products = list(
+ /obj/item/clothing/shoes/laceup = 3,
+ /obj/item/clothing/shoes/jackboots = 3,
+ /obj/item/clothing/gloves/combat = 3,
+ /obj/item/clothing/glasses/sunglasses = 3,
+
+ /obj/item/clothing/under/clip = 3,
+ /obj/item/clothing/under/clip/minutemen = 3,
+ /obj/item/clothing/under/clip/formal/with_shirt = 3,
+ /obj/item/clothing/under/clip/formal/with_shirt/alt = 3,
+ /obj/item/clothing/under/clip/medic = 3,
+ /obj/item/clothing/under/clip/officer = 3,
+ /obj/item/clothing/under/clip/officer/alt = 3,
+
+ /obj/item/clothing/mask/gas/clip = 3,
+ /obj/item/storage/belt/military/clip = 3,
+ /obj/item/storage/belt/medical/webbing/clip = 3,
+ /obj/item/clothing/gloves/color/latex/nitrile/clip = 3,
+
+ /obj/item/clothing/suit/toggle/lawyer/clip = 3,
+ /obj/item/clothing/suit/armor/vest/capcarapace/clip = 3,
+ /obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral = 3,
+ /obj/item/clothing/suit/armor/clip_trenchcoat = 3,
+ /obj/item/clothing/suit/armor/vest/bulletproof = 3,
+ /obj/item/clothing/suit/armor/riot/clip = 3,
+
+ /obj/item/clothing/suit/space/hardsuit/security/independent/clip = 3,
+ /obj/item/clothing/suit/space/hardsuit/clip_spotter = 3,
+
+ /obj/item/clothing/head/helmet/bulletproof/x11/clip = 3,
+ /obj/item/clothing/head/helmet/riot/clip = 3,
+ /obj/item/clothing/head/clip = 3,
+ /obj/item/clothing/head/clip/corpsman = 3,
+ /obj/item/clothing/head/clip/slouch = 3,
+ /obj/item/clothing/head/clip/slouch/officer = 3,
+ /obj/item/clothing/head/clip/boonie = 3,
+ /obj/item/clothing/head/fedora/det_hat/clip = 3,
+ /obj/item/clothing/head/flatcap/clip = 3,
+ /obj/item/clothing/head/clip/bicorne = 3,
+
+ )
+ refill_canister = /obj/item/vending_refill/wardrobe/clip_wardrobe
+/obj/item/vending_refill/wardrobe/clip_wardrobe
+ machine_name = "CLIPDrobe"
+ light_color = LIGHT_COLOR_CYAN
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index a7d4e75a77dd..08f0c94505ee 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mecha/mecha_96x96.dmi b/icons/mecha/mecha_96x96.dmi
index 7a9ba8cc4d61..c284d31561b5 100644
Binary files a/icons/mecha/mecha_96x96.dmi and b/icons/mecha/mecha_96x96.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 324ea7dac8a1..5e08a834a892 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index aef500b67da9..d23ebfae4756 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 8c730bf22ba3..e8702376efce 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 4c6dd4f78bcf..4fad073974aa 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/faction/clip/accessory.dmi b/icons/mob/clothing/faction/clip/accessory.dmi
new file mode 100644
index 000000000000..733bb3d863e0
Binary files /dev/null and b/icons/mob/clothing/faction/clip/accessory.dmi differ
diff --git a/icons/mob/clothing/faction/clip/belt.dmi b/icons/mob/clothing/faction/clip/belt.dmi
new file mode 100644
index 000000000000..befce1b54b10
Binary files /dev/null and b/icons/mob/clothing/faction/clip/belt.dmi differ
diff --git a/icons/mob/clothing/faction/clip/hands.dmi b/icons/mob/clothing/faction/clip/hands.dmi
new file mode 100644
index 000000000000..8e35e752ab8c
Binary files /dev/null and b/icons/mob/clothing/faction/clip/hands.dmi differ
diff --git a/icons/mob/clothing/faction/clip/head.dmi b/icons/mob/clothing/faction/clip/head.dmi
new file mode 100644
index 000000000000..2122a9a2f328
Binary files /dev/null and b/icons/mob/clothing/faction/clip/head.dmi differ
diff --git a/icons/mob/clothing/faction/clip/mask.dmi b/icons/mob/clothing/faction/clip/mask.dmi
new file mode 100644
index 000000000000..a46424e63096
Binary files /dev/null and b/icons/mob/clothing/faction/clip/mask.dmi differ
diff --git a/icons/mob/clothing/faction/clip/suits.dmi b/icons/mob/clothing/faction/clip/suits.dmi
new file mode 100644
index 000000000000..f7a64dc8b320
Binary files /dev/null and b/icons/mob/clothing/faction/clip/suits.dmi differ
diff --git a/icons/mob/clothing/faction/clip/uniforms.dmi b/icons/mob/clothing/faction/clip/uniforms.dmi
new file mode 100644
index 000000000000..71ad9e1b6a3e
Binary files /dev/null and b/icons/mob/clothing/faction/clip/uniforms.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 6b974d5a8199..3246bbb24de2 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 0c79696e569a..bdf9ad412de7 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 3eaea4e2ba3f..dc8a9b671a7a 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 138650d4fb27..ca1eb949aa40 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index c739d99d2f38..5c13c3f615ea 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
index 6350fec50200..457f28fb8ad5 100644
Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ
diff --git a/icons/mob/clothing/suits/toggle.dmi b/icons/mob/clothing/suits/toggle.dmi
index 2059afd5bf46..8ceffd1312c0 100644
Binary files a/icons/mob/clothing/suits/toggle.dmi and b/icons/mob/clothing/suits/toggle.dmi differ
diff --git a/icons/mob/clothing/under/command.dmi b/icons/mob/clothing/under/command.dmi
index fd5f1af01e88..9e62d273cc3d 100644
Binary files a/icons/mob/clothing/under/command.dmi and b/icons/mob/clothing/under/command.dmi differ
diff --git a/icons/mob/clothing/under/security.dmi b/icons/mob/clothing/under/security.dmi
index 7e6c10ec6d6d..61b1d7983225 100644
Binary files a/icons/mob/clothing/under/security.dmi and b/icons/mob/clothing/under/security.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 0b48ccfaf785..e0818c6853df 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 65a951047a35..20cc5db40a44 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/faction/clip/accessory.dmi b/icons/obj/clothing/faction/clip/accessory.dmi
new file mode 100644
index 000000000000..dd081c9f9ca8
Binary files /dev/null and b/icons/obj/clothing/faction/clip/accessory.dmi differ
diff --git a/icons/obj/clothing/faction/clip/belt.dmi b/icons/obj/clothing/faction/clip/belt.dmi
new file mode 100644
index 000000000000..bd513a28c2f2
Binary files /dev/null and b/icons/obj/clothing/faction/clip/belt.dmi differ
diff --git a/icons/obj/clothing/faction/clip/hands.dmi b/icons/obj/clothing/faction/clip/hands.dmi
new file mode 100644
index 000000000000..ad3700cf5f61
Binary files /dev/null and b/icons/obj/clothing/faction/clip/hands.dmi differ
diff --git a/icons/obj/clothing/faction/clip/head.dmi b/icons/obj/clothing/faction/clip/head.dmi
new file mode 100644
index 000000000000..3982f324b9a2
Binary files /dev/null and b/icons/obj/clothing/faction/clip/head.dmi differ
diff --git a/icons/obj/clothing/faction/clip/mask.dmi b/icons/obj/clothing/faction/clip/mask.dmi
new file mode 100644
index 000000000000..646c90868cdd
Binary files /dev/null and b/icons/obj/clothing/faction/clip/mask.dmi differ
diff --git a/icons/obj/clothing/faction/clip/suits.dmi b/icons/obj/clothing/faction/clip/suits.dmi
new file mode 100644
index 000000000000..16390028fee7
Binary files /dev/null and b/icons/obj/clothing/faction/clip/suits.dmi differ
diff --git a/icons/obj/clothing/faction/clip/uniforms.dmi b/icons/obj/clothing/faction/clip/uniforms.dmi
new file mode 100644
index 000000000000..c736bc109bf8
Binary files /dev/null and b/icons/obj/clothing/faction/clip/uniforms.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index ff36ce0bce5e..ba27bd4c8166 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index ce0924a83761..7a1b973759c1 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 7123ae5ab1c2..5a162a969132 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index b596b5f3241e..d325c5098a73 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi
index bd8b5e13597f..fee16c76919d 100644
Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ
diff --git a/icons/obj/clothing/suits/toggle.dmi b/icons/obj/clothing/suits/toggle.dmi
index 806101d0a455..54df84ad5def 100644
Binary files a/icons/obj/clothing/suits/toggle.dmi and b/icons/obj/clothing/suits/toggle.dmi differ
diff --git a/icons/obj/clothing/under/command.dmi b/icons/obj/clothing/under/command.dmi
index d5d48999bec3..17b8285232fc 100644
Binary files a/icons/obj/clothing/under/command.dmi and b/icons/obj/clothing/under/command.dmi differ
diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi
index 5572325faaf8..32aea700793d 100644
Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index ad39d778789b..1617d733b94b 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index ef671bc9c0d9..f34b502078c6 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 81c1e3ff9b12..0856132a4751 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index 8b6fc77c7726..ea47f805dee9 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 26b4ebd8a83f..ad6944ebbbcd 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures/signs/sign.dmi b/icons/obj/structures/signs/sign.dmi
index c7038f2d4121..e5ff1a7cf19e 100644
Binary files a/icons/obj/structures/signs/sign.dmi and b/icons/obj/structures/signs/sign.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 06be7b370c0c..6905749d1e52 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/stamp_icons/large_stamp-clip.png b/icons/stamp_icons/large_stamp-clip.png
new file mode 100644
index 000000000000..82872f034be5
Binary files /dev/null and b/icons/stamp_icons/large_stamp-clip.png differ
diff --git a/icons/stamp_icons/large_stamp-cmm.png b/icons/stamp_icons/large_stamp-cmm.png
deleted file mode 100644
index 7ae1c93cfddc..000000000000
Binary files a/icons/stamp_icons/large_stamp-cmm.png and /dev/null differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 4a05d971bbe5..7652322fdfd1 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -45,7 +45,7 @@ em {font-style: normal; font-weight: bold;}
.ntradio {color: #4e3399;}
.comradio {color: #948f02;}
.pirradio {color: #a30000;}
-.cmmradio {color: #337296;}
+.clipradio {color: #337296;}
.irmgradio {color: #885231;}
.syndradio {color: ##612425;}
.centcomradio {color: #686868;}
diff --git a/shiptest.dme b/shiptest.dme
index 7a2a8db0e2ea..acdd398d06b0 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1937,6 +1937,7 @@
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\towels.dm"
#include "code\modules\clothing\ears\_ears.dm"
+#include "code\modules\clothing\factions\clip.dm"
#include "code\modules\clothing\factions\gezena.dm"
#include "code\modules\clothing\factions\suns.dm"
#include "code\modules\clothing\glasses\_glasses.dm"
diff --git a/sound/misc/trenchwhistle.ogg b/sound/misc/trenchwhistle.ogg
new file mode 100644
index 000000000000..24ca6772547a
Binary files /dev/null and b/sound/misc/trenchwhistle.ogg differ
diff --git a/strings/ship_names.json b/strings/ship_names.json
index 9a6370866138..53f56af55559 100644
--- a/strings/ship_names.json
+++ b/strings/ship_names.json
@@ -1044,7 +1044,7 @@
"Wholesale"
],
- "COLONIAL MINUTEMEN": [
+ "CLIP MINUTEMEN": [
"A New Day's Sun",
"Above and Beyond",
"Against All Odds",
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
index 59323fbdfaa0..e2db02bfde3d 100644
--- a/tgui/packages/tgui-panel/chat/constants.js
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -61,7 +61,7 @@ export const MESSAGE_TYPES = [
name: 'Radio',
description: 'All departments of radio messages',
selector:
- '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .cmmradio, .irmgradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
+ '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .clipradio, .irmgradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
},
{
type: MESSAGE_TYPE_INFO,
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index a3d68ca0aba2..4ce7f6fcbef5 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -346,7 +346,7 @@ em {
color: #dd3535;
}
-.cmmradio {
+.clipradio {
color: #57b8f0;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index 3a61c0f6cc7c..e200bd425569 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -366,7 +366,7 @@ em {
color: #a30000;
}
-.cmmradio {
+.clipradio {
color: #337296;
}