From b63aece2e68152253dbd945a5de472200afc27a1 Mon Sep 17 00:00:00 2001
From: retlaw34 <58402542+retlaw34@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:35:55 -0800
Subject: [PATCH 01/29] FUCK this ship, i hope more are cooked up post-refresh
---
_maps/configs/minutemen_asclepius.json | 2 +-
_maps/configs/minutemen_cepheus.json | 2 +-
_maps/configs/minutemen_corvus.json | 37 -
_maps/configs/minutemen_vela.json | 2 +-
_maps/shuttles/minutemen/minutemen_corvus.dmm | 3217 -----------------
5 files changed, 3 insertions(+), 3257 deletions(-)
delete mode 100644 _maps/configs/minutemen_corvus.json
delete mode 100644 _maps/shuttles/minutemen/minutemen_corvus.dmm
diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json
index 3877d1e24549..9498534f1700 100644
--- a/_maps/configs/minutemen_asclepius.json
+++ b/_maps/configs/minutemen_asclepius.json
@@ -46,5 +46,5 @@
"slots": 1
}
},
- "enabled": true
+ "enabled": false
}
diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json
index e9b51f1b3a02..5de05fef0ceb 100644
--- a/_maps/configs/minutemen_cepheus.json
+++ b/_maps/configs/minutemen_cepheus.json
@@ -40,5 +40,5 @@
"slots": 3
}
},
- "enabled": true
+ "enabled": false
}
diff --git a/_maps/configs/minutemen_corvus.json b/_maps/configs/minutemen_corvus.json
deleted file mode 100644
index 502a67ce6b03..000000000000
--- a/_maps/configs/minutemen_corvus.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
- "map_name": "Corvus-class Response Vessel",
- "prefix": "CMSV",
- "description": "A lightly equipped patrol vessel used by the Minutemen for extended operations in the Frontier. In many systems, a lone Corvus is the only sign of Minutemen presence, an image that is not helped by their widespread usage. The Corvus was originally a light personal vessel retrofitted for combat usage by the Colonial Militia, which was later adopted as their official remote infantry patrol ship as a symbol of colonial ingenuity and grit. First designated the Wallaby-class, until the crew of a now-legendary Wallaby-class known as the CMSV Corvus single handedly destroyed a Frontiersmen capital ship in 392.",
- "tags": [
- "Combot",
- "Riot"
- ],
- "namelists": [
- "COLONIAL MINUTEMEN",
- "MYTHOLOGICAL"
- ],
- "map_short_name": "Corvus-class",
- "map_path": "_maps/shuttles/minutemen/minutemen_corvus.dmm",
- "limit": 2,
- "job_slots": {
- "Captain": {
- "outfit": "/datum/outfit/job/minutemen/captain",
- "officer": true,
- "slots": 1
- },
- "Mechanic": {
- "outfit": "/datum/outfit/job/minutemen/engineer",
- "slots": 1
- },
- "Minuteman": {
- "outfit": "/datum/outfit/job/minutemen/security",
- "slots": 2
- },
- "Cadet": {
- "outfit": "/datum/outfit/job/minutemen/assistant",
- "slots": 2
- }
- },
- "enabled": true
-}
diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json
index e7ea8ba86df4..01a494fa6eb6 100644
--- a/_maps/configs/minutemen_vela.json
+++ b/_maps/configs/minutemen_vela.json
@@ -53,5 +53,5 @@
"slots": 1
}
},
- "enabled": true
+ "enabled": false
}
diff --git a/_maps/shuttles/minutemen/minutemen_corvus.dmm b/_maps/shuttles/minutemen/minutemen_corvus.dmm
deleted file mode 100644
index 36e4581f8dcd..000000000000
--- a/_maps/shuttles/minutemen/minutemen_corvus.dmm
+++ /dev/null
@@ -1,3217 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"bf" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 4
- },
-/obj/effect/turf_decal/techfloor/hole{
- dir = 4
- },
-/obj/structure/closet/wall{
- dir = 8;
- icon_door = "yellow_wall";
- name = "engineering closet";
- pixel_x = 28
- },
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/accessory/armband/engine,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/dblue,
-/obj/item/radio/headset/headset_eng,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/backpack/industrial,
-/obj/item/clothing/shoes/workboots,
-/obj/effect/turf_decal/techfloor/hole/right{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/item/clothing/head/beret/eng/hazard,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"bA" = (
-/turf/template_noop,
-/area/template_noop)
-"bQ" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/obj/machinery/light/small/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"cq" = (
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/components/unary/tank/toxins{
- dir = 1
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"cx" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 5
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/item/gun/ballistic/automatic/pistol/m1911{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/item/flamethrower/full/tank,
-/obj/item/gun/ballistic/automatic/smg/cm5,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"cC" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/wood,
-/area/ship/bridge)
-"cR" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
-"dq" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/security)
-"dB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -10;
- pixel_y = -22
- },
-/obj/machinery/vending/wallmed{
- pixel_y = -28
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"dI" = (
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/obj/machinery/button/door{
- dir = 4;
- id = "minutecop_windows";
- name = "Window blastdoors";
- pixel_x = -22;
- pixel_y = -10
- },
-/obj/machinery/button/door{
- dir = 4;
- id = "minutecop_bridge";
- name = "Bridge shutters";
- pixel_x = -22;
- pixel_y = 2
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"dJ" = (
-/obj/effect/turf_decal/number/six{
- dir = 1
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"dU" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/oil{
- pixel_y = 11
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"ej" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"em" = (
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 8
- },
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"eE" = (
-/obj/structure/table,
-/obj/machinery/computer/secure_data/laptop{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/paper_bin{
- pixel_x = -9;
- pixel_y = 4
- },
-/obj/item/pen{
- pixel_x = -10;
- pixel_y = 4
- },
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"eF" = (
-/obj/effect/turf_decal/number/zero{
- dir = 2
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"eS" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew)
-"eZ" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/mineral/ore_redemption{
- dir = 1;
- output_dir = 1
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"fr" = (
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/decal/cleanable/robot_debris,
-/obj/effect/turf_decal/number/three,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"fy" = (
-/obj/effect/turf_decal/techfloor{
- dir = 8
- },
-/obj/structure/rack,
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/belt/utility/full/engi,
-/obj/item/clothing/glasses/welding{
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 9
- },
-/obj/effect/turf_decal/kfp_small/left,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"fR" = (
-/obj/machinery/advanced_airlock_controller{
- pixel_x = -25
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"fX" = (
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/light_switch{
- pixel_x = 19;
- dir = 8;
- pixel_y = 11
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"gj" = (
-/obj/effect/turf_decal/siding/white/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/white/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"gH" = (
-/obj/structure/bookcase/random,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/turf/open/floor/wood,
-/area/ship/bridge)
-"gP" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 10
- },
-/obj/structure/closet/crate/internals,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/tank/internals/emergency_oxygen/engi{
- pixel_x = -4;
- pixel_y = -4
- },
-/obj/item/tank/internals/emergency_oxygen/engi{
- pixel_x = 1;
- pixel_y = -4
- },
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/obj/machinery/atmospherics/pipe/manifold/orange/visible,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"gS" = (
-/obj/structure/tank_dispenser,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/greenglow,
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"hc" = (
-/obj/structure/sign/minutemen,
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo)
-"hk" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_bridge";
- dir = 4
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"hp" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastleft,
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"hK" = (
-/obj/structure/chair/greyscale{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"hY" = (
-/obj/structure/window/reinforced,
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 6
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/item/gun/energy/disabler{
- pixel_y = 2
- },
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 3;
- pixel_y = -4
- },
-/obj/item/reagent_containers/spray/pepper{
- pixel_x = 8;
- pixel_y = -4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"is" = (
-/obj/machinery/cryopod{
- dir = 8
- },
-/obj/machinery/computer/cryopod/directional/east,
-/obj/effect/turf_decal/industrial/warning/cee{
- dir = 8
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
-"iJ" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 8
- },
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/effect/turf_decal/steeldecal/steel_decals7,
-/obj/effect/turf_decal/steeldecal/steel_decals7{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"iL" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/door/airlock/hatch{
- dir = 4;
- name = "Security"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"iV" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/stand_clear,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = -7;
- pixel_y = -2
- },
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_y = 4
- },
-/obj/structure/closet/cardboard,
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/machinery/light/small/directional/west,
-/obj/structure/cable{
- icon_state = "1-6"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"jk" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/green{
- dir = 10
- },
-/obj/machinery/door/airlock/wood{
- name = "Dormitories"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"jE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel/stairs,
-/area/ship/engineering)
-"jF" = (
-/obj/machinery/door/window/northleft{
- dir = 2
- },
-/obj/effect/turf_decal/techfloor{
- dir = 1
- },
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/hardsuit/swat,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
-"ka" = (
-/obj/effect/turf_decal/number/one{
- dir = 1
- },
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"kE" = (
-/obj/effect/turf_decal/steeldecal/steel_decals3{
- dir = 10
- },
-/obj/effect/turf_decal/steeldecal/steel_decals3{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/oil/streak,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"kJ" = (
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/machinery/computer/warrant{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"kR" = (
-/obj/machinery/vending/tool,
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"lE" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-10"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"lM" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"lX" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"mo" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 8
- },
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"mz" = (
-/obj/structure/sign/warning/docking,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"mF" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"mV" = (
-/obj/structure/chair/sofa/left,
-/obj/item/toy/plush/lizardplushie{
- pixel_x = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"nI" = (
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"nW" = (
-/obj/effect/turf_decal/siding/white/corner,
-/obj/effect/turf_decal/siding/white/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"of" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"oj" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"oN" = (
-/obj/machinery/door/airlock/grunge{
- dir = 4;
- name = "Bathroom"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"oQ" = (
-/obj/machinery/power/smes/engineering,
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
- icon_state = "0-6"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"oR" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/bookcase/random,
-/obj/structure/sign/minutemen{
- pixel_y = 32
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"py" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/obj/structure/sign/poster/minutemen/gold{
- pixel_y = -32
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"pN" = (
-/obj/structure/chair/greyscale{
- dir = 4
- },
-/obj/machinery/newscaster/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"pW" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_x = 7;
- pixel_y = 4
- },
-/obj/item/clipboard{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/pen{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 22;
- pixel_y = 8
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/wood,
-/area/ship/crew)
-"qb" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 6
- },
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"qL" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_bridge";
- dir = 8
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"qN" = (
-/obj/structure/toilet{
- pixel_y = 13
- },
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 8;
- pixel_x = -4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/vomit/old{
- pixel_x = 5
- },
-/obj/effect/spawner/lootdrop/glowstick,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"qU" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/effect/turf_decal/techfloor/hole{
- dir = 1
- },
-/obj/effect/decal/cleanable/wrapping,
-/obj/machinery/light/directional/north,
-/obj/machinery/jukebox,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"qW" = (
-/obj/effect/turf_decal/siding/white/corner,
-/obj/effect/turf_decal/siding/white/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"rb" = (
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 1;
- piping_layer = 2
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"rh" = (
-/obj/structure/chair/sofa/right,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/landmark/observer_start,
-/obj/machinery/light_switch{
- pixel_y = 23
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"rk" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"rt" = (
-/obj/effect/turf_decal/techfloor,
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"rx" = (
-/obj/effect/turf_decal/steeldecal/steel_decals1,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/number/zero,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"rL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = 30
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 10
- },
-/obj/item/clothing/suit/space/engineer,
-/obj/item/clothing/head/helmet/space/light/engineer,
-/obj/machinery/suit_storage_unit/inherit,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
-"rO" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"sc" = (
-/obj/effect/turf_decal/borderfloorblack,
-/obj/machinery/door/airlock/hatch{
- name = "Captains Cabin"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"sy" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/modular_computer/laptop/preset/civilian{
- pixel_x = 12;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/drinks/mug{
- pixel_x = -6
- },
-/obj/machinery/firealarm/directional/north,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/light_switch{
- pixel_x = -12;
- pixel_y = 23
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"sL" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/obj/structure/window/plasma/reinforced/spawner/east,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"sN" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/item/detective_scanner,
-/obj/item/holosign_creator/security{
- pixel_x = 6;
- pixel_y = 4
- },
-/obj/item/holosign_creator/security{
- pixel_x = 2
- },
-/obj/item/key/security,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_door = "red_wall";
- icon_state = "generic_wall";
- name = "Utility locker";
- pixel_y = -28;
- req_access_txt = "1"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"sW" = (
-/obj/structure/table/reinforced{
- color = "#c1b6a5"
- },
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"tc" = (
-/obj/structure/closet/crate/bin,
-/obj/item/trash/candy,
-/obj/item/trash/plate,
-/obj/item/trash/sosjerky{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/item/trash/cheesie{
- pixel_x = 4;
- pixel_y = -4
- },
-/obj/effect/decal/cleanable/shreds{
- pixel_x = 10;
- pixel_y = -7
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/noticeboard{
- pixel_y = 30
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"tp" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/holopad/emergency/engineering,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"tt" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/security)
-"tD" = (
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/computer/cargo/express,
-/obj/structure/sign/poster/minutemen/lanchester{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"tQ" = (
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/effect/turf_decal/techfloor{
- dir = 4
- },
-/obj/machinery/computer/security/hos{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"uF" = (
-/obj/structure/sign/minutemen,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"uK" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
- pixel_y = 5
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"vo" = (
-/obj/docking_port/stationary{
- dwidth = 4;
- width = 15;
- height = 15;
- dir = 2
- },
-/turf/template_noop,
-/area/template_noop)
-"vN" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/airlock/hatch{
- dir = 4;
- name = "Cargo Bay"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"wa" = (
-/obj/structure/chair/greyscale{
- dir = 8
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"wu" = (
-/obj/effect/turf_decal/borderfloorblack{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/airlock/highsecurity{
- name = "Bridge"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"wx" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/railing/corner,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"xL" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"yu" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 10
- },
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/pickaxe/drill,
-/obj/item/pickaxe/rusted,
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/button/flasher{
- dir = 1;
- id = "minuteman_cell1";
- pixel_x = -8;
- pixel_y = -20
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"yE" = (
-/obj/effect/turf_decal/siding/white{
- dir = 6
- },
-/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"yI" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/security)
-"zu" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_bridge"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"zv" = (
-/obj/item/clothing/under/rank/command/minutemen,
-/obj/item/clothing/head/cowboy/sec/minutemen,
-/obj/item/clothing/suit/toggle/lawyer/minutemen,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/glasses/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet{
- icon_state = "cap";
- name = "\proper captain's locker";
- req_access_txt = "20"
- },
-/obj/item/radio/headset/minutemen/alt/captain,
-/obj/item/gun/ballistic/revolver/detective,
-/obj/item/ammo_box/c38/match,
-/obj/item/ammo_box/c38/match,
-/turf/open/floor/wood,
-/area/ship/bridge)
-"zA" = (
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/storage/pill_bottle/dice{
- pixel_x = -5;
- pixel_y = 1
- },
-/obj/item/toy/cards/deck{
- pixel_x = -3
- },
-/obj/item/trash/chips{
- pixel_x = 7;
- pixel_y = 6
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ab" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"At" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Az" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"Bg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/docking_port/mobile{
- can_move_docking_ports = 1;
- dir = 2;
- launch_status = 0;
- port_direction = 8;
- preferred_direction = 4
- },
-/obj/machinery/door/poddoor{
- id = "minutecop_cargohatch";
- name = "Cargo Bay Blast Door"
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"Bk" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo)
-"Bl" = (
-/obj/structure/chair/greyscale{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Bu" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "5-8"
- },
-/obj/structure/cable{
- icon_state = "1-5"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"BA" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/crew)
-"BE" = (
-/obj/effect/turf_decal/techfloor{
- dir = 5
- },
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/rnd/production/techfab/department/security,
-/obj/structure/sign/poster/minutemen/enlist{
- pixel_x = 32
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"BN" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"Ci" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/sign/warning/nosmoking{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Cm" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/closet/secure_closet{
- icon_state = "sec";
- name = "equipment locker";
- req_access_txt = "1"
- },
-/obj/item/storage/belt/military/minutemen,
-/obj/item/storage/belt/military/minutemen,
-/obj/item/storage/belt/military/minutemen,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/clothing/suit/armor/riot/minutemen,
-/obj/item/clothing/head/helmet/riot/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Co" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/structure/rack,
-/obj/item/rack_parts{
- pixel_x = 5;
- pixel_y = 1
- },
-/obj/item/rack_parts{
- pixel_y = -2
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/wrench/old,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/item/circuitboard/computer/rdconsole,
-/obj/item/circuitboard/machine/rdserver{
- pixel_x = 6;
- pixel_y = -4
- },
-/obj/machinery/light_switch{
- pixel_x = -12;
- pixel_y = 23
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Cr" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Cs" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/cloth/grey,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew)
-"Ds" = (
-/obj/effect/turf_decal/techfloor,
-/mob/living/simple_animal/bot/secbot/beepsky/jr,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"DJ" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"DS" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"DY" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/reagent_containers/food/snacks/icecreamsandwich{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/snacks/icecreamsandwich{
- pixel_x = 7;
- pixel_y = -5
- },
-/obj/item/reagent_containers/food/snacks/icecreamsandwich,
-/obj/item/reagent_containers/food/snacks/hotdog{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/reagent_containers/food/snacks/hotdog,
-/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Eo" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/techfloor/orange{
- dir = 5
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 22;
- pixel_y = 8
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Es" = (
-/obj/effect/turf_decal/siding/white{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Ew" = (
-/obj/machinery/computer/crew/syndie{
- dir = 1
- },
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/item/radio/intercom/directional/south,
-/obj/item/radio/intercom/wideband/directional/west,
-/obj/machinery/firealarm/directional/south,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"EO" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/bridge)
-"ER" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
- anchored = 1;
- dir = 4;
- id = "corvus_cargo";
- locked = 1
- },
-/obj/machinery/door/poddoor{
- id = "minutecop_cargohatch";
- name = "Cargo Bay Blast Door"
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"EW" = (
-/obj/machinery/porta_turret/ship/ballistic{
- dir = 9
- },
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Fa" = (
-/obj/effect/turf_decal/techfloor{
- dir = 5
- },
-/obj/machinery/pipedispenser,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Fu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/firealarm/directional/south,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"Fy" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/item/flashlight/lamp/green{
- pixel_x = 6;
- pixel_y = 7
- },
-/obj/item/radio/intercom/directional/west,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/south,
-/obj/item/areaeditor/shuttle,
-/obj/item/radio{
- desc = "An old handheld radio. You could use it, if you really wanted to.";
- icon_state = "radio";
- name = "old radio";
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/paicard{
- pixel_x = -7;
- pixel_y = 4
- },
-/turf/open/floor/wood,
-/area/ship/bridge)
-"Fz" = (
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_door = "red_wall";
- icon_state = "generic_wall";
- name = "equipment locker";
- pixel_y = -28;
- req_access_txt = "1"
- },
-/obj/item/radio/headset/headset_sec/alt,
-/obj/item/radio/headset/headset_sec/alt,
-/obj/item/radio/headset/headset_sec/alt,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"FW" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/ship/external)
-"Gd" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Gf" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/hallway/central)
-"Gh" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Gm" = (
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutecop_bridge"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
-"Gr" = (
-/obj/machinery/autolathe,
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = 6
- },
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/plasteel/twenty{
- pixel_x = -3;
- pixel_y = 6
- },
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 1
- },
-/obj/effect/decal/cleanable/glass{
- pixel_x = -11;
- pixel_y = 2
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Gu" = (
-/obj/machinery/porta_turret/ship/ballistic{
- dir = 5
- },
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/bridge)
-"Gv" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/structure/closet/crate/engineering,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/toy/plush/beeplushie,
-/obj/item/rcl,
-/obj/item/reagent_containers/food/snacks/chips{
- pixel_x = 6;
- pixel_y = -1
- },
-/obj/item/trash/sosjerky{
- pixel_y = 4
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"GF" = (
-/obj/machinery/computer/helm{
- dir = 8
- },
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"GI" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"GK" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ha" = (
-/obj/effect/decal/cleanable/food/flour,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Hw" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"HJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/closet/wall{
- dir = 1;
- icon_door = null;
- name = "radio locker";
- pixel_y = -28
- },
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ip" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central4{
- dir = 1
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"IF" = (
-/obj/structure/chair/office/light{
- dir = 1;
- pixel_y = 3
- },
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/ship/crew)
-"IX" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/engineering)
-"Jh" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Jo" = (
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/structure/closet/wall{
- dir = 1;
- name = "uniform closet";
- pixel_y = -30
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/machinery/newscaster/directional/west,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/turf/open/floor/wood,
-/area/ship/crew)
-"Ju" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/stand_clear,
-/obj/machinery/button/door{
- dir = 8;
- id = "minutecop_cargohatch";
- name = "Cargo hatch";
- pixel_x = 23;
- pixel_y = 10
- },
-/obj/machinery/button/shieldwallgen{
- dir = 8;
- id = "corvus_cargo";
- pixel_x = 21
- },
-/obj/structure/cable{
- icon_state = "1-10"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"JE" = (
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 9
- },
-/obj/effect/turf_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Kz" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/machinery/flasher{
- id = "minuteman_cell1";
- pixel_x = -25
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"Lj" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 4
- },
-/obj/structure/closet/crate/medical,
-/obj/item/storage/firstaid/medical,
-/obj/item/roller,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/item/storage/pill_bottle/iron,
-/obj/item/storage/pill_bottle/charcoal,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/light_switch{
- pixel_x = 19;
- dir = 8;
- pixel_y = 11
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Lq" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
- dir = 4
- },
-/obj/structure/window/plasma/reinforced/spawner/east,
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"LE" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/secure_data/laptop{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/machinery/recharger{
- pixel_x = 12
- },
-/obj/effect/turf_decal/techfloor{
- dir = 9
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"Mh" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/cloth/grey,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/carpet/royalblue,
-/area/ship/crew)
-"Mt" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_x = 8;
- pixel_y = 3
- },
-/obj/item/storage/box/handcuffs{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/structure/reagent_dispensers/peppertank{
- pixel_x = 31
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/item/gps{
- gpstag = null;
- pixel_x = -9;
- pixel_y = 7
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -12;
- pixel_y = -22
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Mu" = (
-/obj/machinery/door/poddoor{
- id = "minutecop_windows"
- },
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"MA" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = 13;
- pixel_y = 2
- },
-/obj/structure/mirror{
- pixel_x = 27
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/garbage,
-/obj/effect/decal/cleanable/wrapping,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"MT" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = 28
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/newspaper{
- pixel_x = 5;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/drinks/britcup{
- pixel_x = -6
- },
-/obj/item/spacecash/bundle/c1000{
- pixel_x = 3;
- pixel_y = -4
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Nr" = (
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/chair/comfy/shuttle{
- dir = 4;
- name = "Helm"
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"NE" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/effect/turf_decal/techfloor/hole/right,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"NL" = (
-/obj/effect/turf_decal/techfloor{
- dir = 10
- },
-/obj/structure/chair/office{
- dir = 4;
- name = "tactical swivel chair"
- },
-/obj/machinery/newscaster/directional/west,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-"NY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 2
- },
-/obj/machinery/light/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"Ok" = (
-/obj/structure/bed,
-/obj/item/bedsheet/blue,
-/obj/structure/curtain/bounty,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/sign/poster/minutemen/bard{
- pixel_y = 32
- },
-/turf/open/floor/carpet/royalblue,
-/area/ship/bridge)
-"Ov" = (
-/obj/machinery/door/window/northright{
- dir = 2
- },
-/obj/effect/turf_decal/techfloor{
- dir = 1
- },
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
-"PA" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"PE" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 1
- },
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/cable/yellow,
-/obj/item/stack/sheet/mineral/plasma/five{
- pixel_x = -4
- },
-/obj/item/stack/sheet/mineral/plasma/five{
- pixel_y = -7
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Qj" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"QY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/shieldwallgen/atmos{
- anchored = 1;
- dir = 8;
- id = "corvus_cargo";
- locked = 1
- },
-/obj/machinery/door/poddoor{
- id = "minutecop_cargohatch";
- name = "Cargo Bay Blast Door"
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"Ri" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/window/eastright{
- name = "Engine Access"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "minutemen_corvus_engines";
- name = "Thruster Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Rj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"RU" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"Sd" = (
-/obj/structure/sign/minutemen,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/bridge)
-"Sn" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew)
-"SH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"ST" = (
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/geiger_counter{
- pixel_x = 4;
- pixel_y = 4
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Tk" = (
-/obj/effect/turf_decal/techfloor/orange,
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 10
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"To" = (
-/obj/machinery/power/shuttle/engine/electric{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"TS" = (
-/obj/structure/closet/wall/red{
- name = "Ammo locker";
- pixel_y = 28
- },
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 9
- },
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 6
- },
-/obj/item/ammo_box/magazine/m45{
- pixel_x = 5
- },
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 1
- },
-/obj/item/ammo_box/magazine/m45/rubber,
-/obj/item/ammo_box/magazine/smgm9mm{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/item/ammo_box/magazine/smgm9mm/rubber{
- pixel_x = -5;
- pixel_y = -2
- },
-/obj/item/ammo_box/magazine/smgm9mm,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"Ua" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
- icon_state = "2-5"
- },
-/obj/structure/cable{
- icon_state = "2-9"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Um" = (
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/security)
-"Uq" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Uy" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo)
-"UP" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/external/glass,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"Vi" = (
-/obj/effect/turf_decal/techfloor/orange/corner{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"VR" = (
-/obj/machinery/shower{
- pixel_y = 13
- },
-/obj/structure/curtain/bounty,
-/obj/structure/spider/cocoon,
-/obj/structure/spider/stickyweb,
-/obj/structure/spider/stickyweb,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
-"Wl" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_x = 4;
- pixel_y = 9
- },
-/obj/item/storage/fancy/cigarettes/cigars/havana{
- pixel_x = 4;
- pixel_y = 13
- },
-/obj/item/lighter{
- pixel_x = 10
- },
-/obj/item/newspaper{
- pixel_x = 7;
- pixel_y = -8
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/computer/helm/viewscreen/directional/north{
- pixel_y = 28
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/wood,
-/area/ship/crew)
-"WT" = (
-/obj/effect/turf_decal/borderfloorblack{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/orange{
- dir = 9
- },
-/obj/machinery/door/airlock/maintenance_hatch{
- dir = 4;
- name = "Engineering"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering)
-"WW" = (
-/obj/machinery/door/window/brigdoor/southright,
-/obj/effect/turf_decal/corner/opaque/red/border,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"WY" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 9
- },
-/obj/effect/turf_decal/steeldecal/steel_decals2,
-/obj/item/wirecutters{
- pixel_x = 6;
- pixel_y = -8
- },
-/obj/machinery/firealarm/directional/north{
- pixel_x = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 10
- },
-/obj/item/kirbyplants/random,
-/obj/machinery/button/door{
- id = "minutemen_corvus_engines";
- name = "Engine Blast Doors";
- pixel_x = -10;
- pixel_y = 24
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Xr" = (
-/obj/effect/turf_decal/techfloor/corner{
- dir = 1
- },
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/turf_decal/steeldecal/steel_decals1,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/chair/comfy/shuttle{
- dir = 4;
- name = "Helm"
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"XM" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
- icon_state = "0-1"
- },
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -19;
- pixel_y = 12
- },
-/turf/open/floor/plasteel/stairs{
- dir = 1;
- icon = 'icons/obj/stairs.dmi'
- },
-/area/ship/bridge)
-"XO" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plastic,
-/area/ship/hallway/central)
-"XR" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/external/glass{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
-"XU" = (
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
- },
-/obj/effect/turf_decal/techfloor/orange{
- dir = 5
- },
-/obj/item/trash/raisins{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/structure/cable{
- icon_state = "2-9"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"Yh" = (
-/obj/structure/railing{
- dir = 2;
- layer = 4.1
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Yn" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/holopad/emergency/command,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Yq" = (
-/obj/item/trash/popcorn{
- pixel_x = -4;
- pixel_y = 11
- },
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "engine fuel pump"
- },
-/obj/effect/turf_decal/number/five,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"YE" = (
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/closet/secure_closet{
- icon_door = "tac";
- icon_state = "tac";
- name = "boarding tools locker";
- req_access_txt = "3"
- },
-/obj/item/storage/backpack/duffelbag/syndie/x4{
- icon_state = "duffel-sec";
- name = "breaching charges duffel bag"
- },
-/obj/item/door_seal,
-/obj/item/door_seal,
-/obj/effect/turf_decal/corner/opaque/red/border{
- dir = 9
- },
-/obj/machinery/light/directional/north,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
-"YG" = (
-/obj/effect/turf_decal/techfloor/orange{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/caution,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering)
-"YL" = (
-/obj/machinery/door/window/brigdoor/southright{
- dir = 4;
- req_access_txt = "1"
- },
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 2
- },
-/obj/effect/turf_decal/corner/opaque/grey/diagonal,
-/obj/effect/turf_decal/industrial/warning{
- color = "#808080";
- dir = 1
- },
-/obj/machinery/computer/helm/viewscreen/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"YM" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/pen/fountain/captain{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/folder/blue{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/stamp/captain{
- pixel_x = -8;
- pixel_y = 12
- },
-/obj/item/stamp/head_of_personnel{
- pixel_x = -10;
- pixel_y = 10
- },
-/obj/item/newspaper,
-/obj/effect/turf_decal/techfloor{
- dir = 5
- },
-/obj/item/desk_flag{
- pixel_x = 10
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"YO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/hallway/central)
-"YT" = (
-/obj/machinery/porta_turret/ship/ballistic{
- dir = 10
- },
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering)
-"Zh" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/techfloor{
- dir = 6
- },
-/obj/machinery/fax,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"Zt" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Zx" = (
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -8;
- pixel_y = -4
- },
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/closet/wall{
- dir = 1;
- name = "Janitorial supplies";
- pixel_y = -28
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/holosign_creator/janibarrier{
- pixel_x = 5;
- pixel_y = -7
- },
-/obj/item/soap/deluxe,
-/obj/item/mop,
-/obj/item/storage/bag/trash,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/hallway/central)
-"ZG" = (
-/obj/effect/turf_decal/techfloor,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/security)
-
-(1,1,1) = {"
-bA
-bA
-bA
-bA
-IX
-Zt
-To
-To
-Zt
-IX
-bA
-bA
-bA
-bA
-"}
-(2,1,1) = {"
-bA
-bA
-bA
-bA
-IX
-sL
-hp
-Ri
-Lq
-IX
-bA
-bA
-bA
-bA
-"}
-(3,1,1) = {"
-bA
-bA
-bA
-EW
-IX
-WY
-iJ
-mo
-gP
-IX
-YT
-bA
-bA
-bA
-"}
-(4,1,1) = {"
-bA
-bA
-bA
-IX
-oQ
-YG
-tp
-kE
-RU
-PE
-IX
-bA
-bA
-bA
-"}
-(5,1,1) = {"
-bA
-bA
-bA
-IX
-kR
-XU
-bf
-Vi
-NE
-Gr
-Jh
-FW
-bA
-bA
-"}
-(6,1,1) = {"
-bA
-bA
-Bk
-Uy
-Uy
-Uy
-IX
-qU
-wx
-IX
-IX
-Gh
-bA
-bA
-"}
-(7,1,1) = {"
-bA
-hc
-Uy
-Kz
-YL
-nI
-IX
-Co
-ej
-sW
-fy
-IX
-Gh
-bA
-"}
-(8,1,1) = {"
-bA
-ER
-iV
-Gd
-PA
-yu
-IX
-Gv
-Tk
-gS
-Yq
-cq
-IX
-bA
-"}
-(9,1,1) = {"
-bA
-Bg
-Ip
-Ua
-Uq
-eZ
-IX
-Ci
-dU
-jE
-rx
-rb
-Mu
-bA
-"}
-(10,1,1) = {"
-bA
-QY
-Ju
-Lj
-oj
-Mt
-IX
-Eo
-qb
-Fa
-fr
-ST
-Mu
-bA
-"}
-(11,1,1) = {"
-bA
-uF
-yI
-yI
-vN
-yI
-IX
-IX
-WT
-IX
-IX
-IX
-IX
-bA
-"}
-(12,1,1) = {"
-yI
-yI
-eE
-NL
-sN
-yI
-pN
-Bl
-HJ
-Gf
-Cs
-Mh
-Sn
-Sn
-"}
-(13,1,1) = {"
-yI
-YE
-Cm
-Ds
-bQ
-yI
-MT
-zA
-DS
-jk
-Qj
-BN
-Jo
-Sn
-"}
-(14,1,1) = {"
-yI
-TS
-WW
-ZG
-Um
-dq
-wa
-hK
-mF
-Gf
-oR
-lX
-Az
-BA
-"}
-(15,1,1) = {"
-yI
-cx
-hY
-rt
-xL
-dq
-DY
-Ha
-dB
-Gf
-sy
-IF
-is
-Sn
-"}
-(16,1,1) = {"
-tt
-yI
-BE
-fX
-Fz
-yI
-uK
-Rj
-NY
-Gf
-Wl
-pW
-Sn
-eS
-"}
-(17,1,1) = {"
-bA
-tt
-yI
-yI
-iL
-yI
-Gf
-XO
-GK
-Gf
-Sn
-Sn
-eS
-bA
-"}
-(18,1,1) = {"
-bA
-bA
-Gf
-jF
-gj
-rO
-At
-DJ
-Bu
-Cr
-Es
-of
-bA
-bA
-"}
-(19,1,1) = {"
-bA
-bA
-dJ
-Ov
-qW
-Ab
-lM
-lE
-GI
-nW
-yE
-of
-bA
-bA
-"}
-(20,1,1) = {"
-bA
-bA
-ka
-Gf
-oN
-Gf
-tc
-YO
-Gf
-XR
-Gf
-Gf
-bA
-bA
-"}
-(21,1,1) = {"
-bA
-bA
-eF
-VR
-Zx
-Gf
-rh
-py
-Gf
-SH
-fR
-mz
-bA
-bA
-"}
-(22,1,1) = {"
-bA
-bA
-ka
-qN
-MA
-Gf
-mV
-Fu
-Gf
-rL
-Hw
-UP
-vo
-bA
-"}
-(23,1,1) = {"
-bA
-bA
-cR
-cR
-cR
-cR
-cR
-wu
-cR
-cR
-cR
-Sd
-bA
-bA
-"}
-(24,1,1) = {"
-bA
-bA
-rk
-gH
-Fy
-cR
-tD
-em
-XM
-dI
-Ew
-cR
-bA
-bA
-"}
-(25,1,1) = {"
-bA
-bA
-rk
-zv
-cC
-sc
-JE
-Yh
-LE
-Xr
-Zh
-zu
-bA
-bA
-"}
-(26,1,1) = {"
-bA
-bA
-Gu
-cR
-Ok
-cR
-Yn
-Nr
-YM
-GF
-zu
-hk
-bA
-bA
-"}
-(27,1,1) = {"
-bA
-bA
-bA
-EO
-cR
-cR
-kJ
-tQ
-zu
-Gm
-hk
-bA
-bA
-bA
-"}
-(28,1,1) = {"
-bA
-bA
-bA
-bA
-bA
-Gu
-Gm
-Gm
-qL
-bA
-bA
-bA
-bA
-bA
-"}
From 0a1acff469fe3c680848905d228ef56a1ebe76eb Mon Sep 17 00:00:00 2001
From: retlaw34 <58402542+retlaw34@users.noreply.github.com>
Date: Sat, 10 Feb 2024 17:11:30 -0800
Subject: [PATCH 02/29] repath
---
.../BeachRuins/beach_treasure_cove.dmm | 4 +-
_maps/configs/minutemen_asclepius.json | 2 +-
_maps/configs/minutemen_cepheus.json | 2 +-
_maps/configs/minutemen_vela.json | 2 +-
_maps/map_files/generic/CentCom.dmm | 18 +-
_maps/outpost/nanotrasen_asteroid.dmm | 2 +-
_maps/ship_config_schema.json | 2 +-
.../independent/independent_beluga.dmm | 2 +-
_maps/shuttles/inteq/inteq_colossus.dmm | 10 +-
_maps/shuttles/inteq/inteq_hound.dmm | 2 +-
_maps/shuttles/inteq/inteq_talos.dmm | 8 +-
_maps/shuttles/inteq/inteq_valor.dmm | 2 +-
_maps/shuttles/inteq/inteq_vaquero.dmm | 8 +-
.../minutemen/minutemen_asclepius.dmm | 40 ++---
.../shuttles/minutemen/minutemen_cepheus.dmm | 82 ++++-----
_maps/shuttles/minutemen/minutemen_vela.dmm | 56 +++---
_maps/shuttles/pirate/pirate_ember.dmm | 8 +-
.../syndicate/syndicate_gorlex_komodo.dmm | 2 +-
code/__HELPERS/names.dm | 2 +-
code/datums/ert.dm | 22 +--
code/game/machinery/telecomms/machines/bus.dm | 2 +-
.../machinery/telecomms/machines/processor.dm | 2 +-
.../machinery/telecomms/machines/relay.dm | 4 +-
.../machinery/telecomms/machines/server.dm | 2 +-
code/game/mecha/combat/durand.dm | 6 +-
code/game/mecha/equipment/tools/work_tools.dm | 18 +-
code/game/mecha/mecha_wreckage.dm | 8 +-
code/game/mecha/working/ripley.dm | 12 +-
code/game/objects/effects/contraband.dm | 58 +++---
.../game/objects/effects/spawners/lootdrop.dm | 4 +-
.../items/devices/radio/encryptionkey.dm | 2 +-
.../objects/items/devices/radio/headset.dm | 14 +-
code/game/objects/items/storage/backpack.dm | 12 +-
code/game/objects/items/storage/belt.dm | 22 ---
code/game/objects/structures/signs/_signs.dm | 8 +-
code/game/say.dm | 2 +-
code/modules/admin/verbs/randomverbs.dm | 2 +-
code/modules/antagonists/ert/ert.dm | 12 +-
code/modules/asset_cache/asset_list_items.dm | 2 +-
code/modules/cargo/packs/mechs.dm | 2 +-
code/modules/clothing/factions/clip.dm | 167 ++++++++++++++++++
code/modules/clothing/head/helmet.dm | 14 --
code/modules/clothing/head/jobs.dm | 10 --
code/modules/clothing/masks/hailer.dm | 42 +++--
.../clothing/outfits/ert/frontiersmen_ert.dm | 4 +-
.../modules/clothing/outfits/ert/inteq_ert.dm | 2 +-
.../clothing/outfits/ert/minutemen_ert.dm | 28 +--
.../clothing/outfits/ert/syndicate_ert.dm | 2 +-
.../clothing/outfits/factions/frontiersmen.dm | 2 +-
.../clothing/outfits/factions/inteq.dm | 8 +-
.../clothing/outfits/factions/minutemen.dm | 44 ++---
code/modules/clothing/spacesuits/hardsuit.dm | 13 --
code/modules/clothing/suits/armor.dm | 12 --
code/modules/clothing/suits/jobs.dm | 2 +-
code/modules/clothing/under/jobs/command.dm | 8 -
code/modules/clothing/under/jobs/security.dm | 8 -
code/modules/paperwork/fax.dm | 4 +-
code/modules/paperwork/stamps.dm | 6 +-
.../projectiles/guns/ballistic/assault.dm | 2 +-
.../projectiles/guns/ballistic/automatic.dm | 4 +-
.../projectiles/guns/ballistic/shotgun.dm | 2 +-
.../modules/projectiles/guns/ballistic/smg.dm | 2 +-
code/modules/research/designs.dm | 12 +-
.../designs/mechfabricator_designs.dm | 10 +-
icons/stamp_icons/large_stamp-clip.png | Bin 0 -> 1721 bytes
icons/stamp_icons/large_stamp-cmm.png | Bin 3119 -> 0 bytes
interface/stylesheet.dm | 2 +-
shiptest.dme | 1 +
sound/misc/trenchwhistle.ogg | Bin 0 -> 32419 bytes
strings/ship_names.json | 2 +-
tgui/packages/tgui-panel/chat/constants.js | 2 +-
.../tgui-panel/styles/tgchat/chat-dark.scss | 2 +-
.../tgui-panel/styles/tgchat/chat-light.scss | 2 +-
73 files changed, 490 insertions(+), 399 deletions(-)
create mode 100644 code/modules/clothing/factions/clip.dm
create mode 100644 icons/stamp_icons/large_stamp-clip.png
delete mode 100644 icons/stamp_icons/large_stamp-cmm.png
create mode 100644 sound/misc/trenchwhistle.ogg
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
index ca4dc1c33263..326cbeb7420f 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/clip,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json
index 9498534f1700..43c219922095 100644
--- a/_maps/configs/minutemen_asclepius.json
+++ b/_maps/configs/minutemen_asclepius.json
@@ -8,7 +8,7 @@
"Chemistry"
],
"namelists": [
- "COLONIAL MINUTEMEN",
+ "CLIP MINUTEMEN",
"CMM-BARD",
"MYTHOLOGICAL"
],
diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json
index 5de05fef0ceb..66b66a30dd49 100644
--- a/_maps/configs/minutemen_cepheus.json
+++ b/_maps/configs/minutemen_cepheus.json
@@ -7,7 +7,7 @@
"Robotics"
],
"namelists": [
- "COLONIAL MINUTEMEN",
+ "CLIP MINUTEMEN",
"MYTHOLOGICAL"
],
"map_short_name": "Cepheus-class",
diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json
index 01a494fa6eb6..e5656c867568 100644
--- a/_maps/configs/minutemen_vela.json
+++ b/_maps/configs/minutemen_vela.json
@@ -3,7 +3,7 @@
"map_name": "Vela-class Industrial Cruiser",
"prefix": "CMGSV",
"namelists": ["GENERAL", "MYTHOLOGICAL", "BEASTS"],
- "description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the Colonial Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.",
+ "description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the CLIP Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.",
"tags": [
"Robotics",
"Construction",
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 7e921680fad9..e6bfd139ab7f 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -6525,7 +6525,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"bIJ" = (
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = -28
},
/obj/machinery/light/directional/west,
@@ -6578,7 +6578,7 @@
/area/centcom/control)
"bRF" = (
/obj/structure/table/reinforced,
-/obj/structure/sign/poster/minutemen/bard{
+/obj/structure/sign/poster/clip/bard{
pixel_y = -32
},
/obj/item/ammo_box/magazine/p16{
@@ -7443,7 +7443,7 @@
/area/centcom/control)
"dKW" = (
/obj/structure/closet/crate/bin,
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 28
},
/obj/machinery/light/directional/east,
@@ -9121,7 +9121,7 @@
/obj/item/paper_bin{
pixel_x = 5
},
-/obj/item/clothing/head/cowboy/sec/minutemen{
+/obj/item/clothing/head/clip/slouch{
pixel_y = 8;
pixel_x = -4
},
@@ -9621,15 +9621,15 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"igC" = (
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = -28
},
/obj/structure/table/reinforced,
-/obj/item/clothing/head/helmet/bulletproof/minutemen{
+/obj/item/clothing/head/helmet/bulletproof/clip{
pixel_x = -1;
pixel_y = 8
},
-/obj/item/clothing/head/helmet/bulletproof/minutemen{
+/obj/item/clothing/head/helmet/bulletproof/clip{
pixel_x = 3;
pixel_y = 11
},
@@ -10700,7 +10700,7 @@
/area/centcom/control)
"kkC" = (
/obj/structure/table/reinforced,
-/obj/structure/sign/poster/minutemen/gold{
+/obj/structure/sign/poster/clip/gold{
pixel_y = 32
},
/obj/machinery/fax/admin/minutemen,
@@ -11465,7 +11465,7 @@
pixel_x = 8;
pixel_y = 3
},
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 28
},
/obj/machinery/light/directional/west,
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index d5ccb5e0af68..79d7b5985eb7 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -10989,7 +10989,7 @@
icon_state = "4-8"
},
/obj/item/radio/intercom/directional/north{
- icon_state = "cmm_headset"
+ icon_state = "clip_headset"
},
/turf/open/floor/plasteel/tech,
/area/outpost/cargo/office)
diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json
index 6d3fd5f67a0e..2a8b3e826a38 100644
--- a/_maps/ship_config_schema.json
+++ b/_maps/ship_config_schema.json
@@ -66,7 +66,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 a46e4b0270e9..2fad8542da16 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -4554,7 +4554,7 @@
/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/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,
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index bf86ed599f7f..87610db7c1cd 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -812,7 +812,7 @@
/area/ship/maintenance/port)
"iS" = (
/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,
@@ -2632,7 +2632,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/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,
@@ -4275,9 +4275,9 @@
name = "equipment locker";
req_access_txt = "1"
},
-/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_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
index 2fc73b689d88..401b192fc9c9 100644
--- a/_maps/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -1608,7 +1608,7 @@
req_access_txt = "58"
},
/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,
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index dfc829d40320..29658e39e907 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1900,7 +1900,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,
@@ -3597,7 +3597,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"
@@ -7504,7 +7504,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,
@@ -7558,7 +7558,7 @@
/area/ship/crew/canteen)
"Yz" = (
/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,
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index 6e5f1e7297c7..1adaf0289730 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -2684,7 +2684,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"ze" = (
-/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/backpack/messenger/inteq,
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index e2232f1a4661..b05e94dfbed0 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,
@@ -916,7 +916,7 @@
req_access_txt = "20"
},
/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,
@@ -1950,7 +1950,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,
@@ -2204,7 +2204,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/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
index a3ac29a8791f..eb9505d54699 100644
--- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm
+++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
@@ -321,11 +321,11 @@
/turf/open/floor/plating,
/area/ship/engineering)
"dT" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
"dW" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/medical/surgery)
"dY" = (
@@ -1607,7 +1607,7 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
},
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 32
},
/obj/effect/decal/cleanable/vomit/old,
@@ -2056,13 +2056,13 @@
/obj/item/hypospray/mkii/oxygen,
/obj/item/flashlight/seclite,
/obj/item/storage/belt/medical/webbing,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/suit/armor/vest{
icon_state = "marine_light_snow"
},
/obj/item/reagent_containers/hypospray/combat,
/obj/item/kitchen/knife/combat/survival,
-/obj/item/clothing/head/helmet/riot/minutemen,
+/obj/item/clothing/head/helmet/riot/clip,
/obj/item/defibrillator/compact/loaded,
/turf/open/floor/plasteel,
/area/ship/crew/office)
@@ -2385,7 +2385,7 @@
name = "engineering closet";
pixel_x = 28
},
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/accessory/armband/engine,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/head/hardhat/dblue,
@@ -2785,7 +2785,7 @@
},
/area/ship/medical/morgue)
"BF" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/central)
"BM" = (
@@ -3599,13 +3599,13 @@
/obj/item/hypospray/mkii/oxygen,
/obj/item/flashlight/seclite,
/obj/item/storage/belt/medical/webbing,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/suit/armor/vest{
icon_state = "marine_light_snow"
},
/obj/item/reagent_containers/hypospray/combat,
/obj/item/kitchen/knife/combat/survival,
-/obj/item/clothing/head/helmet/riot/minutemen,
+/obj/item/clothing/head/helmet/riot/clip,
/obj/item/defibrillator/compact/loaded,
/turf/open/floor/plasteel,
/area/ship/crew/office)
@@ -3964,11 +3964,11 @@
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/storage/backpack,
/obj/item/storage/backpack,
/obj/item/storage/backpack,
@@ -4050,7 +4050,7 @@
"KL" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/storage/backpack,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/shoes/combat,
/obj/item/flashlight/seclite,
/obj/item/kitchen/knife/combat/survival,
@@ -4060,8 +4060,8 @@
name = "Security Longcoat"
},
/obj/item/clothing/gloves/combat,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/head/helmet/bulletproof/clip,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/storage/belt/security,
/obj/item/gun/ballistic/automatic/pistol/candor,
@@ -4419,12 +4419,12 @@
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/cowboy/white,
-/obj/item/clothing/head/cowboy/sec/minutemen,
+/obj/item/clothing/head/clip/slouch,
/obj/item/clothing/head/helmet/marine/medic,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/head/caphat/minutemen,
/obj/item/radio/headset/heads/captain/alt,
-/obj/item/clothing/under/rank/command/minutemen,
+/obj/item/clothing/under/clip/officer,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/suit/toggle/labcoat/cmo,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
@@ -4439,7 +4439,7 @@
/obj/item/gun/ballistic/revolver/shadow,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
-/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
+/obj/item/clothing/suit/armor/vest/capcarapace/clip,
/obj/item/reagent_containers/hypospray/CMO,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
index 90ba560d9b02..e30301f2b3dd 100644
--- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm
+++ b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
@@ -16,7 +16,7 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/science/robotics)
"ag" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/atmospherics)
"ak" = (
@@ -85,7 +85,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/steeldecal/steel_decals_central6,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/accessory/armband/engine,
/obj/item/clothing/shoes/workboots,
/obj/item/clothing/head/beret/eng/hazard,
@@ -412,10 +412,10 @@
/turf/open/floor/carpet/royalblue,
/area/ship/crew/dorm)
"eW" = (
-/obj/item/clothing/under/rank/command/minutemen,
+/obj/item/clothing/under/clip/officer,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/head/caphat/minutemen,
-/obj/item/clothing/head/cowboy/sec/minutemen,
+/obj/item/clothing/head/clip/slouch,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/glasses/sunglasses,
/obj/item/radio/headset/minutemen/alt/captain,
@@ -433,7 +433,7 @@
/obj/item/storage/belt/sabre,
/obj/item/gun/ballistic/revolver/shadow,
/obj/item/ammo_box/c45_speedloader,
-/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
+/obj/item/clothing/suit/armor/vest/capcarapace/clip,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"ff" = (
@@ -515,7 +515,7 @@
/obj/structure/cable{
icon_state = "0-6"
},
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 32
},
/obj/machinery/door/firedoor/border_only{
@@ -714,7 +714,7 @@
"hA" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/effect/turf_decal/rechargefloor,
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 32
},
/obj/machinery/power/shieldwallgen/atmos{
@@ -1251,7 +1251,7 @@
"og" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/effect/turf_decal/rechargefloor,
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 32
},
/obj/machinery/power/shieldwallgen/atmos{
@@ -1373,11 +1373,11 @@
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/radio/headset/minutemen,
/obj/item/radio/headset/minutemen,
/obj/item/radio/headset/minutemen,
@@ -1390,11 +1390,11 @@
name = "uniform closet";
pixel_y = 28
},
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
-/obj/item/storage/backpack/security/cmm,
+/obj/item/storage/backpack/security/clip,
+/obj/item/storage/backpack/security/clip,
+/obj/item/storage/backpack/security/clip,
+/obj/item/storage/backpack/security/clip,
+/obj/item/storage/backpack/security/clip,
/turf/open/floor/carpet/royalblue,
/area/ship/crew/dorm)
"qe" = (
@@ -1548,7 +1548,7 @@
name = "Pilot's Locker";
pixel_x = -28
},
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/beret/sec/officer,
/obj/item/clothing/shoes/combat/swat,
@@ -1969,7 +1969,7 @@
"um" = (
/obj/effect/turf_decal/rechargefloor,
/obj/machinery/door/firedoor/border_only,
-/obj/mecha/working/ripley/cmm{
+/obj/mecha/working/ripley/clip{
dir = 1
},
/turf/open/floor/plasteel/telecomms_floor,
@@ -2141,9 +2141,9 @@
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/effect/turf_decal/trimline/opaque/red/line,
/obj/effect/turf_decal/siding/thinplating/dark,
/turf/open/floor/plasteel/dark,
@@ -2288,13 +2288,13 @@
/turf/open/floor/plasteel/dark,
/area/ship/science/robotics)
"yn" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/science/robotics)
"yI" = (
/obj/effect/turf_decal/rechargefloor,
/obj/machinery/door/firedoor/border_only,
-/obj/structure/mecha_wreckage/durand/cmm,
+/obj/structure/mecha_wreckage/durand/clip,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/science/robotics)
"yK" = (
@@ -2319,7 +2319,7 @@
pixel_x = -28
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/clothing/head/beret/sec/officer,
/obj/item/clothing/shoes/combat/swat,
@@ -3325,7 +3325,7 @@
/obj/structure/sign/poster/official/ion_carbine{
pixel_y = 32
},
-/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen,
+/obj/item/clothing/suit/space/hardsuit/security/independent/clip,
/turf/open/floor/plasteel/tech,
/area/ship/security)
"Jk" = (
@@ -3511,7 +3511,7 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/engineering/electrical)
"LJ" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/security)
"LM" = (
@@ -3644,7 +3644,7 @@
"MW" = (
/obj/effect/turf_decal/siding/wood,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = -32
},
/obj/machinery/light/directional/south,
@@ -3939,7 +3939,7 @@
/obj/effect/turf_decal/trimline/opaque/red/line{
dir = 1
},
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 32
},
/obj/effect/decal/cleanable/dirt,
@@ -4305,19 +4305,19 @@
/obj/item/clothing/gloves/combat,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/gloves/combat,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/suit/armor/riot/minutemen,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/suit/armor/riot/clip,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/structure/railing{
dir = 4;
layer = 4.1
},
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
-/obj/item/clothing/head/helmet/riot/minutemen,
+/obj/item/clothing/head/helmet/bulletproof/clip,
+/obj/item/clothing/head/helmet/bulletproof/clip,
+/obj/item/clothing/head/helmet/riot/clip,
/obj/structure/sign/poster/contraband/stechkin{
pixel_y = -32
},
@@ -4348,7 +4348,7 @@
pixel_x = 7;
pixel_y = 11
},
-/obj/item/disk/design_disk/cmm_mechs{
+/obj/item/disk/design_disk/clip_mechs{
pixel_y = -12
},
/turf/open/floor/plasteel/dark,
@@ -4397,7 +4397,7 @@
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"UW" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/electrical)
"Vb" = (
@@ -4474,7 +4474,7 @@
dir = 8;
layer = 3.1
},
-/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen,
+/obj/item/clothing/suit/space/hardsuit/security/independent/clip,
/turf/open/floor/plasteel/tech,
/area/ship/security)
"WB" = (
diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm
index ab113e52e2c5..646df3693b26 100644
--- a/_maps/shuttles/minutemen/minutemen_vela.dmm
+++ b/_maps/shuttles/minutemen/minutemen_vela.dmm
@@ -84,7 +84,7 @@
/area/ship/science/ai_chamber)
"az" = (
/obj/structure/table/reinforced,
-/obj/item/disk/design_disk/cmm_mechs,
+/obj/item/disk/design_disk/clip_mechs,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/hangar/port)
@@ -304,7 +304,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"cy" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/atmospherics)
"cz" = (
@@ -558,12 +558,12 @@
name = "captain's locker";
req_access_txt = "20"
},
-/obj/item/clothing/under/rank/command/minutemen,
+/obj/item/clothing/under/clip/officer,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/glasses/sunglasses,
/obj/item/gun/ballistic/automatic/pistol/candor,
-/obj/item/clothing/head/cowboy/sec/minutemen,
+/obj/item/clothing/head/clip/slouch,
/obj/item/radio/headset/minutemen/alt/captain,
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel,
@@ -602,7 +602,7 @@
/turf/open/floor/plating,
/area/ship/engineering)
"dL" = (
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 36
},
/obj/effect/turf_decal/industrial/warning/corner{
@@ -1347,7 +1347,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"iy" = (
-/obj/structure/sign/poster/minutemen/random{
+/obj/structure/sign/poster/clip/random{
pixel_y = -30
},
/obj/effect/turf_decal/corner/opaque/black{
@@ -2263,7 +2263,7 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/crew/dorm)
"nn" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hangar/port)
"no" = (
@@ -2556,7 +2556,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/structure/sign/poster/minutemen/random{
+/obj/structure/sign/poster/clip/random{
pixel_x = 28
},
/turf/open/floor/wood,
@@ -2811,12 +2811,12 @@
pixel_x = -28;
pixel_y = 0
},
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/under/clip/minutemen,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
@@ -3050,9 +3050,9 @@
populate = 0
},
/obj/item/reagent_containers/spray/pepper,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/head/helmet/bulletproof/clip,
/obj/item/storage/belt/security/full,
/obj/item/restraints/handcuffs,
/obj/item/ammo_box/magazine/m45/rubber,
@@ -4516,7 +4516,7 @@
/area/ship/engineering)
"yu" = (
/obj/structure/rack,
-/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/cmm,
+/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/hangar/port)
@@ -5119,7 +5119,7 @@
/obj/machinery/camera/autoname{
dir = 1
},
-/obj/structure/sign/poster/minutemen/random{
+/obj/structure/sign/poster/clip/random{
pixel_x = 28;
pixel_y = 0
},
@@ -5864,8 +5864,8 @@
name = "foreman's locker";
req_access = list(56)
},
-/obj/item/clothing/head/cowboy/sec/minutemen,
-/obj/item/clothing/under/rank/command/minutemen,
+/obj/item/clothing/head/clip/slouch,
+/obj/item/clothing/under/clip/officer,
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel,
/obj/item/clothing/glasses/sunglasses,
@@ -6135,7 +6135,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"Hm" = (
-/obj/structure/sign/minutemen,
+/obj/structure/sign/clip,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/engine)
"Ht" = (
@@ -6257,9 +6257,9 @@
populate = 0
},
/obj/item/reagent_containers/spray/pepper,
-/obj/item/clothing/mask/gas/sechailer/minutemen,
-/obj/item/clothing/under/rank/security/officer/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
+/obj/item/clothing/under/clip/minutemen,
+/obj/item/clothing/head/helmet/bulletproof/clip,
/obj/item/storage/belt/security/full,
/obj/item/restraints/handcuffs,
/obj/item/ammo_box/magazine/m45/rubber,
@@ -6274,7 +6274,7 @@
"HU" = (
/obj/effect/turf_decal/industrial/outline/red,
/obj/effect/turf_decal/rechargefloor,
-/obj/mecha/working/ripley/cmm,
+/obj/mecha/working/ripley/clip,
/turf/open/floor/plasteel/tech/grid,
/area/ship/hangar/port)
"HV" = (
@@ -8299,7 +8299,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/hallway/fore)
"Tf" = (
-/obj/structure/sign/minutemen{
+/obj/structure/sign/clip{
pixel_y = 36
},
/obj/effect/turf_decal/industrial/warning/corner{
@@ -8830,7 +8830,7 @@
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
},
-/obj/structure/sign/poster/minutemen/random{
+/obj/structure/sign/poster/clip/random{
pixel_x = -28
},
/turf/open/floor/wood,
diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm
index a44c02e8a814..135b0ebc875b 100644
--- a/_maps/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/shuttles/pirate/pirate_ember.dmm
@@ -2254,7 +2254,7 @@
pixel_x = 1;
pixel_y = -4
},
-/obj/item/clothing/mask/gas/sechailer/minutemen,
+/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,
@@ -5743,9 +5743,9 @@
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/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,
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 23eb56cb400c..75248e0ac7c7 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -3600,7 +3600,7 @@
/obj/effect/turf_decal/techfloor{
dir = 10
},
-/obj/item/clothing/mask/gas/sechailer/minutemen,
+/obj/item/clothing/mask/gas/sechailer/balaclava,
/obj/item/clothing/under/syndicate/skirt,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index 820e88389ef1..5f14470737c1 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -256,7 +256,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 844548748824..73330b1bca28 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -137,7 +137,7 @@
/datum/ert/solgov/inspector/New()
mission = "Conduct a routine review on [station_name()]'s vessels."
-// Minutemen
+// CLIP
/datum/ert/minutemen
teamsize = 4
@@ -145,37 +145,37 @@
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"
+ rename_team = "Generic CLIP Minutemen Team"
+ polldesc = "a CLIP Minutemen emergency team"
random_names = TRUE
/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"
+ rename_team = "CLIP Minutemen BARD Team"
+ 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 Team"
+ 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"
+ rename_team = "CLIP Minutemen Pirate Hunter Team"
+ polldesc = "a fireteam of CLIP Minutemen pirate hunters"
/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 728bacdb671d..cf89811d5f09 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -14,11 +14,11 @@
var/obj/durand_shield/shield
-/obj/mecha/combat/durand/cmm
+/obj/mecha/combat/durand/clip
desc = "An aging combat exosuit appropriated from abandoned Nanotrasen facilities, now supplied to the CMM-BARD anti-xenofauna division."
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 b1f8d126705c..95e7b2f07224 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -562,16 +562,16 @@
source_mech = list(/obj/mecha/working/ripley, /obj/mecha/working/ripley/mining)
result_mech = /obj/mecha/working/ripley/mkii
-/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/cmm
- name = "CMM Ripley MK-IV Conversion Kit"
- desc = "A CMM-custom lightweight canopy kit for an Autonomous Power Loader Unit \"Ripley\" MK-I mecha, to convert it to the mobile and spaceworthy Mk-IV design. This kit cannot be removed, once applied."
- icon_state = "cmmupgrade"
+/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip
+ name = "CLIP Ripley MK-IV Conversion Kit"
+ desc = "A CLIP-custom lightweight canopy kit for an Autonomous Power Loader Unit \"Ripley\" MK-I mecha, to convert it to the mobile and spaceworthy Mk-IV design. This kit cannot be removed, once applied."
+ icon_state = "clipupgrade"
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 = "A CMM-custom conversion kit for a Durand combat exosuit, to convert it to the specialized Paladin anti-xenofauna exosuit."
- icon_state = "cmmupgrade"
+ name = "CLIP Paladin Conversion Kit"
+ desc = "A CLIP-custom conversion kit for a Durand combat exosuit, to convert it to the specialized Paladin anti-xenofauna exosuit."
+ icon_state = "clipupgrade"
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 a6d2fff1571f..b189ac844a02 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
+/obj/structure/sign/poster/clip/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"
+ 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 d1f47ff647f6..3370c8b4543d 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 36b1090fd7e0..bf73e74cd193 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -151,25 +151,25 @@ GLOBAL_LIST_INIT(channel_tokens, list(
//minutemen
/obj/item/radio/headset/minutemen
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
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
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
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
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index b4ec267bd770..65eb0547007e 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -131,10 +131,10 @@
icon_state = "securitypack"
item_state = "securitypack"
-/obj/item/storage/backpack/security/cmm
- name = "cmm backpack"
+/obj/item/storage/backpack/security/clip
+ name = "clip backpack"
desc = "It's a very blue backpack."
- icon_state = "cmmpack"
+ icon_state = "clippack"
/obj/item/storage/backpack/captain
name = "captain's backpack"
@@ -285,10 +285,10 @@
icon_state = "satchel-sec"
item_state = "satchel-sec"
-/obj/item/storage/backpack/satchel/sec/cmm
- name = "cmm satchel"
+/obj/item/storage/backpack/satchel/sec/clip
+ name = "clip satchel"
desc = "A robust satchel for anti-piracy related needs."
- icon_state = "satchel-cmm"
+ icon_state = "satchel-clip"
/obj/item/storage/backpack/satchel/explorer
name = "explorer satchel"
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 84b34bed9ea7..9663ba45fb8a 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -449,24 +449,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"
@@ -543,10 +525,6 @@
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)
-
/obj/item/storage/belt/military/assault/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm
index 4a2a98192243..291567f5d1e7 100644
--- a/code/game/objects/structures/signs/_signs.dm
+++ b/code/game/objects/structures/signs/_signs.dm
@@ -249,10 +249,10 @@
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."
+// 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 = "minutemen"
//Numeral signs
diff --git a/code/game/say.dm b/code/game/say.dm
index a5e180c4d67a..306ad62fefdc 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 a6c339303517..d58add494c86 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(!sender)
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index d731343d33f0..1a31b3e39d4c 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -278,17 +278,17 @@
// ********************************************************************
-// ** Minutemen **
+// ** CLIP Minutemen **
// ********************************************************************
/datum/antagonist/ert/minutemen
- name = "Minutemen Infantry"
+ name = "CLIP Minutemen Infantry"
outfit = /datum/outfit/job/minutemen/ert
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()].
"
+ var/missiondesc = "You stand shoulder to shoulder with your fellow colonists in the CLIP Minutemen within [station_name()].
"
if(leader) //If Squad Leader
missiondesc += "Lead your team to ensure the completion of your objectives."
else
@@ -300,7 +300,7 @@
to_chat(owner,missiondesc)
/datum/antagonist/ert/minutemen/leader
- name = "Minutemen Leader"
+ name = "CLIP Minutemen Leader"
leader = TRUE
outfit = /datum/outfit/job/minutemen/ert/leader
role = "Sergeant"
@@ -335,9 +335,9 @@
/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]")
+ to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Minutemen. 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 Minutemen. Your task: [ert_team.mission.explanation_text]")
/datum/antagonist/ert/minutemen/piratehunters
name = "Pirate Hunter"
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index f6a9d07aa68f..83abc98ed990 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -117,7 +117,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..409e873e01ad
--- /dev/null
+++ b/code/modules/clothing/factions/clip.dm
@@ -0,0 +1,167 @@
+//under
+
+/obj/item/clothing/under/clip
+ name = "clip deck worker jumpsuit"
+ desc = "A jumpsuit worn by deck workers in the CLIP Minutemen Navy vessels."
+ alt_covers_chest = TRUE
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ dying_key = DYE_REGISTRY_UNDER //???
+
+ 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."
+
+ icon_state = "minuteman"
+ item_state = "b_suit"
+
+ 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, low ranking CLIP Minutemen officers."
+ 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, low ranking CLIP Minutemen officers."
+
+/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. "
+
+/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 = "minuteman_officer"
+ item_state = "g_suit"
+ can_adjust = FALSE
+
+
+//head
+/obj/item/clothing/head/helmet/bulletproof/clip
+ name = "\improper Minutemen ballistic helmet"
+ desc = "A bulletproof helmet that is worn by members of the CLIP Minutemen."
+ icon_state = "antichristhelm"
+ allow_post_reskins = TRUE
+ unique_reskin = null
+
+/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_state = "riot_minutemen"
+
+/obj/item/clothing/head/caphat/minutemen
+ name = "general's bicorne"
+ desc = "A fancy bicorne used by generals of the CLIP Minutemen."
+ icon_state = "minuteman_general_hat"
+
+//suit
+
+/obj/item/clothing/suit/toggle/lawyer/minutemen
+ name = "CLIP Minutemen suit jacket"
+ desc = "An enterprising dress jacket used by officers of the CLIP 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
+
+//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_state = "carapace_minutemen"
+ item_state = "carapace_minutemen"
+
+/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_state = "riot_minutemen"
+
+/obj/item/clothing/suit/armor/clip_trenchcoat
+ name = "\improper CLIP trenchcoat"
+ desc = "A CLIP trenchcoat. Despite it's reputation as a clothing for officers, it's actually issued to entire CLIP government in general. Has a lot of pockets."
+ icon_state = "armor_solgov_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" = 0, "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
+ 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. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed."
+ 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
+ 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. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed."
+ icon_state = "hardsuit0-clip-patrol"
+ hardsuit_type = "clip-patrol"
+
+//hats
+/obj/item/clothing/head/clip
+ name = "\improper CLIP 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 minutemen proper in spite of this."
+// 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 = "navalhat"
+ 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/slouch
+ 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 = "minuteman_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
+
+//mask
+
+
+
+//gloves
+
+//boots
+
+//belt
+/obj/item/storage/belt/military/minutemen
+ name = "CLIP Minutemen chest rig"
+ desc = "A chest rig worn by the CLIP Minutemen of the League."
+ icon_state = "clipwebbing"
+ item_state = "clipwebbing"
+
+/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)
+
+
+//neck
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index e6400198864e..ee9a688d9ca1 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -274,12 +274,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."
@@ -511,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."
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index c4d13ef36948..7326584e4ab5 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."
@@ -154,11 +149,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..d25d3af8bdc0 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, 30, 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 431170b5f3dc..b2e1937ec208 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 5a39d3ea3da4..f87b5262d615 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..d9709824a76f 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -3,11 +3,11 @@
jobtype = /datum/job/officer
job_icon = "securityofficerOld"
- 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
+ head = /obj/item/clothing/head/helmet/bulletproof/clip
+ uniform = /obj/item/clothing/under/clip/minutemen
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
ears = /obj/item/radio/headset/minutemen/alt
- back = /obj/item/storage/backpack/security/cmm
+ back = /obj/item/storage/backpack/security/clip
suit = /obj/item/clothing/suit/armor/vest/bulletproof
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
id = /obj/item/card/id
@@ -22,7 +22,7 @@
job_icon = "lieutenant"
ears = /obj/item/radio/headset/minutemen/alt/captain
- back = /obj/item/storage/backpack/satchel/sec/cmm
+ back = /obj/item/storage/backpack/satchel/sec/clip
head = /obj/item/clothing/head/beret/command
/datum/outfit/job/minutemen/ert/bard
@@ -31,7 +31,7 @@
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
+ head = /obj/item/clothing/head/helmet/riot/clip
belt = /obj/item/storage/belt/military/minutemen/cm5
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/grenade/smokebomb
@@ -49,8 +49,8 @@
name = "ERT - Minuteman Sergeant (BARD)"
job_icon = "lieutenant"
- belt = /obj/item/storage/belt/military/assault/minutemen
- uniform = /obj/item/clothing/under/rank/command/minutemen
+ belt = /obj/item/storage/belt/military/minutemen/p16
+ uniform = /obj/item/clothing/under/clip/officer
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
@@ -67,8 +67,8 @@
name = "ERT - 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
@@ -90,11 +90,11 @@
jobtype = /datum/job/head_of_personnel
job_icon = "minutemen"
- head = /obj/item/clothing/head/cowboy/sec/minutemen
+ head = /obj/item/clothing/head/clip/slouch
mask = null
belt = /obj/item/clipboard
glasses = /obj/item/clothing/glasses/sunglasses
- uniform = /obj/item/clothing/under/rank/command/minutemen
+ uniform = /obj/item/clothing/under/clip/officer
suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
suit_store = null
ears = /obj/item/radio/headset/minutemen/alt/captain
@@ -109,13 +109,13 @@
job_icon = "securityofficerOld"
head = null
- suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
+ suit = /obj/item/clothing/suit/space/hardsuit/security/independent/clip
/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
+ uniform = /obj/item/clothing/under/clip/officer
ears = /obj/item/radio/headset/minutemen/alt/captain
belt = /obj/item/storage/belt/military/minutemen/gal
suit_store = /obj/item/gun/ballistic/automatic/gal
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index ab256d094a38..185dbc5dc4d1 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 48702c064447..0fc4e14acb9f 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 @@
uniform = /obj/item/clothing/under/syndicate/inteq
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/military/assault
suit = /obj/item/clothing/suit/armor/vest/alt
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..4bbf8ea5cc1f 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -3,14 +3,14 @@
/datum/outfit/job/minutemen
name = "Minutemen - Base Outfit"
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ uniform = /obj/item/clothing/under/clip/minutemen
alt_uniform = null
faction_icon = "bg_minutemen"
- 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
+ backpack = /obj/item/storage/backpack/security/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/duffelbag //to-do: bug rye for clip duffles // rye. rye. give me 20 pound bag of ice
satchel = /obj/item/storage/backpack/messenger //and these
box = /obj/item/storage/box/survival
@@ -49,14 +49,14 @@
accessory = /obj/item/clothing/accessory/medal/gold/captain
ears = /obj/item/radio/headset/minutemen/alt/captain
- uniform = /obj/item/clothing/under/rank/command/minutemen
+ uniform = /obj/item/clothing/under/clip/officer
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
+ head = /obj/item/clothing/head/clip/slouch
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)
@@ -66,8 +66,8 @@
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
+ 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
@@ -113,14 +113,14 @@
ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
+ uniform = /obj/item/clothing/under/clip/officer
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
+ head = /obj/item/clothing/head/clip/slouch
backpack = /obj/item/storage/backpack
backpack_contents = list(
/obj/item/melee/classic_baton/telescopic=1,
@@ -144,13 +144,13 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
+ uniform = /obj/item/clothing/under/clip/officer
alt_uniform = null
suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
alt_suit = null
shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
+ head = /obj/item/clothing/head/clip/slouch
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)
@@ -172,7 +172,7 @@
chameleon_extras = /obj/item/gun/syringe
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ uniform = /obj/item/clothing/under/clip/minutemen
accessory = /obj/item/clothing/accessory/armband/medblue
shoes = /obj/item/clothing/shoes/sneakers/white
head = /obj/item/clothing/head/beret/med
@@ -215,7 +215,7 @@
courierbag = /obj/item/storage/backpack/messenger/tox
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ 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
@@ -227,8 +227,8 @@
job_icon = "scientist"
jobtype = /datum/job/scientist
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- backpack = /obj/item/storage/backpack/security/cmm
+ uniform = /obj/item/clothing/under/clip/minutemen
+ backpack = /obj/item/storage/backpack/security/clip
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/science
@@ -245,11 +245,11 @@
job_icon = "securityofficer"
jobtype = /datum/job/officer
- head = /obj/item/clothing/head/helmet/bulletproof/minutemen
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ head = /obj/item/clothing/head/helmet/bulletproof/clip
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
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
@@ -311,7 +311,7 @@
duffelbag = /obj/item/storage/backpack/duffelbag/engineering
courierbag = /obj/item/storage/backpack/messenger/engi
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ uniform = /obj/item/clothing/under/clip/minutemen
accessory = /obj/item/clothing/accessory/armband/engine
head = /obj/item/clothing/head/hardhat/dblue
suit = /obj/item/clothing/suit/hazardvest
@@ -329,9 +329,9 @@
glasses = /obj/item/clothing/glasses/sunglasses
ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ uniform = /obj/item/clothing/under/clip/minutemen
accessory = /obj/item/clothing/accessory/armband
- head = /obj/item/clothing/head/cowboy/sec/minutemen
+ head = /obj/item/clothing/head/clip/slouch
suit = /obj/item/clothing/suit/armor/vest/bulletproof
belt = /obj/item/storage/belt/military/minutemen
shoes = /obj/item/clothing/shoes/combat
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 517a51982e7f..1ea5af9f1ea4 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -1099,12 +1099,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"
@@ -1123,13 +1117,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 9c363c11551a..775324ce5d1a 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -164,12 +164,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."
@@ -190,12 +184,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..f38fdfcde5ab 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -161,7 +161,7 @@
/obj/item/clothing/suit/toggle/lawyer/minutemen
name = "minutemen suit jacket"
- desc = "An enterprising dress jacket used by officers of the Colonial Minutemen."
+ desc = "An enterprising dress jacket used by officers of the CLIP Minutemen."
icon_state = "suitjacket_minuteman"
item_state = "suitjacket_navy"
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..e7ba19100fca 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."
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index a4881fdfee38..f43c40987a3a 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -62,7 +62,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)
)
@@ -523,7 +523,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 4de28c0c213e..2578fc97961c 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -125,9 +125,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 576a914cce01..5ed1b35750bc 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -124,7 +124,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 7cbd8574ba86..805b6ec45466 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -148,7 +148,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"
@@ -167,7 +167,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 ab404b1261d5..a8c7b86deb8e 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -240,7 +240,7 @@
/obj/item/gun/ballistic/shotgun/bulldog/minutemen
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 8644534e3117..babc464f3ccd 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -253,7 +253,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
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/icons/stamp_icons/large_stamp-clip.png b/icons/stamp_icons/large_stamp-clip.png
new file mode 100644
index 0000000000000000000000000000000000000000..82872f034be5c5644b62ed353ab591cb1c393269
GIT binary patch
literal 1721
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
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 9840f4d4cc9c..ff5c335584a1 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1922,6 +1922,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 0000000000000000000000000000000000000000..25b5d63ddb1ed27ee1c8afef6a73bc3eeb94500b
GIT binary patch
literal 32419
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
Date: Sat, 10 Feb 2024 21:53:07 -0800
Subject: [PATCH 03/29] need to pause
---
.../minutemen/minutemen_asclepius.dmm | 2 +-
.../shuttles/minutemen/minutemen_cepheus.dmm | 2 +-
code/modules/clothing/factions/clip.dm | 102 +++++++++++-------
code/modules/clothing/head/jobs.dm | 6 +-
code/modules/clothing/masks/hailer.dm | 2 +-
.../clothing/outfits/ert/minutemen_ert.dm | 8 +-
.../clothing/outfits/factions/minutemen.dm | 10 +-
icons/mob/clothing/faction/clip/accessory.dmi | Bin 0 -> 751 bytes
icons/mob/clothing/faction/clip/belt.dmi | Bin 0 -> 587 bytes
icons/mob/clothing/faction/clip/eyes.dmi | Bin 0 -> 477 bytes
icons/mob/clothing/faction/clip/feet.dmi | Bin 0 -> 800 bytes
icons/mob/clothing/faction/clip/hands.dmi | Bin 0 -> 895 bytes
icons/mob/clothing/faction/clip/head.dmi | Bin 0 -> 11044 bytes
icons/mob/clothing/faction/clip/mask.dmi | Bin 0 -> 685 bytes
icons/mob/clothing/faction/clip/neck.dmi | Bin 0 -> 1189 bytes
icons/mob/clothing/faction/clip/suits.dmi | Bin 0 -> 8449 bytes
icons/mob/clothing/faction/clip/uniforms.dmi | Bin 0 -> 6200 bytes
icons/mob/clothing/mask.dmi | Bin 56846 -> 57323 bytes
icons/obj/clothing/faction/clip/belt.dmi | Bin 0 -> 492 bytes
icons/obj/clothing/faction/clip/head.dmi | Bin 0 -> 840 bytes
icons/obj/clothing/faction/clip/mask.dmi | Bin 0 -> 408 bytes
icons/obj/clothing/faction/clip/suits.dmi | Bin 0 -> 843 bytes
icons/obj/clothing/faction/clip/uniforms.dmi | Bin 0 -> 182 bytes
icons/obj/clothing/hats.dmi | Bin 139462 -> 138436 bytes
icons/obj/clothing/masks.dmi | Bin 41244 -> 40796 bytes
icons/obj/clothing/suits/armor.dmi | Bin 34784 -> 34372 bytes
icons/obj/clothing/suits/spacesuits.dmi | Bin 52925 -> 51270 bytes
icons/obj/clothing/suits/toggle.dmi | Bin 16003 -> 15791 bytes
icons/obj/clothing/under/command.dmi | Bin 2188 -> 2037 bytes
icons/obj/clothing/under/security.dmi | Bin 14655 -> 15858 bytes
sound/misc/trenchwhistle.ogg | Bin 32419 -> 80447 bytes
31 files changed, 82 insertions(+), 50 deletions(-)
create mode 100644 icons/mob/clothing/faction/clip/accessory.dmi
create mode 100644 icons/mob/clothing/faction/clip/belt.dmi
create mode 100644 icons/mob/clothing/faction/clip/eyes.dmi
create mode 100644 icons/mob/clothing/faction/clip/feet.dmi
create mode 100644 icons/mob/clothing/faction/clip/hands.dmi
create mode 100644 icons/mob/clothing/faction/clip/head.dmi
create mode 100644 icons/mob/clothing/faction/clip/mask.dmi
create mode 100644 icons/mob/clothing/faction/clip/neck.dmi
create mode 100644 icons/mob/clothing/faction/clip/suits.dmi
create mode 100644 icons/mob/clothing/faction/clip/uniforms.dmi
create mode 100644 icons/obj/clothing/faction/clip/belt.dmi
create mode 100644 icons/obj/clothing/faction/clip/head.dmi
create mode 100644 icons/obj/clothing/faction/clip/mask.dmi
create mode 100644 icons/obj/clothing/faction/clip/suits.dmi
create mode 100644 icons/obj/clothing/faction/clip/uniforms.dmi
diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
index f522c27ef2f5..5174992109ac 100644
--- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm
+++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
@@ -417,7 +417,7 @@
/obj/item/clothing/head/clip/slouch,
/obj/item/clothing/head/helmet/marine/medic,
/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/head/caphat/minutemen,
+/obj/item/clothing/head/clip/bicorne,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/clothing/under/clip/officer,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
index c21ed22dce09..ac276ba8ead1 100644
--- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm
+++ b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
@@ -3161,7 +3161,7 @@
"Hp" = (
/obj/item/clothing/under/clip/officer,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
-/obj/item/clothing/head/caphat/minutemen,
+/obj/item/clothing/head/clip/bicorne,
/obj/item/clothing/head/clip/slouch,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/glasses/sunglasses,
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index 409e873e01ad..e0c6e9a61216 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -3,6 +3,10 @@
/obj/item/clothing/under/clip
name = "clip deck worker jumpsuit"
desc = "A jumpsuit worn by deck workers in the CLIP Minutemen Navy vessels."
+
+ icon_state = "clip_deck"
+ item_state = "b_suit"
+
alt_covers_chest = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
@@ -15,8 +19,7 @@
name = "clip minutemen fatigues"
desc = "Fatigues worn by the CLIP Minutemen."
- icon_state = "minuteman"
- item_state = "b_suit"
+ icon_state = "clip_minutemen"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
@@ -27,6 +30,9 @@
/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, low ranking CLIP Minutemen officers."
+
+ icon_state = "clip_formal"
+
armor = null
supports_variations = null
@@ -34,42 +40,28 @@
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, 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 = "minuteman_officer"
+ icon_state = "clip_officer"
item_state = "g_suit"
can_adjust = FALSE
-//head
-/obj/item/clothing/head/helmet/bulletproof/clip
- name = "\improper Minutemen ballistic helmet"
- desc = "A bulletproof helmet that is worn by members of the CLIP Minutemen."
- icon_state = "antichristhelm"
- allow_post_reskins = TRUE
- unique_reskin = null
-
-/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_state = "riot_minutemen"
-
-/obj/item/clothing/head/caphat/minutemen
- name = "general's bicorne"
- desc = "A fancy bicorne used by generals of the CLIP Minutemen."
- icon_state = "minuteman_general_hat"
-
//suit
/obj/item/clothing/suit/toggle/lawyer/minutemen
name = "CLIP Minutemen suit jacket"
desc = "An enterprising dress jacket used by officers of the CLIP Minutemen."
- icon_state = "suitjacket_minuteman"
+ icon_state = "suitjacket_clip"
item_state = "suitjacket_navy"
/obj/item/clothing/suit/toggle/lawyer/minutemen/Initialize()
@@ -82,17 +74,17 @@
/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_state = "carapace_minutemen"
- item_state = "carapace_minutemen"
+ icon_state = "clip_general"
+ item_state = "clip_general"
/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_state = "riot_minutemen"
+ 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 clothing for officers, it's actually issued to entire CLIP government in general. Has a lot of pockets."
+ 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_state = "armor_solgov_trenchcoat"
item_state = "trenchcoat_solgov"
body_parts_covered = CHEST|LEGS|ARMS
@@ -117,49 +109,87 @@
//hats
/obj/item/clothing/head/clip
- name = "\improper CLIP 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 minutemen proper in spite of this."
+ 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 = "navalhat"
+ 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/slouch
- name = "clip minutemen officer's slouch hat"
+ 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 = "minuteman_officer_hat"
+ 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 a wide brimmed cap to keep yourself cool during blistering hot weather."
+ icon_state = "clip_boonie"
-//mask
+/obj/item/clothing/head/clip/bicorne
+ name = "general's bicorne"
+ desc = "A fancy bicorne used by generals of the CLIP Minutemen."
+ icon_state = "minuteman_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/clip
+ name = "\improper Minutemen ballistic helmet"
+ desc = "A bulletproof helmet that is worn by members of the CLIP Minutemen."
+ icon_state = "antichristhelm"
+ allow_post_reskins = TRUE
+ unique_reskin = null
+/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_state = "riot_clip"
+
+//GOLD
+/obj/item/clothing/head/fedora/det_hat/clip
+ name = "GOLD fedora"
+ icon_state = "clip_fedora"
+ item_state = "detective"
+ desc = "A hat issued by the GOLD division of the CLIP Minutemen. Designed to look more casual than the standard CLIP military equipment, yet fashionable"
+ 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
+ name = "GOLD flatcap"
+ desc = "A hat issued by the GOLD division of the CLIP Minutemen. A office worker's hat."
+ icon_state = "clip_flat_cap"
+ 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."
+ icon_state = "clip-gasmask"
+ strip_delay = 60
//gloves
//boots
//belt
-/obj/item/storage/belt/military/minutemen
+/obj/item/storage/belt/military/clip
name = "CLIP Minutemen chest rig"
desc = "A chest rig worn by the CLIP Minutemen of the League."
icon_state = "clipwebbing"
item_state = "clipwebbing"
-/obj/item/storage/belt/military/minutemen/p16/PopulateContents()
+/obj/item/storage/belt/military/clip/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()
+/obj/item/storage/belt/military/clip/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()
+/obj/item/storage/belt/military/clip/cm5/PopulateContents()
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/smgm9mm(src)
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 7326584e4ab5..0074e7204e58 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -103,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)
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index d25d3af8bdc0..66e329a0e9c6 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -56,7 +56,7 @@
if(!COOLDOWN_FINISHED(src, whistle_cooldown))
return
user.audible_message("[user] blows on the [src]!")
- playsound(src, blown_sound, 30, FALSE, 4)
+ playsound(src, blown_sound, 80, FALSE, 4)
COOLDOWN_START(src, whistle_cooldown, 5 SECONDS)
/obj/item/clothing/mask/whistle/trench
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index d9709824a76f..180a2f55abfb 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -11,7 +11,7 @@
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
+ belt = /obj/item/storage/belt/military/clip/p16
r_pocket = /obj/item/kitchen/knife/combat
l_pocket = /obj/item/flashlight/seclite
@@ -32,7 +32,7 @@
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/clip
- belt = /obj/item/storage/belt/military/minutemen/cm5
+ belt = /obj/item/storage/belt/military/clip/cm5
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/grenade/smokebomb
l_pocket = /obj/item/extinguisher/mini
@@ -49,7 +49,7 @@
name = "ERT - Minuteman Sergeant (BARD)"
job_icon = "lieutenant"
- belt = /obj/item/storage/belt/military/minutemen/p16
+ belt = /obj/item/storage/belt/military/clip/p16
uniform = /obj/item/clothing/under/clip/officer
suit = /obj/item/clothing/suit/armor/vest/marine/heavy
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
@@ -117,7 +117,7 @@
uniform = /obj/item/clothing/under/clip/officer
ears = /obj/item/radio/headset/minutemen/alt/captain
- belt = /obj/item/storage/belt/military/minutemen/gal
+ belt = /obj/item/storage/belt/military/clip/gal
suit_store = /obj/item/gun/ballistic/automatic/gal
backpack_contents = list(/obj/item/ammo_box/magazine/gal=4)
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index 4bbf8ea5cc1f..f534eb4d0252 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -64,7 +64,7 @@
/datum/outfit/job/minutemen/captain/general
name = "Minutemen - General"
- head = /obj/item/clothing/head/caphat/minutemen
+ head = /obj/item/clothing/head/clip/bicorne
ears = /obj/item/radio/headset/minutemen/alt/captain
uniform = /obj/item/clothing/under/clip/officer
suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip
@@ -255,7 +255,7 @@
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/alt
- 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
@@ -266,7 +266,7 @@
name = "Minutemen - Minuteman (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
/datum/outfit/job/minutemen/security/mech_pilot
name = "Minutemen - Mech Pilot"
@@ -333,7 +333,7 @@
accessory = /obj/item/clothing/accessory/armband
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
@@ -347,6 +347,6 @@
name = "Minutemen - Field Commander (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
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)
diff --git a/icons/mob/clothing/faction/clip/accessory.dmi b/icons/mob/clothing/faction/clip/accessory.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..00e868d303fd6eeb16cbf172e7327f87a64dca52
GIT binary patch
literal 751
zcmV004jp0{{R3yS+6b&p2ES&Nk?1&{{Xei
znR);K00DGTPE!Ct=GbNc007N;R9JLGWpiV4X>fFDZ*Bkpc$|%pu?~VT6h&wH6)!L=
zqOJ}aiZ($^1ZGocfhNE+w8-xZIv8DKdiN&h>|ncG5o=Jw
zRAbq!iB(BeR_0x_;YNYB{U{?Fu0}
z=kyNF%Y;!Jf7Q#?;C=ZQ>oG>L{#hcL8C+D=i{U!R>bX79*(IDWWDoNDRlrLByKxvR
z`GQCoN(a0;!B)dul*g~j@6T6kZ;-zMC7^6VsbP0e6n`#YKK{+U*#TYt4C-52YnY3o
z_)`J%{vqDp&46JIXm|Kt!`xsizBgppz9e?Qkbh=^4A{vIZXdyxF1C=rvAZ4w00000
z;3aZ+b&!iW!_(8p^1wKZdIETa{%WmUYn%5&{yR9%qrto;d*$niU%BH3ePzZA00000
z0Px?5@lJK}Gfh+T{8jdIbW&KT*8(PsD8j10RR91004f_KHNLkl+K*n9H4#rc(V54-pT%Y
hzH>*10002M4j%#y2K5-9gpB|I002ovPDHLkV1j*tRGt6;
literal 0
HcmV?d00001
diff --git a/icons/mob/clothing/faction/clip/belt.dmi b/icons/mob/clothing/faction/clip/belt.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..dde9fb4bfa427d4528c5e0ec8729a04b25adaa85
GIT binary patch
literal 587
zcmV-R0<`^!P)+6b&o;-d!kLy3zsC9|j)q??N~ttc@!6~s2g
zrChf-F{vn(I8CHjK#b|i3a)-GU@rpzXq!rzswiIY0003>NklK@g(JxVUX5t5e5l*uV6uy-x}!8;=%fy95+=x6ph-i@-8
zB!m$1_qZ^1Ut)AuS_F?6
z2qqiMDvRJu7)Q2>>nI>xE9qOPIUjI7&!aXv^mAACh^SNya2
Z;1j?~Iy2s<=cxby002ovPDHLkV1h<-@;U$j
literal 0
HcmV?d00001
diff --git a/icons/mob/clothing/faction/clip/eyes.dmi b/icons/mob/clothing/faction/clip/eyes.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0dd74b2018764bfe8abe048bcb6c6fca72faf3db
GIT binary patch
literal 477
zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!VDzUL(;2&lvaRGh%1op&6;-T;K{D8c^Mvs
z&booz9O9ntG0$3*{@+ep?WO+u^=nB!R{C#yA2_`wA(K<8ZYba4!cXiZL#U@bVH
z;V`Ml(PZBwPY;edSueE{HsRsyA(@+xm<0Y|o1v=o`G^p6z|xzdS3bT@PY8E=CMhZq
zV8`WlP(y-sae_!s$pOP+Hb&7oyc)067kKIymPR(*Z_r$KVvm5o$;)kLOqkfVq&|4Y
z$T)qQSlwTq7+*FHzRhfmui^Te0t;?5PUvDjA!GLCV%weDm$-g>eSXjFnQETXWV>l|
z(+)I<%ba$57VGUc`Pt4VE%Elu=VMt}+ONAXPTv)10C9)1Gy{X6lI+Asayxl|zGLuo
L^>bP0l+XkKrcAdq
literal 0
HcmV?d00001
diff --git a/icons/mob/clothing/faction/clip/feet.dmi b/icons/mob/clothing/faction/clip/feet.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0c665a29cda6837fb42aab2d8a620c75c9343f59
GIT binary patch
literal 800
zcmV+*1K<3KP)004jl0{{R3eocQU0000UP)t-sz`(#6
z87Ah0A`1u?F)={G!O2NST#AaGNJ?1i>+9PwY*qjO00DGTPE!Ct=GbNc005YJR9JLG
zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB
zGg33tGfE(w;*!LYR3KBSxHPXgJ~^?VBr!8DDL=oYSc!`>C9|j)WB?auT2W$dDu``}
zrXwXkxg@_RIVV4zNDWzu$=M{BpOcuJT3SG?;{3dHyk;vaxca$(g9iYiu~~?jMj}4|
z00In2L_t(&f$f>GZsRZvKrP5f(ak<-@R~mmK@A;kC_~0BMOH6oBU_gSxG^{n`GNM(
zzdia;z@&}3?G-3G@F5EYilLI_fy^>RQ4~c{l#gMy0k%Beh1l=}`@_i_unlVkZ5hC=
z#B_l229{r2(5J%fiYbO&;TwL#L=k3|Zm{sKZ~LFOEdAmNSDjfu5J0qO;37JvkQKcC
zb7=d+Gy6V-qC{k|3+VVGjYIKfq#IMTIdyH#ufXE?VKJE$zMB0G@^gTJ
z#U=%8Ud?_7mh4P)IQPki=l1w`&ki=HyOt+x$N*UgV@FIFJqC^zBo+
zN48QWc@WR5E50VcC6h26T
zDID0sUjAled~!bM_>-6OMIYkod{I#pMNyRRiycDz&0=#2H)oNspKo)A_2p|5fUAY|
zg_p}$Kbs@D=8bJ`-H2`Os3JTeFXtVW^?HYOBRZ_Yji`_>J6td5>LfZG005u_0{{R3dEt5<0000gP)t-s00021
zN+$~l7mA9W=7b_KF+dp^Cc?qVNk?4k>+48LSe8}`yNnd<*D0&vMG61_00DGTPE!Ct
z=GbNc005fFDZ*Bkpc$}4x%MOAt5JlJRS2VCUzP4@*#ITTGFqIDN
z#M+upK|bGNcP1vVyLWQ#yh?GdFHI||Yr{tfgx-mhIBvF_y-`Jz%wf-&0n{dDLs3RZ
zvY^4yt&^`P(P`^Ppn@}nf#wdJ^+7&i*1Mm`eK3ZMgfwY
zo|tt|g?9h|0002i&+x(ov8wf!H9=zfrv+tU3(R}8@?(`=-|(dSM3q;g)~Sdi9pbo0
zcm196gA1ZPF9)qtna^~XH-=6g8C^Pq*Y$Vix!oZ{SqFkgGS
z$VgMDuF^+DSG=J1dhHIK`%~(t
zdHL6yMt`&V+9y2z5p?+b`QR6`Zo7=nW*xH%<5qhB00000w?wX@^%hL$>nu1{ZqI+K
z-8`#wI9b+uu&{dJ6JEaxr+24IVr(<_*DWwQF#7F*PuQP?^Ti2!o$1iIKcc%!Q{eQx
zxn9o~&wRqu?tGD*+9sLXvo9OGbp4ohleg5JFLrhS00000{tu+}nrZXFS=5@1^YoY5
z$V;J4{d}>5ux>cHX!O+RhwOL3<1CynCVm{)?XdpF?k1R>Pvlfa6d>|&2LSLF`2~QS
VXg7{bd}#mx002ovPDHLkV1jJ^u-yOv
literal 0
HcmV?d00001
diff --git a/icons/mob/clothing/faction/clip/head.dmi b/icons/mob/clothing/faction/clip/head.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..22eb273e8041ba00ad582594a89a686feec8e818
GIT binary patch
literal 11044
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