diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm index ca4dc1c3326..7943cf93372 100644 --- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm @@ -1525,8 +1525,8 @@ pixel_x = -7; pixel_y = 2 }, -/obj/item/clothing/under/rank/command/minutemen, -/obj/item/clothing/head/helmet/bulletproof/minutemen, +/obj/item/clothing/under/clip/officer, +/obj/item/clothing/head/helmet/bulletproof/x11/clip, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/wood, /area/ruin/beach/treasure_cove) diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index ed19285b586..1fb95523712 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -923,7 +923,7 @@ /obj/item/clothing/suit/space/hardsuit/syndi/ramzi, /obj/item/reagent_containers/food/drinks/bottle/rum, /obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/folder/syndicate/mining, +/obj/item/folder/documents/syndicate/mining, /obj/item/paper/fluff/gateway, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf) diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm index c43ba081269..4e7fe7fd9c5 100644 --- a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm +++ b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm @@ -208,7 +208,7 @@ /area/ruin/space/has_grav/syndicircle/halls) "gi" = ( /obj/structure/table/reinforced, -/obj/item/folder/syndicate/red, +/obj/item/folder/documents/syndicate/red, /turf/open/floor/plasteel/tech, /area/ruin/space/has_grav/syndicircle/winter) "gp" = ( diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json deleted file mode 100644 index 9498534f170..00000000000 --- a/_maps/configs/minutemen_asclepius.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "map_name": "Asclepius-class Hospital Ship", - "prefix": "CMSV", - "description": "The Asclepius is a medical vessel employed by the CMM. Much in CMM fashion it features tight hallways and moderately sized personal quarters. Well stocked in medical supplies, this vessel is known for its capability of fulfilling extensive treatment for patients in sectors where such treatment is otherwise scarce. Stocked with a cryo lab, a morgue, a chemlab, and surgery room, the Asclepius rarely finds difficulty when provided all measures both preventative and restorative.", - "tags": [ - "Medical", - "Chemistry" - ], - "namelists": [ - "COLONIAL MINUTEMEN", - "CMM-BARD", - "MYTHOLOGICAL" - ], - "map_short_name": "Asclepius-class", - "map_path": "_maps/shuttles/minutemen/minutemen_asclepius.dmm", - "limit": 1, - "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": 1 - }, - "Cadet": { - "outfit": "/datum/outfit/job/minutemen/assistant", - "slots": 3 - }, - "Field Medic": { - "outfit": "/datum/outfit/job/minutemen/doctor", - "slots": 3 - }, - "Paramedic":{ - "outfit": "/datum/outfit/job/minutemen/paramedic", - "slots": 2 - }, - "Chemist":{ - "outfit": "/datum/outfit/job/minutemen/chemist", - "slots": 1 - } - }, - "enabled": false -} diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json deleted file mode 100644 index 5de05fef0ce..00000000000 --- a/_maps/configs/minutemen_cepheus.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", - "map_name": "Cepheus-class Mech Carrier", - "prefix": "CMSV", - "description": "The Cepheus is the go-to for the CMM whenever it wishes to deploy vessels capable of creating anything in the realm robotica. These vessels are deployed to sectors full of scrap and salvageable material, stocked with armament for their salvagers and a mechanical laboratory for their mechanical engineers. Crews on Cepheus ships are typically treated to somewhat crammed together quarters and tight schedules of collection and production.", - "tags": [ - "Robotics" - ], - "namelists": [ - "COLONIAL MINUTEMEN", - "MYTHOLOGICAL" - ], - "map_short_name": "Cepheus-class", - "map_path": "_maps/shuttles/minutemen/minutemen_cepheus.dmm", - "limit": 1, - "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 - }, - "Mech Pilot" :{ - "outfit": "/datum/outfit/job/minutemen/security/mech_pilot", - "slots": 2 - }, - "Roboticist": { - "outfit": "/datum/outfit/job/minutemen/roboticist", - "slots": 1 - }, - "Cadet": { - "outfit": "/datum/outfit/job/minutemen/assistant", - "slots": 3 - } - }, - "enabled": false -} diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json index 01a494fa6eb..74746ef5432 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", @@ -15,41 +15,38 @@ "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/minutemen/captain", + "outfit": "/datum/outfit/job/clip/minutemen/captain", "officer": true, "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/minutemen/ce", + "outfit": "/datum/outfit/job/clip/ce", "officer": true, "slots": 1 }, - "Bridge Officer": { - "outfit": "/datum/outfit/job/minutemen/head_of_personnel", + "First Officer": { + "outfit": "/datum/outfit/job/clip/first_officer", + "officer": true, "slots": 1 }, "Mech Pilot": { - "outfit": "/datum/outfit/job/minutemen/miner", + "outfit": "/datum/outfit/job/clip/minutemen/vehicle_pilot", "slots": 4 }, - "Mech Technician": { - "outfit": "/datum/outfit/job/minutemen/roboticist", + "Minuteman": { + "outfit": "/datum/outfit/job/clip/minutemen/grunt", "slots": 2 }, "Engineer": { - "outfit": "/datum/outfit/job/minutemen/engineer", - "slots": 2 - }, - "Minuteman": { - "outfit": "/datum/outfit/job/minutemen/security", + "outfit": "/datum/outfit/job/clip/mechanic", "slots": 2 }, - "Scientist": { - "outfit": "/datum/outfit/job/minutemen/scientist", + "Researcher": { + "outfit": "/datum/outfit/job/clip/scientist", "slots": 2 }, - "Cadet": { - "outfit": "/datum/outfit/job/minutemen/assistant", + "Deckhand": { + "outfit": "/datum/outfit/job/clip/minutemen/deckhand", "slots": 1 } }, diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json index 0ef5e800575..9fe11023e37 100644 --- a/_maps/configs/solgov_chronicle.json +++ b/_maps/configs/solgov_chronicle.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Chronicle-class Sensor Frigate", - "prefix": "SGSV", + "prefix": "SCSV", "namelists": [ "SOLGOV", "SPACE", diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index d34cb392f65..b7ae54a1b6b 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Inkwell-class Supply Freighter", - "prefix": "SGSV", + "prefix": "SCSV", "namelists": [ "SOLGOV", "SPACE", diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json index cd3b056e282..a5eefc5296d 100644 --- a/_maps/configs/solgov_paracelsus.json +++ b/_maps/configs/solgov_paracelsus.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Paracelsus-class Medical Corvette", - "prefix": "SGSV", + "prefix": "SCSV", "namelists": [ "SOLGOV", "SPACE", diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d4bd622b8f0..c441891d33b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -6366,6 +6366,15 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) +"bpl" = ( +/obj/structure/closet/crate/bin, +/obj/structure/sign/clip{ + pixel_y = 28 + }, +/obj/machinery/light/directional/east, +/obj/item/reagent_containers/food/snacks/pancakes/blueberry, +/turf/open/floor/plasteel, +/area/centcom) "bsD" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -6518,16 +6527,6 @@ /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel, /area/centcom/control) -"bIJ" = ( -/obj/structure/sign/minutemen{ - pixel_y = -28 - }, -/obj/machinery/light/directional/west, -/obj/machinery/telecomms/relay/preset/minutemen{ - autolinkers = list("relay") - }, -/turf/open/floor/plasteel, -/area/centcom) "bMY" = ( /obj/effect/turf_decal/corner/opaque/green{ dir = 1 @@ -6570,28 +6569,6 @@ }, /turf/open/floor/plasteel, /area/centcom/control) -"bRF" = ( -/obj/structure/table/reinforced, -/obj/structure/sign/poster/minutemen/bard{ - pixel_y = -32 - }, -/obj/item/ammo_box/magazine/p16{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/ammo_box/magazine/p16{ - pixel_x = 1; - pixel_y = 2 - }, -/obj/item/ammo_casing{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/ammo_casing{ - pixel_x = 11 - }, -/turf/open/floor/plasteel, -/area/centcom) "bRK" = ( /obj/structure/table/reinforced, /obj/item/taperecorder, @@ -7395,6 +7372,20 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/dark, /area/centcom/control) +"dGh" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 5 + }, +/obj/item/clothing/head/clip/slouch{ + pixel_y = 8; + pixel_x = -4 + }, +/obj/item/pen/fourcolor{ + pixel_x = 5 + }, +/turf/open/floor/plasteel, +/area/centcom) "dGq" = ( /obj/machinery/computer/med_data{ dir = 8 @@ -7434,15 +7425,6 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) -"dKW" = ( -/obj/structure/closet/crate/bin, -/obj/structure/sign/minutemen{ - pixel_y = 28 - }, -/obj/machinery/light/directional/east, -/obj/item/reagent_containers/food/snacks/pancakes/blueberry, -/turf/open/floor/plasteel, -/area/centcom) "dMa" = ( /obj/item/radio{ pixel_x = 5; @@ -9108,20 +9090,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel, /area/centcom/supply) -"hba" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 5 - }, -/obj/item/clothing/head/cowboy/sec/minutemen{ - pixel_y = 8; - pixel_x = -4 - }, -/obj/item/pen/fourcolor{ - pixel_x = 5 - }, -/turf/open/floor/plasteel, -/area/centcom) "hbh" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -9611,26 +9579,6 @@ }, /turf/open/floor/plasteel, /area/centcom/control) -"igC" = ( -/obj/structure/sign/minutemen{ - pixel_y = -28 - }, -/obj/structure/table/reinforced, -/obj/item/clothing/head/helmet/bulletproof/minutemen{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/clothing/head/helmet/bulletproof/minutemen{ - pixel_x = 3; - pixel_y = 11 - }, -/obj/machinery/light/directional/east, -/obj/item/reagent_containers/food/drinks/bottle/rum{ - pixel_x = -9; - pixel_y = 3 - }, -/turf/open/floor/plasteel, -/area/centcom) "igW" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -9965,6 +9913,18 @@ }, /turf/open/floor/plasteel, /area/centcom/control) +"iMC" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/structure/sign/clip{ + pixel_y = 28 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel, +/area/centcom) "iNA" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/corner/opaque/red, @@ -10424,6 +10384,22 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"jRf" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{ + pixel_x = 2 + }, +/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{ + pixel_x = -1; + pixel_y = -6 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel, +/area/centcom) "jTw" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/corner/opaque/green{ @@ -10688,14 +10664,6 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) -"kkC" = ( -/obj/structure/table/reinforced, -/obj/structure/sign/poster/minutemen/gold{ - pixel_y = 32 - }, -/obj/machinery/fax/admin/minutemen, -/turf/open/floor/plasteel, -/area/centcom) "kkV" = ( /obj/effect/turf_decal/corner/opaque/green{ dir = 4 @@ -11448,18 +11416,6 @@ }, /turf/open/floor/plasteel, /area/tdome/arena_source) -"lQr" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/structure/sign/minutemen{ - pixel_y = 28 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel, -/area/centcom) "lQv" = ( /obj/effect/turf_decal/corner/opaque/brown, /obj/effect/turf_decal/corner/opaque/brown{ @@ -11559,6 +11515,24 @@ }, /turf/open/floor/plasteel, /area/centcom) +"man" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/assault/skm/inteq{ + pixel_y = 3 + }, +/obj/item/gun/ballistic/automatic/assault/skm/inteq{ + pixel_y = -1; + pixel_x = -5 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel, +/area/centcom) "mbm" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -12581,24 +12555,6 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) -"odH" = ( -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/gun/ballistic/automatic/assault/skm/inteq{ - pixel_y = 3 - }, -/obj/item/gun/ballistic/automatic/assault/skm/inteq{ - pixel_y = -1; - pixel_x = -5 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel, -/area/centcom) "odV" = ( /obj/structure/chair/office{ dir = 8 @@ -13652,6 +13608,14 @@ }, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) +"qap" = ( +/obj/structure/table/reinforced, +/obj/structure/sign/poster/clip/gold{ + pixel_y = 32 + }, +/obj/machinery/fax/admin/minutemen, +/turf/open/floor/plasteel, +/area/centcom) "qdG" = ( /obj/effect/turf_decal/corner/transparent/neutral, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -14312,7 +14276,7 @@ /area/centcom/control) "rvC" = ( /obj/structure/table/reinforced, -/obj/item/radio/headset/minutemen/alt/captain{ +/obj/item/radio/headset/clip/alt/captain{ pixel_y = 2; pixel_x = 1 }, @@ -14393,6 +14357,28 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"rIP" = ( +/obj/structure/table/reinforced, +/obj/structure/sign/poster/clip/bard{ + pixel_y = -32 + }, +/obj/item/ammo_box/magazine/p16{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/p16{ + pixel_x = 1; + pixel_y = 2 + }, +/obj/item/ammo_casing{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/ammo_casing{ + pixel_x = 11 + }, +/turf/open/floor/plasteel, +/area/centcom) "rJp" = ( /obj/item/storage/firstaid/regular, /obj/structure/table, @@ -14650,6 +14636,26 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"slo" = ( +/obj/structure/sign/clip{ + pixel_y = -28 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/head/helmet/bulletproof/x11/clip{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/clothing/head/helmet/bulletproof/x11/clip{ + pixel_x = 3; + pixel_y = 11 + }, +/obj/machinery/light/directional/east, +/obj/item/reagent_containers/food/drinks/bottle/rum{ + pixel_x = -9; + pixel_y = 3 + }, +/turf/open/floor/plasteel, +/area/centcom) "slp" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -15189,22 +15195,6 @@ }, /turf/open/floor/plasteel, /area/centcom/supply) -"tvO" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/structure/rack, -/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{ - pixel_x = 2 - }, -/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{ - pixel_x = -1; - pixel_y = -6 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel, -/area/centcom) "tyg" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 @@ -16252,6 +16242,16 @@ }, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) +"wbr" = ( +/obj/structure/sign/clip{ + pixel_y = -28 + }, +/obj/machinery/light/directional/west, +/obj/machinery/telecomms/relay/preset/minutemen{ + autolinkers = list("relay") + }, +/turf/open/floor/plasteel, +/area/centcom) "wbx" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/weldingtool/experimental, @@ -16470,7 +16470,7 @@ /area/centcom) "wCp" = ( /obj/structure/table/wood/fancy/blue, -/obj/item/folder/solgov/red{ +/obj/item/folder/documents/solgov{ pixel_x = -3 }, /obj/item/folder/solgov{ @@ -26673,11 +26673,11 @@ psm aPu aaa hzJ -lQr +iMC moE qVq qVq -bIJ +wbr hzJ aaa aaa @@ -26930,7 +26930,7 @@ eqM aPu aaa hzJ -hba +dGh wad pTR gaU @@ -27187,7 +27187,7 @@ unc iSo aaa hzJ -kkC +qap pvW iWI hBf @@ -27448,7 +27448,7 @@ qVq tGR kiC bUH -bRF +rIP hzJ aaa aaa @@ -27701,11 +27701,11 @@ gsx aPu aaa hzJ -dKW +bpl qVq qVq aIF -igC +slo hzJ aaa aaa @@ -30781,7 +30781,7 @@ nYZ mGE rUa mGE -odH +man aPu aaa eAJ @@ -31809,7 +31809,7 @@ lKP sQw rjV sQw -tvO +jRf aPu aaa eAJ diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index 29ac7afbc65..987c9f97094 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -1197,6 +1197,13 @@ }, /turf/open/floor/plasteel/tech, /area/outpost/crew/cryo) +"eF" = ( +/obj/structure/table/glass, +/obj/machinery/fax/admin/outpost{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/outpost/operations) "eH" = ( /obj/structure/railing/wood{ dir = 4 @@ -3783,6 +3790,9 @@ }, /turf/open/floor/concrete/tiles, /area/outpost/hallway/central) +"nV" = ( +/turf/closed/indestructible/fakeglass, +/area/outpost/engineering/atmospherics) "nX" = ( /turf/open/floor/wood, /area/outpost/crew/bar) @@ -10091,6 +10101,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/ridged, /area/outpost/crew/canteen) +"Jj" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/decal/cleanable/generic, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/item/radio/intercom/directional/north{ + icon_state = "clip_headset" + }, +/turf/open/floor/plasteel/tech, +/area/outpost/cargo/office) "Jm" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood/corner{ @@ -10973,22 +10999,6 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/outpost/engineering/atmospherics) -"Mg" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/decal/cleanable/generic, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/radio/intercom/directional/north{ - icon_state = "cmm_headset" - }, -/turf/open/floor/plasteel/tech, -/area/outpost/cargo/office) "Mi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -12127,6 +12137,12 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/outpost/crew/library) +"Qk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/closed/indestructible/fakeglass, +/area/outpost/engineering/atmospherics) "Ql" = ( /obj/structure/rack, /obj/effect/turf_decal/box/corners, @@ -13488,12 +13504,6 @@ }, /turf/open/floor/plating, /area/outpost/maintenance/fore) -"UX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/closed/indestructible/fakeglass, -/area/outpost/engineering/atmospherics) "UY" = ( /obj/structure/table/wood, /obj/item/trash/plate{ @@ -13593,9 +13603,6 @@ }, /turf/open/floor/plasteel/rockvault, /area/outpost/operations) -"Vm" = ( -/turf/closed/indestructible/fakeglass, -/area/outpost/engineering/atmospherics) "Vn" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -13803,13 +13810,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/wood, /area/outpost/hallway/central) -"We" = ( -/obj/structure/table/glass, -/obj/machinery/fax/admin/outpost{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/dark, -/area/outpost/operations) "Wi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -23407,11 +23407,11 @@ Zp Zp pU vD -Vm +nV my LO CE -Vm +nV QU pU Qq @@ -23530,11 +23530,11 @@ Zp Zp pU rP -Vm +nV my LO CE -Vm +nV qc pU dX @@ -23653,11 +23653,11 @@ Zp Zp pU vD -Vm +nV my mz ye -Vm +nV QU pU dU @@ -23809,7 +23809,7 @@ cX Mt Mt lS -Mg +Jj TR ex RR @@ -23899,11 +23899,11 @@ Zp Zp pU lr -Vm +nV my mz ye -Vm +nV QA pU gP @@ -24022,11 +24022,11 @@ Zp Zp pU ui -Vm +nV my mz ye -Vm +nV qp pU Hh @@ -24145,11 +24145,11 @@ Zp Zp pU lr -Vm +nV my mz ye -Vm +nV QA pU OA @@ -24391,11 +24391,11 @@ Zp Zp pU Di -Vm +nV my mz PE -Vm +nV tj pU NA @@ -24514,11 +24514,11 @@ Zp Zp pU BH -Vm +nV MZ Ck ye -Vm +nV tj pU vk @@ -24637,11 +24637,11 @@ Zp Zp pU Tu -Vm +nV ke hO bW -Vm +nV tj pU gP @@ -24761,9 +24761,9 @@ Zp pU pU pU -Vm -UX -Vm +nV +Qk +nV pU pU pU @@ -26241,7 +26241,7 @@ EN wS wS aG -We +eF Ke wS cH diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 852e422343f..79c924cc348 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -71,7 +71,7 @@ "ACLF", "GEC", "DONK", - "COLONIAL MINUTEMEN", + "CLIP MINUTEMEN", "SAINT-ROUMAIN", "INSTALLATION", "SOLGOV", diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index ef0e3a0ade9..e8bf634e863 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -322,13 +322,42 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/machinery/fax, +/obj/machinery/fax/indie, /obj/machinery/airalarm/directional/north, /obj/machinery/camera/autoname{ dir = 6 }, /turf/open/floor/plasteel/tech, /area/ship/bridge) +"dB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/closet/wall/blue{ + dir = 4; + name = "Janitorial Closet"; + pixel_x = -28 + }, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/soap/deluxe, +/obj/item/reagent_containers/glass/rag, +/obj/item/clothing/gloves/color/latex/nitrile/evil, +/obj/item/clothing/head/soft/purple{ + pixel_x = 5 + }, +/obj/item/clothing/shoes/galoshes{ + pixel_x = 7; + pixel_y = -8 + }, +/obj/item/storage/box/mousetraps{ + pixel_y = -3; + pixel_x = -9 + }, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew/dorm) "dC" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 1 @@ -3325,30 +3354,6 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/hallway/central) -"FF" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/toggle/lawyer/burgundy{ - pixel_y = -3 - }, -/obj/item/clothing/head/beanie/stripedgreen{ - pixel_x = 2; - pixel_y = -5 - }, -/obj/item/clothing/glasses/regular/hipster, -/obj/machinery/button/door{ - id = "beluga_dorm1_window"; - pixel_x = 10; - pixel_y = -23; - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/obj/item/clothing/under/suit/charcoal, -/obj/item/clothing/glasses/monocle, -/obj/item/clothing/shoes/laceup{ - pixel_y = -11 - }, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew) "FH" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) @@ -3426,35 +3431,6 @@ }, /turf/open/floor/carpet/nanoweave/orange, /area/ship/security) -"Hb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/closet/wall/blue{ - dir = 4; - name = "Janitorial Closet"; - pixel_x = -28 - }, -/obj/item/mop, -/obj/item/reagent_containers/glass/bucket, -/obj/item/soap/deluxe, -/obj/item/reagent_containers/glass/rag, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/head/soft/purple{ - pixel_x = 5 - }, -/obj/item/clothing/shoes/galoshes{ - pixel_x = 7; - pixel_y = -8 - }, -/obj/item/storage/box/mousetraps{ - pixel_y = -3; - pixel_x = -9 - }, -/turf/open/floor/carpet/nanoweave/beige, -/area/ship/crew/dorm) "Hc" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/light/directional/north, @@ -3964,6 +3940,30 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/library) +"Lj" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/toggle/lawyer/burgundy{ + pixel_y = -3 + }, +/obj/item/clothing/head/beanie/stripedgreen{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/clothing/glasses/regular/hipster, +/obj/machinery/button/door{ + id = "beluga_dorm1_window"; + pixel_x = 10; + pixel_y = -23; + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/obj/item/clothing/under/suit/charcoal, +/obj/item/clothing/glasses/monocle, +/obj/item/clothing/shoes/laceup{ + pixel_y = -11 + }, +/turf/open/floor/carpet/nanoweave/beige, +/area/ship/crew) "Lr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -4538,29 +4538,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) -"RW" = ( -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/structure/closet/wall/red{ - dir = 1; - name = "Officer's Locker"; - pixel_y = -28 - }, -/obj/item/clothing/shoes/combat, -/obj/item/storage/belt/security/webbing/inteq, -/obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/item/clothing/mask/gas/sechailer/inteq, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/gloves/tackler/combat, -/obj/item/reagent_containers/spray/pepper{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line, -/turf/open/floor/plasteel/dark, -/area/ship/security) "Sd" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -4995,6 +4972,29 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) +"WG" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/structure/closet/wall/red{ + dir = 1; + name = "Officer's Locker"; + pixel_y = -28 + }, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/security/webbing/inteq, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/gloves/tackler/combat, +/obj/item/reagent_containers/spray/pepper{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line, +/turf/open/floor/plasteel/dark, +/area/ship/security) "WS" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -5726,7 +5726,7 @@ aF Iw pH mr -Hb +dB TG Go Kn @@ -5737,7 +5737,7 @@ bF TV Ey xe -FF +Lj bF Sv "} @@ -6071,7 +6071,7 @@ GY Sy eJ iX -RW +WG OE Sv Sv @@ -6092,7 +6092,7 @@ fV fX pk Zl -RW +WG OE Sv Sv diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm index 9001bc9faf6..3f17359288c 100644 --- a/_maps/shuttles/independent/independent_box.dmm +++ b/_maps/shuttles/independent/independent_box.dmm @@ -2589,7 +2589,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "OF" = ( -/obj/machinery/fax, +/obj/machinery/fax/indie, /obj/structure/table/reinforced, /obj/machinery/light/small/directional/north, /turf/open/floor/plasteel/dark, diff --git a/_maps/shuttles/independent/independent_halftrack.dmm b/_maps/shuttles/independent/independent_halftrack.dmm index 3b04da3c56d..1363fefa185 100644 --- a/_maps/shuttles/independent/independent_halftrack.dmm +++ b/_maps/shuttles/independent/independent_halftrack.dmm @@ -271,7 +271,7 @@ /area/ship/security/range) "hF" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/indie, /turf/open/floor/plasteel/dark, /area/ship/bridge) "hH" = ( diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm index a6312b7de61..8bd2c209481 100644 --- a/_maps/shuttles/independent/independent_rigger.dmm +++ b/_maps/shuttles/independent/independent_rigger.dmm @@ -234,7 +234,7 @@ "dH" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/west, -/obj/machinery/fax, +/obj/machinery/fax/indie, /obj/machinery/light/directional/south, /turf/open/floor/carpet/blue, /area/ship/bridge) diff --git a/_maps/shuttles/independent/independent_rube_goldberg.dmm b/_maps/shuttles/independent/independent_rube_goldberg.dmm index 1f4b5703503..d9033819dc3 100644 --- a/_maps/shuttles/independent/independent_rube_goldberg.dmm +++ b/_maps/shuttles/independent/independent_rube_goldberg.dmm @@ -1281,7 +1281,7 @@ "mj" = ( /obj/structure/table/wood, /obj/machinery/light/directional/east, -/obj/machinery/fax{ +/obj/machinery/fax/indie{ pixel_y = -5 }, /obj/effect/turf_decal/corner/opaque/yellow/border{ diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm index 78836ac3bde..612ff07c1b6 100644 --- a/_maps/shuttles/independent/independent_schmiedeberg.dmm +++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm @@ -2019,7 +2019,7 @@ /obj/item/gps{ gpstag = "PHARM1" }, -/obj/machinery/fax, +/obj/machinery/fax/indie, /obj/machinery/button/door{ dir = 4; id = "pharmbridge"; diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index 365a96a1e33..5233549f322 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -1499,7 +1499,7 @@ /obj/effect/turf_decal/corner/opaque/bottlegreen/full, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/table/wood, -/obj/machinery/fax, +/obj/machinery/fax/indie, /turf/open/floor/plasteel, /area/ship/security) "pC" = ( @@ -2047,7 +2047,7 @@ /obj/effect/turf_decal/corner/opaque/neutral/half{ dir = 1 }, -/obj/machinery/fax, +/obj/machinery/fax/indie, /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/dark, /area/ship/bridge) diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 051d96584ae..ed5ac0d11fb 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -115,7 +115,7 @@ /area/ship/hallway/fore) "bJ" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/inteq, /obj/machinery/light/directional/north, /obj/structure/cable{ icon_state = "2-8" @@ -720,7 +720,7 @@ /area/ship/security) "hx" = ( /obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/clothing/mask/gas/sechailer/inteq, +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, /obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/shoes/combat, /obj/item/storage/belt/security/webbing/inteq/alt, @@ -2631,7 +2631,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 fc586a5aa7b..e67d176f568 100644 --- a/_maps/shuttles/inteq/inteq_hound.dmm +++ b/_maps/shuttles/inteq/inteq_hound.dmm @@ -41,6 +41,25 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) +"aE" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_x = 8 + }, +/obj/item/lighter{ + pixel_x = -11; + pixel_y = 5 + }, +/obj/item/ammo_box/a762_40/inteq{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "aX" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ @@ -558,49 +577,6 @@ /obj/item/tank/jetpack/oxygen, /turf/open/floor/plasteel/tech/grid, /area/ship/storage/eva) -"nD" = ( -/obj/item/ammo_box/magazine/co9mm{ - pixel_x = 5 - }, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm{ - pixel_x = -5 - }, -/obj/item/ammo_box/magazine/co9mm{ - pixel_x = 5 - }, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/ammo_box/magazine/co9mm{ - pixel_x = -5 - }, -/obj/item/gun/ballistic/automatic/pistol/commander/inteq{ - pixel_y = 5 - }, -/obj/item/gun/ballistic/automatic/pistol/commander/inteq, -/obj/item/gun/ballistic/automatic/pistol/commander/inteq{ - pixel_y = -5 - }, -/obj/item/ammo_box/magazine/skm_762_40{ - pixel_x = -7 - }, -/obj/item/ammo_box/magazine/skm_762_40{ - pixel_x = 7 - }, -/obj/item/gun/ballistic/automatic/assault/skm/inteq{ - pixel_x = -5 - }, -/obj/structure/closet/secure_closet/wall{ - dir = 1; - icon_state = "sec_wall"; - name = "weapons lockup"; - pixel_y = -28; - req_one_access_txt = "58" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/carpet/orange, -/area/ship/bridge) "nL" = ( /obj/structure/railing, /obj/effect/turf_decal/borderfloorblack{ @@ -988,6 +964,32 @@ /obj/item/storage/toolbox/ammo/c9mm, /turf/open/floor/plasteel/patterned, /area/ship/cargo) +"va" = ( +/obj/structure/closet/secure_closet/wall{ + dir = 4; + icon_door = "solgov_wall"; + icon_state = "solgov_wall"; + name = "vanguard's locker"; + pixel_x = -28; + req_access_txt = "58" + }, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, +/obj/item/clothing/gloves/tackler/combat/insulated, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/military/assault, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/megaphone/command, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/suit/armor/hos/inteq, +/obj/item/clothing/head/beret/sec/hos/inteq, +/obj/item/radio/headset/inteq/alt/captain, +/obj/item/areaeditor/shuttle, +/obj/item/shield/riot/tele, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "ve" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/corner/opaque/yellow, @@ -1358,6 +1360,49 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) +"Ek" = ( +/obj/item/ammo_box/magazine/co9mm{ + pixel_x = 5 + }, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm{ + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/co9mm{ + pixel_x = 5 + }, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm{ + pixel_x = -5 + }, +/obj/item/gun/ballistic/automatic/pistol/commander/inteq{ + pixel_y = 5 + }, +/obj/item/gun/ballistic/automatic/pistol/commander/inteq, +/obj/item/gun/ballistic/automatic/pistol/commander/inteq{ + pixel_y = -5 + }, +/obj/item/ammo_box/magazine/skm_762_40{ + pixel_x = -7 + }, +/obj/item/ammo_box/magazine/skm_762_40{ + pixel_x = 7 + }, +/obj/item/gun/ballistic/automatic/assault/skm/inteq{ + pixel_x = -5 + }, +/obj/structure/closet/secure_closet/wall{ + dir = 1; + icon_state = "sec_wall"; + name = "weapons lockup"; + pixel_y = -28; + req_one_access_txt = "58" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "EC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -1598,32 +1643,6 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) -"Ix" = ( -/obj/structure/closet/secure_closet/wall{ - dir = 4; - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; - name = "vanguard's locker"; - pixel_x = -28; - req_access_txt = "58" - }, -/obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/clothing/mask/gas/sechailer/inteq, -/obj/item/clothing/gloves/tackler/combat/insulated, -/obj/item/clothing/shoes/combat, -/obj/item/storage/belt/military/assault, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/megaphone/command, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/suit/armor/hos/inteq, -/obj/item/clothing/head/beret/sec/hos/inteq, -/obj/item/radio/headset/inteq/alt/captain, -/obj/item/areaeditor/shuttle, -/obj/item/shield/riot/tele, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet/orange, -/area/ship/bridge) "ID" = ( /obj/structure/sign/number/one, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -2075,7 +2094,7 @@ "RM" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/fax, +/obj/machinery/fax/inteq, /turf/open/floor/carpet/orange, /area/ship/bridge) "Sh" = ( @@ -2375,25 +2394,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/dorm) -"Zy" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/cigarettes/cigars{ - pixel_x = 8 - }, -/obj/item/lighter{ - pixel_x = -11; - pixel_y = 5 - }, -/obj/item/ammo_box/a762_40/inteq{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_x = -7; - pixel_y = 6 - }, -/turf/open/floor/carpet/orange, -/area/ship/bridge) "ZR" = ( /obj/machinery/power/smes/engineering{ charge = 1e+006 @@ -2797,7 +2797,7 @@ ib ib GB mw -Ix +va Ki of NI @@ -2816,9 +2816,9 @@ ib ib ib Yj -Zy +aE DB -nD +Ek pe ne Pk diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index ef86f6f2a7c..c8bdcb1bd3b 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1160,7 +1160,7 @@ /area/ship/hallway/central) "hK" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/inteq, /obj/machinery/button/door{ id = "talos_bridge"; name = "Bridge Shutters"; @@ -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, @@ -3595,7 +3595,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" @@ -7503,7 +7503,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, @@ -7557,7 +7557,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 8aaf959387a..ede8c585a5c 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -508,29 +508,16 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"em" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/airlock/command{ - name = "Bridge"; - dir = 8; - req_access = list(19) - }, -/obj/structure/cable{ - icon_state = "4-8" +"el" = ( +/obj/docking_port/mobile{ + can_move_docking_ports = 1; + dir = 2; + name = "valor docking port"; + port_direction = 8; + preferred_direction = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/port) "ew" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -684,20 +671,6 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/patterned/ridged, /area/ship/crew/office) -"fQ" = ( -/obj/structure/bed/dogbed{ - name = "Picket's bed"; - anchored = 1; - desc = "A comfy-looking dog bed. Despite the name, the owner is a cat." - }, -/mob/living/simple_animal/pet/cat{ - dir = 4; - name = "Picket"; - desc = "Guardian of the bridge and the Honorable Corpsman's bedsheets." - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/carpet/blue, -/area/ship/bridge) "gb" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 10 @@ -987,6 +960,21 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"iW" = ( +/obj/structure/table, +/obj/item/phone{ + pixel_x = -14 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/jukebox/boombox{ + pixel_x = 3; + pixel_y = 2 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "jj" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -1132,15 +1120,28 @@ }, /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) -"kv" = ( -/obj/structure/bed, -/obj/item/bedsheet/cmo{ - name = "honorable corpsman's bedsheet"; - desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Picket." +"kx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/curtain/cloth, -/obj/machinery/light/directional/west, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/command{ + dir = 8; + name = "Bridge"; + req_access = list(19) + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "ky" = ( /obj/structure/catwalk/over/plated_catwalk/dark, @@ -1363,21 +1364,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"ml" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "valor_cargo" - }, -/obj/machinery/power/shieldwallgen/atmos{ - dir = 1; - id = "valor_holo"; - anchored = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/cargo) "mp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1538,29 +1524,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"nx" = ( -/obj/structure/railing{ - dir = 6 - }, -/obj/item/target{ - pixel_y = 10; - pixel_x = -9 - }, -/obj/item/target/alien{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/target{ - pixel_x = -8; - pixel_y = 2 - }, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/obj/structure/rack, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "nz" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -1683,6 +1646,21 @@ "oO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew/office) +"oS" = ( +/obj/machinery/door/poddoor{ + dir = 4; + id = "valor_cargo" + }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1; + id = "valor_holo" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/cargo) "pa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1985,6 +1963,24 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/dark, /area/ship/security) +"sb" = ( +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/light/directional/south, +/obj/structure/sign/poster/contraband/tools{ + pixel_x = -32 + }, +/obj/effect/turf_decal/corner_techfloor_gray/full, +/obj/machinery/cell_charger, +/turf/open/floor/plating, +/area/ship/maintenance/port) "sc" = ( /obj/structure/rack, /obj/machinery/firealarm/directional/east, @@ -2157,6 +2153,29 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"tf" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/item/chair/plastic, +/obj/item/chair/plastic{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/chair/plastic{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/chair/plastic{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/structure/rack, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "tj" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ @@ -2309,6 +2328,20 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) +"vd" = ( +/obj/machinery/door/poddoor{ + dir = 4; + id = "valor_cargo" + }, +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + id = "valor_holo" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/cargo) "vh" = ( /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/inteq, @@ -2358,18 +2391,6 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"vI" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/machinery/smartfridge/bloodbank/preloaded{ - pixel_y = 32; - density = 0 - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical) "vK" = ( /obj/machinery/cryopod{ dir = 1 @@ -2392,6 +2413,19 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/canteen) +"wb" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/structure/table, +/obj/item/storage/box/cups{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "wc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2534,6 +2568,29 @@ /obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw, /turf/open/floor/plasteel/dark, /area/ship/medical) +"xr" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/folder/white{ + pixel_x = -15; + pixel_y = -1 + }, +/obj/item/pen, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/toy/figure/paramedic{ + name = "Corpsman action figure"; + pixel_x = -13; + pixel_y = 14 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/crew/office) "xs" = ( /obj/machinery/iv_drip, /obj/machinery/light/directional/south, @@ -2595,16 +2652,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) -"xU" = ( -/obj/docking_port/mobile{ - can_move_docking_ports = 1; - name = "valor docking port"; - port_direction = 8; - preferred_direction = 4; - dir = 2 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/port) "yb" = ( /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 @@ -2682,29 +2729,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/ship/security) -"ze" = ( -/obj/item/clothing/mask/gas/sechailer/inteq, -/obj/item/clothing/gloves/tackler/combat/insulated, -/obj/item/clothing/shoes/combat, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/megaphone/command, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/suit/armor/hos/inteq, -/obj/item/clothing/head/beret/sec/hos/inteq, -/obj/structure/closet/secure_closet/wall{ - dir = 4; - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; - name = "vanguard's locker"; - pixel_x = -28; - req_access = list(58) - }, -/obj/item/storage/lockbox/medal/sec, -/obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/clothing/head/inteq_peaked, -/turf/open/floor/carpet/orange, -/area/ship/bridge) "zh" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/port) @@ -2733,7 +2757,7 @@ dir = 8 }, /obj/machinery/airalarm/directional/south, -/obj/machinery/fax{ +/obj/machinery/fax/inteq{ pixel_y = 3 }, /turf/open/floor/plasteel/dark, @@ -2759,6 +2783,18 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) +"zC" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/smartfridge/bloodbank/preloaded{ + density = 0; + pixel_y = 32 + }, +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/open/floor/plasteel/mono/dark, +/area/ship/medical) "zD" = ( /obj/machinery/computer/operating{ dir = 4 @@ -2920,6 +2956,19 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) +"Au" = ( +/obj/structure/rack, +/obj/item/roller, +/obj/item/roller{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/roller{ + pixel_x = 1; + pixel_y = 16 + }, +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/cargo) "Av" = ( /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) @@ -2988,6 +3037,23 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) +"AT" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/bag/tray{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/snacks/burger/plain{ + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "AV" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 @@ -3243,6 +3309,24 @@ }, /turf/open/floor/plasteel/tech, /area/ship/medical) +"DQ" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/item/flashlight/lamp{ + pixel_x = -13; + pixel_y = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "DR" = ( /obj/machinery/door/airlock/hatch{ name = "Cargo Bay" @@ -3751,23 +3835,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"IQ" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/bag/tray{ - pixel_y = 5; - pixel_x = -1 - }, -/obj/item/reagent_containers/food/drinks/soda_cans/cola{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/snacks/burger/plain{ - pixel_y = 3; - pixel_x = -4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) "Jd" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -3815,21 +3882,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"Jz" = ( -/obj/structure/table, -/obj/item/phone{ - pixel_x = -14 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/jukebox/boombox{ - pixel_y = 2; - pixel_x = 3 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) "JC" = ( /obj/machinery/door/poddoor{ dir = 4; @@ -3856,6 +3908,16 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"JT" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 15; + height = 15; + name = "valor dock"; + width = 15 + }, +/turf/template_noop, +/area/template_noop) "Kh" = ( /turf/open/floor/carpet/blue, /area/ship/bridge) @@ -3943,18 +4005,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"KC" = ( -/obj/structure/table, -/obj/item/folder{ - pixel_y = 4; - pixel_x = -3 - }, -/obj/item/folder/blue{ - pixel_x = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) "KD" = ( /obj/machinery/iv_drip, /turf/open/floor/plasteel/white, @@ -4032,6 +4082,38 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"Lq" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_x = 4; + pixel_y = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/machinery/button/door{ + dir = 8; + id = "valor_bridge"; + name = "Bridge Shutters"; + pixel_x = -9; + pixel_y = 8 + }, +/obj/machinery/button/door{ + dir = 8; + id = "valor_external"; + name = "External Shutters"; + pixel_x = -9; + pixel_y = -4 + }, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 4; + pixel_y = -6 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "Ls" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -4158,24 +4240,6 @@ }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/cargo) -"MS" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/item/flashlight/lamp{ - pixel_y = 10; - pixel_x = -13 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) "Nh" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/cargo) @@ -4198,30 +4262,6 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew/canteen) -"Nu" = ( -/obj/structure/closet/secure_closet/wall{ - dir = 4; - pixel_x = -28; - req_access = list(19); - name = "honorable corpsman's locker" - }, -/obj/item/clothing/shoes/combat, -/obj/item/megaphone/command, -/obj/item/clothing/under/syndicate/inteq/corpsman, -/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, -/obj/item/clothing/suit/armor/hos/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/storage/backpack/messenger/med, -/obj/item/clothing/head/beret/sec/brig_phys{ - icon_state = "beret_med"; - name = "honorable corpsman beret"; - desc = "A beret made out of white reinforced fabric with a lue cross emblazoned on it. Smells faintly of blood and gauze." - }, -/obj/item/clothing/glasses/hud/health/sunglasses, -/obj/item/storage/box/hypospray/CMO, -/obj/item/clothing/gloves/color/latex/nitrile, -/turf/open/floor/carpet/blue, -/area/ship/bridge) "NA" = ( /obj/effect/turf_decal/trimline/opaque/brown/filled/warning, /obj/effect/turf_decal/siding/thinplating/dark, @@ -4295,24 +4335,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/hallway/port) -"NT" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/poster/contraband/tools{ - pixel_x = -32 - }, -/obj/effect/turf_decal/corner_techfloor_gray/full, -/obj/machinery/cell_charger, -/turf/open/floor/plating, -/area/ship/maintenance/port) "NZ" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/structure/cable{ @@ -4323,6 +4345,29 @@ /obj/effect/turf_decal/trimline/opaque/brown/line, /turf/open/floor/plasteel/dark, /area/ship/medical) +"Oc" = ( +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq, +/obj/item/clothing/gloves/tackler/combat/insulated, +/obj/item/clothing/shoes/combat, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/megaphone/command, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/suit/armor/hos/inteq, +/obj/item/clothing/head/beret/sec/hos/inteq, +/obj/structure/closet/secure_closet/wall{ + dir = 4; + icon_door = "solgov_wall"; + icon_state = "solgov_wall"; + name = "vanguard's locker"; + pixel_x = -28; + req_access = list(58) + }, +/obj/item/storage/lockbox/medal/sec, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/head/inteq_peaked, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "Od" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -4365,6 +4410,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned, /area/ship/cargo) +"Oz" = ( +/obj/structure/table, +/obj/item/folder{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/folder/blue{ + pixel_x = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "OC" = ( /obj/structure/bed, /obj/structure/curtain, @@ -4382,38 +4439,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"OE" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/wideband/table{ - dir = 4; - pixel_x = 4; - pixel_y = 8 - }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/machinery/button/door{ - pixel_x = -9; - dir = 8; - pixel_y = 8; - name = "Bridge Shutters"; - id = "valor_bridge" - }, -/obj/machinery/button/door{ - pixel_x = -9; - dir = 8; - pixel_y = -4; - id = "valor_external"; - name = "External Shutters" - }, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 4; - pixel_y = -6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "OK" = ( /obj/machinery/iv_drip/saline, /turf/open/floor/plasteel/patterned/ridged, @@ -4668,36 +4693,6 @@ "Rh" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/security) -"Rj" = ( -/obj/structure/toilet/secret{ - secret_type = "/obj/item/toy/plush/moth"; - dir = 8 - }, -/turf/open/floor/plasteel/patterned/brushed, -/area/ship/crew/canteen) -"Rz" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/item/chair/plastic, -/obj/item/chair/plastic{ - pixel_y = 3; - pixel_x = -3 - }, -/obj/item/chair/plastic{ - pixel_y = 6; - pixel_x = 2 - }, -/obj/item/chair/plastic{ - pixel_y = 8; - pixel_x = -3 - }, -/obj/structure/rack, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "RA" = ( /obj/item/storage/backpack/messenger/inteq, /obj/item/storage/backpack/messenger/inteq, @@ -4724,6 +4719,37 @@ /obj/structure/rack, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"RR" = ( +/obj/structure/closet/secure_closet/wall{ + dir = 4; + name = "honorable corpsman's locker"; + pixel_x = -28; + req_access = list(19) + }, +/obj/item/clothing/shoes/combat, +/obj/item/megaphone/command, +/obj/item/clothing/under/syndicate/inteq/corpsman, +/obj/item/clothing/under/syndicate/inteq/skirt/corpsman, +/obj/item/clothing/suit/armor/hos/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/storage/backpack/messenger/med, +/obj/item/clothing/head/beret/sec/brig_phys{ + desc = "A beret made out of white reinforced fabric with a lue cross emblazoned on it. Smells faintly of blood and gauze."; + icon_state = "beret_med"; + name = "honorable corpsman beret" + }, +/obj/item/clothing/glasses/hud/health/sunglasses, +/obj/item/storage/box/hypospray/CMO, +/obj/item/clothing/gloves/color/latex/nitrile, +/turf/open/floor/carpet/blue, +/area/ship/bridge) +"RT" = ( +/obj/structure/toilet/secret{ + dir = 8; + secret_type = "/obj/item/toy/plush/moth" + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew/canteen) "Sd" = ( /obj/effect/turf_decal/siding/thinplating, /obj/machinery/light/directional/south, @@ -4808,6 +4834,29 @@ "Tw" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/hallway/central) +"TB" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/item/target{ + pixel_x = -9; + pixel_y = 10 + }, +/obj/item/target/alien{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/target{ + pixel_x = -8; + pixel_y = 2 + }, +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/borderfloor{ + dir = 4 + }, +/obj/structure/rack, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "TC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4832,19 +4881,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"TS" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/structure/table, -/obj/item/storage/box/cups{ - pixel_y = 7; - pixel_x = -3 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) "TW" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -4862,20 +4898,6 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) -"Ug" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "valor_cargo" - }, -/obj/machinery/power/shieldwallgen/atmos{ - id = "valor_holo"; - anchored = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/cargo) "Ui" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 @@ -4919,16 +4941,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"Uv" = ( -/obj/docking_port/stationary{ - height = 15; - width = 15; - name = "valor dock"; - dwidth = 15; - dir = 8 - }, -/turf/template_noop, -/area/template_noop) "Uz" = ( /obj/machinery/power/smes/engineering{ charge = 1e+006 @@ -5082,29 +5094,16 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"Wd" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/folder/white{ - pixel_x = -15; - pixel_y = -1 - }, -/obj/item/pen, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/toy/figure/paramedic{ - pixel_x = -13; - pixel_y = 14; - name = "Corpsman action figure" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +"Wo" = ( +/obj/structure/bed, +/obj/item/bedsheet/cmo{ + desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Picket."; + name = "honorable corpsman's bedsheet" }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/office) +/obj/structure/curtain/cloth, +/obj/machinery/light/directional/west, +/turf/open/floor/carpet/blue, +/area/ship/bridge) "Wp" = ( /obj/machinery/door/airlock/hatch{ name = "Port Hallway" @@ -5405,6 +5404,20 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) +"Zc" = ( +/obj/structure/bed/dogbed{ + anchored = 1; + desc = "A comfy-looking dog bed. Despite the name, the owner is a cat."; + name = "Picket's bed" + }, +/mob/living/simple_animal/pet/cat{ + desc = "Guardian of the bridge and the Honorable Corpsman's bedsheets."; + dir = 4; + name = "Picket" + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/carpet/blue, +/area/ship/bridge) "Zd" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -5430,19 +5443,6 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"Zr" = ( -/obj/structure/rack, -/obj/item/roller, -/obj/item/roller{ - pixel_y = 8; - pixel_x = -1 - }, -/obj/item/roller{ - pixel_y = 16; - pixel_x = 1 - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) "Zu" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security) @@ -5475,7 +5475,7 @@ /area/ship/crew/dorm) (1,1,1) = {" -xU +el MK MK MK @@ -5490,7 +5490,7 @@ Td Td Td Td -Uv +JT Td Td Td @@ -5545,7 +5545,7 @@ cu pL wS Pb -NT +sb cu Td Td @@ -5553,13 +5553,13 @@ Td Td Td Nh -Ug +vd JC JC JC JC JC -ml +oS Nh Td Td @@ -5626,7 +5626,7 @@ OM OM UO LH -Rz +tf xj Td Td @@ -5742,7 +5742,7 @@ LI Zu kK LR -MS +DQ FZ hl NM @@ -5874,7 +5874,7 @@ LI tZ Xx Gm -Wd +xr Hg tS HC @@ -5892,7 +5892,7 @@ HL ec xg xj -Zr +Au Re OK LI @@ -5950,7 +5950,7 @@ Sh Hw ux ct -nx +TB AM NG dO @@ -5995,7 +5995,7 @@ Yx Io mt LI -vI +zC Ye mw mw @@ -6248,7 +6248,7 @@ HK Jh Av VB -KC +Oz zL Us Tu @@ -6380,12 +6380,12 @@ HK Jh Av Av -Jz +iW UC EL -IQ +AT ET -TS +wb HK Ct Td @@ -6447,7 +6447,7 @@ dI nk nk nk -em +kx nk nk nk @@ -6479,10 +6479,10 @@ Nn ni nk AG -ze +Oc ND -Nu -kv +RR +Wo nk nZ HQ @@ -6515,10 +6515,10 @@ bS Am KY Kh -fQ +Zc nk wa -Rj +RT HK Td Td @@ -6612,7 +6612,7 @@ Td jS nk zi -OE +Lq fK nk jS diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index f8eaba0a6fb..c93d0cc7f0a 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, @@ -917,7 +917,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, @@ -1952,7 +1952,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, @@ -2919,7 +2919,7 @@ /area/ship/bridge) "TQ" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/inteq, /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm deleted file mode 100644 index a4dcffa117d..00000000000 --- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm +++ /dev/null @@ -1,6939 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ab" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom/directional/east, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/item/camera, -/obj/item/firing_pin, -/obj/item/folder/red, -/obj/item/taperecorder, -/turf/open/floor/carpet/red, -/area/ship/security) -"ae" = ( -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/structure/grille, -/turf/open/floor/plating, -/area/ship/engineering) -"am" = ( -/obj/machinery/door/airlock/medical{ - name = "Mourge" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/dark, -/area/ship/medical/morgue) -"ay" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals1, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_reception_lockdown"; - name = "Lockdown Shutters" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"aJ" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"aP" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/mecha_wreckage/odysseus, -/turf/open/floor/plasteel/dark{ - icon_state = "grid" - }, -/area/ship/cargo) -"aT" = ( -/obj/machinery/door/airlock/medical/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/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/crew/office) -"aU" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/machinery/medical_kiosk, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"aW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/chair/comfy/black{ - dir = 1 - }, -/obj/effect/landmark/start/depsec, -/obj/structure/sign/poster/official/safety_report{ - pixel_x = 32 - }, -/turf/open/floor/carpet/red, -/area/ship/security) -"be" = ( -/obj/machinery/computer/helm{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"bp" = ( -/obj/structure/sign/number/eight, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"bx" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"bG" = ( -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"bQ" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"bU" = ( -/obj/machinery/smartfridge/organ, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "floor6-old"; - pixel_x = 12 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "grid" - }, -/area/ship/medical/morgue) -"bV" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/cargo) -"cc" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/smartfridge/bloodbank/preloaded{ - density = 0; - pixel_x = -32 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"ce" = ( -/obj/structure/table/glass, -/obj/machinery/door/window/southleft{ - dir = 1 - }, -/obj/item/reagent_containers/glass/bottle/diethylamine{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/polonium{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/ethanol{ - pixel_x = 1 - }, -/obj/item/reagent_containers/glass/bottle/hydrogen{ - pixel_x = -9 - }, -/obj/item/reagent_containers/glass/bottle/carbon{ - pixel_x = 11 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"ck" = ( -/obj/item/rcl/ghetto{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/machinery/button/door{ - id = "asclepius_intcargo"; - name = "Cargo Storage"; - pixel_x = -10; - pixel_y = 23 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"cs" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"cw" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"cF" = ( -/obj/vehicle/ridden/wheelchair{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/west, -/obj/structure/sign/warning/securearea{ - pixel_y = 32 - }, -/obj/machinery/camera/autoname{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"cG" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"dh" = ( -/obj/machinery/modular_computer/console/preset/command, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"dk" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/emcloset/wall{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"dl" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastleft{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - id = "asclepius_engineering_shutters"; - name = "Engineering Blast Doors"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"dJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/structure/grille, -/turf/open/floor/plating, -/area/ship/engineering) -"dT" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"dW" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical/surgery) -"dY" = ( -/obj/machinery/vending/cigarette, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel{ - icon_state = "ridged" - }, -/area/ship/hallway/central) -"el" = ( -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/engineering) -"eo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "floor6-old"; - pixel_x = 12 - }, -/turf/open/floor/plasteel/dark, -/area/ship/medical/morgue) -"eO" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"eU" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/machinery/door/poddoor{ - id = "asclepius_engineering_shutters"; - name = "Engineering Blast Doors"; - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"eW" = ( -/obj/structure/table/glass, -/obj/item/hand_labeler{ - pixel_y = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/reagent_scanner{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/item/clothing/glasses/science{ - pixel_x = -1; - pixel_y = -2 - }, -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"fb" = ( -/obj/structure/sign/number/one, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"ft" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/wood, -/area/ship/crew) -"fx" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/camera/autoname, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"fU" = ( -/obj/machinery/computer/crew/syndie{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"fW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/morgue) -"fY" = ( -/obj/structure/railing{ - dir = 1; - layer = 4.1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals3, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"ga" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_bridge_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/bridge) -"gm" = ( -/obj/effect/turf_decal/corner_techfloor_gray/diagonal{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 5 - }, -/obj/machinery/light/small/directional/east, -/obj/item/circuitboard/machine/rdserver{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/circuitboard/computer/rdconsole, -/obj/structure/closet/crate/science, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"gw" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/gloves/color/latex{ - pixel_y = -4 - }, -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/storage/pill_bottle/epinephrine{ - pixel_x = -8; - pixel_y = 11 - }, -/obj/item/reagent_containers/medigel/sterilizine{ - pixel_x = -9; - pixel_y = 7 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"gE" = ( -/obj/structure/railing{ - layer = 4.1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 6 - }, -/obj/effect/turf_decal/industrial/loading, -/obj/item/radio/intercom/directional/west, -/obj/effect/decal/cleanable/xenoblood/xgibs/larva, -/obj/item/stack/sheet/animalhide/xeno, -/obj/effect/decal/cleanable/xenoblood/xgibs, -/obj/effect/decal/cleanable/xenoblood/xgibs/up{ - pixel_x = 7; - pixel_y = 7 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "steel_dirty" - }, -/area/ship/medical/morgue) -"gG" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line, -/obj/structure/chair/greyscale{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/decal/cleanable/blood/old, -/obj/item/trash/candy{ - layer = 2.5; - pixel_x = 7; - pixel_y = 2 - }, -/obj/effect/turf_decal/minutemen{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"gJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"gQ" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/steeldecal/steel_decals3, -/obj/effect/turf_decal/steeldecal/steel_decals_central6{ - pixel_y = -4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"gS" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/ship/crew) -"hh" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"hi" = ( -/obj/effect/turf_decal/corner/opaque/blue/three_quarters{ - dir = 4 - }, -/obj/structure/bed/roller, -/obj/item/bedsheet/medical, -/obj/machinery/iv_drip, -/obj/structure/sign/departments/examroom{ - pixel_y = 25 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"hr" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/item/kirbyplants{ - icon_state = "plant-10"; - pixel_x = -9 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/ship/hallway/central) -"hu" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/newspaper{ - pixel_x = 3; - pixel_y = 1 - }, -/obj/machinery/light/directional/west, -/obj/item/paicard{ - pixel_x = 5; - pixel_y = 18 - }, -/turf/open/floor/wood, -/area/ship/crew) -"hF" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/landmark/start/paramedic, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"hG" = ( -/obj/structure/filingcabinet/security{ - pixel_x = -10 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/item/kirbyplants{ - icon_state = "plant-03"; - pixel_x = 6 - }, -/obj/item/reagent_containers/food/snacks/chocolatebar{ - pixel_x = -5 - }, -/obj/structure/sign/poster/official/ian{ - pixel_x = -32 - }, -/obj/item/dice, -/obj/item/storage/pill_bottle/neurine, -/obj/item/storage/pill_bottle/dice, -/obj/item/spacecash/bundle/c100, -/turf/open/floor/wood, -/area/ship/bridge) -"hH" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"hL" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"hO" = ( -/obj/machinery/sleeper, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/plasteel/dark, -/area/ship/medical) -"ib" = ( -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/belt/medical/webbing, -/obj/machinery/airalarm/directional/north, -/obj/structure/closet/secure_closet/medical3{ - anchored = 1 - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/crew/office) -"iH" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical/morgue) -"iL" = ( -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"iP" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"iQ" = ( -/obj/machinery/door/airlock/medical/glass{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "asclepius_medbay_lockdown"; - name = "Lockdown Shutters" - }, -/turf/open/floor/plasteel/mono, -/area/ship/cargo) -"iX" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/effect/turf_decal/industrial/warning/cee{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/machinery/airalarm/directional/south, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/clothing/suit/space/hardsuit/security/independent, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"jl" = ( -/obj/structure/railing{ - layer = 4.1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 10 - }, -/obj/effect/mapping_helpers/dead_body_placer, -/obj/effect/turf_decal/industrial/loading, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gib2-old" - }, -/turf/open/floor/plasteel/dark{ - icon_state = "steel_dirty" - }, -/area/ship/medical/morgue) -"jm" = ( -/obj/machinery/cryopod{ - dir = 1 - }, -/obj/machinery/computer/cryopod/directional/east, -/obj/effect/turf_decal/industrial/warning/cee{ - dir = 1 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew) -"jo" = ( -/obj/structure/closet/wall/white/med{ - name = "Chemistry Tools"; - pixel_y = 28 - }, -/obj/item/reagent_containers/syringe/epinephrine, -/obj/item/reagent_containers/syringe/oxandrolone{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/stack/sheet/mineral/plasma/five{ - pixel_x = -4 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/assembly/voice{ - pixel_x = 9 - }, -/obj/item/assembly/voice{ - pixel_x = 9; - pixel_y = -4 - }, -/obj/item/assembly/signaler{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/assembly/signaler{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/assembly/prox_sensor{ - pixel_y = -11 - }, -/obj/item/assembly/prox_sensor{ - pixel_y = -11 - }, -/obj/item/storage/portable_chem_mixer, -/obj/item/reagent_containers/glass/filter{ - pixel_x = 8 - }, -/obj/item/reagent_containers/glass/filter{ - pixel_x = 3 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"jG" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical/surgery) -"jR" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/hallway/central) -"jW" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -1; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/wrapping, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"kp" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 8 - }, -/obj/effect/decal/cleanable/garbage{ - pixel_x = 13; - pixel_y = -9 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"kx" = ( -/obj/effect/turf_decal/techfloor, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"kJ" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/crew) -"kN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"kV" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light/directional/west{ - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"kW" = ( -/obj/effect/turf_decal/corner_techfloor_gray/diagonal{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/stack/wrapping_paper, -/obj/item/sales_tagger, -/obj/item/pushbroom, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"lr" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/sign/departments/xenobio{ - pixel_y = 26 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "steel_dirty" - }, -/area/ship/medical/morgue) -"lu" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/office) -"lx" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/closet/firecloset, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"lR" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew) -"lW" = ( -/obj/effect/decal/cleanable/robot_debris{ - color = "#808080" - }, -/obj/item/trash/energybar{ - color = "#808080"; - layer = 2; - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/cigbutt{ - anchored = 1; - color = "#808080"; - layer = 2; - pixel_x = -4; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/greenglow{ - color = "#808080" - }, -/obj/item/trash/cheesie{ - color = "#808080"; - pixel_x = 21; - pixel_y = 1 - }, -/obj/structure/railing{ - layer = 4.1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/effect/decal/fakelattice{ - color = "#808080" - }, -/turf/open/floor/plasteel/elevatorshaft{ - color = "#808080" - }, -/area/ship/hallway/central) -"mt" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/obj/machinery/vending/cola, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"mI" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/machinery/stasis, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/plasteel/white{ - icon_state = "grid" - }, -/area/ship/medical) -"mK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/minutemen{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"mN" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/landmark/start/station_engineer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"mQ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/kirbyplants{ - icon_state = "plant-04"; - pixel_x = -7; - pixel_y = 22 - }, -/turf/open/floor/wood, -/area/ship/crew) -"mR" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/bag/trash{ - pixel_x = 5; - pixel_y = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"mT" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/machinery/vending/medical/syndicate_access, -/turf/open/floor/plasteel/white{ - icon_state = "grid" - }, -/area/ship/medical) -"nc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ - dir = 8 - }, -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"ne" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/decal/cleanable/plasma, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/number/zero{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"ni" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew) -"nj" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/closet/wall{ - icon_door = "orange_wall"; - name = "Mining equipment"; - pixel_y = 28 - }, -/obj/item/storage/bag/ore, -/obj/item/pickaxe, -/obj/item/pickaxe/drill, -/obj/item/clothing/glasses/meson, -/obj/item/gps/mining, -/obj/item/gps/mining{ - pixel_x = 4; - pixel_y = 2 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"nt" = ( -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/sign/departments/restroom{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"nw" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/flashlight/lamp{ - pixel_x = -8; - pixel_y = 13 - }, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/folder/yellow{ - pixel_x = 7; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/fancy/donut_box{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/obj/machinery/button/door{ - id = "asclepius_engineering_shutters"; - name = "Engineering Lockdown"; - pixel_x = 10; - pixel_y = 23 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) -"nF" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) -"nG" = ( -/obj/machinery/door/airlock/highsecurity, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"nI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"nU" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line, -/obj/effect/turf_decal/steeldecal/steel_decals_central4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-6" - }, -/obj/structure/cable{ - icon_state = "1-10" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"ob" = ( -/obj/machinery/door/airlock/grunge{ - name = "Bathroom" - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"oc" = ( -/obj/machinery/light/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/decal/cleanable/xenoblood{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/pen/red{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/clipboard{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = -8 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "grid" - }, -/area/ship/medical/morgue) -"ok" = ( -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"om" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"oo" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -17 - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"op" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"oB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"oV" = ( -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"oZ" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/bridge) -"pd" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/minutemen, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"ps" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"pz" = ( -/obj/structure/chair/comfy/beige, -/obj/effect/landmark/start/paramedic, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"pD" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/mineral/ore_redemption{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/dark{ - icon_state = "grid" - }, -/area/ship/cargo) -"pL" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/office) -"pQ" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"pV" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"ql" = ( -/obj/effect/turf_decal/industrial/warning{ - color = "#808080" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/machinery/button/door{ - dir = 4; - id = "asclepius_medbay_lockdown"; - name = "Medical Lockdown"; - pixel_x = -21; - pixel_y = -10 - }, -/turf/open/floor/engine{ - icon_state = "reinforced" - }, -/area/ship/medical) -"qq" = ( -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"qu" = ( -/obj/structure/curtain, -/obj/machinery/door/airlock/medical{ - name = "Surgery" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"qF" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/wrench{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) -"qM" = ( -/obj/structure/table, -/obj/item/trash/can/food{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/toy/cards/deck{ - pixel_y = 10 - }, -/obj/item/pen/edagger{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/storage/fancy/cigarettes/cigpack_robust{ - pixel_x = 6 - }, -/obj/item/lighter{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/holosign_creator/security{ - pixel_x = -14; - pixel_y = 5 - }, -/obj/item/toy/xmas_cracker, -/obj/machinery/button/door{ - dir = 8; - id = "asclepius_windowsec_shutters"; - name = "Security Shutters"; - pixel_x = 23 - }, -/turf/open/floor/carpet/red, -/area/ship/security) -"qZ" = ( -/obj/structure/sign/number/six, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"ro" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 6 - }, -/obj/machinery/button/door{ - dir = 8; - id = "asclepius_extcargo"; - name = "Cargo hatch"; - pixel_x = 23; - pixel_y = 10 - }, -/obj/machinery/button/shieldwallgen{ - dir = 8; - id = "asclepius_cargoholo"; - pixel_x = 21 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"rs" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 6 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/closet/crate/internals, -/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/item/tank/internals/emergency_oxygen/engi{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical, -/obj/structure/cable, -/obj/structure/sign/poster/official/moth/hardhats{ - pixel_x = 32 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -16 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"rw" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 9 - }, -/obj/structure/chair/greyscale{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/obj/structure/sign/minutemen{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"rA" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/dark{ - icon_state = "steel_dirty" - }, -/area/ship/medical/morgue) -"rB" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/siding/white/corner, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"rJ" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering) -"rP" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/loading{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"rU" = ( -/obj/structure/table/reinforced, -/obj/item/stack/medical/splint{ - pixel_x = 8 - }, -/obj/item/storage/firstaid/o2{ - pixel_x = -10; - pixel_y = 5 - }, -/obj/machinery/door/window/eastright{ - dir = 2 - }, -/obj/item/storage/firstaid/brute{ - pixel_x = -1; - pixel_y = 3 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"rV" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"rY" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"rZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/dark, -/area/ship/medical/morgue) -"se" = ( -/obj/machinery/chem_heater, -/obj/structure/sign/poster/official/moth/meth{ - pixel_x = 32 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"sl" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/grass/jungle/b{ - pixel_x = 1; - pixel_y = -10 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1; - pixel_x = 7 - }, -/obj/machinery/light/small/directional/west, -/obj/structure/sign/poster/official/here_for_your_safety{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating/grass, -/area/ship/cargo) -"sp" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/structure/sink/kitchen{ - pixel_y = 13 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"sy" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/phone{ - pixel_x = -11; - pixel_y = 3 - }, -/obj/item/newspaper{ - pixel_x = 6; - pixel_y = -3 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/blood/old{ - pixel_x = -15; - pixel_y = -5 - }, -/obj/item/stack/sheet/mineral/plasma/twenty{ - pixel_x = -5; - pixel_y = -9 - }, -/obj/structure/fireaxecabinet{ - pixel_y = 27 - }, -/obj/machinery/jukebox/boombox{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) -"sB" = ( -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"sN" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/medical/surgery) -"sR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"te" = ( -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"th" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/greenglow{ - pixel_y = -10 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/obj/item/kirbyplants{ - icon_state = "plant-21"; - pixel_x = -8; - pixel_y = 17 - }, -/obj/item/storage/box/maid{ - pixel_x = -10; - pixel_y = 11 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"tk" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"tm" = ( -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"tn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/east{ - light_color = "#d8b1b1" - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"tA" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"tH" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/corner, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"tO" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-5" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "asclepius_cargoholo"; - locked = 1 - }, -/obj/machinery/door/poddoor{ - id = "asclepius_extcargo"; - name = "Cargo Bay Blast Door" - }, -/turf/open/floor/plasteel{ - icon_state = "monotile_dark" - }, -/area/ship/cargo) -"ub" = ( -/obj/structure/table/glass, -/obj/structure/sign/warning/explosives/alt{ - pixel_x = 32 - }, -/obj/item/reagent_containers/glass/beaker/meta{ - pixel_x = 8 - }, -/obj/item/storage/bag/chemistry{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/storage/bag/chemistry{ - pixel_x = -7 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"ug" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 6 - }, -/obj/machinery/button/door{ - dir = 1; - id = "asclepius_reception_lockdown"; - name = "Reception Lockdown"; - pixel_y = -22 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"ui" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/chair/stool{ - dir = 1; - pixel_y = 11 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"uu" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/structure/fluff/hedge, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"uw" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/green, -/area/ship/crew) -"uD" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals9, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"uF" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "tactical chair" - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals_central4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"uU" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/item/stamp/cmo{ - pixel_x = 6; - pixel_y = 9 - }, -/obj/item/stamp{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/stamp/denied{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 1 - }, -/obj/item/pen{ - pixel_x = -6; - pixel_y = 3 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"uW" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"uX" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"vc" = ( -/obj/structure/closet/wall/white/med{ - dir = 1; - name = "paramedic equipment locker"; - pixel_y = -28 - }, -/obj/item/clothing/under/rank/medical/paramedic/emt, -/obj/item/clothing/under/rank/medical/paramedic/emt/skirt, -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/item/clothing/neck/stripedbluescarf, -/obj/item/clothing/mask/bandana/blue, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/glasses/hud/health/sunglasses, -/obj/item/healthanalyzer, -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic, -/obj/item/clothing/head/soft/paramedic, -/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/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/defibrillator/compact/loaded, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"vi" = ( -/mob/living/simple_animal/pet/penguin/baby{ - desc = "Despite his cute appearance, there is something missing in his eyes... He was never the same after that Xenomorph Hive assault"; - name = "Corporal Duke" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/bed/dogbed, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"vm" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/medical/surgery) -"vs" = ( -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"vt" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white, -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"vw" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"vO" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 4 - }, -/obj/effect/turf_decal/number/five{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"vP" = ( -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/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) -"vY" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"wb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/landmark/start/chief_medical_officer, -/turf/open/floor/wood, -/area/ship/bridge) -"wg" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"wk" = ( -/obj/structure/table/reinforced, -/obj/item/detective_scanner{ - pixel_y = 8 - }, -/obj/item/pen/survival{ - pixel_x = -4 - }, -/obj/structure/sign/warning/chemdiamond{ - pixel_x = -32 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 10; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/item/organ/liver/alien{ - pixel_x = -4; - pixel_y = -11 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"wm" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_windowsec_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/security) -"wr" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"ww" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"wD" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"wI" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"wM" = ( -/obj/machinery/vending/boozeomat/syndicate_access{ - density = 0; - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/wood, -/area/ship/hallway/central) -"wR" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/siding/white/corner, -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"wU" = ( -/obj/item/gps{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/item/megaphone/command{ - pixel_x = 3; - pixel_y = 4 - }, -/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 = -12; - pixel_y = -3 - }, -/obj/machinery/button/door{ - dir = 1; - id = "asclepius_internalbridge_shutters"; - name = "Internal Shutters"; - pixel_x = -10; - pixel_y = -23 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"wX" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/carpet/green, -/area/ship/crew) -"xz" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 10 - }, -/obj/structure/table, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/airalarm/directional/west, -/obj/item/desk_flag/trans{ - pixel_x = -10; - pixel_y = 1 - }, -/obj/item/paper/pamphlet/violent_video_games{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/paper/pamphlet/violent_video_games{ - pixel_x = 1; - pixel_y = 2 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"xE" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = 12 - }, -/obj/item/radio/intercom/wideband/directional/west, -/turf/open/floor/plasteel/stairs{ - dir = 1; - icon = 'icons/obj/stairs.dmi' - }, -/area/ship/bridge) -"xP" = ( -/obj/effect/turf_decal/atmos/plasma{ - dir = 8; - layer = 2.01 - }, -/obj/effect/decal/cleanable/oil{ - layer = 2.09 - }, -/turf/open/floor/engine/plasma, -/area/ship/engineering) -"xT" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"ye" = ( -/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/item/clothing/head/beret/eng/hazard, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/number/four{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"yl" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"yq" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/power/smes/engineering, -/obj/structure/railing{ - dir = 5; - layer = 4.1 - }, -/obj/structure/cable{ - icon_state = "0-9" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) -"yv" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/turf_decal/techfloor/hole/right, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"yy" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sparsegrass{ - pixel_y = 12 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1; - pixel_x = 7 - }, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/turf/open/floor/plating/grass, -/area/ship/cargo) -"yC" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 6 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"yL" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/structure/sign/poster/official/work_for_a_future{ - pixel_x = -32 - }, -/obj/item/trash/boritos{ - pixel_x = 11; - pixel_y = 2 - }, -/mob/living/simple_animal/bot/cleanbot/medbay, -/turf/open/floor/plasteel/tech, -/area/ship/crew/office) -"yO" = ( -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/decal/cleanable/vomit/old, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"yQ" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line, -/obj/structure/chair/greyscale{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/decal/cleanable/glass{ - pixel_x = -17; - pixel_y = 8 - }, -/obj/effect/turf_decal/minutemen/corner{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"za" = ( -/obj/effect/turf_decal/industrial/outline/red, -/obj/structure/closet/crate/medical, -/obj/item/roller, -/obj/item/roller, -/obj/item/roller, -/obj/item/roller, -/obj/item/roller, -/obj/item/tank/internals/anesthetic, -/obj/item/clothing/mask/breath/medical, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/gloves, -/obj/item/storage/box/masks, -/obj/item/storage/box/bodybags, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"zf" = ( -/obj/effect/turf_decal/corner_techfloor_gray/diagonal{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/vending_refill/medical{ - pixel_x = 2 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = 8 - }, -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"zm" = ( -/obj/effect/turf_decal/industrial/outline/red, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"zw" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -22; - pixel_y = 12 - }, -/turf/open/floor/plasteel/white{ - icon_state = "ridged" - }, -/area/ship/medical) -"zy" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/obj/item/radio/intercom/directional/west, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/engine{ - icon_state = "reinforced" - }, -/area/ship/medical) -"zB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/closet/secure_closet/wall{ - dir = 4; - icon_state = "sec_wall"; - name = "BARD Equipment"; - pixel_x = -28 - }, -/obj/item/clothing/suit/bio_suit/security, -/obj/item/clothing/head/bio_hood/security, -/obj/item/flamethrower/full/tank, -/obj/item/gun/energy/e_gun/mini{ - pixel_x = 3; - pixel_y = -5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"zC" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"zD" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"zZ" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Af" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/grille/broken, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -22; - pixel_y = 12 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Aj" = ( -/obj/structure/sign/warning/gasmask{ - pixel_x = -31 - }, -/obj/effect/turf_decal/industrial/outline/red, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"Ak" = ( -/obj/machinery/vending/wallmed{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Ax" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"AH" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"AV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/sign/poster/contraband/grey_tide{ - pixel_x = -32 - }, -/obj/structure/noticeboard{ - pixel_y = 31 - }, -/obj/structure/table/wood/reinforced, -/obj/machinery/microwave{ - pixel_y = 2 - }, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/turf/open/floor/wood, -/area/ship/hallway/central) -"AY" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"Ba" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -1; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass{ - pixel_x = 11 - }, -/obj/structure/window/reinforced/tinted{ - pixel_y = -3 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"Bx" = ( -/obj/effect/decal/cleanable/leaper_sludge{ - color = "#808080" - }, -/obj/item/trash/sosjerky{ - anchored = 1; - color = "#808080"; - pixel_x = 8; - pixel_y = 8 - }, -/obj/structure/railing{ - layer = 4.1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/effect/decal/fakelattice{ - color = "#808080" - }, -/turf/open/floor/plasteel/elevatorshaft{ - color = "#808080" - }, -/area/ship/hallway/central) -"Bz" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/steeldecal/steel_decals4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"BE" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/hole{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/old{ - icon_state = "gib6-old"; - pixel_x = 8 - }, -/obj/item/stack/sheet/xenochitin{ - pixel_x = -6; - pixel_y = -2 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "ridged" - }, -/area/ship/medical/morgue) -"BF" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"BM" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/machinery/fax, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"BQ" = ( -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile{ - can_move_docking_ports = 1; - launch_status = 0; - port_direction = 4; - preferred_direction = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"BR" = ( -/obj/structure/table/reinforced, -/obj/effect/gibspawner/larva, -/obj/item/organ/heart/gland/spiderman{ - pixel_x = 3; - pixel_y = 1 - }, -/obj/item/research_notes/loot/small{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/flashlight/pen{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/scalpel{ - pixel_y = 19 - }, -/obj/machinery/light/directional/west, -/obj/structure/sign/poster/official/safety_eye_protection{ - pixel_x = -32 - }, -/obj/item/organ/alien/plasmavessel/small, -/obj/item/bodypart/head/alien{ - pixel_x = -5; - pixel_y = 5 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"BW" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/spawner/lootdrop/glowstick{ - pixel_x = 5; - pixel_y = 9 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"BX" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"BZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/igniter/on, -/turf/open/floor/plasteel/dark, -/area/ship/medical/morgue) -"Cf" = ( -/obj/effect/turf_decal/siding/white, -/obj/structure/sign/departments/security{ - pixel_y = -32 - }, -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Ci" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/bodybags{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/toy/toy_xeno{ - pixel_x = 8; - pixel_y = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ship/medical/morgue) -"Cr" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/caution{ - pixel_y = 2 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Cw" = ( -/obj/machinery/newscaster/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"CB" = ( -/obj/docking_port/stationary{ - dwidth = 7; - width = 15; - height = 15; - dir = 2 - }, -/turf/template_noop, -/area/template_noop) -"CV" = ( -/obj/machinery/door/airlock/medical/glass{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "asclepius_medbay_lockdown"; - name = "Lockdown Shutters" - }, -/turf/open/floor/plasteel/mono{ - dir = 1 - }, -/area/ship/cargo) -"CW" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"Di" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/external, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"Dp" = ( -/obj/structure/railing{ - dir = 1; - layer = 4.1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/poster/contraband/xenofauna_parasite{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/stairs{ - dir = 8; - icon = 'icons/obj/stairs.dmi' - }, -/area/ship/bridge) -"Dx" = ( -/obj/machinery/door/airlock/hatch{ - 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/dark, -/area/ship/cargo) -"DF" = ( -/obj/structure/table/glass, -/obj/item/stock_parts/micro_laser{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/stock_parts/scanning_module{ - pixel_x = 8 - }, -/obj/item/stock_parts/capacitor, -/obj/item/lighter{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/assembly/igniter{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/xenofauna_parasite{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"DP" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/item/kirbyplants{ - layer = 3.9; - pixel_x = -3; - pixel_y = 18 - }, -/obj/structure/sign/poster/official/moth/epi{ - pixel_y = 32 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Ef" = ( -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/holopad/emergency/command, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Ej" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor/orange/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "6-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/mop{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"El" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-9" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"En" = ( -/obj/effect/turf_decal/techfloor, -/obj/machinery/computer/security{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Ep" = ( -/obj/structure/railing{ - dir = 5; - layer = 4.1 - }, -/obj/machinery/pipedispenser, -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/effect/turf_decal/techfloor/orange/corner{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Ev" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "4-10" - }, -/obj/structure/cable{ - icon_state = "4-9" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Ex" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/firealarm/directional/west, -/obj/structure/frame/computer, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"EA" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/medical) -"EH" = ( -/obj/structure/table/wood/reinforced, -/obj/effect/turf_decal/siding/wood, -/obj/item/newspaper{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/newspaper{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/newspaper{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/table_bell{ - pixel_x = -12; - pixel_y = -1 - }, -/obj/item/toy/figure/paramedic{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/ship/hallway/central) -"EL" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 4 - }, -/obj/structure/sign/departments/cargo{ - pixel_x = 32 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"EN" = ( -/obj/structure/cable{ - icon_state = "1-10" - }, -/obj/structure/cable{ - icon_state = "1-6" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/stairs, -/area/ship/engineering) -"EO" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"EV" = ( -/obj/machinery/computer/rdconsole{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 5 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"Fd" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"Fh" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/power/smes/engineering, -/obj/structure/railing{ - dir = 9; - layer = 4.1 - }, -/obj/structure/cable{ - icon_state = "0-5" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) -"Fi" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 9 - }, -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"Fl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/stairs, -/area/ship/security) -"Fv" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/medical) -"FA" = ( -/obj/machinery/autolathe, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/item/radio/intercom/directional/west, -/obj/machinery/firealarm/directional/west, -/obj/item/stack/sheet/metal/twenty{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/stack/sheet/glass/twenty, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) -"FB" = ( -/obj/effect/turf_decal/siding/white/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"FD" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/medical/morgue) -"FF" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white/corner, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "5-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"FI" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"FW" = ( -/obj/structure/table/wood/reinforced, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/item/storage/wallet/random{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 12; - pixel_y = 5 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light/directional/west, -/turf/open/floor/wood, -/area/ship/hallway/central) -"FZ" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"Gd" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Gg" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-9" - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "asclepius_cargoholo"; - locked = 1 - }, -/obj/machinery/door/poddoor{ - id = "asclepius_extcargo"; - name = "Cargo Bay Blast Door" - }, -/turf/open/floor/plasteel{ - icon_state = "monotile_dark" - }, -/area/ship/cargo) -"Gj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"Gq" = ( -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Gu" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/structure/curtain{ - color = "#363636" - }, -/obj/structure/sign/poster/official/high_class_martini{ - pixel_y = -32 - }, -/turf/open/floor/carpet/royalblue, -/area/ship/bridge) -"GU" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/door/poddoor{ - id = "asclepius_engineering_shutters"; - name = "Engineering Blast Doors" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Hc" = ( -/obj/structure/filingcabinet/medical{ - pixel_x = -10 - }, -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/item/storage/pill_bottle/happy{ - pixel_x = -9 - }, -/obj/item/kirbyplants{ - icon_state = "plant-10"; - pixel_x = 6 - }, -/obj/item/folder{ - pixel_x = -3; - pixel_y = -6 - }, -/obj/item/healthanalyzer, -/obj/item/key, -/obj/item/lighter, -/obj/item/storage/wallet/random, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Hk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/ship/hallway/central) -"Hq" = ( -/obj/machinery/computer/med_data{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Hv" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastright{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - id = "asclepius_engineering_shutters"; - name = "Engineering Blast Doors"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"HA" = ( -/obj/item/flashlight/lamp{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/storage/fancy/cigarettes/derringer{ - pixel_x = 9; - pixel_y = 2 - }, -/obj/item/lighter/greyscale{ - pixel_x = 4 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"HC" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/structure/sign/warning/bodysposal{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"HH" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"HM" = ( -/obj/structure/closet/wall/white/med{ - dir = 1; - name = "paramedic equipment locker"; - pixel_y = -28 - }, -/obj/item/clothing/under/rank/medical/paramedic/emt, -/obj/item/clothing/under/rank/medical/paramedic/emt/skirt, -/obj/item/clothing/suit/toggle/labcoat/paramedic, -/obj/item/clothing/neck/stripedbluescarf, -/obj/item/clothing/mask/bandana/blue, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/glasses/hud/health/sunglasses, -/obj/item/healthanalyzer, -/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic, -/obj/item/clothing/head/soft/paramedic, -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/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/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/defibrillator/compact/loaded, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"HP" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/folder/red{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/pen, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Il" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 1; - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - pixel_x = -13; - pixel_y = 22 - }, -/turf/open/floor/wood, -/area/ship/crew) -"Im" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/item/roller{ - pixel_y = 5 - }, -/obj/item/roller{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/roller{ - pixel_x = 5; - pixel_y = 18 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Iu" = ( -/obj/structure/table/reinforced, -/obj/item/trash/raisins{ - pixel_x = 2; - pixel_y = 10 - }, -/obj/item/trash/sosjerky{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood/corner, -/obj/item/reagent_containers/food/drinks/mug{ - pixel_x = 10; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"Ix" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"Iz" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"IC" = ( -/obj/structure/sign/number/five, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"IE" = ( -/obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical/surgery) -"IN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/engineering) -"IQ" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering) -"IV" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Jd" = ( -/obj/vehicle/ridden/wheelchair{ - dir = 1 - }, -/obj/structure/sign/departments/medbay/alt{ - pixel_x = 32 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/poster/official/moth/smokey{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Jf" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/circuitboard/machine/shuttle/engine/electric{ - pixel_x = -1; - pixel_y = -3 - }, -/obj/item/circuitboard/machine/shuttle/engine/electric{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/book/manual/wiki/engineering{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/machinery/light/directional/east, -/obj/structure/plaque/static_plaque/atmos{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) -"Jj" = ( -/obj/structure/chair/office{ - name = "tactical swivel chair" - }, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"Jm" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/item/radio/intercom/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Js" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/structure/table/reinforced, -/obj/machinery/door/window/eastleft{ - dir = 2 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = -2; - pixel_y = 10 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"Jy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/railing{ - dir = 1; - layer = 4.1 - }, -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/toolbox/electrical{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/item/multitool{ - pixel_x = 9 - }, -/obj/item/clothing/glasses/welding{ - pixel_y = 5 - }, -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-6" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"JA" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"JI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"JM" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/chemistry{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/flashlight/lamp{ - pixel_x = -6; - pixel_y = 11 - }, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -5; - pixel_y = -3 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/keycard_auth{ - pixel_x = -26; - pixel_y = 23 - }, -/obj/structure/plaque/static_plaque/golden/captain{ - pixel_x = -32 - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/wood, -/area/ship/bridge) -"JN" = ( -/obj/effect/turf_decal/minutemen{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"JV" = ( -/obj/effect/turf_decal/corner_techfloor_gray/diagonal{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/cable_coil, -/obj/item/stack/circuit_stack, -/obj/item/shovel, -/obj/item/shard{ - pixel_x = 2; - pixel_y = -7 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"JX" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/obj/machinery/light/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/machinery/button/door{ - dir = 8; - id = "asclepius_medbay_lockdown"; - name = "Medical Lockdown"; - pixel_x = 23; - pixel_y = -10 - }, -/obj/structure/closet/secure_closet/medical1, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"JY" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Ka" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 9 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Kd" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/crew/office) -"Ke" = ( -/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/item/storage/backpack, -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/obj/structure/closet/wall{ - dir = 8; - name = "uniform closet"; - pixel_x = 28 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/item/radio/headset/minutemen, -/obj/item/radio/headset/minutemen, -/obj/item/radio/headset/minutemen, -/obj/item/radio/headset/minutemen, -/turf/open/floor/wood, -/area/ship/crew) -"Ki" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_bridge_shutters"; - name = "Blast Shutters"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/bridge) -"Kj" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 10 - }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/head/helmet/space/light/engineer, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/clothing/suit/space/engineer, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Kq" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" - }, -/obj/effect/turf_decal/industrial/hatch/blue, -/turf/open/floor/plasteel/white{ - icon_state = "grid" - }, -/area/ship/medical) -"Kz" = ( -/obj/effect/turf_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/effect/turf_decal/steeldecal/steel_decals_central6, -/obj/machinery/airalarm/directional/east, -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"KD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/isf_small{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"KL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/backpack, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/shoes/combat, -/obj/item/flashlight/seclite, -/obj/item/kitchen/knife/combat/survival, -/obj/item/radio/headset/headset_sec/alt, -/obj/item/storage/belt/military, -/obj/item/clothing/suit/longcoat/brig_phys{ - 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/glasses/hud/security/sunglasses/eyepatch, -/obj/item/storage/belt/security, -/obj/item/gun/ballistic/automatic/pistol/candor, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/item/ammo_box/magazine/m45/rubber{ - pixel_x = 3 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/closet/secure_closet/wall{ - dir = 1; - icon_state = "sec_wall"; - pixel_y = -28 - }, -/turf/open/floor/carpet/red, -/area/ship/security) -"KM" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/eastright{ - dir = 2 - }, -/obj/item/megaphone, -/obj/item/toy/figure/md{ - pixel_x = 14 - }, -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation{ - pixel_x = -15 - }, -/obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin{ - pixel_x = -14; - pixel_y = 9 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"KN" = ( -/obj/structure/table/optable, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 24 - }, -/obj/effect/turf_decal/corner/opaque/blue/full, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"KV" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/stock_parts/cell/high, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"KZ" = ( -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew) -"Ls" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 9 - }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = -32 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Lv" = ( -/obj/structure/closet/wall{ - dir = 1; - pixel_y = -28 - }, -/obj/item/reagent_containers/syringe/contraband/methamphetamine, -/obj/item/reagent_containers/syringe/contraband/fentanyl{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/reagent_containers/syringe/charcoal{ - pixel_x = -3 - }, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = -4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass{ - dir = 8; - pixel_x = -9; - pixel_y = 5 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"Lw" = ( -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"Ly" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/office) -"LH" = ( -/obj/effect/decal/cleanable/glass{ - color = "#808080"; - dir = 8; - pixel_y = 1 - }, -/obj/structure/railing{ - dir = 6; - layer = 4.1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 6 - }, -/obj/effect/decal/fakelattice{ - color = "#808080" - }, -/turf/open/floor/plasteel/elevatorshaft{ - color = "#808080" - }, -/area/ship/hallway/central) -"Mb" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Mi" = ( -/obj/effect/turf_decal/corner_techfloor_gray/diagonal{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/iv_drip, -/obj/item/poster/random_official{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/poster/random_official{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/poster/random_official, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Mn" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Ms" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 8 - }, -/obj/structure/chair/greyscale{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/item/reagent_containers/food/drinks/mug/tea{ - pixel_x = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Mw" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Mz" = ( -/obj/machinery/power/port_gen/pacman/super, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 - }, -/obj/structure/sign/warning/electricshock{ - pixel_y = -30 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"MD" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"MH" = ( -/obj/structure/curtain/bounty, -/obj/structure/window/reinforced/tinted/frosted, -/obj/machinery/shower{ - pixel_y = 13 - }, -/obj/effect/decal/cleanable/greenglow{ - color = "#808080" - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/ship/hallway/central) -"Nd" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/mob/living/simple_animal/bot/medbot, -/obj/effect/turf_decal/minutemen/corner{ - dir = 8 - }, -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Nh" = ( -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"Nk" = ( -/obj/structure/closet/wall/white/med{ - dir = 1; - name = "Chemistry locker"; - pixel_y = -28 - }, -/obj/item/clothing/under/rank/medical/chemist, -/obj/item/clothing/under/rank/medical/chemist, -/obj/item/clothing/under/rank/medical/chemist/skirt, -/obj/item/clothing/under/rank/medical/chemist/skirt, -/obj/item/clothing/suit/longcoat/chemist, -/obj/item/clothing/suit/toggle/labcoat/chemist/side, -/obj/item/clothing/head/beret/chem, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"NE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/isf_small/right{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"NH" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"NN" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"NR" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"NU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/carpet/red, -/area/ship/security) -"NX" = ( -/obj/structure/closet/secure_closet{ - icon_state = "cap"; - name = "\proper captain's locker"; - req_access_txt = "20" - }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/cowboy/white, -/obj/item/clothing/head/cowboy/sec/minutemen, -/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/suit/toggle/lawyer/minutemen, -/obj/item/clothing/suit/toggle/labcoat/cmo, -/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/item/autosurgeon/cmo, -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/clothing/suit/armor/vest/marine/medium{ - name = "medium medical armor vest" - }, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/healthanalyzer/advanced, -/obj/item/clothing/neck/cloak/cmo, -/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/reagent_containers/hypospray/CMO, -/obj/item/ammo_box/c45_speedloader, -/obj/item/ammo_box/c45_speedloader, -/turf/open/floor/carpet/royalblue, -/area/ship/bridge) -"NY" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/mining, -/obj/effect/decal/cleanable/robot_debris, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/meat/slab, -/obj/item/reagent_containers/food/snacks/grilledcheese, -/obj/item/reagent_containers/food/snacks/honeybar, -/obj/item/reagent_containers/food/snacks/honeybar, -/obj/item/reagent_containers/food/snacks/honeybar, -/obj/item/reagent_containers/food/snacks/honeybar, -/obj/item/reagent_containers/food/snacks/deadmouse, -/obj/item/reagent_containers/food/snacks/grilledcheese, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/ship/hallway/central) -"Ot" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Ou" = ( -/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 = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"OB" = ( -/obj/structure/table/wood/reinforced, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = -2; - pixel_y = 10 - }, -/obj/item/lighter{ - pixel_x = 9; - pixel_y = -1 - }, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = -10; - pixel_y = -6 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/wood, -/area/ship/hallway/central) -"OJ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/pill_bottle/dice{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/flask/det{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/dirt, -/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 = -7 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"OK" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/ship/hallway/central) -"OP" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"OR" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/chair/stool{ - dir = 1; - pixel_x = -5; - pixel_y = 12 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Pe" = ( -/obj/structure/table/wood, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 8; - pixel_y = 11 - }, -/obj/item/reagent_containers/food/drinks/bottle/kahlua{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/wood, -/area/ship/bridge) -"PF" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/turf/open/floor/plasteel/white{ - icon_state = "ridged" - }, -/area/ship/medical) -"PP" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/wrapping, -/obj/structure/closet/firecloset/wall{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/toy/plush/beeplushie, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"PS" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/crew) -"PX" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Qb" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"Qf" = ( -/obj/machinery/door/airlock/medical/glass{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - 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/poddoor/shutters/preopen{ - dir = 4; - id = "asclepius_medbay_lockdown"; - name = "Lockdown Shutters" - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"Qi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/minutemen/middle, -/obj/effect/landmark/observer_start, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Qk" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Qn" = ( -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/item/storage/belt/medical/webbing, -/obj/structure/closet/secure_closet/medical3{ - anchored = 1 - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/crew/office) -"Qr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"QP" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"QT" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/medical) -"Rb" = ( -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/machinery/rnd/production/protolathe/department/medical, -/turf/open/floor/plasteel/tech, -/area/ship/crew/office) -"Ro" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Rs" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/poddoor{ - id = "asclepius_extcargo"; - name = "Cargo Bay Blast Door" - }, -/turf/open/floor/plasteel{ - icon_state = "monotile_dark" - }, -/area/ship/cargo) -"Rt" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/minutemen/corner, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Rw" = ( -/obj/item/paper_bin{ - pixel_x = -6 - }, -/obj/item/pen/fourcolor{ - pixel_x = -4 - }, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/stamp/denied{ - pixel_x = 8 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"RA" = ( -/obj/effect/turf_decal/industrial/loading, -/obj/effect/turf_decal/steeldecal/steel_decals7, -/obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 4; - pixel_x = -1 - }, -/obj/machinery/atmospherics/components/binary/pump/on, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) -"RG" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ship/crew) -"RI" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"RN" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"RR" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - id = "asclepius_engineering_shutters"; - name = "Engineering Blast Doors" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"RS" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "asclepius_window_shutters"; - name = "Window Shutters"; - pixel_x = -6; - pixel_y = 1 - }, -/obj/machinery/button/door{ - id = "asclepius_bridge_shutters"; - name = "Bridge Shutters"; - pixel_x = -6; - pixel_y = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ - id = "asclepius_reception_lockdown"; - name = "Reception Lockdown"; - pixel_x = 4; - pixel_y = 1 - }, -/obj/machinery/button/door{ - id = "asclepius_medbay_lockdown"; - name = "Medical Lockdown"; - pixel_x = 4; - pixel_y = 9 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"RU" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white/corner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Sd" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Se" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"Sp" = ( -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/structure/closet/crate/freezer, -/obj/item/organ_storage, -/obj/item/organ_storage, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -17 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "grid" - }, -/area/ship/medical/morgue) -"Sr" = ( -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/plastic, -/obj/effect/turf_decal/steeldecal/steel_decals9, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) -"SE" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"SF" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"SH" = ( -/obj/item/clothing/gloves/color/latex/nitrile/evil, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/storage/belt/medical/webbing, -/obj/structure/closet/secure_closet/medical3{ - anchored = 1 - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/crew/office) -"SJ" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"SR" = ( -/obj/machinery/power/port_gen/pacman, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/effect/decal/cleanable/robot_debris, -/obj/machinery/light/directional/south, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/sign/warning/electricshock{ - pixel_y = -30 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"SZ" = ( -/obj/structure/table/wood, -/obj/machinery/computer/helm/viewscreen/directional/north{ - pixel_y = 17 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/maunamug{ - pixel_x = 12; - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigpack_uplift{ - pixel_x = -9; - pixel_y = -12 - }, -/obj/item/storage/fancy/cigarettes/cigpack_uplift{ - pixel_x = -6; - pixel_y = -10 - }, -/obj/item/lighter{ - pixel_x = -6; - pixel_y = -16 - }, -/turf/open/floor/wood, -/area/ship/crew) -"Te" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Tj" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 4 - }, -/turf/open/floor/engine{ - icon_state = "reinforced" - }, -/area/ship/medical) -"Tk" = ( -/obj/effect/spawner/lootdrop/glowstick, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/garbage, -/obj/structure/sink{ - dir = 8; - pixel_x = 13; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = 27 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"Tn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/isf_small/left{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Ub" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/machinery/computer/secure_data/laptop{ - dir = 1; - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = -9; - pixel_y = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Um" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_internalbridge_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/bridge) -"Uu" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 6 - }, -/obj/item/reagent_containers/glass/bottle/dexalin{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = 3 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Uy" = ( -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/engine{ - icon_state = "reinforced" - }, -/area/ship/medical) -"UA" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/computer/cargo/express{ - dir = 1 - }, -/obj/structure/railing{ - layer = 4.1 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "grid" - }, -/area/ship/cargo) -"UI" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/closet/secure_closet/medical2, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 1 - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"UK" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals2, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"UX" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew) -"Vh" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/chair/office, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/ship/hallway/central) -"Vj" = ( -/obj/machinery/computer/operating{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/turf/open/floor/plasteel/dark{ - icon_state = "ridged" - }, -/area/ship/medical/morgue) -"Vm" = ( -/obj/machinery/chem_master, -/obj/machinery/camera/autoname, -/obj/item/toy/figure/chemist{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = -8 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"Vu" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"VB" = ( -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/morgue) -"VO" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/paper/pamphlet/violent_video_games{ - pixel_x = -1; - pixel_y = 3 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/turf/open/floor/carpet/red, -/area/ship/security) -"VT" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Wd" = ( -/turf/template_noop, -/area/template_noop) -"Wh" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/storage/box/syringes{ - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/storage/box/beakers{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"Wl" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Wm" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Wu" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/sign/departments/chemistry/pharmacy{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"WH" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical) -"WK" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/north{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"WU" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/steeldecal/steel_decals3, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"WW" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/machinery/door/poddoor{ - id = "asclepius_engineering_shutters"; - name = "Engineering Blast Doors"; - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/engineering) -"WX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/stairs, -/area/ship/cargo) -"Xc" = ( -/obj/machinery/stasis, -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/machinery/vending/wallmed{ - pixel_y = -28 - }, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/plasteel/white{ - icon_state = "grid" - }, -/area/ship/medical) -"Xe" = ( -/obj/effect/turf_decal/corner/opaque/blue/full, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Xf" = ( -/obj/effect/turf_decal/techfloor/orange/corner, -/obj/effect/turf_decal/techfloor/orange/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/medical/surgery) -"Xq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"Xu" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-10" - }, -/obj/structure/closet/wall{ - dir = 8; - name = "uniform closet"; - pixel_x = 28 - }, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Xw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"Xy" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_reception_lockdown"; - name = "Lockdown Shutters" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"XH" = ( -/obj/structure/table/glass, -/obj/machinery/door/window/northright, -/obj/item/reagent_containers/glass/bottle/mercury{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/structure/sign/poster/contraband/hacking_guide{ - pixel_y = -32 - }, -/obj/item/reagent_containers/glass/bottle/oxygen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -1 - }, -/obj/item/reagent_containers/glass/bottle/formaldehyde{ - pixel_x = 9 - }, -/obj/item/reagent_containers/glass/bottle/ammonia{ - pixel_x = -11 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"XI" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/machinery/recharger{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/desk_flag{ - pixel_y = 12 - }, -/obj/item/reagent_containers/food/drinks/mug{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/areaeditor/shuttle{ - pixel_x = -1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"XM" = ( -/obj/structure/table/wood, -/obj/machinery/computer/med_data/laptop{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = -12; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = -12; - pixel_y = 1 - }, -/obj/item/stamp/cmo{ - pixel_x = -9; - pixel_y = 9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = -12 - }, -/turf/open/floor/wood, -/area/ship/bridge) -"XO" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/clipboard{ - pixel_x = -9 - }, -/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy{ - pixel_x = -9 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"XP" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/structure/sign/poster/contraband/engis_unite{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"XR" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Yf" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 5 - }, -/obj/structure/rack, -/obj/item/storage/belt/utility/full/engi{ - pixel_y = 4 - }, -/obj/item/geiger_counter{ - pixel_x = 1; - pixel_y = 2 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"Yj" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/garbage{ - pixel_x = -7 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Yl" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/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/security) -"Yy" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Yz" = ( -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 4 - }, -/obj/machinery/rnd/destructive_analyzer, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"YK" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/bottlegreen/warning{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ - dir = 8; - id = "asclepius_intcargo"; - name = "Cargo Storage"; - pixel_x = 23; - pixel_y = -10 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"YR" = ( -/obj/effect/turf_decal/industrial/warning/cee{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "asclepius_intcargo"; - name = "Cargo Hatch" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"YX" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"YY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"Zh" = ( -/obj/effect/turf_decal/trimline/opaque/bottlegreen/line, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/light/directional/south, -/obj/item/kirbyplants{ - icon_state = "plant-03" - }, -/obj/effect/turf_decal/minutemen/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Zq" = ( -/obj/structure/table, -/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/machinery/computer/med_data/laptop{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/machinery/firealarm/directional/north{ - pixel_x = -2 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/plasteel/tech, -/area/ship/crew/office) -"ZA" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "asclepius_window_shutters"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/medical/surgery) -"ZB" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/sign/poster/official/help_others{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"ZF" = ( -/obj/machinery/door/airlock/medical{ - name = "Chemistry" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/medical/surgery) -"ZH" = ( -/obj/effect/turf_decal/corner/opaque/blue/three_quarters{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/item/bedsheet/medical, -/obj/machinery/iv_drip, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"ZI" = ( -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/machinery/computer/helm/viewscreen/directional/north{ - pixel_y = 17 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/decal/cleanable/glass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/grimy, -/area/ship/hallway/central) -"ZJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/siding/white, -/obj/structure/sign/poster/official/cohiba_robusto_ad{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"ZL" = ( -/obj/effect/turf_decal/steeldecal/steel_decals1, -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"ZN" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ship/crew/office) -"ZX" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/combatmedic, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/gas/sechailer, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/camera/autoname{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"ZY" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-5" - }, -/obj/item/weldingtool{ - pixel_x = -5; - pixel_y = -6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) - -(1,1,1) = {" -Wd -Wd -Wd -Wd -Wd -Wd -rJ -XR -XR -XR -rJ -Wd -Wd -Wd -Wd -Wd -Wd -Wd -Wd -Wd -"} -(2,1,1) = {" -Wd -Wd -Wd -Wd -rJ -rJ -rJ -dl -dl -Hv -rJ -rJ -Wd -Wd -Wd -Wd -Wd -Wd -Wd -Wd -"} -(3,1,1) = {" -Wd -Wd -Wd -Mb -rJ -XP -Af -Jy -BW -ZY -xT -GU -IN -Wd -Wd -Wd -Wd -Wd -Wd -Wd -"} -(4,1,1) = {" -Wd -Wd -IQ -WW -rJ -th -Ro -Ep -Ev -KV -vP -rJ -Mb -Wd -Wd -Wd -Wd -Wd -Wd -Wd -"} -(5,1,1) = {" -Wd -Wd -rJ -nw -Sr -mN -WU -Bz -cG -kp -Kj -rJ -eU -rJ -IQ -Wd -Wd -Wd -Wd -Wd -"} -(6,1,1) = {" -Wd -IQ -rJ -sy -Jf -Yf -vO -ne -ye -Ej -mR -FA -Fh -Mz -rJ -Wd -Wd -Wd -Wd -Wd -"} -(7,1,1) = {" -YX -aJ -aJ -aJ -aJ -aJ -ae -dJ -rJ -WK -El -EN -RA -qF -RR -Wd -Wd -Wd -Wd -Wd -"} -(8,1,1) = {" -aJ -JM -Pe -hG -NX -aJ -bG -nc -rJ -PP -yv -nF -yq -SR -rJ -Wd -Wd -Wd -Wd -Wd -"} -(9,1,1) = {" -aJ -XM -oZ -wb -Gu -aJ -xP -bG -rJ -dk -rs -rJ -rJ -rJ -rJ -Wd -Wd -Wd -Wd -Wd -"} -(10,1,1) = {" -aJ -aJ -Lw -aJ -aJ -aJ -rJ -rJ -rJ -el -rJ -Iz -Aj -zm -Iz -Wd -Wd -Wd -Wd -Wd -"} -(11,1,1) = {" -ga -Ex -kx -xE -UK -nG -Cw -kV -zZ -rB -Di -gJ -kN -oB -BQ -Wd -Wd -Wd -Wd -Wd -"} -(12,1,1) = {" -ga -RS -uF -vs -fY -aJ -mt -MD -Qr -ZJ -Iz -Ix -lx -Se -Iz -Wd -Wd -Wd -Wd -Wd -"} -(13,1,1) = {" -ga -Ou -be -XI -Dp -aJ -Iz -Iz -DP -Gq -Iz -Iz -Iz -Iz -Iz -Wd -Wd -Wd -Wd -Wd -"} -(14,1,1) = {" -Ki -ga -uD -Mn -Yy -En -Um -lW -Cr -nt -Iz -MH -Ba -jW -Iz -Wd -Wd -Wd -Wd -Wd -"} -(15,1,1) = {" -Wd -ga -BM -Rw -ZL -fU -Um -Bx -eO -wR -ob -Tk -tn -Lv -Iz -Wd -Wd -Wd -Wd -Wd -"} -(16,1,1) = {" -Wd -Ki -ga -vi -Ef -HA -Um -LH -Cr -Cf -CW -CW -Gj -CW -CW -Wd -Wd -Wd -Wd -Wd -"} -(17,1,1) = {" -Wd -Wd -ga -dh -Kz -wU -aJ -dY -PX -RU -Yl -Fl -zB -iX -CW -Wd -Wd -Wd -Wd -Wd -"} -(18,1,1) = {" -Wd -Wd -Ki -ga -aJ -aJ -aJ -Iz -fx -rV -wm -VO -NU -KL -CW -Wd -Wd -Wd -Wd -Wd -"} -(19,1,1) = {" -Wd -Wd -Wd -Iz -Iz -Iz -OB -FW -ui -pV -wm -qM -aW -ab -CW -Wd -Wd -Wd -Wd -Wd -"} -(20,1,1) = {" -Wd -Wd -Wd -Iz -AV -wM -Vh -EH -OR -ZB -ni -ni -ni -ni -ni -lR -Wd -Wd -Wd -Wd -"} -(21,1,1) = {" -Wd -Wd -Wd -BF -NY -OK -Hk -hr -BX -NN -ni -SZ -hu -mQ -wX -kJ -Wd -Wd -Wd -Wd -"} -(22,1,1) = {" -Wd -Wd -Wd -Iz -Iz -ZI -ok -tm -wI -sB -ni -Il -KZ -gS -uw -kJ -Wd -Wd -Wd -Wd -"} -(23,1,1) = {" -Wd -Wd -Wd -Wd -jR -OJ -Iu -uu -NR -FF -PS -ft -Ke -RG -jm -ni -Wd -Wd -Wd -Wd -"} -(24,1,1) = {" -Wd -Wd -Wd -Wd -jR -yO -iL -FB -Xu -hH -ni -UX -ni -ni -ni -ni -Wd -Wd -Wd -Wd -"} -(25,1,1) = {" -Wd -Wd -Wd -Wd -Ly -Ly -Ly -vt -Ly -FZ -FZ -FZ -FZ -sl -yy -FZ -bV -Wd -Wd -Wd -"} -(26,1,1) = {" -Wd -Wd -Wd -Wd -Ly -Zq -yL -ZN -za -FZ -Qk -Hq -FZ -rw -Ms -xz -FZ -Wd -Wd -Wd -"} -(27,1,1) = {" -Wd -Wd -Wd -Wd -Kd -Rb -pL -oo -Ly -FZ -oV -te -uU -Rt -JN -yQ -HH -Wd -Wd -Wd -"} -(28,1,1) = {" -Wd -Wd -Wd -Wd -Kd -Qn -FI -hF -Ly -Hc -sR -pz -KM -pd -Qi -gG -HH -Wd -Wd -Wd -"} -(29,1,1) = {" -Wd -Wd -Wd -Wd -Ly -SH -op -vc -Ly -ZX -SF -gQ -Ub -Nd -mK -Zh -FZ -FZ -vY -Wd -"} -(30,1,1) = {" -Wd -Wd -Wd -lu -Ly -ib -AH -HM -Ly -FZ -Dx -FZ -FZ -aU -JI -SE -Ak -OP -tO -Wd -"} -(31,1,1) = {" -Wd -Wd -Wd -Ly -Js -Xw -iP -Nh -aT -WX -bQ -uX -ay -vw -om -nI -ps -nU -Rs -CB -"} -(32,1,1) = {" -Wd -Wd -Wd -Ly -rU -qq -YY -JX -Ly -cF -VT -tH -Xy -YK -cw -EL -yl -ro -Gg -Wd -"} -(33,1,1) = {" -Wd -Wd -Wd -Ly -Ly -Ly -Qf -Ly -Ly -Jd -cs -ug -FZ -FZ -YR -FZ -FZ -FZ -dT -Wd -"} -(34,1,1) = {" -Wd -Wd -Wd -WH -zy -ql -wr -zw -WH -FZ -CV -iQ -FZ -ck -rP -UA -pD -aP -IC -Wd -"} -(35,1,1) = {" -Wd -Wd -Wd -WH -Tj -Uy -Gd -NH -Ls -Ka -Mw -tA -FZ -nj -NE -KD -Tn -Yj -bp -Wd -"} -(36,1,1) = {" -Wd -Wd -Wd -EA -Uu -pQ -Ax -ww -zD -zD -Wl -Wm -FZ -gm -JV -kW -Mi -zf -fb -Wd -"} -(37,1,1) = {" -Wd -Wd -Wd -EA -mT -mI -Kq -Xc -WH -hO -tk -Jm -FZ -FZ -FZ -FZ -FZ -FZ -qZ -Wd -"} -(38,1,1) = {" -Wd -Wd -Wd -WH -WH -WH -WH -WH -WH -WH -Ot -Wu -jG -wk -BR -EV -Yz -jG -jG -Wd -"} -(39,1,1) = {" -Wd -Wd -Wd -WH -Vu -Xe -cc -rY -WH -hi -bx -Te -IE -XO -Fi -hh -AY -ce -dW -Wd -"} -(40,1,1) = {" -Wd -Wd -Wd -WH -KN -IV -Sd -Xq -qu -SJ -uW -hL -ZF -Fd -Xf -Qb -yC -XH -jG -Wd -"} -(41,1,1) = {" -Wd -Wd -Wd -WH -gw -wg -UI -PF -WH -ZH -JY -Nk -jG -sp -RN -eW -DF -jG -sN -Wd -"} -(42,1,1) = {" -Wd -Wd -Wd -WH -WH -WH -WH -WH -WH -WH -EO -QP -jG -jo -RI -Jj -ub -ZA -Wd -Wd -"} -(43,1,1) = {" -Wd -Wd -Wd -iH -lr -gE -Ci -BE -Vj -iH -HC -zC -jG -Vm -se -Wh -jG -sN -Wd -Wd -"} -(44,1,1) = {" -Wd -Wd -Wd -iH -VB -fW -eo -BZ -rZ -am -wD -JA -WH -jG -jG -vm -sN -Wd -Wd -Wd -"} -(45,1,1) = {" -Wd -Wd -Wd -iH -rA -jl -bU -oc -Sp -iH -HP -Im -WH -sN -Wd -Wd -Wd -Wd -Wd -Wd -"} -(46,1,1) = {" -Wd -Wd -Wd -FD -iH -iH -iH -iH -iH -iH -Fv -WH -QT -Wd -Wd -Wd -Wd -Wd -Wd -Wd -"} diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm deleted file mode 100644 index 2faae373eca..00000000000 --- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm +++ /dev/null @@ -1,5567 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"ae" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/science/robotics) -"ag" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/atmospherics) -"ak" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cepheus_windows"; - name = "External Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"an" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering/atmospherics) -"aE" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"aU" = ( -/obj/machinery/pipedispenser, -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/sign/poster/contraband/hacking_guide{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"aW" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/dorm) -"bb" = ( -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/head/helmet/space/light/engineer, -/obj/item/clothing/suit/space/engineer, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/obj/machinery/firealarm/directional/north{ - pixel_x = 3 - }, -/obj/machinery/light_switch{ - pixel_x = -10; - pixel_y = 23 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"bh" = ( -/obj/structure/closet/wall{ - dir = 4; - icon_door = "yellow_wall"; - name = "engineering closet"; - pixel_x = -28 - }, -/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/accessory/armband/engine, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/head/beret/eng/hazard, -/obj/item/storage/backpack/industrial, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/head/hardhat/dblue, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"bn" = ( -/obj/item/storage/bag/tray, -/obj/effect/spawner/lootdrop/ration{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/effect/spawner/lootdrop/ration{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"bz" = ( -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/machinery/computer/crew/syndie{ - dir = 4 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/firealarm/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"bX" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/turf_decal/techfloor/hole/right, -/obj/structure/closet/secure_closet/engineering_welding{ - anchored = 1; - req_access = null - }, -/obj/effect/turf_decal/box, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"cg" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"cl" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/science/robotics) -"cF" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/book/manual/wiki/engineering{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/button/door{ - dir = 1; - id = "cepheus_engines"; - name = "Engine Shutters"; - pixel_x = 9; - pixel_y = -23 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"cH" = ( -/obj/effect/turf_decal/arrows{ - dir = 1; - pixel_y = -12 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/robot_debris, -/obj/structure/closet/wall{ - dir = 8; - icon_door = "red_wall"; - name = "Roboticists Locker"; - pixel_x = 28 - }, -/obj/item/clothing/under/rank/rnd/roboticist, -/obj/item/clothing/under/rank/rnd/roboticist/skirt, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/head/beret/sci, -/obj/item/clothing/suit/longcoat/roboblack, -/obj/item/clothing/suit/longcoat/robowhite, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"db" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/glass{ - dir = 8; - pixel_y = -10 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"dg" = ( -/obj/structure/sink{ - pixel_x = 1; - pixel_y = 20 - }, -/obj/structure/mirror{ - pixel_x = 1; - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/garbage, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"di" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/fireaxecabinet{ - pixel_y = 27 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"dp" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = 12 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"dq" = ( -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/structure/railing/corner, -/obj/effect/turf_decal/industrial/loading, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"dy" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cepheus_cargo"; - name = "Cargo Shutter" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) -"dA" = ( -/obj/machinery/door/poddoor{ - id = "cepheus_mech_1"; - name = "Mechbay Shutters" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"dI" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 8 - }, -/obj/item/mecha_ammo/scattershot{ - pixel_x = 9; - pixel_y = 8 - }, -/obj/effect/decal/cleanable/wrapping, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"dV" = ( -/obj/machinery/mecha_part_fabricator{ - dir = 8 - }, -/obj/structure/railing{ - color = "#808080"; - dir = 4; - layer = 4.1 - }, -/obj/structure/sign/poster/contraband/shamblers_juice{ - pixel_x = 32 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"ea" = ( -/obj/machinery/door/poddoor{ - id = "cepheus_mech_2"; - name = "Mechbay Shutters" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"eu" = ( -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/effect/turf_decal/techfloor/corner, -/mob/living/simple_animal/bot/secbot/beepsky/jr, -/obj/machinery/firealarm/directional/west{ - pixel_y = 1; - pixel_x = -34 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/button/door{ - dir = 4; - id = "cepheus_armoury"; - name = "Armoury Lockdown"; - pixel_x = -23; - pixel_y = -10 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) -"ey" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/sign/warning/explosives/alt{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/hardline_small/right{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"eQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 23 - }, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/dorm) -"eW" = ( -/obj/item/clothing/under/rank/command/minutemen, -/obj/item/clothing/suit/toggle/lawyer/minutemen, -/obj/item/clothing/head/caphat/minutemen, -/obj/item/clothing/head/cowboy/sec/minutemen, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/glasses/sunglasses, -/obj/item/radio/headset/minutemen/alt/captain, -/obj/effect/turf_decal/techfloor, -/obj/structure/closet/secure_closet/wall{ - dir = 1; - icon_door = "solgov_wall"; - icon_state = "solgov_wall"; - name = "captain's locker"; - pixel_y = -28; - req_access_txt = "20" - }, -/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/item/clothing/shoes/cowboy/white, -/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, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"ff" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/science/robotics) -"fh" = ( -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/number/five, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"fq" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"fr" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_x = -6 - }, -/obj/machinery/recharger{ - pixel_x = 5 - }, -/obj/structure/sign/poster/contraband/d_day_promo{ - pixel_x = -32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/toy/figure/secofficer{ - pixel_x = -9; - pixel_y = 14 - }, -/obj/item/screwdriver, -/obj/item/holosign_creator/security{ - pixel_x = -3; - pixel_y = 7 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"fy" = ( -/obj/structure/closet/emcloset/wall{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/decal/cleanable/oil{ - pixel_y = 11 - }, -/obj/machinery/light/small/directional/south, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 10; - pixel_x = -25 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"fJ" = ( -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - id = "cepheus_cargo_holo"; - locked = 1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-6" - }, -/obj/structure/sign/minutemen{ - pixel_y = 32 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cepheus_cargo"; - name = "Cargo Shutter" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) -"fM" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots{ - pixel_x = -2; - pixel_y = -3 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/robot_debris, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"fN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"fX" = ( -/obj/machinery/door/window/eastright{ - dir = 1; - name = "Kitchen" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/food/egg_smudge{ - pixel_x = 11; - pixel_y = -6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"fY" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "cepheus_windows"; - name = "External Shutters" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"gi" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/paper_bin{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/stamp/captain{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/stamp/head_of_personnel{ - pixel_x = -10; - pixel_y = 10 - }, -/obj/item/folder/blue{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/newspaper, -/obj/item/desk_flag{ - pixel_x = 10 - }, -/obj/machinery/button/door{ - id = "cepheus_windows"; - name = "Window Shutters"; - pixel_x = -10; - pixel_y = 23 - }, -/obj/machinery/button/door{ - id = "cepheus_bridge"; - name = "Bridge Shutters"; - pixel_x = 1; - pixel_y = 23 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"go" = ( -/obj/machinery/cryopod{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/rip_badger{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/dorm) -"gu" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/greenglow{ - pixel_y = -10 - }, -/obj/effect/turf_decal/industrial/caution, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"gC" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/glass{ - pixel_x = 11; - pixel_y = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"gG" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 10 - }, -/obj/item/kirbyplants{ - pixel_x = -8; - pixel_y = -1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"gT" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"hd" = ( -/obj/structure/frame/computer{ - anchored = 1; - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"hr" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/red/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"hA" = ( -/obj/machinery/computer/mech_bay_power_console, -/obj/effect/turf_decal/rechargefloor, -/obj/structure/sign/minutemen{ - pixel_y = 32 - }, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 8; - id = "cepheus_mech_1_holo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/science/robotics) -"im" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/turf_decal/trimline/opaque/red/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/red/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"ir" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/industrial/caution, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) -"is" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/arrows{ - pixel_y = 15 - }, -/obj/structure/railing{ - color = "#808080"; - dir = 4; - layer = 4.1 - }, -/obj/item/circuitboard/mecha/ripley/peripherals{ - pixel_x = -5; - pixel_y = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"it" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/industrial/loading{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"iz" = ( -/obj/machinery/mech_bay_recharge_port{ - dir = 8 - }, -/obj/effect/turf_decal/rechargefloor, -/obj/structure/sign/warning/vacuum{ - pixel_y = 32 - }, -/obj/machinery/light/directional/north, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 8; - id = "cepheus_mech_2_holo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/science/robotics) -"iM" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/atmospherics) -"jl" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"jp" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/techfloor/hole, -/obj/effect/turf_decal/industrial/loading{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"jx" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/loading, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"jK" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/light_switch{ - pixel_x = -10; - pixel_y = 23 - }, -/obj/structure/closet/crate/science, -/obj/item/storage/box/stockparts/t2{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/item/survey_handheld{ - pixel_x = 7 - }, -/obj/item/clothing/glasses/science{ - pixel_x = -2; - pixel_y = -6 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"jR" = ( -/obj/structure/railing{ - dir = 1; - layer = 4.1 - }, -/obj/machinery/computer/monitor, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"jU" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"kg" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"kv" = ( -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"kA" = ( -/obj/effect/turf_decal/steeldecal/steel_decals9, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"kG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/airlock/grunge{ - name = "Bathroom" - }, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"lc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"lu" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"lx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/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, -/area/ship/hallway/central) -"lA" = ( -/obj/machinery/cryopod{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/dorm) -"lF" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Cargo Bay" - }, -/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, -/area/ship/cargo) -"lV" = ( -/obj/machinery/suit_storage_unit/independent/pilot, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/radio/intercom/directional/east, -/obj/machinery/light_switch{ - pixel_x = -8; - pixel_y = 22 - }, -/obj/machinery/camera/autoname{ - dir = 9 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/science/robotics) -"lX" = ( -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/red/line, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_armoury"; - name = "Armoury Shutter" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"me" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/obj/structure/sign/departments/cargo{ - pixel_x = -32 - }, -/obj/structure/closet/crate/bin, -/obj/item/trash/plate, -/obj/item/trash/cheesie{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/trash/sosjerky{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"mf" = ( -/obj/structure/closet/firecloset/wall{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/decal/cleanable/plasma, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"mn" = ( -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) -"mB" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"mH" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/circuitboard/machine/rdserver, -/obj/item/circuitboard/computer/rdconsole{ - pixel_y = 7 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/circuitboard/machine/circuit_imprinter/department/basic{ - pixel_y = -10 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/science/robotics) -"mK" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/structure/curtain/cloth/grey, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/dorm) -"mS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/wood/birch{ - icon_state = "wood-broken7" - }, -/area/ship/crew/dorm) -"mY" = ( -/obj/structure/curtain/bounty, -/turf/open/floor/plasteel/stairs{ - dir = 1; - icon = 'icons/obj/stairs.dmi' - }, -/area/ship/crew/dorm) -"nc" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/dorm) -"ng" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/electrical{ - pixel_y = -4 - }, -/obj/item/multitool{ - pixel_x = 9 - }, -/obj/item/geiger_counter{ - pixel_x = 1 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"nr" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/structure/sign/departments/engineering{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"nG" = ( -/obj/structure/closet/emcloset/wall{ - pixel_y = 28 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"nN" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"nT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/caution{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"og" = ( -/obj/machinery/computer/mech_bay_power_console, -/obj/effect/turf_decal/rechargefloor, -/obj/structure/sign/minutemen{ - pixel_y = 32 - }, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 4; - id = "cepheus_mech_2_holo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/science/robotics) -"oo" = ( -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"pc" = ( -/obj/effect/turf_decal/techfloor, -/obj/item/mecha_parts/mecha_equipment/cable_layer{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 7 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"pq" = ( -/obj/machinery/suit_storage_unit/independent/pilot, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/sign/poster/contraband/engis_unite{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/science/robotics) -"pr" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"pD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"pQ" = ( -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"pV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/stairs{ - dir = 8 - }, -/area/ship/engineering/electrical) -"pW" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/machinery/computer/secure_data/laptop{ - dir = 4; - pixel_x = -8; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"qb" = ( -/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/item/radio/headset/minutemen, -/obj/item/radio/headset/minutemen, -/obj/item/radio/headset/minutemen, -/obj/item/radio/headset/minutemen, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/retro/radio{ - pixel_x = 32 - }, -/obj/structure/closet/wall{ - 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, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/dorm) -"qe" = ( -/obj/structure/table/reinforced, -/obj/item/taperecorder{ - pixel_x = -7 - }, -/obj/item/megaphone/sec{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 8; - pixel_y = -22 - }, -/obj/item/firing_pin{ - pixel_x = 3; - pixel_y = -7 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"qk" = ( -/obj/effect/turf_decal/siding/white, -/obj/structure/sign/poster/contraband/space_cola{ - pixel_y = -32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"qn" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/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 = "2-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"qq" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/decal/cleanable/glass{ - pixel_x = 11; - pixel_y = 9 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"qs" = ( -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/structure/sign/poster/official/moth/hardhats{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"qI" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"qJ" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/organ/tongue/robot, -/obj/item/mmi/posibrain{ - pixel_x = 8 - }, -/obj/item/clothing/glasses/hud/diagnostic{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/clothing/glasses/hud/diagnostic{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/science/robotics) -"qK" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/cargo) -"qT" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/sign/warning/electricshock{ - pixel_y = 36 - }, -/obj/machinery/button/shieldwallgen{ - id = "cepheus_mech_2_holo"; - pixel_y = 21 - }, -/obj/machinery/button/door{ - id = "cepheus_mech_2"; - name = "Mechbay Shutters"; - pixel_x = 10; - pixel_y = 23 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"qW" = ( -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/structure/closet/wall/orange{ - dir = 4; - name = "Pilot's Locker"; - pixel_x = -28 - }, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/head/beret/sec/officer, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/gloves/tackler/dolphin, -/obj/item/clothing/mask/bandana/skull, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/suit/armor/vest/alt, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"rc" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/red/warning, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"ri" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cepheus_windows"; - name = "External Shutters" - }, -/turf/open/floor/plating, -/area/ship/hallway/central) -"rr" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/sign/poster/retro/we_watch{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"rt" = ( -/obj/structure/tank_dispenser, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 10 - }, -/obj/effect/decal/cleanable/ash/large{ - pixel_x = -14; - pixel_y = -9 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"rx" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"rB" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/stairs, -/area/ship/engineering/atmospherics) -"rH" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/plasma, -/obj/machinery/light/directional/south, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"rU" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"rZ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/airalarm/directional/south, -/obj/structure/dresser, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"sb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"se" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"sm" = ( -/obj/structure/bed, -/obj/structure/curtain/cloth/grey, -/obj/item/bedsheet/dorms, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 8; - pixel_y = -22 - }, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/dorm) -"so" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastright{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_engines"; - name = "Engine Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"sz" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/arrows{ - pixel_y = 15 - }, -/obj/structure/railing{ - color = "#808080"; - dir = 8; - layer = 4.1 - }, -/obj/effect/decal/cleanable/glass/plasma, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"sA" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/structure/sign/poster/official/moth/epi{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"sB" = ( -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/item/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/reagent_containers/food/snacks/meat/slab/monkey, -/obj/structure/closet/secure_closet/freezer/meat/open, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"sE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/atmosia_independence{ - pixel_y = 32 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"sH" = ( -/obj/structure/bed/dogbed, -/mob/living/simple_animal/turtle{ - name = "Jimmie" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"sX" = ( -/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/door/poddoor/shutters/preopen{ - dir = 4; - id = "cepheus_bridge_lockdown"; - name = "Blast Shutters" - }, -/obj/machinery/door/airlock/highsecurity, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/bridge) -"te" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"th" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/hardline_small{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"tm" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/storage/belt/utility/full{ - pixel_y = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_y = 23; - pixel_x = -12 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"tH" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/item/kirbyplants{ - icon_state = "plant-03" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"tQ" = ( -/obj/machinery/mech_bay_recharge_port, -/obj/effect/turf_decal/rechargefloor, -/obj/structure/sign/poster/official/get_your_legs{ - pixel_x = -32 - }, -/obj/structure/sign/warning/vacuum{ - pixel_y = 32 - }, -/obj/machinery/light/directional/north, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 4; - id = "cepheus_mech_1_holo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/science/robotics) -"tV" = ( -/obj/structure/guncase, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/item/gun/ballistic/automatic/pistol/candor{ - pixel_y = 3 - }, -/obj/item/gun/ballistic/automatic/pistol/candor{ - pixel_y = 3 - }, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/item/gun/ballistic/automatic/pistol/candor{ - pixel_y = 3 - }, -/obj/structure/sign/poster/contraband/twelve_gauge{ - pixel_y = 32 - }, -/obj/item/gun/ballistic/shotgun/hellfire, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"tX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/dorm) -"ug" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/structure/chair, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"uj" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"um" = ( -/obj/effect/turf_decal/rechargefloor, -/obj/machinery/door/firedoor/border_only, -/obj/mecha/working/ripley/cmm{ - dir = 1 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/science/robotics) -"uo" = ( -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 1; - id = "cepheus_cargo_holo"; - locked = 1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-5" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "cepheus_cargo"; - name = "Cargo Shutter" - }, -/turf/open/floor/plasteel/patterned/ridged, -/area/ship/cargo) -"uO" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/red/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"uS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"uX" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/atmospherics) -"vj" = ( -/obj/effect/turf_decal/techfloor, -/obj/machinery/button/door{ - dir = 1; - id = "cepheus_cargo"; - name = "Cargo Shutters"; - pixel_x = -10; - pixel_y = -23 - }, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "cepheus_cargo_holo"; - pixel_y = -21 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"vJ" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/glass{ - amount = 40; - pixel_x = 3; - pixel_y = -4 - }, -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 50 - }, -/obj/item/stack/sheet/metal/fifty{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/stack/sheet/plasteel/five{ - pixel_x = -7; - pixel_y = 1 - }, -/obj/machinery/firealarm/directional/south, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"vQ" = ( -/obj/machinery/door/airlock/hatch{ - name = "Mech Bay" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cepheus_bridge_lockdown"; - name = "Blast Shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"vT" = ( -/obj/effect/decal/cleanable/dirt, -/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" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"vY" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"vZ" = ( -/obj/machinery/shower{ - dir = 4; - name = "emergency shower" - }, -/obj/item/soap/deluxe, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"we" = ( -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/obj/item/storage/backpack, -/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/trimline/opaque/red/line, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"wy" = ( -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"wC" = ( -/obj/structure/sign/poster/contraband/free_drone{ - pixel_y = -32 - }, -/obj/machinery/airalarm/directional/east, -/obj/structure/frame/machine{ - anchored = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"wF" = ( -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/decal/cleanable/dirt, -/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/stairs{ - dir = 8 - }, -/area/ship/cargo) -"wH" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"wJ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "engine fuel pump" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/number/four, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"wK" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/loading, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"wN" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/ship/engineering/atmospherics) -"xd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/steeldecal/steel_decals4, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/holopad/emergency/engineering, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"xF" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/trash/sosjerky{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"xT" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 15; - height = 15; - width = 15 - }, -/turf/template_noop, -/area/template_noop) -"xV" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"yh" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/oil, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"yn" = ( -/obj/structure/sign/minutemen, -/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, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/science/robotics) -"yK" = ( -/obj/effect/turf_decal/siding/thinplating/corner, -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"yL" = ( -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/structure/closet/wall/orange{ - dir = 4; - name = "Pilot's Locker"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/under/rank/security/officer/minutemen, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/head/beret/sec/officer, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/gloves/tackler/dolphin, -/obj/item/clothing/mask/bandana/skull, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/suit/armor/vest/alt, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"yM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"yZ" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10"; - pixel_x = 7; - pixel_y = 19 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/oil{ - icon_state = "floor6" - }, -/obj/item/weldingtool{ - pixel_x = -5; - pixel_y = -6 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"zc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"zn" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/light/directional/east, -/obj/item/radio/intercom/directional/north{ - pixel_y = 22 - }, -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/medical, -/obj/item/storage/pill_bottle/iron{ - pixel_x = 6 - }, -/obj/item/stack/medical/splint{ - pixel_x = 6 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"zA" = ( -/obj/structure/closet/crate/internals, -/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/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"zD" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"zI" = ( -/obj/structure/chair/office{ - dir = 1; - name = "tactical swivel chair" - }, -/obj/effect/turf_decal/steeldecal/steel_decals1{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"zJ" = ( -/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, -/area/ship/hallway/central) -"zK" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/door/airlock/grunge{ - name = "Engineering" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/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/engineering/atmospherics) -"zQ" = ( -/turf/template_noop, -/area/template_noop) -"zX" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastleft{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_engines"; - name = "Engine Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"Ao" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/hatch{ - name = "Dormitories" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/crew/dorm) -"At" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/oil/slippery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/hardline_small/left{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"Ay" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"AH" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/caution, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"AL" = ( -/obj/machinery/recharge_station, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/decal/cleanable/chem_pile{ - pixel_x = 17; - pixel_y = -6 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/science/robotics) -"By" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"Bz" = ( -/obj/machinery/modular_computer/console/preset/command, -/obj/structure/noticeboard{ - pixel_y = 31 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"BO" = ( -/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" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"BR" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cepheus_windows"; - name = "External Shutters" - }, -/turf/open/floor/plating, -/area/ship/security) -"BU" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"BZ" = ( -/obj/machinery/computer/cargo/express{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"Cr" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/ship/engineering/electrical) -"CS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/table/wood/reinforced, -/obj/item/flashlight/lamp{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/paicard{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"CY" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_engines"; - name = "Engine Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"Da" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/vending/coffee, -/obj/structure/sign/warning/securearea{ - pixel_x = 32 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/autoname, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Dg" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Dj" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 4 - }, -/turf/open/floor/engine/hull, -/area/ship/engineering/electrical) -"Dk" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "cepheus_bridge"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/bridge) -"Dr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/obj/machinery/light/directional/south, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/button/door{ - dir = 1; - id = "cepheus_engines"; - name = "Engine Shutters"; - pixel_x = 9; - pixel_y = -23 - }, -/obj/effect/turf_decal/number/zero, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"Dy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/wrapping{ - pixel_y = 15 - }, -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"DA" = ( -/obj/machinery/computer/helm{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"DG" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"DN" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood/reinforced, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen/fountain{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/storage/pill_bottle/dice{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/structure/sign/poster/official/work_for_a_future{ - pixel_y = 32 - }, -/obj/item/clothing/neck/tie/genderfluid, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"El" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"Em" = ( -/obj/machinery/rnd/production/techfab/department/security, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 8; - pixel_y = -22 - }, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Eo" = ( -/obj/machinery/computer/bounty{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"Et" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stamp/hos{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/item/storage/fancy/donut_box{ - pixel_x = -10; - pixel_y = 3 - }, -/obj/machinery/light/directional/east{ - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Ev" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Ew" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"EA" = ( -/obj/machinery/processor, -/obj/effect/decal/cleanable/xenoblood{ - pixel_x = 7 - }, -/obj/effect/turf_decal/corner_techfloor_gray/full{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"EB" = ( -/obj/effect/turf_decal/techfloor, -/obj/item/radio/intercom/wideband/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -13; - pixel_y = -22 - }, -/obj/machinery/computer/security{ - dir = 8 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"EG" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals2, -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"EL" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/machinery/computer/cryopod/directional/north{ - pixel_y = 26 - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/dorm) -"EN" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/light/directional/east, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/obj/structure/ore_box, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"ER" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/vending/cigarette, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Fg" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Fm" = ( -/obj/structure/rack, -/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp{ - pixel_y = -7 - }, -/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Fo" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/grunge{ - name = "Engineering" - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/engineering/electrical) -"Fr" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/obj/structure/sign/departments/engineering{ - pixel_y = -32 - }, -/obj/machinery/light/directional/south, -/obj/machinery/newscaster/directional/west, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Ft" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 4 - }, -/obj/machinery/jukebox, -/obj/effect/decal/cleanable/wrapping, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/structure/railing/wood{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Fu" = ( -/obj/structure/frame/computer{ - anchored = 1; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Fx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/wall{ - name = "Utility Closet"; - pixel_y = 28 - }, -/obj/item/flashlight, -/obj/item/flashlight, -/obj/item/flashlight, -/obj/item/flashlight, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"FA" = ( -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/head/helmet/space/light/engineer, -/obj/item/clothing/suit/space/engineer, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"FC" = ( -/obj/structure/table, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"FJ" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_engines"; - name = "Engine Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"FS" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/railing{ - dir = 4; - layer = 3.1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/warning/gasmask{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"FW" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - piping_layer = 2 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/electrical) -"Gf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Gk" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/effect/turf_decal/trimline/opaque/red/warning{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"Gm" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/machinery/light/directional/west, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/dorm) -"Gn" = ( -/obj/machinery/mecha_part_fabricator, -/obj/structure/railing{ - color = "#808080"; - dir = 8; - layer = 4.1 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/sign/poster/official/safety_eye_protection{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Gr" = ( -/obj/structure/sign/poster/contraband/tools{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/stairs{ - dir = 1 - }, -/area/ship/engineering/electrical) -"Ho" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/hole{ - dir = 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/camera/autoname, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"HM" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -1; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/greenglow, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/patterned, -/area/ship/crew/dorm) -"Ih" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/decal/cleanable/glass{ - pixel_x = 11; - pixel_y = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "6-8" - }, -/obj/structure/cable{ - icon_state = "5-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/electrical) -"Im" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Io" = ( -/obj/machinery/power/port_gen/pacman, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/item/wrench, -/obj/structure/cable/yellow, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/electrical) -"Iq" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/structure/sign/poster/official/walk{ - pixel_x = -32 - }, -/obj/item/taperecorder{ - pixel_x = 12; - pixel_y = 1 - }, -/obj/machinery/camera/autoname{ - dir = 10 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"IB" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"IK" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/machinery/computer/secure_data/laptop{ - density = 0; - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/recharger{ - pixel_x = 12 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"IR" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, -/obj/item/mecha_parts/mecha_equipment/drill{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/oil{ - icon_state = "floor6"; - pixel_x = -16; - pixel_y = -13 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Jb" = ( -/obj/effect/turf_decal/techfloor/corner, -/obj/effect/turf_decal/techfloor/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 2 - }, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 6 - }, -/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/dark, -/area/ship/cargo) -"Jc" = ( -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/structure/sign/poster/official/ion_carbine{ - pixel_y = 32 - }, -/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Jk" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/caution, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"Jw" = ( -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/industrial/warning, -/obj/item/toy/plush/hornet/gay{ - pixel_x = 5; - pixel_y = 21 - }, -/obj/structure/cable{ - icon_state = "0-10" - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/electrical) -"JO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner_techfloor_grid, -/obj/structure/cable{ - icon_state = "4-10" - }, -/obj/structure/cable{ - icon_state = "4-9" - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"JR" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 8 - }, -/obj/structure/table, -/obj/item/trash/sosjerky{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/structure/sign/poster/official/fruit_bowl{ - pixel_x = -32 - }, -/obj/effect/decal/cleanable/vomit/old{ - pixel_y = 13 - }, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_x = 3; - pixel_y = -1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"JX" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 4 - }, -/obj/structure/closet/wall{ - dir = 8; - icon_door = "grey_wall"; - pixel_x = 28 - }, -/obj/item/kitchen/knife/plastic{ - pixel_x = 8 - }, -/obj/item/kitchen/knife/plastic{ - pixel_x = 8 - }, -/obj/item/kitchen/knife/plastic{ - pixel_x = 8 - }, -/obj/item/kitchen/knife/plastic{ - pixel_x = 8 - }, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 2 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 2 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 2 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 2 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 2 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"JZ" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"Kc" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - name = "Security" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cepheus_bridge_lockdown"; - name = "Blast Shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"KL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed/pod, -/obj/structure/sign/poster/contraband/ambrosia_vulgaris{ - pixel_x = 32 - }, -/obj/item/toy/plush/beeplushie, -/obj/machinery/camera/autoname, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Lc" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/security) -"Ld" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/item/analyzer{ - pixel_x = 3; - pixel_y = -4 - }, -/obj/item/analyzer{ - pixel_y = -1 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"Lj" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"Lr" = ( -/obj/machinery/power/port_gen/pacman, -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/electrical) -"LJ" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"LM" = ( -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/power/terminal, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/electrical) -"LY" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/structure/chair, -/obj/structure/railing/wood{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Mi" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/newspaper{ - pixel_x = 7; - pixel_y = -1 - }, -/obj/machinery/jukebox/boombox{ - pixel_y = 5 - }, -/obj/item/reagent_containers/food/snacks/breadslice/moldy{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = 12 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"Mj" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/curtain/bounty, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/shower{ - pixel_y = 19 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/catwalk_floor, -/area/ship/security) -"Mo" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/firealarm/directional/west, -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Mr" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/hallway/central) -"ME" = ( -/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/plasteel, -/area/ship/hallway/central) -"MR" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"MS" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/south, -/obj/structure/closet/crate/trashcart, -/obj/item/trash/can, -/obj/item/trash/waffles, -/obj/item/trash/chips, -/obj/item/trash/energybar, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"MW" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/minutemen{ - pixel_y = -32 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/wood/birch{ - icon_state = "wood-broken4" - }, -/area/ship/crew/dorm) -"Nj" = ( -/obj/effect/turf_decal/corner/transparent/beige/full, -/obj/effect/turf_decal/corner/transparent/beige/diagonal, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 4 - }, -/obj/machinery/light/directional/east{ - light_color = "#e8eaff" - }, -/obj/structure/chair, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"Nr" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"Nt" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/wrench/old, -/obj/item/reagent_containers/food/drinks/mug{ - pixel_x = -12; - pixel_y = -2 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"Nx" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastleft{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_engines"; - name = "Engine Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"NI" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/item/ammo_box/magazine/co9mm, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 31 - }, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 8 - }, -/obj/item/gun/energy/disabler{ - pixel_y = 2 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"NJ" = ( -/obj/structure/bed, -/obj/structure/curtain/cloth/grey, -/obj/item/bedsheet/dorms, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/south, -/turf/open/floor/carpet/royalblue, -/area/ship/crew/dorm) -"NR" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"NW" = ( -/obj/machinery/light/directional/east, -/obj/structure/bed/pod, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Ob" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/electrical) -"Of" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/railing{ - dir = 4; - layer = 3.1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/techfloor/hole{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering/atmospherics) -"Oi" = ( -/obj/item/mecha_parts/mecha_equipment/generator{ - pixel_x = -9; - pixel_y = -9 - }, -/obj/effect/decal/cleanable/oil{ - icon_state = "streak3" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/stack/ore/salvage/scraptitanium{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Ol" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/requests_console{ - pixel_y = 25 - }, -/obj/machinery/light/directional/west{ - light_color = "#e8eaff" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"OG" = ( -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/swat, -/obj/structure/railing{ - dir = 4; - layer = 3.1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"OP" = ( -/obj/effect/turf_decal/techfloor/orange, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/wall/orange{ - dir = 8; - name = "fuel locker"; - pixel_x = 28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/item/stack/sheet/mineral/plasma/five{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering/electrical) -"OX" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/button/door{ - dir = 4; - id = "cepheus_bridge_lockdown"; - name = "Bridge lockdown"; - pixel_x = -22 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Pc" = ( -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/effect/turf_decal/industrial/loading{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"Pz" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "0-1" - }, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"PO" = ( -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-9" - }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/electrical) -"PP" = ( -/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/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/red/line, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"PV" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals9, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Qf" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"Qr" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/science/robotics) -"Qx" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 1 - }, -/obj/structure/sign/minutemen{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"QI" = ( -/obj/effect/turf_decal/techfloor{ - dir = 9 - }, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/machinery/fax, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"QJ" = ( -/obj/machinery/autolathe, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 8 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/sign/poster/retro/build{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"QO" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/item/circuitboard/mecha/durand/main{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/sign/warning/electricshock{ - pixel_y = 36 - }, -/obj/machinery/button/shieldwallgen{ - id = "cepheus_mech_1_holo"; - pixel_y = 21 - }, -/obj/machinery/button/door{ - id = "cepheus_mech_1"; - name = "Mechbay Shutters"; - pixel_x = -10; - pixel_y = 23 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"QS" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/holopad/emergency/command, -/obj/machinery/light/directional/west{ - light_color = "#e8eaff" - }, -/obj/structure/sign/departments/security{ - pixel_y = -32 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Rd" = ( -/obj/effect/turf_decal/techfloor/corner, -/obj/effect/spawner/lootdrop/random_machine_circuit_mech, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Ri" = ( -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/toy/cards/deck{ - pixel_x = -3 - }, -/obj/item/trash/chips{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Rt" = ( -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Ru" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 1 - }, -/turf/open/floor/plasteel/stairs{ - dir = 8; - icon_state = "stairs-old" - }, -/area/ship/bridge) -"RL" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/item/ammo_box/magazine/co9mm, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 10 - }, -/obj/item/gun/energy/disabler{ - pixel_y = 2 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"RM" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/obj/structure/closet/wall/red{ - dir = 8; - name = "Ammo locker"; - pixel_x = 28 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 5 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 6 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 6 - }, -/obj/item/ammo_box/magazine/m45{ - pixel_x = 6 - }, -/obj/item/ammo_box/a12g/rubbershot, -/obj/item/ammo_box/magazine/cm15_mag, -/obj/item/ammo_box/a12g/rubbershot, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) -"RN" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) -"RW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Sd" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/plasma, -/obj/effect/turf_decal/steeldecal, -/obj/structure/closet/wall{ - icon_door = "orange_wall"; - name = "Mining equipment"; - pixel_y = 28 - }, -/obj/item/clothing/glasses/meson, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/circuitboard/machine/ore_redemption, -/obj/item/gps/mining, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) -"SE" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "engine fuel pump" - }, -/obj/item/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 8 - }, -/obj/effect/turf_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"SQ" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 10 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/electrical) -"Tu" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"Tv" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/sign/warning/nosmoking{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/science/robotics) -"Tx" = ( -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/structure/chair/office{ - dir = 8; - name = "tactical swivel chair" - }, -/obj/effect/decal/cleanable/vomit/old, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Tz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"TH" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/south, -/obj/machinery/vending/wallmed{ - pixel_y = -28 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"TJ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Helm" - }, -/obj/effect/turf_decal/steeldecal/steel_decals7{ - dir = 4; - pixel_x = -1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/bridge) -"TL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi' - }, -/area/ship/engineering/electrical) -"TU" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) -"Ui" = ( -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 4 - }, -/obj/item/kitchen/knife, -/obj/item/kitchen/rollingpin, -/obj/item/book/manual/chef_recipes, -/obj/structure/closet/secure_closet/freezer/wall{ - dir = 8; - pixel_x = 28 - }, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/clothing/suit/apron/chef, -/obj/effect/decal/cleanable/food/tomato_smudge, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"Uj" = ( -/obj/structure/closet/secure_closet{ - icon_door = "tac"; - icon_state = "tac"; - name = "boarding tools locker"; - req_access_txt = "3" - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/storage/backpack/duffelbag/syndie/x4{ - icon_state = "duffel-sec"; - name = "breaching charges duffel bag" - }, -/obj/item/crowbar/power{ - pixel_y = -4 - }, -/obj/item/door_seal, -/obj/item/door_seal, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Um" = ( -/obj/structure/closet/secure_closet{ - icon_state = "sec"; - name = "equipment locker"; - req_access_txt = "1" - }, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, -/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/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/structure/sign/poster/contraband/stechkin{ - pixel_y = -32 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Up" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/engineering/electrical) -"Ur" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/steeldecal/steel_decals_central2{ - pixel_y = 2 - }, -/obj/item/book/manual/wiki/robotics{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/welding{ - pixel_x = 6; - pixel_y = -5 - }, -/obj/item/clothing/glasses/welding{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/toy/figure/roboticist{ - pixel_x = 7; - pixel_y = 11 - }, -/obj/item/disk/design_disk/cmm_mechs{ - pixel_y = -12 - }, -/turf/open/floor/plasteel/dark, -/area/ship/science/robotics) -"Us" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cepheus_windows"; - name = "External Shutters" - }, -/turf/open/floor/plating, -/area/ship/science/robotics) -"UC" = ( -/obj/effect/turf_decal/siding/white, -/obj/item/radio/intercom/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -22 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"UQ" = ( -/obj/machinery/vending/tool, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"UV" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastright{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "cepheus_engines"; - name = "Engine Blast Door" - }, -/turf/open/floor/plating, -/area/ship/engineering/atmospherics) -"UW" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/electrical) -"Vb" = ( -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals3{ - dir = 10 - }, -/obj/effect/turf_decal/industrial/caution, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/steeldecal/steel_decals_central4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"Vj" = ( -/obj/effect/turf_decal/techfloor, -/obj/item/radio/intercom/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 7; - pixel_y = -21 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/dorm) -"Vl" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -1; - pixel_y = 5 - }, -/turf/open/floor/plating/catwalk_floor, -/area/ship/security) -"Vt" = ( -/obj/machinery/photocopier{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/kirbyplants{ - icon_state = "plant-22"; - pixel_x = -10 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"VI" = ( -/obj/machinery/door/airlock/freezer{ - dir = 4 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"VQ" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"VV" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/structure/railing{ - dir = 8; - layer = 3.1 - }, -/obj/item/clothing/suit/space/hardsuit/security/independent/minutemen, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"WB" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm) -"WL" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, -/obj/docking_port/mobile{ - dir = 4; - launch_status = 0; - port_direction = 2; - preferred_direction = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/atmospherics) -"WN" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/transparent/black/half{ - dir = 4 - }, -/obj/machinery/microwave{ - pixel_y = 5 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -22 - }, -/obj/effect/turf_decal/corner_techfloor_gray{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) -"WQ" = ( -/obj/structure/closet/secure_closet/freezer/wall{ - dir = 4; - pixel_x = -28 - }, -/obj/item/reagent_containers/food/condiment/sugar{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/condiment/sugar{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/condiment/sugar{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) -"WU" = ( -/obj/structure/table, -/obj/machinery/computer/secure_data/laptop{ - dir = 8; - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/trash/can/food{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/machinery/button/door{ - dir = 8; - id = "cepheus_armoury"; - name = "Armoury Lockdown"; - pixel_x = 23; - pixel_y = 10 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"WX" = ( -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"WY" = ( -/obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "1" - }, -/obj/effect/turf_decal/industrial/warning/corner{ - color = "#808080"; - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Xs" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/electrical) -"Xv" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/poster/official/the_owl{ - pixel_x = 32 - }, -/obj/structure/sign/poster/contraband/peacemaker{ - pixel_y = -32 - }, -/obj/item/phone{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/clothing/gloves/krav_maga/sec{ - pixel_x = -9 - }, -/obj/item/clothing/head/beret/sec/warden{ - pixel_x = -4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security) -"Xx" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/atmospherics) -"XA" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/security) -"XP" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/red/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"YI" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/table/wood/reinforced, -/obj/item/storage/photo_album{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/storage/fancy/cigarettes/cigpack_uplift{ - pixel_x = -6 - }, -/obj/item/storage/fancy/cigarettes/cigpack_robustgold{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/lighter{ - pixel_x = -9 - }, -/obj/item/newspaper{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/wood/birch, -/area/ship/crew/dorm) -"YW" = ( -/obj/effect/turf_decal/techfloor, -/obj/item/circuitboard/mecha/odysseus/peripherals{ - pixel_x = 2; - pixel_y = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"Zt" = ( -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 8 - }, -/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, -/area/ship/hallway/central) -"ZF" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/rcl, -/obj/effect/turf_decal/industrial/warning{ - color = "#808080"; - dir = 9 - }, -/obj/effect/turf_decal/box, -/obj/effect/decal/cleanable/wrapping, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 22; - pixel_y = -10 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"ZJ" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals7, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/electrical) -"ZN" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/item/stack/ore/salvage/scrapsilver{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/science/robotics) -"ZY" = ( -/obj/structure/railing{ - dir = 2; - layer = 4.1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/structure/closet/secure_closet/freezer/fridge, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/hallway/central) - -(1,1,1) = {" -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -xT -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -"} -(2,1,1) = {" -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -El -fJ -dy -uo -El -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -"} -(3,1,1) = {" -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -qK -El -Sd -JO -vj -El -qK -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -"} -(4,1,1) = {" -zQ -zQ -zQ -zQ -zQ -iM -xV -xV -El -jK -wK -lc -jp -MS -El -Xs -Xs -SQ -zQ -zQ -zQ -zQ -zQ -"} -(5,1,1) = {" -zQ -zQ -zQ -zQ -an -uX -Nx -UV -El -rr -jx -sb -it -Pz -El -zX -so -Ob -Up -Dj -zQ -zQ -zQ -"} -(6,1,1) = {" -zQ -zQ -uX -WL -uX -uX -sE -fh -El -zn -dq -Jb -Pc -EN -El -yZ -rH -Ob -Ob -fY -Ob -zQ -zQ -"} -(7,1,1) = {" -ag -wN -uX -Nr -fy -uX -di -Dr -El -El -BZ -wF -Eo -El -El -nG -bX -Lj -Mi -cF -Ob -Cr -UW -"} -(8,1,1) = {" -uX -CY -uX -VQ -uX -uX -jU -wJ -rx -El -El -lF -El -El -FW -gu -Ld -Lj -xF -ZJ -Ob -FJ -Ob -"} -(9,1,1) = {" -ak -aE -FS -nT -Of -ey -th -At -uX -uX -me -Zt -Fr -Ob -Ob -Ho -zA -Lj -Nt -kA -bh -ng -Ob -"} -(10,1,1) = {" -uX -aU -FA -Xx -rt -jR -mf -pD -rB -zK -kv -se -yK -Fo -Gr -uj -OP -TL -Vb -xd -SE -rU -Ob -"} -(11,1,1) = {" -an -uX -bb -db -fM -uX -uX -uX -uX -uX -nr -zc -UC -Ob -Ob -pV -Ob -Ob -UQ -ZF -QJ -Ob -Up -"} -(12,1,1) = {" -zQ -aW -WB -WB -WB -WB -CS -YI -rZ -WB -vY -lx -qk -Ob -Lr -Ih -Io -Ob -Ob -Ob -Ob -Up -zQ -"} -(13,1,1) = {" -zQ -zQ -WB -vZ -HM -WB -DN -Dy -NR -WB -sA -ME -TH -Ob -Jw -LM -PO -Ob -WQ -sB -Qf -zQ -zQ -"} -(14,1,1) = {" -zQ -zQ -WB -dg -fN -kG -mS -zD -MW -WB -lu -zJ -Ev -Ob -Ob -Ob -Ob -Ob -fq -ZY -Qf -zQ -zQ -"} -(15,1,1) = {" -zQ -zQ -aW -WB -WB -WB -WB -Fx -nN -Ao -te -yM -gT -LY -JR -Mo -JZ -Qf -VI -Qf -Mr -zQ -zQ -"} -(16,1,1) = {" -zQ -zQ -zQ -WB -Gm -nc -mY -tX -mK -WB -tH -vT -gT -IB -IB -IB -fX -Dg -Tz -ri -zQ -zQ -zQ -"} -(17,1,1) = {" -zQ -zQ -zQ -WB -EL -Vj -WB -eQ -NJ -WB -ER -Gf -Ew -Im -qq -ug -bn -Tz -EA -ri -zQ -zQ -zQ -"} -(18,1,1) = {" -zQ -zQ -zQ -WB -go -lA -WB -qb -sm -WB -Da -BO -gT -Ft -JX -Nj -Ri -Ui -WN -Qf -zQ -zQ -zQ -"} -(19,1,1) = {" -zQ -zQ -zQ -Qr -Qr -Qr -Qr -Qr -Qr -By -By -sX -By -By -TU -TU -TU -TU -TU -TU -zQ -zQ -zQ -"} -(20,1,1) = {" -zQ -zQ -zQ -Qr -tQ -yL -qW -Fm -Qr -Ol -OX -qn -Fg -QS -TU -dp -fr -hd -Em -TU -zQ -zQ -zQ -"} -(21,1,1) = {" -zQ -zQ -zQ -dA -um -Jk -cg -aa -vQ -DG -Ay -qI -kg -Tu -Kc -XP -mB -hr -gG -BR -zQ -zQ -zQ -"} -(22,1,1) = {" -zQ -zQ -zQ -Qr -hA -ZN -YW -cH -Qr -Bz -zI -Ru -sH -Fu -TU -NI -RL -pr -PP -TU -zQ -zQ -zQ -"} -(23,1,1) = {" -zQ -zQ -Qr -Qr -Qr -QO -gC -ae -Qr -By -QI -PV -bz -By -TU -TU -TU -Qx -we -TU -TU -zQ -zQ -"} -(24,1,1) = {" -zQ -zQ -Qr -Gn -sz -IR -dI -Ur -Iq -By -IK -TJ -eW -By -Mj -Vl -Lc -MR -rc -Vt -TU -zQ -zQ -"} -(25,1,1) = {" -zQ -zQ -Qr -tm -Oi -uS -RW -Tx -vJ -By -gi -DA -EB -By -Rt -oo -WY -im -Gk -FC -BR -zQ -zQ -"} -(26,1,1) = {" -zQ -zQ -Qr -dV -is -yh -Rd -qs -wC -By -Dk -Dk -Dk -By -KL -NW -Lc -uO -WU -Et -BR -zQ -zQ -"} -(27,1,1) = {" -zQ -zQ -cl -Qr -Qr -qT -pc -Qr -Qr -BU -zQ -zQ -zQ -BU -TU -TU -TU -lX -TU -TU -jl -zQ -zQ -"} -(28,1,1) = {" -zQ -zQ -zQ -Qr -og -wH -wy -Tv -Qr -zQ -zQ -zQ -zQ -zQ -TU -tV -eu -mn -Um -TU -zQ -zQ -zQ -"} -(29,1,1) = {" -zQ -zQ -zQ -ea -yI -AH -wy -AL -Us -zQ -zQ -zQ -zQ -zQ -TU -VV -RN -pW -qe -TU -zQ -zQ -zQ -"} -(30,1,1) = {" -zQ -zQ -zQ -Qr -iz -WX -pQ -mH -Us -zQ -zQ -zQ -zQ -zQ -TU -Jc -ir -EG -Xv -TU -zQ -zQ -zQ -"} -(31,1,1) = {" -zQ -zQ -zQ -ff -Qr -lV -pq -qJ -Qr -zQ -zQ -zQ -zQ -zQ -TU -OG -RM -Uj -TU -XA -zQ -zQ -zQ -"} -(32,1,1) = {" -zQ -zQ -zQ -zQ -ff -Qr -Qr -Qr -yn -zQ -zQ -zQ -zQ -zQ -LJ -TU -TU -TU -XA -zQ -zQ -zQ -zQ -"} diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm index 2f39a367d76..d46365996e2 100644 --- a/_maps/shuttles/minutemen/minutemen_vela.dmm +++ b/_maps/shuttles/minutemen/minutemen_vela.dmm @@ -20,21 +20,19 @@ /obj/structure/closet/secure_closet/lethalshots{ populate = 0 }, -/obj/item/ammo_box/c45, -/obj/item/ammo_box/c45, -/obj/item/ammo_box/c45/hp, -/obj/item/ammo_box/c45/hp, -/obj/item/ammo_box/magazine/m45, -/obj/item/ammo_box/magazine/m45, -/obj/item/ammo_box/magazine/m45, -/obj/item/ammo_box/magazine/m45, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm, +/obj/item/ammo_box/magazine/co9mm, /obj/item/ammo_box/magazine/smgm9mm/rubber, /obj/item/ammo_box/magazine/smgm9mm/rubber, /obj/item/ammo_box/magazine/smgm9mm/rubber, -/obj/item/ammo_box/c9mm/rubbershot, /obj/structure/cable{ icon_state = "0-6" }, +/obj/item/ammo_box/c9mm/rubbershot, +/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "al" = ( @@ -82,12 +80,6 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/science/ai_chamber) -"az" = ( -/obj/structure/table/reinforced, -/obj/item/disk/design_disk/cmm_mechs, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hangar/port) "aE" = ( /obj/machinery/washing_machine, /obj/machinery/light/small/directional/south, @@ -301,12 +293,11 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "cw" = ( +/obj/structure/toilet{ + pixel_y = 12 + }, /turf/open/floor/plasteel/dark, /area/ship/security/armory) -"cy" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/atmospherics) "cz" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/opaque/purple/line{ @@ -412,6 +403,25 @@ /obj/structure/frame/machine, /turf/open/floor/plasteel/tech, /area/ship/hangar/port) +"cY" = ( +/obj/structure/closet/secure_closet/security{ + populate = 0 + }, +/obj/item/reagent_containers/spray/pepper, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/clothing/under/clip/minutemen, +/obj/item/clothing/head/helmet/bulletproof/x11/clip, +/obj/item/storage/belt/military/clip, +/obj/item/restraints/handcuffs, +/obj/item/ammo_box/magazine/co9mm/rubber, +/obj/item/ammo_box/magazine/co9mm/rubber, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/structure/sign/poster/official/focus{ + pixel_y = 32 + }, +/obj/item/clothing/suit/armor/vest/bulletproof, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "dc" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/corner/opaque/black{ @@ -470,9 +480,7 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "dp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light/directional/north, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -552,25 +560,6 @@ }, /turf/open/floor/plating, /area/ship/science/xenobiology) -"dC" = ( -/obj/structure/closet/secure_closet{ - icon_state = "cap"; - name = "captain's locker"; - req_access_txt = "20" - }, -/obj/item/clothing/under/rank/command/minutemen, -/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/radio/headset/minutemen/alt/captain, -/obj/item/storage/backpack, -/obj/item/storage/backpack/satchel, -/obj/item/binoculars, -/obj/item/door_remote/captain, -/turf/open/floor/carpet/royalblack, -/area/ship/crew/office) "dD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -601,19 +590,6 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering) -"dL" = ( -/obj/structure/sign/minutemen{ - pixel_y = 36 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/camera/autoname, -/obj/machinery/light/directional/north{ - pixel_y = 28 - }, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external) "dN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -659,6 +635,26 @@ /obj/effect/turf_decal/trimline/opaque/red/filled/warning, /turf/open/floor/engine, /area/ship/cargo) +"ed" = ( +/obj/structure/closet/secure_closet{ + icon_state = "cap"; + name = "foreman's locker"; + req_access = list(56) + }, +/obj/item/clothing/head/clip/slouch, +/obj/item/clothing/under/clip/officer, +/obj/item/storage/backpack/industrial, +/obj/item/storage/backpack/satchel/eng, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/shoes/combat, +/obj/item/radio/headset/clip/alt/captain, +/obj/item/megaphone, +/obj/item/binoculars, +/obj/effect/turf_decal/box, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "ee" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -681,14 +677,28 @@ "ek" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/engineering/atmospherics) +"em" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/sign/poster/clip/random{ + pixel_x = 28 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "eq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/steeldecal/steel_decals_central7{ dir = 8; - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/machinery/light_switch{ dir = 1; @@ -701,8 +711,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/sign/poster/random{ - pixel_y = 30 +/obj/structure/sign/poster/clip/random{ + pixel_y = 28 }, /obj/item/kirbyplants/random{ pixel_y = 12 @@ -861,9 +871,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hangar/port) "fk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -1346,16 +1354,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"iy" = ( -/obj/structure/sign/poster/minutemen/random{ - pixel_y = -30 - }, -/obj/effect/turf_decal/corner/opaque/black{ - dir = 1 - }, -/obj/effect/turf_decal/borderfloor, -/turf/open/floor/plasteel/white, -/area/ship/crew/canteen) "iz" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/reagent_dispensers/watertank, @@ -1536,6 +1534,12 @@ /obj/item/clothing/suit/toggle/industrial, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"jB" = ( +/obj/structure/table/reinforced, +/obj/item/disk/design_disk/clip_mechs, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hangar/port) "jD" = ( /obj/structure/rack, /obj/item/mecha_parts/mecha_equipment/drill, @@ -2262,10 +2266,18 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/dorm) -"nn" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hangar/port) +"nm" = ( +/obj/structure/sign/clip{ + pixel_y = 36 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/light/directional/north{ + pixel_y = 28 + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) "no" = ( /obj/structure/janitorialcart, /obj/effect/turf_decal/box/corners{ @@ -2306,6 +2318,14 @@ dir = 4 }, /obj/item/radio/intercom/directional/west, +/obj/item/reagent_containers/food/condiment/mayonnaise{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/condiment/ketchup{ + pixel_x = 8; + pixel_y = 6 + }, /turf/open/floor/plasteel/white, /area/ship/crew/canteen) "nw" = ( @@ -2546,21 +2566,6 @@ }, /turf/open/floor/carpet/nanoweave/purple, /area/ship/science) -"oU" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/structure/sign/poster/minutemen/random{ - pixel_x = 28 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "oZ" = ( /obj/machinery/ai_slipper, /obj/effect/turf_decal/box, @@ -2613,17 +2618,18 @@ /area/ship/crew) "pp" = ( /obj/effect/turf_decal/industrial/hatch/yellow, -/obj/item/clothing/under/rank/cargo/miner/hazard, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson/prescription, /obj/structure/closet/secure_closet/miner{ name = "pilot's equipment"; populate = 0 }, -/obj/item/clothing/gloves/explorer, +/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc, +/obj/item/clothing/suit/armor/vest/alt, +/obj/item/clothing/shoes/combat, /obj/item/gps/mining, +/obj/item/clothing/glasses/hud/diagnostic, +/obj/item/clothing/gloves/fingerless, /obj/item/stock_parts/cell/high/plus, +/obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/tech/grid, /area/ship/hangar/port) "pq" = ( @@ -2803,31 +2809,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, /area/ship/science) -"qm" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/structure/closet/wall{ - dir = 4; - name = "spare uniforms"; - 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/suit/toggle/lawyer/minutemen, -/obj/item/clothing/suit/toggle/lawyer/minutemen, -/obj/item/clothing/suit/toggle/lawyer/minutemen, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/turf/open/floor/plasteel/tech, -/area/ship/crew/dorm) "qy" = ( /obj/machinery/door/poddoor/preopen{ id = "obhangarent2" @@ -2853,17 +2834,18 @@ pixel_y = -32 }, /obj/effect/turf_decal/industrial/hatch/yellow, -/obj/item/clothing/under/rank/cargo/miner/hazard, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson/prescription, /obj/structure/closet/secure_closet/miner{ name = "pilot's equipment"; populate = 0 }, -/obj/item/clothing/gloves/explorer, +/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc, +/obj/item/clothing/suit/armor/vest/alt, +/obj/item/clothing/shoes/combat, /obj/item/gps/mining, +/obj/item/clothing/glasses/hud/diagnostic, +/obj/item/clothing/gloves/fingerless, /obj/item/stock_parts/cell/high/plus, +/obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/tech/grid, /area/ship/hangar/port) "qC" = ( @@ -2997,7 +2979,7 @@ }, /obj/structure/closet/secure_closet{ icon_state = "cap"; - name = "bridge officer's locker"; + name = "first officer's locker"; req_access_txt = "19" }, /obj/effect/turf_decal/box, @@ -3006,11 +2988,13 @@ /obj/item/megaphone, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/shoes/combat, -/obj/item/radio/headset/minutemen/alt/captain, -/obj/item/storage/backpack, -/obj/item/storage/backpack/satchel, +/obj/item/radio/headset/clip/alt/captain, +/obj/item/storage/backpack/captain, +/obj/item/storage/backpack/satchel/cap, /obj/item/clipboard, /obj/item/reagent_containers/spray/pepper, +/obj/item/clothing/suit/toggle/lawyer/clip/fo, +/obj/item/clothing/head/clip/slouch/officer, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "ra" = ( @@ -3045,23 +3029,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/ship/science) -"rm" = ( -/obj/structure/closet/secure_closet/security{ - 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/storage/belt/security/full, -/obj/item/restraints/handcuffs, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/item/clothing/suit/armor/vest/marine, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) "rn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -3429,6 +3396,10 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/corner/opaque/black/diagonal, /obj/machinery/light/directional/west, +/obj/item/reagent_containers/food/condiment/hotsauce{ + pixel_x = 5; + pixel_y = 7 + }, /turf/open/floor/plasteel/white, /area/ship/crew/canteen) "tc" = ( @@ -3496,6 +3467,9 @@ }, /turf/open/floor/plating, /area/ship/crew/office) +"tu" = ( +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) "tx" = ( /obj/structure/frame/machine, /obj/effect/turf_decal/techfloor{ @@ -3807,20 +3781,21 @@ /area/ship/engineering/atmospherics) "uT" = ( /obj/effect/turf_decal/industrial/hatch/yellow, -/obj/item/clothing/under/rank/cargo/miner/hazard, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson/prescription, /obj/structure/closet/secure_closet/miner{ name = "pilot's equipment"; populate = 0 }, -/obj/item/clothing/gloves/explorer, +/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc, +/obj/item/clothing/suit/armor/vest/alt, +/obj/item/clothing/shoes/combat, /obj/item/gps/mining, +/obj/item/clothing/glasses/hud/diagnostic, +/obj/item/clothing/gloves/fingerless, /obj/item/stock_parts/cell/high/plus, /obj/structure/sign/poster/official/safety_eye_protection{ pixel_y = -32 }, +/obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/tech/grid, /area/ship/hangar/port) "uU" = ( @@ -3850,6 +3825,19 @@ }, /turf/open/floor/engine, /area/ship/cargo) +"vr" = ( +/obj/effect/turf_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/structure/sign/poster/clip/random{ + pixel_x = -28 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "vz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3934,25 +3922,8 @@ /area/ship/external) "vV" = ( /obj/structure/rack, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/structure/table_frame/wood, -/obj/item/stack/sheet/mineral/wood{ - amount = 30 - }, /obj/machinery/light/directional/north, +/obj/item/stack/sheet/mineral/wood/fifty, /turf/open/floor/plasteel/tech, /area/ship/crew/canteen) "vX" = ( @@ -4154,6 +4125,19 @@ /obj/machinery/modular_computer/console/preset/civilian, /turf/open/floor/plasteel/dark, /area/ship/science/xenobiology) +"wR" = ( +/obj/structure/sign/clip{ + pixel_y = 36 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/camera/autoname, +/obj/machinery/light/directional/north{ + pixel_y = 28 + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external) "wW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -4339,8 +4323,7 @@ "xH" = ( /obj/structure/sink{ dir = 8; - pixel_x = 13; - pixel_y = 0 + pixel_x = 13 }, /obj/structure/mirror{ pixel_x = 28 @@ -4514,12 +4497,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/tech, /area/ship/engineering) -"yu" = ( -/obj/structure/rack, -/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/cmm, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hangar/port) "yv" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/components/unary/tank/air{ @@ -4594,6 +4571,12 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) +"yL" = ( +/obj/effect/turf_decal/industrial/outline/red, +/obj/effect/turf_decal/rechargefloor, +/obj/mecha/working/ripley/clip, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hangar/port) "zf" = ( /obj/structure/window/plasma/reinforced{ dir = 8 @@ -4708,6 +4691,10 @@ /obj/machinery/vending/snack/random, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) +"zE" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hangar/port) "zF" = ( /obj/structure/frame/computer{ dir = 1 @@ -5003,6 +4990,11 @@ dir = 8 }, /obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -12; + pixel_y = -16 + }, /turf/open/floor/plasteel/dark, /area/ship/cargo) "Bh" = ( @@ -5010,6 +5002,25 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"Bj" = ( +/obj/structure/closet/secure_closet{ + icon_state = "cap"; + name = "captain's locker"; + req_access_txt = "20" + }, +/obj/item/clothing/under/clip/officer, +/obj/item/clothing/suit/armor/clip_capcoat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/glasses/sunglasses, +/obj/item/gun/ballistic/automatic/pistol/candor, +/obj/item/clothing/head/clip/slouch/officer, +/obj/item/radio/headset/clip/alt/captain, +/obj/item/storage/backpack, +/obj/item/storage/backpack/satchel, +/obj/item/binoculars, +/obj/item/door_remote/captain, +/turf/open/floor/carpet/royalblack, +/area/ship/crew/office) "Bn" = ( /obj/effect/turf_decal/corner_techfloor_grid{ dir = 4 @@ -5039,8 +5050,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/steeldecal/steel_decals_central7{ dir = 8; - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/effect/turf_decal/steeldecal/steel_decals7{ dir = 4 @@ -5115,19 +5125,6 @@ /obj/machinery/door/airlock, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"BO" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/structure/sign/poster/minutemen/random{ - pixel_x = 28; - pixel_y = 0 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) "BQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -5844,7 +5841,7 @@ "FK" = ( /obj/machinery/airalarm/directional/south, /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/clip, /turf/open/floor/plasteel/tech, /area/ship/bridge) "FN" = ( @@ -5858,51 +5855,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, /area/ship/hangar/port) -"FS" = ( -/obj/structure/closet/secure_closet{ - icon_state = "cap"; - name = "foreman's locker"; - req_access = list(56) - }, -/obj/item/clothing/head/cowboy/sec/minutemen, -/obj/item/clothing/under/rank/command/minutemen, -/obj/item/storage/backpack, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/glasses/sunglasses, -/obj/item/clothing/shoes/combat, -/obj/item/radio/headset/minutemen/alt/captain, -/obj/item/megaphone, -/obj/item/binoculars, -/obj/effect/turf_decal/box, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/suit/toggle/industrial, -/turf/open/floor/mineral/plastitanium, -/area/ship/bridge) "Ga" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/spline/fancy/wood{ dir = 9 }, /turf/open/floor/wood, /area/ship/crew) -"Gb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/firealarm/directional/south, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/storage/fancy/donut_box{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/plasteel/tech, -/area/ship/security/armory) "Ge" = ( /obj/effect/decal/cleanable/dirt, /obj/item/screwdriver{ @@ -6113,6 +6072,10 @@ /obj/effect/turf_decal/box/corners, /obj/structure/closet/secure_closet/freezer/kitchen, /obj/machinery/light/directional/north, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, /turf/open/floor/pod, /area/ship/cargo) "Hf" = ( @@ -6130,10 +6093,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) -"Hm" = ( -/obj/structure/sign/minutemen, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/engine) "Ht" = ( /obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 8 @@ -6248,31 +6207,6 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) -"HQ" = ( -/obj/structure/closet/secure_closet/security{ - 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/storage/belt/security/full, -/obj/item/restraints/handcuffs, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/item/ammo_box/magazine/m45/rubber, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/sign/poster/official/focus{ - pixel_y = 32 - }, -/obj/item/clothing/suit/armor/vest/marine, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"HU" = ( -/obj/effect/turf_decal/industrial/outline/red, -/obj/effect/turf_decal/rechargefloor, -/obj/mecha/working/ripley/cmm, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hangar/port) "HV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -6463,6 +6397,33 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/ship/hallway/central) +"Jj" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/structure/closet/wall{ + dir = 4; + name = "spare uniforms"; + pixel_x = -28 + }, +/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/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/turf/open/floor/plasteel/tech, +/area/ship/crew/dorm) "Jk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -6584,9 +6545,6 @@ /area/ship/hangar/port) "JM" = ( /obj/structure/window/reinforced, -/obj/structure/chair/plastic{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -6809,8 +6767,8 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "LL" = ( -/obj/structure/sign/poster/random{ - pixel_y = 30 +/obj/structure/sign/poster/clip/random{ + pixel_y = 28 }, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -7226,6 +7184,7 @@ "Nr" = ( /obj/structure/table, /obj/machinery/light/small/directional/east, +/obj/structure/bedsheetbin/empty, /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "Nv" = ( @@ -7471,6 +7430,10 @@ }, /turf/open/floor/plasteel/dark, /area/ship/science) +"OK" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/engine) "OL" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/line{ dir = 8 @@ -7567,9 +7530,24 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/ship/security/armory) +"Pc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/firealarm/directional/south, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/storage/fancy/donut_box{ + pixel_x = 1; + pixel_y = 3 + }, +/turf/open/floor/plasteel/tech, +/area/ship/security/armory) "Pe" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -7711,6 +7689,10 @@ }, /turf/open/floor/plating, /area/ship/hallway/central) +"PJ" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/atmospherics) "PL" = ( /obj/effect/decal/cleanable/ash, /obj/effect/turf_decal/techfloor, @@ -7750,6 +7732,23 @@ }, /turf/open/floor/plasteel/tech, /area/ship/crew/toilet) +"PY" = ( +/obj/structure/closet/secure_closet/security{ + populate = 0 + }, +/obj/item/reagent_containers/spray/pepper, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/clothing/under/clip/minutemen, +/obj/item/clothing/head/helmet/bulletproof/x11/clip, +/obj/item/storage/belt/military/clip, +/obj/item/restraints/handcuffs, +/obj/item/ammo_box/magazine/co9mm/rubber, +/obj/item/ammo_box/magazine/co9mm/rubber, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/clothing/suit/armor/vest/bulletproof, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "PZ" = ( /obj/effect/turf_decal/trimline/opaque/green/filled/warning{ dir = 1 @@ -7807,8 +7806,8 @@ /area/ship/hallway/central) "Qm" = ( /obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/firealarm/directional/west, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "Qq" = ( @@ -7855,6 +7854,12 @@ /obj/machinery/door/airlock/external, /turf/open/floor/plasteel/tech, /area/ship/hallway/fore) +"QK" = ( +/obj/structure/rack, +/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) "QN" = ( /obj/machinery/holopad/secure, /obj/effect/turf_decal/corner/opaque/black/diagonal, @@ -8007,15 +8012,18 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "Ru" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/glass, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 10 }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"Rx" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/engineering, +/turf/open/floor/wood, +/area/ship/hallway/central) "RG" = ( /obj/item/paper/pamphlet/violent_video_games, /obj/machinery/computer/arcade/orion_trail{ @@ -8294,25 +8302,13 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, /turf/open/floor/plasteel/tech, /area/ship/hallway/fore) -"Tf" = ( -/obj/structure/sign/minutemen{ - pixel_y = 36 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/light/directional/north{ - pixel_y = 28 - }, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external) "Tg" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/office) "Th" = ( /obj/structure/guncase, -/obj/item/gun/ballistic/automatic/pistol/candor/no_mag, -/obj/item/gun/ballistic/automatic/pistol/candor/no_mag, +/obj/item/gun/ballistic/automatic/pistol/commander, +/obj/item/gun/ballistic/automatic/pistol/commander, /obj/item/gun/ballistic/automatic/smg/cm5{ spawnwithmagazine = 0 }, @@ -8461,6 +8457,18 @@ }, /turf/open/floor/wood, /area/ship/crew/office) +"TW" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/structure/sign/poster/clip/random{ + pixel_x = 28 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "TY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8582,6 +8590,16 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) +"UI" = ( +/obj/structure/sign/poster/clip/random{ + pixel_y = -30 + }, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/borderfloor, +/turf/open/floor/plasteel/white, +/area/ship/crew/canteen) "UM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -8708,10 +8726,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/carpet/nanoweave/purple, /area/ship/science) -"VM" = ( -/obj/structure/chair, -/turf/open/floor/plasteel/grimy, -/area/ship/crew/canteen) "VO" = ( /obj/structure/chair/sofa/right, /obj/machinery/light/small/directional/west, @@ -8741,9 +8755,7 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/engineering) "VX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/steeldecal/steel_decals8, /turf/open/floor/plasteel/dark, /area/ship/science/xenobiology) @@ -8818,19 +8830,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) -"Wl" = ( -/obj/effect/turf_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/structure/sign/poster/minutemen/random{ - pixel_x = -28 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "Wn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/corner/transparent/purple/diagonal, @@ -9109,11 +9108,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/wood, /area/ship/hallway/fore) -"XC" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/engineering, -/turf/open/floor/wood, -/area/ship/hallway/central) "XJ" = ( /obj/structure/filingcabinet, /obj/item/pen/fountain, @@ -9332,8 +9326,7 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 20; - pixel_y = 0 + pixel_x = 20 }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/science/ai_chamber) @@ -9438,7 +9431,7 @@ /obj/structure/chair/sofa/corner{ dir = 4 }, -/obj/structure/sign/poster/random{ +/obj/structure/sign/poster/clip/random{ pixel_x = -28 }, /turf/open/floor/carpet, @@ -9543,7 +9536,7 @@ We sR We We -Hm +OK We We VR @@ -9553,7 +9546,7 @@ jP VR We We -cy +PJ We We sR @@ -10161,7 +10154,7 @@ We (16,1,1) = {" We We -nn +zE Mi iE ee @@ -10205,7 +10198,7 @@ Ak Ak dZ vD -HU +yL EN Gs yH @@ -10310,7 +10303,7 @@ Cd OL uv MP -Gb +Pc Cd We Rk @@ -10349,7 +10342,7 @@ yd Xv YV Cd -HQ +cY qP qd Ju @@ -10384,14 +10377,14 @@ eQ Ae CO GO -qm +Jj hX Ae fr xc jS Cd -rm +PY Ko rb pA @@ -10413,7 +10406,7 @@ We (22,1,1) = {" We fJ -nn +zE Sk Sk uw @@ -10455,7 +10448,7 @@ We (23,1,1) = {" We dZ -az +jB DI gj gj @@ -10514,7 +10507,7 @@ Ae Ae RG zX -XC +Rx UM Hf ys @@ -10623,7 +10616,7 @@ We (27,1,1) = {" We dZ -yu +QK Wx YC IF @@ -10636,7 +10629,7 @@ xT ys Vp dD -BO +TW ys zC ml @@ -10665,7 +10658,7 @@ We (28,1,1) = {" We WV -nn +zE CK oJ QR @@ -10727,7 +10720,7 @@ Tn us yI dh -Wl +vr tk tb nr @@ -10766,9 +10759,9 @@ jI cV vV dW -VM +tu Ty -VM +tu MV XN iO @@ -10808,9 +10801,9 @@ wk cV iu dW -VM +tu Ty -VM +tu MV Hw iO @@ -10850,13 +10843,13 @@ nQ cV fz RY -VM +tu Ty -VM +tu MV MW QN -iy +UI Np We io @@ -10892,9 +10885,9 @@ ww cV LL Go -VM +tu Ty -VM +tu MV Gu yA @@ -10917,7 +10910,7 @@ We (34,1,1) = {" We We -nn +zE OT Yx JL @@ -10934,9 +10927,9 @@ ZX cV dp ug -VM +tu Ty -VM +tu MV XN lk @@ -10976,9 +10969,9 @@ Pp Px mq Ca -VM +tu pU -VM +tu Pv XN lk @@ -11024,7 +11017,7 @@ ip Pe Kq nF -oU +em Np We We @@ -11321,7 +11314,7 @@ fl Em la lK -Tf +nm We We We @@ -11388,7 +11381,7 @@ We We We Tg -dC +Bj Vi rR Tg @@ -11489,7 +11482,7 @@ Cp il uq lK -dL +wR We We We @@ -11568,7 +11561,7 @@ Ef EG Uh qY -FS +ed Ek lK lK diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm index 1248c3a9f84..46e396a197a 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -3569,7 +3569,7 @@ /area/ship/maintenance/fore) "JV" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /obj/structure/sign/poster/retro/random{ pixel_y = 32 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 935f0a2595d..eb0b34fcf3d 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -9598,7 +9598,7 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -10619,7 +10619,7 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /obj/item/radio/intercom/wideband/directional/west{ pixel_y = 8 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 95486e6fc6a..b9f1fe3ee68 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -2958,7 +2958,7 @@ /area/ship/science) "tc" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /obj/effect/turf_decal/corner/opaque/ntblue, /obj/effect/turf_decal/corner/opaque/ntblue{ dir = 4 diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index 9dc0703630b..91f43369e93 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -1765,7 +1765,7 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /turf/open/floor/plasteel/dark, /area/ship/bridge) "sl" = ( diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm index 81465759ba4..5ec1a75727d 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm @@ -479,7 +479,7 @@ /area/ship/engineering/atmospherics) "ed" = ( /obj/structure/table, -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -3937,7 +3937,7 @@ /turf/closed/wall, /area/ship/cargo) "Fv" = ( -/obj/machinery/fax, +/obj/machinery/fax/nanotrasen, /obj/structure/table/reinforced, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm index cff10d5446b..ff37ec89e5b 100644 --- a/_maps/shuttles/pirate/pirate_ember.dmm +++ b/_maps/shuttles/pirate/pirate_ember.dmm @@ -2243,37 +2243,6 @@ }, /turf/open/floor/plating, /area/ship/engineering) -"le" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/item/clothing/gloves/krav_maga/combatglovesplus, -/obj/item/clothing/under/syndicate/camo, -/obj/item/clothing/under/syndicate/camo, -/obj/item/clothing/neck/scarf/black, -/obj/item/clothing/neck/cloak/hos, -/obj/item/clothing/mask/bandana/black{ - pixel_x = 1; - pixel_y = -4 - }, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/suit/armor/vest/marine/medium, -/obj/item/storage/belt/military, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/head/helmet/bulletproof/x11/frontier, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "hos"; - name = "master at arm's locker"; - req_access_txt = "3" - }, -/obj/item/gun/ballistic/automatic/pistol/APS, -/obj/item/ammo_box/magazine/pistolm9mm, -/obj/item/clothing/mask/gas/atmos{ - name = "tactical gas mask"; - desc = "Improved gas mask utilized by pirates. Still not very good at blocking gas flow, but it's flameproof!" - }, -/turf/open/floor/carpet/black, -/area/ship/security) "lf" = ( /obj/structure/table/wood/poker, /obj/effect/decal/cleanable/dirt, @@ -3019,6 +2988,21 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/incinerator) +"oM" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/item/book/manual/wiki/hacking{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/efuel{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating/rust, +/area/ship/engineering/communications) "oN" = ( /obj/structure/railing{ dir = 2; @@ -3632,6 +3616,29 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/ship/hallway/central) +"rV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/trashcart, +/obj/item/trash/candy, +/obj/effect/decal/cleanable/vomit/old, +/obj/item/book/manual/wiki/ghetto_chemistry{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/item/trash/sosjerky, +/obj/item/storage/portable_chem_mixer{ + pixel_x = -1; + pixel_y = -3 + }, +/obj/item/trash/syndi_cakes{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/trash/energybar{ + pixel_y = -6 + }, +/turf/open/floor/plating, +/area/ship/maintenance/fore) "rW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 8 @@ -4776,6 +4783,37 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/fore) +"wV" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/item/clothing/gloves/krav_maga/combatglovesplus, +/obj/item/clothing/under/syndicate/camo, +/obj/item/clothing/under/syndicate/camo, +/obj/item/clothing/neck/scarf/black, +/obj/item/clothing/neck/cloak/hos, +/obj/item/clothing/mask/bandana/black{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/clothing/suit/armor/vest/marine/medium, +/obj/item/storage/belt/military, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/head/helmet/bulletproof/x11/frontier, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "hos"; + name = "master at arm's locker"; + req_access_txt = "3" + }, +/obj/item/gun/ballistic/automatic/pistol/APS, +/obj/item/ammo_box/magazine/pistolm9mm, +/obj/item/clothing/mask/gas/atmos{ + name = "tactical gas mask"; + desc = "Improved gas mask utilized by pirates. Still not very good at blocking gas flow, but it's flameproof!" + }, +/turf/open/floor/carpet/black, +/area/ship/security) "wZ" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8; @@ -5724,45 +5762,6 @@ icon_state = "panelscorched" }, /area/ship/hallway/central) -"BX" = ( -/obj/structure/closet/secure_closet{ - icon_state = "sec"; - name = "equipment locker"; - req_access_txt = "1" - }, -/obj/effect/turf_decal/techfloor, -/obj/item/clothing/mask/bandana/black{ - pixel_x = 1; - pixel_y = -4 - }, -/obj/item/clothing/mask/bandana/black{ - pixel_x = 1; - pixel_y = -4 - }, -/obj/item/clothing/mask/bandana/black{ - pixel_x = 1; - pixel_y = -4 - }, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military/army, -/obj/item/storage/belt/military/army, -/obj/item/clothing/head/helmet/old{ - pixel_x = 7 - }, -/obj/item/clothing/head/helmet/old{ - pixel_x = 7; - pixel_y = -4 - }, -/obj/item/clothing/suit/armor/riot, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security/armory) "BZ" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -8365,6 +8364,45 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/fore) +"Mn" = ( +/obj/structure/closet/secure_closet{ + icon_state = "sec"; + name = "equipment locker"; + req_access_txt = "1" + }, +/obj/effect/turf_decal/techfloor, +/obj/item/clothing/mask/bandana/black{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/item/clothing/mask/bandana/black{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/item/clothing/mask/bandana/black{ + pixel_x = 1; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/storage/belt/military, +/obj/item/storage/belt/military, +/obj/item/storage/belt/military/army, +/obj/item/storage/belt/military/army, +/obj/item/clothing/head/helmet/old{ + pixel_x = 7 + }, +/obj/item/clothing/head/helmet/old{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/clothing/suit/armor/riot, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security/armory) "Mo" = ( /obj/effect/turf_decal/industrial/traffic, /obj/effect/turf_decal/industrial/traffic{ @@ -8671,29 +8709,6 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/security) -"NT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/trashcart, -/obj/item/trash/candy, -/obj/effect/decal/cleanable/vomit/old, -/obj/item/book/manual/wiki/ghetto_chemistry{ - pixel_x = 6; - pixel_y = -5 - }, -/obj/item/trash/sosjerky, -/obj/item/storage/portable_chem_mixer{ - pixel_x = -1; - pixel_y = -3 - }, -/obj/item/trash/syndi_cakes{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/trash/energybar{ - pixel_y = -6 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) "NW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -9356,21 +9371,6 @@ color = "#808080" }, /area/ship/engineering/atmospherics) -"Ry" = ( -/obj/structure/table/reinforced{ - color = "#c1b6a5" - }, -/obj/item/book/manual/wiki/hacking{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/drinks/soda_cans/efuel{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plating/rust, -/area/ship/engineering/communications) "RB" = ( /obj/effect/turf_decal/techfloor/corner{ dir = 8 @@ -11212,7 +11212,7 @@ Ds Yv YH uO -Ry +oM fH ws ws @@ -12120,7 +12120,7 @@ KY Yh Ht jY -le +wV ni Iv Gw @@ -12239,7 +12239,7 @@ um ys UY TI -BX +Mn kc fm By @@ -12566,7 +12566,7 @@ ln ln IL yM -NT +rV IL tu je diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index dd5fa22a86a..e5f06babb73 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -345,17 +345,27 @@ pixel_x = 8; pixel_y = 6 }, -/obj/item/ammo_box/magazine/illestren_a850r{ - pixel_x = 8; - pixel_y = 2 - }, /obj/item/ammo_box/c38_box{ pixel_x = -6; pixel_y = 1 }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8 + }, /obj/item/ammo_box/magazine/illestren_a850r{ pixel_x = 8; - pixel_y = -2 + pixel_y = -4 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 8; + pixel_y = -6 }, /turf/open/floor/wood/ebony, /area/ship/storage) @@ -2016,9 +2026,10 @@ pixel_x = -7 }, /obj/item/gun/ballistic/revolver/montagne, -/obj/item/ammo_box/c38/match, -/obj/item/ammo_box/c38/match, /obj/item/storage/backpack/satchel/leather, +/obj/item/ammo_box/c45_speedloader, +/obj/item/ammo_box/c45_speedloader, +/obj/item/ammo_box/c45, /turf/open/floor/wood/mahogany, /area/ship/bridge) "zH" = ( @@ -2043,7 +2054,7 @@ /area/ship/engineering/engine) "zX" = ( /obj/structure/table/wood, -/obj/machinery/fax, +/obj/machinery/fax/roumain, /obj/effect/turf_decal/spline/fancy/wood{ dir = 8 }, diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm index a974c8b859c..9cceb17c5de 100644 --- a/_maps/shuttles/solgov/solgov_chronicle.dmm +++ b/_maps/shuttles/solgov/solgov_chronicle.dmm @@ -256,8 +256,8 @@ /obj/item/clothing/head/solgov/captain, /obj/item/folder/solgov, /obj/item/folder/solgov, -/obj/item/folder/solgov/red, -/obj/item/folder/solgov/red, +/obj/item/folder/documents/solgov, +/obj/item/folder/documents/solgov, /obj/item/clothing/under/solgov/formal, /obj/item/clothing/gloves/combat, /obj/item/storage/backpack/captain, @@ -771,7 +771,7 @@ /area/ship/crew) "hr" = ( /obj/structure/table/wood/fancy/purple, -/obj/machinery/fax, +/obj/machinery/fax/solgov, /obj/item/desk_flag/solgov{ pixel_x = 8; pixel_y = 13 @@ -2999,7 +2999,7 @@ /turf/open/floor/plasteel/white, /area/ship/security/armory) "CU" = ( -/obj/machinery/fax, +/obj/machinery/fax/solgov, /obj/structure/table/wood, /obj/machinery/light/small/directional/south, /turf/open/floor/wood, @@ -3577,7 +3577,7 @@ /area/ship/security/armory) "Jh" = ( /obj/structure/table/wood/fancy/blue, -/obj/machinery/fax, +/obj/machinery/fax/solgov, /obj/item/desk_flag/solgov{ pixel_x = -9; pixel_y = 14 @@ -4121,7 +4121,7 @@ /obj/item/clothing/gloves/combat, /obj/item/folder/solgov, /obj/item/folder/solgov, -/obj/item/folder/solgov/red, +/obj/item/folder/documents/solgov, /obj/item/clothing/under/solgov/formal, /obj/item/clothing/head/solgov, /obj/item/storage/belt/sabre/solgov, diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm index 3c8e75a7ace..e42972d85ee 100644 --- a/_maps/shuttles/solgov/solgov_inkwell.dmm +++ b/_maps/shuttles/solgov/solgov_inkwell.dmm @@ -2320,7 +2320,7 @@ /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "pd" = ( -/obj/machinery/fax, +/obj/machinery/fax/solgov, /obj/structure/table/wood/fancy/purple, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) @@ -5197,7 +5197,7 @@ /area/ship/crew/canteen/kitchen) "HT" = ( /obj/structure/table/wood/fancy/blue, -/obj/machinery/fax, +/obj/machinery/fax/solgov, /turf/open/floor/wood/maple, /area/ship/bridge) "HV" = ( @@ -5784,8 +5784,8 @@ /obj/item/clothing/under/solgov/formal, /obj/item/folder/solgov, /obj/item/folder/solgov, -/obj/item/folder/solgov/red, -/obj/item/folder/solgov/red, +/obj/item/folder/documents/solgov, +/obj/item/folder/documents/solgov, /obj/structure/closet/secure_closet{ icon_state = "cap"; name = "\proper captain's locker"; diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm index 70bfabe5d26..b4ca4f13cb0 100644 --- a/_maps/shuttles/solgov/solgov_paracelsus.dmm +++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm @@ -1884,7 +1884,7 @@ pixel_x = 8; pixel_y = 12 }, -/obj/machinery/fax, +/obj/machinery/fax/solgov, /turf/open/floor/wood/mahogany, /area/ship/bridge) "sp" = ( @@ -2483,7 +2483,7 @@ /obj/item/clothing/gloves/combat, /obj/item/folder/solgov, /obj/item/folder/solgov, -/obj/item/folder/solgov/red, +/obj/item/folder/documents/solgov, /obj/item/clothing/under/solgov/formal, /obj/item/clothing/head/solgov, /obj/item/storage/belt/sabre/solgov, @@ -3581,8 +3581,8 @@ /obj/item/clothing/under/solgov/formal, /obj/item/folder/solgov, /obj/item/folder/solgov, -/obj/item/folder/solgov/red, -/obj/item/folder/solgov/red, +/obj/item/folder/documents/solgov, +/obj/item/folder/documents/solgov, /obj/structure/closet/secure_closet{ icon_state = "cap"; name = "\proper captain's locker"; diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm index b210a8874de..f14f1e64d7f 100644 --- a/_maps/shuttles/subshuttles/inteq_anvil.dmm +++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm @@ -17,7 +17,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/inteq, /turf/open/floor/plasteel/dark, /area/ship/bridge) "c" = ( diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm index 3e32e2694bc..9a42bbd165e 100644 --- a/_maps/shuttles/subshuttles/minutemen_crux.dmm +++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm @@ -88,7 +88,8 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "k" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ id = "crux_windows" }, @@ -232,19 +233,25 @@ /obj/effect/turf_decal/techfloor/hole{ dir = 4 }, -/obj/machinery/power/port_gen/pacman, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, /obj/effect/turf_decal/industrial/hatch/yellow, /obj/structure/cable{ icon_state = "0-5" }, /obj/effect/decal/cleanable/greenglow, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -21 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/bridge) "I" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, -/obj/structure/sign/minutemen{ +/obj/structure/sign/clip{ pixel_y = 28 }, /obj/structure/cable{ @@ -274,9 +281,7 @@ /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-1" - }, +/obj/structure/cable, /obj/structure/cable{ icon_state = "1-4" }, @@ -363,7 +368,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/obj/structure/sign/minutemen{ +/obj/structure/sign/clip{ pixel_y = -32 }, /obj/structure/cable{ @@ -372,11 +377,14 @@ /turf/open/floor/plasteel, /area/ship/bridge) "X" = ( -/obj/structure/guncase, /obj/structure/window/reinforced, /obj/effect/turf_decal/techfloor{ dir = 9 }, +/obj/structure/closet/crate, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/sheet/mineral/plasma/twenty, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Y" = ( @@ -443,7 +451,7 @@ L w "} (6,1,1) = {" -k +w w h v diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm index 4565f12416f..7176477bab9 100644 --- a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm +++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm @@ -436,7 +436,7 @@ /area/ship/bridge) "ZG" = ( /obj/structure/table, -/obj/machinery/fax{ +/obj/machinery/fax/nanotrasen{ pixel_y = 5 }, /obj/effect/turf_decal/corner/opaque/green/half, diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index d86cb9b23de..f5b0e87a6b1 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -4187,7 +4187,7 @@ pixel_y = 9 }, /obj/item/radio/intercom/wideband/directional/north, -/obj/machinery/fax, +/obj/machinery/fax/syndicate, /obj/effect/turf_decal/siding/wood{ dir = 5 }, diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 3a20cb1f5c2..523a524de9d 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -604,7 +604,7 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/dorm) "pa" = ( -/obj/machinery/fax, +/obj/machinery/fax/syndicate, /obj/item/toy/figure/detective{ name = "Intel Buddy"; pixel_x = 5; diff --git a/_maps/shuttles/syndicate/syndicate_gec_lugol.dmm b/_maps/shuttles/syndicate/syndicate_gec_lugol.dmm index 04e7a8d4b46..2e4e22caa6d 100644 --- a/_maps/shuttles/syndicate/syndicate_gec_lugol.dmm +++ b/_maps/shuttles/syndicate/syndicate_gec_lugol.dmm @@ -575,7 +575,7 @@ /area/ship/construction) "gv" = ( /obj/structure/table, -/obj/item/folder/syndicate/red, +/obj/item/folder/documents/syndicate/red, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 6a8cee6cc78..0cd79289ede 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -1921,7 +1921,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/item/paper_bin/carbon, -/obj/item/folder/syndicate/red, +/obj/item/folder/documents/syndicate/red, /obj/item/pen/fountain/captain, /obj/item/stamp/hos{ name = "captain's rubber stamp" @@ -2552,7 +2552,7 @@ pixel_x = 11; pixel_y = -3 }, -/obj/machinery/fax, +/obj/machinery/fax/syndicate, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/borderfloorblack{ dir = 1 diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 35486f0a375..4500ef61d3b 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -16,6 +16,20 @@ /obj/machinery/power/terminal, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"ah" = ( +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/effect/turf_decal/techfloor{ + dir = 10 + }, +/obj/item/clothing/mask/gas/sechailer/balaclava, +/obj/item/clothing/under/syndicate/skirt, +/obj/structure/closet/syndicate{ + desc = "It's a basic storage unit."; + name = "uniform closet" + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/hallway/central) "am" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 6 @@ -985,22 +999,6 @@ /obj/item/gun/ballistic/shotgun/bulldog/unrestricted, /turf/open/floor/pod/dark, /area/ship/security/armory) -"jh" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 5 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/closet/crate/secure/loot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "jp" = ( /obj/effect/turf_decal/arrows{ dir = 8 @@ -2792,6 +2790,22 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) +"BL" = ( +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 5 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet/crate/secure/loot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "BP" = ( /obj/structure/sign/syndicate, /turf/closed/wall/mineral/plastitanium, @@ -3098,7 +3112,7 @@ /area/ship/crew/canteen) "El" = ( /obj/structure/filingcabinet, -/obj/item/folder/syndicate/mining, +/obj/item/folder/documents/syndicate/mining, /turf/open/floor/engine, /area/ship/bridge) "Ep" = ( @@ -3590,20 +3604,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/rust, /area/ship/maintenance/starboard) -"Iv" = ( -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/effect/turf_decal/techfloor{ - dir = 10 - }, -/obj/item/clothing/mask/gas/sechailer/minutemen, -/obj/item/clothing/under/syndicate/skirt, -/obj/structure/closet/syndicate{ - desc = "It's a basic storage unit."; - name = "uniform closet" - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/hallway/central) "IE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -5024,7 +5024,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/machinery/fax{ +/obj/machinery/fax/syndicate{ pixel_x = 4; pixel_y = 0 }, @@ -5659,7 +5659,7 @@ Dl JB bS tC -jh +BL KE Vq Or @@ -5719,7 +5719,7 @@ Dd RN Ye OG -Iv +ah VR Eg xP diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm index 02e738d39bf..e81231480df 100644 --- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm +++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm @@ -286,7 +286,7 @@ /area/ship/hallway/central) "hF" = ( /obj/structure/table/reinforced, -/obj/machinery/fax, +/obj/machinery/fax/syndicate, /turf/open/floor/plasteel/dark, /area/ship/bridge) "hQ" = ( diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 4b6183391ff..79c693817dd 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -422,7 +422,7 @@ pixel_y = 32 }, /obj/structure/table, -/obj/machinery/fax{ +/obj/machinery/fax/syndicate{ pixel_y = 5 }, /turf/open/floor/plasteel/tech, @@ -1692,11 +1692,11 @@ /area/ship/medical) "jO" = ( /obj/structure/table/reinforced, -/obj/item/folder/syndicate/red{ +/obj/item/folder/documents/syndicate/red{ pixel_x = -8; pixel_y = 6 }, -/obj/item/folder/syndicate/blue{ +/obj/item/folder/documents/syndicate/blue{ pixel_x = 6; pixel_y = 4 }, @@ -7701,7 +7701,7 @@ pixel_y = 12 }, /obj/structure/rack, -/obj/item/clothing/suit/armor/riot/minutemen{ +/obj/item/clothing/suit/armor/riot/clip{ desc = "Designed to protect against close range attacks. This one is painted black."; pixel_y = 1; pixel_x = 5 @@ -8604,7 +8604,7 @@ /obj/effect/turf_decal/corner/opaque/syndiered/half{ dir = 8 }, -/obj/machinery/fax, +/obj/machinery/fax/syndicate, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xf" = ( diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index ea2585df835..2b8dc67cb68 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -762,3 +762,6 @@ /// send when enabling/diabling an autofire component #define COMSIG_GUN_DISABLE_AUTOFIRE "disable_autofire" #define COMSIG_GUN_ENABLE_AUTOFIRE "enable_autofire" + +///called in /obj/item/gun/process_chamber (src) +#define COMSIG_GUN_CHAMBER_PROCESSED "gun_chamber_processed" diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index a5195f26623..79f17882028 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -160,6 +160,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list( /obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, + /obj/item/flamethrower, /obj/item/kitchen/knife/combat, /obj/item/melee/baton, /obj/item/melee/classic_baton/telescopic, diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index f1289d15bdb..72123b78268 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -241,7 +241,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_XENO_IMMUNE "xeno_immune"//prevents xeno huggies implanting skeletons #define TRAIT_NAIVE "naive" #define TRAIT_PRIMITIVE "primitive" -#define TRAIT_GUNFLIP "gunflip" +#define TRAIT_GUNSLINGER "gunslinger" #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" ///Increases chance of getting special traumas, makes them harder to cure #define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat" #define TRAIT_SPACEWALK "spacewalk" diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index dc9fbf80e29..e34b48a357e 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list( "SUNS", ), "SolGov" = list( - "SGSV", + "SCSV", ), "Saint-Roumain Militia" = list( "SRSV", @@ -266,7 +266,7 @@ GLOBAL_LIST_INIT(ship_faction_to_prefixes, list( "Inteq Risk Management Group" = list( "IRMV", ), - "Colonial Minutemen" = list( + "CLIP Minutemen" = list( "CMSV", "CMGSV", ), diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index c91b96db8de..dbc3607129f 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -110,7 +110,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE, "TRAIT_NAIVE" = TRAIT_NAIVE, "TRAIT_PRIMITIVE" = TRAIT_PRIMITIVE, //unable to use mechs. Given to Ash Walkers - "TRAIT_GUNFLIP" = TRAIT_GUNFLIP, + "TRAIT_GUNSLINGER" = TRAIT_GUNSLINGER, "TRAIT_SPECIAL_TRAUMA_BOOST" = TRAIT_SPECIAL_TRAUMA_BOOST, "TRAIT_BLOODCRAWL_EAT" = TRAIT_BLOODCRAWL_EAT, "TRAIT_SPACEWALK" = TRAIT_SPACEWALK, diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 379feecb3be..0833d606927 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -351,6 +351,9 @@ combo_display = new /atom/movable/screen/combo() infodisplay += combo_display + ammo_counter = new /atom/movable/screen/ammo_counter(null, src) + infodisplay += ammo_counter + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0a5c787d3bf..6ae8b0e6240 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -282,7 +282,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Welcome to [station_name()], enjoy your stay!") SSredbot.send_discord_message("ooc", "**A new round has begun.**") - SEND_SOUND(world, sound('sound/ai/welcome.ogg')) + SEND_SOUND(world, sound('sound/roundstart/addiguana.ogg')) current_state = GAME_STATE_PLAYING Master.SetRunLevel(RUNLEVEL_GAME) @@ -571,15 +571,12 @@ SUBSYSTEM_DEF(ticker) update_everything_flag_in_db() if(!round_end_sound) round_end_sound = pick(\ - 'sound/roundend/newroundsexy.ogg', - 'sound/roundend/apcdestroyed.ogg', - 'sound/roundend/bangindonk.ogg', - 'sound/roundend/leavingtg.ogg', - 'sound/roundend/its_only_game.ogg', - 'sound/roundend/yeehaw.ogg', - 'sound/roundend/disappointed.ogg', - 'sound/roundend/scrunglartiy.ogg', - 'sound/roundend/petersondisappointed.ogg'\ + 'sound/roundend/deliguana.ogg', + 'sound/roundend/undecided.ogg', + 'sound/roundend/repair.ogg', + 'sound/roundend/boowomp.ogg', + 'sound/roundend/shiptestingthursday.ogg', + 'sound/roundend/gayrights.ogg'\ ) ///The reference to the end of round sound that we have chosen. var/sound/end_of_round_sound_ref = sound(round_end_sound) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 43af3bc2b3e..ff11057704c 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -142,46 +142,53 @@ /datum/ert/solgov/inspector/New() mission = "Conduct a routine review on [station_name()]'s vessels." -// Minutemen +// CLIP /datum/ert/minutemen + teamsize = 5 + opendoors = FALSE + leader_role = /datum/antagonist/ert/minutemen/leader + /// TODO: figure out a way to fill in at least one rifleman first + roles = list(/datum/antagonist/ert/minutemen, /datum/antagonist/ert/minutemen/corpsman = 1, /datum/antagonist/ert/minutemen/engi = 1, /datum/antagonist/ert/minutemen/gunner = 1) + mission = "Keep the peace in sector affairs" + rename_team = "CLIP Minutemen Squadron" + polldesc = "a CLIP Minutemen squadron" + ert_template = /datum/map_template/shuttle/subshuttles/crux + +//quick infantry - for use when you need to throw minutemen somewhere fast but dont want ANY preperation at all +/datum/ert/minutemen/quick teamsize = 4 opendoors = FALSE leader_role = /datum/antagonist/ert/minutemen/leader roles = list(/datum/antagonist/ert/minutemen) - mission = "Keep the peace in sector affairs" - rename_team = "Generic Minutemen Team" - polldesc = "a Minutemen emergency team" + mission = "Resolve the conflict at hand" + polldesc = "a CLIP Minutemen emergency team" random_names = TRUE - ert_template = /datum/map_template/shuttle/subshuttles/crux /datum/ert/minutemen/bard leader_role = /datum/antagonist/ert/minutemen/bard/leader - roles = list(/datum/antagonist/ert/minutemen/bard) - rename_team = "Minutemen BARD Team" - polldesc = "a Minutemen biohazard removal team" + roles = list(/datum/antagonist/ert/minutemen/bard, /datum/antagonist/ert/minutemen/bard/medic = 1, /datum/antagonist/ert/minutemen/bard/flamer = 1) + rename_team = "CLIP Minutemen BARD Squadron" + polldesc = "a CLIP Minutemen biohazard removal team" /datum/ert/minutemen/riot teamsize = 6 leader_role = /datum/antagonist/ert/minutemen/riot/leader roles = list(/datum/antagonist/ert/minutemen/riot) - rename_team = "Minutemen Riot Control Team" - polldesc = "a Minutemen riot control team" + rename_team = "CLIP Minutemen Riot Control Squadron" + polldesc = "a CLIP Minutemen riot control team" -/datum/ert/minutemen/piratehunters - leader_role = /datum/antagonist/ert/minutemen/piratehunters/leader - roles = list(/datum/antagonist/ert/minutemen/piratehunters) - mission = "Eliminate pirate presence within the sector." - rename_team = "Minutemen Pirate Hunter Team" - polldesc = "a fireteam of Minutemen pirate hunters" +/datum/ert/minutemen/eva + leader_role = /datum/antagonist/ert/minutemen/eva/leader + roles = list(/datum/antagonist/ert/minutemen/eva) /datum/ert/minutemen/inspector teamsize = 1 leader_role = /datum/antagonist/ert/official/minutemen roles = list(/datum/antagonist/ert/official/minutemen) - rename_team = "Minutemen GOLD Inspector" - polldesc = "a Minutemen inspector" + rename_team = "CLIP Minutemen GOLD Inspector" + polldesc = "a CLIP Minutemen inspector" // Syndicate diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index b92a3d137dc..eb53db8519c 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -226,3 +226,11 @@ SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "bad_hair_day", /datum/mood_event/bald) +/datum/quirk/gunslinger + name = "Gunslinger" + desc = "You are one of the fastest guns in the frontier. Those new-fangled and complicated firearms don't suit you; pistols and semi-automatic rifles suit you better, but revolvers in particular were made for you. You can fan single action revolvers, flip any revolver, and have mastery of the greatest handgun ever made. NOT RECOMENDED FOR BEGINNERS. ADVANCED PLAYERS ONLY." + value = 0 + gain_text = "The HP Shadow is greatest handgun ever made." + lose_text = "...Who the hell would use such antiquated weapons in this year?" + medical_record_text = "Patient always has their hand around their holster." + mob_traits = list(TRAIT_GUNSLINGER) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 2a27c774142..87820b3acc5 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -303,15 +303,28 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17) /obj/machinery/cryopod/proc/despawn_occupant() var/mob/living/mob_occupant = occupant - if(linked_ship) - if(mob_occupant.job in linked_ship.current_ship.job_slots) - linked_ship.current_ship.job_slots[mob_occupant.job]++ - - if(mob_occupant.mind && mob_occupant.mind.assigned_role) - //Handle job slot/tater cleanup. - if(LAZYLEN(mob_occupant.mind.objectives)) - mob_occupant.mind.objectives.Cut() - mob_occupant.mind.special_role = null + if(!isnull(mob_occupant.mind.original_ship)) + var/datum/overmap/ship/controlled/original_ship_instance = mob_occupant.mind.original_ship.resolve() + + var/job_identifier = mob_occupant.job + + var/datum/job/crew_job + for(var/datum/job/job as anything in original_ship_instance.job_slots) + if(job.name == job_identifier) + crew_job = job + break + + if(isnull(crew_job)) + message_admins(span_warning("Failed to identify the job of [key_name_admin(mob_occupant)] belonging to [original_ship_instance.name] at [loc_name(src)].")) + else + original_ship_instance.job_slots[crew_job]++ + original_ship_instance.job_holder_refs[crew_job] -= WEAKREF(mob_occupant) + + if(mob_occupant.mind && mob_occupant.mind.assigned_role) + //Handle job slot/tater cleanup. + if(LAZYLEN(mob_occupant.mind.objectives)) + mob_occupant.mind.objectives.Cut() + mob_occupant.mind.special_role = null // Delete them from datacore. var/announce_rank = null diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 1af8988aae9..2496ee41c87 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 827e350468f..86bc02438d9 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 773faec875f..60797eaee99 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 ce8ad22d6b1..664d45b5b1c 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 728bacdb671..cf89811d5f0 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 b1f8d126705..95e7b2f0722 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 bf11c24b0d8..27c680120fa 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 2ef07992eb2..40783ecbb20 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/anomalies/anomalies_plasmasoul.dm b/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm index aead14f26e2..006d42ac28d 100644 --- a/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm +++ b/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm @@ -15,34 +15,48 @@ return COOLDOWN_START(src, pulse_cooldown, pulse_delay) - for(var/mob/living/mob in range(effectrange,src)) - if(iscarbon(mob)) - var/mob/living/carbon/target = mob - target.reagents?.add_reagent(/datum/reagent/toxin/plasma, reagent_amount) - to_chat(mob, span_warning("Your blood feels thick..")) - playsound(mob, 'sound/effects/bubbles.ogg', 50) + harm_surrounding_mobs() /obj/effect/anomaly/plasmasoul/Bumped(atom/movable/AM) var/turf/open/spot = locate(rand(src.x-effectrange, src.x+effectrange), rand(src.y-effectrange, src.y+effectrange), src.z) - for(var/mob/living/mob in range(effectrange,src)) - if(iscarbon(mob)) - var/mob/living/carbon/target = mob - target.reagents?.add_reagent(/datum/reagent/toxin/plasma, reagent_amount) - to_chat(mob, span_warning("Your blood feels thick..")) - playsound(mob, 'sound/effects/bubbles.ogg', 50) + harm_surrounding_mobs() if(istype(spot)) spot.atmos_spawn_air("plasma=300;TEMP=200") +/obj/effect/anomaly/plasmasoul/proc/harm_surrounding_mobs() + for(var/mob/living/carbon/human/H in range(effectrange, src)) + + if(!(H.dna?.species.reagent_tag & PROCESS_ORGANIC)) + H.adjustFireLoss(20) + to_chat(H, span_warning("Something bubbles and hisses under your plating...")) + playsound(H, 'sound/items/welder.ogg', 150) + continue + + H.reagents?.add_reagent(/datum/reagent/toxin/plasma, reagent_amount) + to_chat(H, span_warning("Your blood feels thick...")) + playsound(H, 'sound/effects/bubbles.ogg', 50) + /obj/effect/anomaly/plasmasoul/detonate() - for(var/mob/living/Mob in range(effectrange*2,src)) - if(iscarbon(Mob)) - var/mob/living/carbon/carbon = Mob - if(carbon.run_armor_check(attack_flag = "bio") <= 40) - carbon.reagents?.add_reagent(/datum/reagent/toxin/plasma, reagent_amount*3) + for(var/mob/living/carbon/human/H in range(effectrange*2, src)) + if(H.run_armor_check(attack_flag = "bio") <= 40) + continue + + if(!(H.dna?.species.reagent_tag & PROCESS_ORGANIC)) + H.adjustFireLoss(60) + to_chat(H, span_warning("Plasma flashes and ignites inside of your chassis!")) + playsound(H, 'sound/items/welder.ogg', 150) + continue + + H.reagents?.add_reagent(/datum/reagent/toxin/plasma, reagent_amount*3) + to_chat(H, span_warning("Your blood thickens and bubbles in your veins!")) + playsound(H, 'sound/effects/bubbles.ogg', 50) + var/turf/open/tile = get_turf(src) + if(istype(tile)) tile.atmos_spawn_air("o2=600;plasma=3000;TEMP=2000") - . = ..() + + return ..() /obj/effect/anomaly/plasmasoul/planetary immortal = TRUE diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index a86a74c2c3d..a50e72d9fcb 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -56,8 +56,8 @@ icon_state = "rolled_solgov" /obj/item/poster/random_minutemen - name = "random cmm poster" - poster_type = /obj/structure/sign/poster/minutemen/random + name = "random clip poster" + poster_type = /obj/structure/sign/poster/clip/random icon_state = "rolled_legit" /obj/item/poster/random_rilena @@ -261,7 +261,7 @@ /obj/structure/sign/poster/contraband/lusty_xenomorph name = "Lusty Xenomorph" - desc = "A heretical poster depicting the titular star of an equally heretical book. Wow, this would be extremely offensive to anyone in the CMM." + desc = "A heretical poster depicting the titular star of an equally heretical book. Wow, this would be extremely offensive to anyone in CLIP." icon_state = "poster_xeno" //i dont even know how to redo this one /obj/structure/sign/poster/contraband/syndicate_recruitment @@ -427,7 +427,7 @@ /obj/structure/sign/poster/contraband/backdoor_xeno_babes_6 name = "Backdoor Xeno Babes 6" - desc = "... You don't even know where to start with this. Wow, this would be extremely offensive to anyone in the CMM." + desc = "... You don't even know where to start with this. Wow, this would be extremely offensive to anyone in CLIP." icon_state = "poster_xeno_maid" /obj/structure/sign/poster/contraband/robustmore_drinkfoods @@ -938,54 +938,54 @@ desc = "SUNS, best known for it's diverse variety of top students from various solarian universities, dealing with internal fighting via dueling with swords, and being sued by Nanotrasen for trademark infrigement on their old name \"NSV.\"" icon_state = "poster-solgov_suns" -//CMM poster pool. This is quite limited, so don't use more than 3 random ones at once. Expect to see these on CMM ships. +//CLIP poster pool. This is quite limited, so don't use more than 3 random ones at once. Expect to see these on CLIP ships. -/obj/structure/sign/poster/minutemen - poster_item_name = "cmm poster" - poster_item_desc = "A poster that is produced within the CMM. It comes with adhesive backing, for easy pinning to any vertical surface." +/obj/structure/sign/poster/clip + poster_item_name = "clip poster" + poster_item_desc = "A poster that is produced within CLIP. It comes with adhesive backing, for easy pinning to any vertical surface." poster_item_icon_state = "rolled_legit" -/obj/structure/sign/poster/minutemen/random - name = "random cmm poster" - icon_state = "random_cmm" +/obj/structure/sign/poster/clip/random + name = "random clip poster" + icon_state = "random_clip" never_random = TRUE - random_basetype = /obj/structure/sign/poster/minutemen + random_basetype = /obj/structure/sign/poster/clip random_type = POSTER_SUBTYPES -/obj/structure/sign/poster/minutemen/enlist +/obj/structure/sign/poster/clip/enlist name = "Enlist" - desc = "\"Do your part for not just the CMM, but Luna Town, Lanchester City, Serene, Star City, Ryunosuke, Lanshuka, Radinska, New Kalixcis, and all of your families! Plus, finance your future; It's a win/win to enlist in the CMM!\"" - icon_state = "poster-cmm_enlist" + desc = "\"Do your part for not just CLIP, but Luna Town, Lanchester City, Serene, Star City, Ryunosuke, Lanshuka, Radinska, New Kalixcis, and all of your families! Plus, finance your future; It's a win/win to enlist in the CMM!\"" + icon_state = "poster-clip_enlist" -/obj/structure/sign/poster/minutemen/bard +/obj/structure/sign/poster/clip/bard name = "CMM-BARD" desc = "A poster made by soldiers to recruit people into the BARD, depecting a \"Sergeant Clues\" mowing down waves and waves of xenofauna, and them exploding into blood. Something tells you that service is a lot less interesting than this." - icon_state = "poster-cmm_bard" + icon_state = "poster-clip_bard" -/obj/structure/sign/poster/minutemen/gold - name = "CMM-GOLD" - desc = "A poster listing job positions open in the CMM GOLD and asking for applications, listing important but uninteresting benifits like health insurance and such." - icon_state = "poster-cmm_gold" +/obj/structure/sign/poster/clip/gold + name = "CLIP-GOLD" + desc = "A poster listing job positions open in the CLIP GOLD and asking for applications, listing important but uninteresting benifits like health insurance and such." + icon_state = "poster-clip_gold" -/obj/structure/sign/poster/minutemen/lunatown +/obj/structure/sign/poster/clip/lunatown name = "Luna-Town" - desc = "Luna-town, the second planet of the Kanler-332 system. The capital of the Colonial Minutemen and the Milita. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, including the capital city itself and the remains of the UNSV Lichtenstein, famous for bringing the CMM from the brink into what it is today." - icon_state = "poster-cmm_luna" + desc = "Luna-town, one of the many moons of the gas giant Maxin. The capital of the Confederated League of Independent Planets. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, including the capital city itself and the remains of the UNSV Lichtenstein, famous for bringing CLIP from the brink into what it is today." + icon_state = "poster-clip_luna" -/obj/structure/sign/poster/minutemen/maxin +/obj/structure/sign/poster/clip/maxin name = "Maxin" desc = "Maxin, the fourth planet of the Kanler-332 system. It's many moons including Lanchester City make it a popular sightseeing attraction for those enroute to Lanchester City." - icon_state = "poster-cmm_maxin" + icon_state = "poster-clip_maxin" -/obj/structure/sign/poster/minutemen/lanchester +/obj/structure/sign/poster/clip/lanchester name = "Lanchester City" - desc = "Luna-town, one of the many moons of the gas giant Maxin. A moon well known for it's numerous, massive factories. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, such as crashed Frontiersmen ships and the massive entertainment industry." - icon_state = "poster-cmm_lanchester" + desc = "Lanchester City, one of the many moons of the gas giant Maxin. A moon well known for it's numerous, massive factories. This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, such as crashed Frontiersmen ships and the massive entertainment industry." + icon_state = "poster-clip_lanchester" -/obj/structure/sign/poster/minutemen/serene +/obj/structure/sign/poster/clip/serene name = "Serene" desc = "Serene, the fifth planet of the Druja system. Covered with a thick sheet of snow, the atmosphere has been described as \"Breathable, if it weren't so darn cold.\" This poster is attempting to encounrage tourism with this poster by listing several tourist attractions, such as old Frontiersmen War sites and Xenofauna war sites." - icon_state = "poster-cmm_serene" + icon_state = "poster-clip_serene" // Syndicate posters. Since syndicate are dived lorewise, this would only make sense on pre-split ships. /obj/structure/sign/poster/syndicate diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d1f47ff647f..3370c8b4543 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/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 154e4b48a48..ce5afeba737 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -168,6 +168,7 @@ if(mapload && access_txt) access = text2access(access_txt) update_label() + update_appearance() RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet)) /obj/item/card/id/Destroy() @@ -421,7 +422,6 @@ update_label() /obj/item/card/id/proc/update_label() var/blank = !registered_name name = "[blank ? initial(name) : "[registered_name]'s ID Card"][(!assignment) ? "" : " ([assignment])"]" - update_appearance() /obj/item/card/id/silver name = "silver identification card" diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 8800dee2001..a60600b3661 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -750,7 +750,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM overlay_state = "slime" grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5) -/obj/item/lighter/clockwork //WS edit: Clockwork Zippo, by Tergius. PR #395 +/obj/item/lighter/clockwork name = "bronze zippo" desc = "A zippo plated with brass. I mean bronze. Has a neat red flame!" icon = 'icons/obj/cigarettes.dmi' @@ -829,7 +829,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /////////////// /obj/item/clothing/mask/vape name = "\improper E-Cigarette" - desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\" Must be lit via interfacing with a PDA."//<<< i'd vape to that. + desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\" Can be lit via interfacing with a PDA, tablet computer, or an APC."//<<< i'd vape to that. icon = 'icons/obj/clothing/masks.dmi' icon_state = "red_vapeoff" item_state = "red_vapeoff" @@ -839,19 +839,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/vapetime = 0 //this so it won't puff out clouds every tick var/screw = 0 // kinky var/super = 0 //for the fattest vapes dude. - var/vapecolor //What color the vape should be. If this is not filled out it will automatically be set on Initialize() - WS edit - Lightable e-cigarettes - var/overlayname = "vape" //Used to decide what overlay sprites to use - WS edit - Lightable e-cigarettes + var/vapecolor //What color the vape should be. If this is not filled out it will automatically be set on Initialize() + var/overlayname = "vape" //Used to decide what overlay sprites to use /obj/item/clothing/mask/vape/Initialize(mapload, param_color) . = ..() create_reagents(chem_volume, NO_REACT) reagents.add_reagent(/datum/reagent/drug/nicotine, 50) - if(!vapecolor) //BeginWS edit - Lightable e-cigarettes + if(!vapecolor) if(!param_color) param_color = pick("red","blue","black","white","green","purple","yellow","orange") vapecolor = param_color icon_state = "[vapecolor]_vapeoff" - item_state = "[vapecolor]_vapeoff" //EndWS edit - Lightable e-cigarettes + item_state = "[vapecolor]_vapeoff" /obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_SCREWDRIVER) @@ -863,11 +863,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, "You open the cap on [src].") reagents.flags |= OPENCONTAINER if(obj_flags & EMAGGED) - add_overlay("[overlayname]open_high") //WS edit - lightable e-cigarettes + add_overlay("[overlayname]open_high") else if(super) - add_overlay("[overlayname]open_med") //WS edit - lightable e-cigarettes + add_overlay("[overlayname]open_med") else - add_overlay("[overlayname]open_low") //WS edit - lightable e-cigarettes + add_overlay("[overlayname]open_low") else screw = FALSE to_chat(user, "You close the cap on [src].") @@ -880,18 +880,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM cut_overlays() super = 1 to_chat(user, "You increase the voltage of [src].") - add_overlay("[overlayname]open_med") //WS edit - lightable e-cigarettes + add_overlay("[overlayname]open_med") else cut_overlays() super = 0 to_chat(user, "You decrease the voltage of [src].") - add_overlay("[overlayname]open_low") //WS edit - lightable e-cigarettes + add_overlay("[overlayname]open_low") if(screw && (obj_flags & EMAGGED)) to_chat(user, "[src] can't be modified!") else ..() - if(istype(O, /obj/item/pda)) //BeginWS edit - Lightable e-cigarettes + if(istype(O, /obj/item/pda) || istype(O, /obj/item/modular_computer/tablet)) if(screw) to_chat(user, "You need to close the cap first!") return @@ -918,8 +918,32 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) src.update_icon_state() user.update_inv_wear_mask() - user.update_inv_hands() //EndWS edit - Lightable e-cigarettes + user.update_inv_hands() +/obj/item/clothing/mask/vape/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + if((!istype(target, /obj/machinery/power/apc)) || !ishuman(user) || !proximity_flag) + return ..() + if(screw) + to_chat(user, "You need to close the cap first!") + return + on = !on + if(on) + user.visible_message( + "[user] turns on [user.p_their()] [src] with a holographic flame from the APC.", + "You turn on your [src] with a holographic flame from the APC." + ) + reagents.flags |= NO_REACT + icon_state = "[vapecolor]_vape" + item_state = "[vapecolor]_vape" + else + user.visible_message( + "[user] turns off [user.p_their()] [src] with a holographic gust from the APC.", + "You turn off your [src] with a holographic gust from the APC." + ) + reagents.flags &= NO_REACT + icon_state = "[vapecolor]_vapeoff" + item_state = "[vapecolor]_vapeoff" + src.update_icon_state() /obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY. if(screw) @@ -928,7 +952,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM obj_flags |= EMAGGED super = 0 to_chat(user, "You maximize the voltage of [src].") - add_overlay("[overlayname]open_high") //WS edit - lightable e-cigarettes + add_overlay("[overlayname]open_high") var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect sp.set_up(5, 1, src) sp.start() @@ -944,7 +968,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/vape/equipped(mob/user, slot) . = ..() - if(slot == ITEM_SLOT_MASK) //BeginWS edit - Lightable e-cigarettes + if(slot == ITEM_SLOT_MASK) if(on) if(!screw) to_chat(user, "You start puffing on \the [src].") @@ -952,7 +976,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else //it will not start if the vape is opened. to_chat(user, "You need to close the cap first!") else - to_chat(user, "You need to turn on \the [src] first!") //EndWS edit - Lightable e-cigarettes + to_chat(user, "You need to turn on \the [src] first!") /obj/item/clothing/mask/vape/dropped(mob/user) . = ..() @@ -999,7 +1023,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM //open flame removed because vapes are a closed system, they wont light anything on fire if(super && vapetime > 3)//Time to start puffing those fat vapes, yo. - var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new //BeginWS edit - Fix vape clouds + var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new var/datum/reagents/smokereagents = new reagents.trans_to(smokereagents, reagents.total_volume / 10, 0.65) s.set_up(smokereagents, 1, 24, loc) @@ -1011,7 +1035,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/datum/reagents/smokereagents = new reagents.trans_to(smokereagents, reagents.total_volume / 5, 0.75) s.set_up(smokereagents, 4, 24, loc) - s.start() //EndWS edit - Fix vape clouds + s.start() vapetime = 0 if(prob(5))//small chance for the vape to break and deal damage if it's emagged playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, FALSE) @@ -1027,13 +1051,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(reagents && reagents.total_volume) hand_reagents() -/obj/item/clothing/mask/vape/examine(mob/user) //BeginWS edit - Lightable e-cigarettes +/obj/item/clothing/mask/vape/examine(mob/user) . = ..() - to_chat(user, "It is currently [on ? "on" : "off"].") /obj/item/clothing/mask/vape/cigar name = "\improper E-Cigar" - desc = "The latest recreational device developed by a small tech startup, Shadow Tech, the E-Cigar has all the uses of a normal E-Cigarette, with the classiness of short fat cigar. Must be lit via interfacing with a PDA." + desc = "The latest recreational device developed by a small tech startup, Shadow Tech, the E-Cigar has all the uses of a normal E-Cigarette, with the classiness of short fat cigar. Can be lit via interfacing with a PDA, tablet computer, or an APC." icon_state = "ecigar_vapeoff" item_state = "ecigar_vapeoff" vapecolor = "ecigar" diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 41a8f59509a..bf08b704beb 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -30,7 +30,11 @@ if(pai) if(!pai.master_dna || !pai.master) dat += "Imprint Master DNA
" - dat += "Installed Personality: [pai.name]
" + dat += "Prime directive:
" + if(pai.laws.zeroth) + dat +="[pai.laws.zeroth]
" + else + dat +="None
" dat += "Prime directive:
[pai.laws.zeroth]
" for(var/slaws in pai.laws.supplied) dat += "Additional directives:
[slaws]
" @@ -48,6 +52,7 @@ var/mob/living/carbon/human/H = user if(H.real_name == pai.master || H.dna.unique_enzymes == pai.master_dna) dat += "\[[pai.canholo? "Disable" : "Enable"] holomatrix projectors\]
" + dat += "\[Remove Prime directive\]
" dat += "\[Reset speech synthesis module\]
" dat += "\[Wipe current pAI personality\]
" else @@ -79,6 +84,7 @@ pai.master = M.real_name pai.master_dna = M.dna.unique_enzymes to_chat(pai, "You have been bound to a new master.") + pai.laws.set_zeroth_law("Serve your master.") pai.emittersemicd = FALSE if(href_list["wipe"]) var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No") @@ -89,6 +95,10 @@ to_chat(pai, "Your mental faculties leave you.") to_chat(pai, "oblivion... ") qdel(pai) + if(href_list["clear_zero"]) + if((input("Are you CERTAIN you wish to remove this pAI's Prime directive? This action cannot be undone.", "Clear Directive") in list("Yes", "No")) == "Yes") + if(pai) + pai.laws.clear_zeroth_law() if(href_list["fix_speech"]) pai.stuttering = 0 pai.slurring = 0 @@ -149,4 +159,3 @@ return if(pai && !pai.holoform) pai.emp_act(severity) - diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 9d244ce74cd..0904cdef367 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 36b1090fd7e..574dd88e5cc 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -148,32 +148,32 @@ GLOBAL_LIST_INIT(channel_tokens, list( . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) -//minutemen -/obj/item/radio/headset/minutemen +//clip +/obj/item/radio/headset/clip name = "minutemen radio headset" - desc = "Used by militias flying the five stars of the Colonial Minutemen." - icon_state = "cmm_headset" + desc = "Used by militias flying the five stars of the CLIP Minutemen." + icon_state = "clip_headset" keyslot = new /obj/item/encryptionkey/minutemen -/obj/item/radio/headset/minutemen/captain +/obj/item/radio/headset/clip/captain name = "minuteman officer radio headset" - desc = "Used by the Colonial Minutemen's enlisted officers." + desc = "Used by the CLIP Minutemen's enlisted officers." keyslot2 = new /obj/item/encryptionkey/heads/captain command = TRUE -/obj/item/radio/headset/minutemen/alt +/obj/item/radio/headset/clip/alt name = "minutemen bowman headset" - desc = "Used by militias flying the five stars of the Colonial Minutemen. Protects ears from flashbangs." - icon_state = "cmm_headset_alt" - item_state = "cmm_headset_alt" + desc = "Used by militias flying the five stars of the CLIP Minutemen. Protects ears from flashbangs." + icon_state = "clip_headset_alt" + item_state = "clip_headset_alt" -/obj/item/radio/headset/minutemen/alt/captain +/obj/item/radio/headset/clip/alt/captain name = "minuteman officer bowman headset" - desc = "Used by the Colonial Minutemen's enlisted officers. Protects ears from flashbangs." + desc = "Used by the CLIP Minutemen's enlisted officers. Protects ears from flashbangs." keyslot2 = new /obj/item/encryptionkey/heads/captain command = TRUE -/obj/item/radio/headset/minutemen/alt/ComponentInitialize() +/obj/item/radio/headset/clip/alt/ComponentInitialize() . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -335,8 +335,6 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/silicon/pai name = "\proper mini Integrated Subspace Transceiver " - subspace_transmission = FALSE - /obj/item/radio/headset/silicon/ai name = "\proper Integrated Subspace Transceiver " diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 6f11fe4ebac..3f40f82fe0a 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -140,7 +140,7 @@ GENE SCANNER // Used by the PDA medical scanner too /proc/healthscan(mob/user, mob/living/M, mode = SCANNER_VERBOSE, advanced = FALSE) - if(isliving(user) && (user.incapacitated() || user.is_blind())) + if(isliving(user) && (user.incapacitated())) return // the final list of strings to render @@ -456,7 +456,7 @@ GENE SCANNER /obj/item/analyzer/attack_self(mob/user) add_fingerprint(user) - if (user.stat || user.is_blind()) + if (user.stat) return var/turf/location = user.loc @@ -636,7 +636,7 @@ GENE SCANNER custom_materials = list(/datum/material/iron=30, /datum/material/glass=20) /obj/item/slime_scanner/attack(mob/living/M, mob/living/user) - if(user.stat || user.is_blind()) + if(user.stat) return if (!isslime(M)) to_chat(user, "This device can only scan slimes!") diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 4367861c7f7..46d92aa9b6f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -37,7 +37,12 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE) + new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (middle)", /obj/structure/chair/sofa/red, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (right)", /obj/structure/chair/sofa/red/right, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (corner)", /obj/structure/chair/sofa/red/corner, 1, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("red sofa (internal corner)", /obj/structure/chair/sofa/red/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE) )), null, \ new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index b4ec267bd77..ac5b14568da 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -131,11 +131,6 @@ icon_state = "securitypack" item_state = "securitypack" -/obj/item/storage/backpack/security/cmm - name = "cmm backpack" - desc = "It's a very blue backpack." - icon_state = "cmmpack" - /obj/item/storage/backpack/captain name = "captain's backpack" desc = "It's a special backpack made exclusively for Nanotrasen officers." @@ -285,11 +280,6 @@ icon_state = "satchel-sec" item_state = "satchel-sec" -/obj/item/storage/backpack/satchel/sec/cmm - name = "cmm satchel" - desc = "A robust satchel for anti-piracy related needs." - icon_state = "satchel-cmm" - /obj/item/storage/backpack/satchel/explorer name = "explorer satchel" desc = "A robust satchel for stashing your loot." diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 10d3531b68d..157f9c611f3 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -434,6 +434,27 @@ item_state = "militarywebbing" resistance_flags = FIRE_PROOF + unique_reskin = list( + "None" = "militarywebbing", + "Desert" = "militarywebbing_desert", + "Woodland" = "militarywebbing_woodland", + "Snow" = "militarywebbing_snow", + "Urban" = "militarywebbing_urban", + ) + unique_reskin = null + +//this might seem obtuse instead of setting allow_post_reskins to TRUE, but reskin menu would open every time on alt click, which is not good for this +/obj/item/storage/belt/military/examine(mob/user) + . = ..() + if(unique_reskin && current_skin) + . += "You can Ctrl-Click [src] to reskin it again after skinning it." + +/obj/item/storage/belt/military/CtrlClick(mob/user) + . = ..() + if(isliving(user) && in_range(src, user)) + current_skin = null + to_chat(user, "You can reskin [src] again wtih Alt-Click.") + /obj/item/storage/belt/military/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) @@ -449,24 +470,6 @@ for(var/i in 1 to 4) new /obj/item/ammo_box/magazine/m556(src) -/obj/item/storage/belt/military/minutemen - name = "minutemen tactical webbing" - desc = "A set of tactical webbing worn by the Colonial Minutemen of the frontier." - icon_state = "cmmwebbing" - item_state = "cmmwebbing" - -/obj/item/storage/belt/military/minutemen/p16/PopulateContents() - for(var/i in 1 to 4) - new /obj/item/ammo_box/magazine/p16(src) - -/obj/item/storage/belt/military/minutemen/gal/PopulateContents() - for(var/i in 1 to 4) - new /obj/item/ammo_box/magazine/gal(src) - -/obj/item/storage/belt/military/minutemen/cm5/PopulateContents() - for(var/i in 1 to 4) - new /obj/item/ammo_box/magazine/smgm9mm(src) - /obj/item/storage/belt/military/snack name = "tactical snack rig" @@ -520,6 +523,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "grenadebeltnew" item_state = "grenadebeltnew" + unique_reskin = null /obj/item/storage/belt/military/abductor/full/PopulateContents() new /obj/item/screwdriver/abductor(src) @@ -535,6 +539,7 @@ desc = "A belt used by military forces." icon_state = "grenadebeltold" item_state = "grenadebeltol" + unique_reskin = null /obj/item/storage/belt/military/assault name = "assault belt" @@ -542,10 +547,7 @@ icon_state = "assault" item_state = "assault" supports_variations = VOX_VARIATION - -/obj/item/storage/belt/military/assault/minutemen/PopulateContents() - for(var/i in 1 to 6) - new /obj/item/ammo_box/magazine/p16(src) + unique_reskin = null /obj/item/storage/belt/military/assault/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 7b1710cd896..e9bc325bef8 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -170,6 +170,19 @@ /obj/item/storage/box/survival/medical mask_type = /obj/item/clothing/mask/breath/medical +/obj/item/storage/box/survival/clip + internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel + +/obj/item/storage/box/survival/clip/PopulateContents() + . = ..() + new /obj/item/radio/off(src) + +/obj/item/storage/box/survival/clip/balaclava + mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava + +/obj/item/storage/box/survival/clip/balaclava + internal_type = /obj/item/tank/internals/emergency_oxygen/double + /obj/item/storage/box/gloves name = "box of latex gloves" desc = "Contains sterile latex gloves." @@ -774,6 +787,13 @@ for(var/i in 1 to 7) new /obj/item/light/bulb(src) +/obj/item/storage/box/flares + name = "box of flares" + illustration = "firecracker" + +/obj/item/storage/box/flares/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/flashlight/flare(src) /obj/item/storage/box/deputy name = "box of deputy armbands" diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index c194ea84dae..7b02bd6b19d 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -238,8 +238,8 @@ /obj/item/storage/toolbox/ammo/a850r/PopulateContents() name = "ammo can (8x50mmR)" icon_state = "ammobox_850" - for(var/i in 1 to 7) - new /obj/item/ammo_box/magazine/illestren_a850r(src) + for(var/i in 1 to 4) + new /obj/item/ammo_box/c8x50mm_box(src) /obj/item/storage/toolbox/ammo/a762_40/PopulateContents() name = "ammo can (7.62x40mm CLIP)" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f295bfab895..688122b2c23 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -364,7 +364,7 @@ current_skin = pick icon_state = unique_reskin[pick] to_chat(M, "[src] is now skinned as '[pick].'") - update_icon_state() + update_appearance() /** * Checks if we are allowed to interact with a radial menu for reskins diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7a7c73b33fc..a8d560796f7 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -151,7 +151,7 @@ return ..() /obj/structure/chair/comfy/proc/GetArmrest() - return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest") + return mutable_appearance(icon, "[icon_state]_armrest") /obj/structure/chair/comfy/Destroy() QDEL_NULL(armrest) diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm index c811ceafcd2..8ba78792054 100644 --- a/code/game/objects/structures/beds_chairs/sofa.dm +++ b/code/game/objects/structures/beds_chairs/sofa.dm @@ -1,5 +1,5 @@ /obj/structure/chair/sofa - name = "old ratty sofa" + name = "sofa" icon_state = "sofamiddle" icon = 'icons/obj/sofa.dmi' buildstackamount = 1 @@ -13,3 +13,19 @@ /obj/structure/chair/sofa/corner icon_state = "sofacorner" + +/obj/structure/chair/sofa/red + name = "comfortable sofa" + icon_state = "sofamiddle_red" + +/obj/structure/chair/sofa/red/left + icon_state = "sofaend_left_red" + +/obj/structure/chair/sofa/red/right + icon_state = "sofaend_right_red" + +/obj/structure/chair/sofa/red/corner + icon_state = "sofacorner_red" + +/obj/structure/chair/sofa/red/internal_corner + icon_state = "sofainternalcorner_red" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 8ba938dae8e..bcf75fe3a61 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -63,7 +63,7 @@ desc = "A coniferous pine tree." icon = 'icons/obj/flora/pinetrees.dmi' icon_state = "pine_1" - var/list/icon_states = list("pine_1", "pine_2", "pine_3") + var/list/icon_states = list("pine_1", "pine_2", "pine_3", "pine_4") /obj/structure/flora/tree/pine/Initialize() . = ..() diff --git a/code/game/objects/structures/sauna.dm b/code/game/objects/structures/sauna.dm index 0b0a10565a3..ef0478a0ccd 100644 --- a/code/game/objects/structures/sauna.dm +++ b/code/game/objects/structures/sauna.dm @@ -66,7 +66,7 @@ to_chat(user, "You begin to deconstruct [src].") if(T.use_tool(src, user, 60, volume=50)) to_chat(user, "You successfully deconstructed [src].") - new /obj/item/stack/sheet/mineral/wood(get_turf(src), 30) + new /obj/item/stack/sheet/mineral/wood(get_turf(src), 15) qdel(src) else if(istype(T, /obj/item/stack/sheet/mineral/wood)) diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index 5b6c209190b..48a26493ae2 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -249,11 +249,11 @@ icon = 'icons/obj/solgov_logos.dmi' icon_state = "solgovflag-left" -// colonial minutemen seal -/obj/structure/sign/minutemen - name = "Banner of the Colonial Minutemen" - desc = "A seal representing the many colonies comprising the Colonial Minutemen." - icon_state = "minutemen" +// clip seal +/obj/structure/sign/clip + name = "Banner of the Confederated League of Independent Planets" + desc = "A seal representing the many colonies comprising the League." + icon_state = "clip" //Numeral signs diff --git a/code/game/say.dm b/code/game/say.dm index a5e180c4d67..306ad62fefd 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/debug.dm b/code/modules/admin/verbs/debug.dm index 9647d4c0794..19ac8a0514d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -206,6 +206,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that id.registered_name = H.real_name id.assignment = "Captain" id.update_label() + id.update_appearance() if(worn) if(istype(worn, /obj/item/pda)) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 701351b238d..131dd55ad82 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -45,9 +45,10 @@ if(!check_rights(R_SOUND)) return + var/vol = input("Select a volume for the sound", "Play Local Sound", 50) as num log_admin("[key_name(src)] played a local sound [S]") message_admins("[key_name_admin(src)] played a local sound [S]") - playsound(get_turf(src.mob), S, 50, FALSE, FALSE) + playsound(get_turf(src.mob), S, vol, FALSE, FALSE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/play_direct_mob_sound(S as sound, mob/M) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index af596c972ca..ae621e17d47 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -72,7 +72,7 @@ if (RADIO_CHANNEL_SYNDICATE) sender = input("From what branch?", "Syndicate") as null|anything in list("Syndicate High Command", "The Anti-Corporation Liberation Front", "The Gorlex Marauders", "Donk! Corporation", "Cybersun Virtual Solutions", "The Galactic Engineer's Concordat", "The Naturalienwissenschaftlicher Studentenverbindungs-Verband") if (RADIO_CHANNEL_MINUTEMEN) - sender = input("From what division?", "Minutemen") as null|anything in list("Colonial Minutemen Headquarters", "The Galactic Optium Labor Divison", "The Biohazard Assesment and Removal Division") + sender = input("From what division?", "Minutemen") as null|anything in list("CLIP Minutemen Headquarters", "The Galactic Optium Labor Divison", "The Biohazard Assesment and Removal Division") if (RADIO_CHANNEL_INTEQ) sender = "Inteq Risk Management" if ("Outpost") diff --git a/code/modules/antagonists/ert/minutemen.dm b/code/modules/antagonists/ert/minutemen.dm index 3799e36bff2..069ab6625c3 100644 --- a/code/modules/antagonists/ert/minutemen.dm +++ b/code/modules/antagonists/ert/minutemen.dm @@ -3,70 +3,88 @@ // ******************************************************************** /datum/antagonist/ert/minutemen - name = "Minutemen Infantry" - outfit = /datum/outfit/job/minutemen/ert + name = "CLIP Minutemen" + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/armed role = "Minuteman" /datum/antagonist/ert/minutemen/greet() - to_chat(owner, "You are the [name].") - var/missiondesc = "You stand shoulder to shoulder with your fellow colonists in the Colonial Minutemen within [station_name()].
" + to_chat(owner, "You are \the [role].") + var/missiondesc = "You serve in the armed forced of the Confederated League of Independent Planets (CLIP), an independent government. You are being deployed to the sector of [station_name()].
" if(leader) //If Squad Leader - missiondesc += "Lead your team to ensure the completion of your objectives." + missiondesc += "Lead your squad to complete all objectives." else - missiondesc += "Follow orders given to you by your Sergent." + missiondesc += "Follow orders given to you by your Leader, the Sergent." if(deathsquad) - missiondesc += "Leave no witnesses." + missiondesc += "You have been given the order to fire at will." missiondesc += "
Your Mission: [ert_team.mission.explanation_text]" to_chat(owner,missiondesc) /datum/antagonist/ert/minutemen/leader - name = "Minutemen Leader" + name = "CLIP Minutemen Field Sergeant" leader = TRUE - outfit = /datum/outfit/job/minutemen/ert/leader + outfit = /datum/outfit/job/clip/minutemen/grunt/lead role = "Sergeant" +/datum/antagonist/ert/minutemen/corpsman + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/med/armed + role = "Field Corpsman" + +/datum/antagonist/ert/minutemen/engi + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed + role = "Field Engineer" + +/datum/antagonist/ert/minutemen/gunner + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed + role = "Field Gunner" + /datum/antagonist/ert/minutemen/bard name = "BARD Infantry" - outfit = /datum/outfit/job/minutemen/ert/bard + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard role = "Minuteman" +/datum/antagonist/ert/minutemen/bard/flamer + name = "BARD Flamethrower Infantry" + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer + +/datum/antagonist/ert/minutemen/bard/medic + name = "BARD Corpsman" + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic + role = "Corpsman" + /datum/antagonist/ert/minutemen/bard/leader name = "BARD Sergeant" leader = TRUE - outfit = /datum/outfit/job/minutemen/ert/bard/leader + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader role = "Sergeant" /datum/antagonist/ert/minutemen/riot name = "Riot Officer" - outfit = /datum/outfit/job/minutemen/ert/riot + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot role = "Minuteman" /datum/antagonist/ert/minutemen/riot/leader name = "Riot Sergeant" leader = TRUE - outfit = /datum/outfit/job/minutemen/ert/riot/leader + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader role = "Sergeant" /datum/antagonist/ert/official/minutemen name = "GOLD Inspector" - outfit = /datum/outfit/job/minutemen/ert/inspector + outfit = /datum/outfit/job/clip/investigator role = "Lieutenant" /datum/antagonist/ert/official/minutemen/greet() to_chat(owner, "You are the GOLD Inspector.") - if (ert_team) - to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the Colonial League. Your task: [ert_team.mission.explanation_text]") - else - to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the Colonial League. Your task: [ert_team.mission.explanation_text]") + to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Government. Your task: [ert_team.mission.explanation_text]") -/datum/antagonist/ert/minutemen/piratehunters - name = "Pirate Hunter" - outfit = /datum/outfit/job/minutemen/ert/pirate_hunter +/datum/antagonist/ert/minutemen/eva + name = "CLIP Minutemen" + outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit role = "Minuteman" -/datum/antagonist/ert/minutemen/piratehunters/leader - name = "Pirate Hunter Leader" +/datum/antagonist/ert/minutemen/eva/leader + name = "CLIP Minutemen Field Sergeant" leader = TRUE - outfit = /datum/outfit/job/minutemen/ert/pirate_hunter/leader + outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit role = "Sergeant" diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 894023d9c19..40a925e9b82 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -283,11 +283,11 @@ //Spawn and equip documents var/mob/living/carbon/human/mob = owner.current - var/obj/item/folder/syndicate/folder + var/obj/item/folder/documents/syndicate/folder if(owner == SSticker.mode.exchange_red) - folder = new/obj/item/folder/syndicate/red(mob.loc) + folder = new/obj/item/folder/documents/syndicate/red(mob.loc) else - folder = new/obj/item/folder/syndicate/blue(mob.loc) + folder = new/obj/item/folder/documents/syndicate/blue(mob.loc) var/list/slots = list ( "backpack" = ITEM_SLOT_BACKPACK, diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index f6a9d07aa68..83abc98ed99 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/ammo.dm b/code/modules/cargo/packs/ammo.dm index 9138e47035e..28d5ad1ec24 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -20,7 +20,7 @@ /datum/supply_pack/ammo/m45_speedloader name = ".45 ACP Speedloader Crate" - desc = "Contains a .45 ACP speedloader for revolvers, containing six rounds." + desc = "Contains a .45 ACP speedloader for the HP Montagne, containing six rounds." contains = list(/obj/item/ammo_box/c45_speedloader) cost = 400 @@ -39,9 +39,8 @@ /datum/supply_pack/ammo/a357_mag name = ".357 Speedloader Crate" desc = "Contains a .357 speedloader for revolvers, containing seven rounds." - contains = list(/obj/item/ammo_box/a357, - /obj/item/ammo_box/a357) - cost = 1500 + contains = list(/obj/item/ammo_box/a357) + cost = 750 /datum/supply_pack/ammo/mag_556mm name = "5.56 Pistole C Magazine Crate" @@ -164,7 +163,7 @@ /datum/supply_pack/ammo/a850r_ammo name = "8x50mmR En Bloc Clip Crate" - desc = "Contains a 8x50mmR en bloc clips for rifles like the illestren rifle, containing five rounds." + desc = "Contains a 8x50mmR en bloc clip for rifles like the illestren rifle, containing five rounds." contains = list(/obj/item/ammo_box/magazine/illestren_a850r) cost = 250 @@ -182,7 +181,7 @@ /datum/supply_pack/ammo/c45_ammo_box name = ".45 Ammo Box Crate" - desc = "Contains a fifty-round .45 box for pistols and SMGs like the M1911 or the C-20r." + desc = "Contains a fifty-round .45 box for pistols and SMGs like the Candor or the C-20r." contains = list(/obj/item/ammo_box/c45) cost = 250 diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm index 398233a6448..f383e4e706f 100644 --- a/code/modules/cargo/packs/food.dm +++ b/code/modules/cargo/packs/food.dm @@ -24,7 +24,7 @@ /datum/supply_pack/food/pizza name = "Pizza Crate" - desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99% anomaly-free!" + desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99.5% anomaly-free!" cost = 6000 // Best prices this side of the galaxy. contains = list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, @@ -48,46 +48,71 @@ /datum/supply_pack/food/ingredients_basic name = "Basic Ingredients Crate" - desc = "Get things cooking with this crate full of useful ingredients! Contains a dozen eggs, three bananas, and some flour, rice, milk, soymilk, salt, pepper, enzyme, sugar, and monkeymeat." + desc = "Get things cooking with this crate full of useful ingredients! Contains a dozen eggs, two slabs of meat, some flour, some rice, a bottle of milk, a bottle of soymilk, and a bag of sugar." cost = 1000 contains = list(/obj/item/reagent_containers/food/condiment/flour, + /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/rice, /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/soymilk, - /obj/item/reagent_containers/food/condiment/saltshaker, - /obj/item/reagent_containers/food/condiment/peppermill, - /obj/item/storage/fancy/egg_box, - /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/condiment/sugar, - /obj/item/reagent_containers/food/snacks/meat/slab/monkey, - /obj/item/reagent_containers/food/snacks/grown/banana, - /obj/item/reagent_containers/food/snacks/grown/banana, - /obj/item/reagent_containers/food/snacks/grown/banana) + /obj/item/storage/fancy/egg_box, + /obj/item/reagent_containers/food/snacks/meat/slab, + /obj/item/reagent_containers/food/snacks/meat/slab + ) crate_name = "food crate" crate_type = /obj/structure/closet/crate/freezer +/datum/supply_pack/food/ingredients_specialized + name = "Advanced Cooking Crate" + desc = "For the discerning chef. Contains a bottle of enzyme, a salt shaker, a pepper mill, a bottle of ketchup, a bottle of hot sauce, and a bottle of cream." + cost = 2000 + contains = list(/obj/item/reagent_containers/food/condiment/enzyme, + /obj/item/reagent_containers/food/condiment/saltshaker, + /obj/item/reagent_containers/food/condiment/peppermill, + /obj/item/reagent_containers/food/condiment/ketchup, + /obj/item/reagent_containers/food/condiment/hotsauce, + /obj/item/reagent_containers/food/drinks/bottle/cream + ) + crate_name = "condiments crate" + crate_type = /obj/structure/closet/crate/freezer + /datum/supply_pack/food/ingredients_randomized - name = "Variety Meat Crate" - desc = "The best cuts in the whole galaxy." + name = "Exotic Meat Crate" + desc = "The best cuts in the whole galaxy. Probably." cost = 1000 contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, /obj/item/reagent_containers/food/snacks/meat/slab/killertomato, /obj/item/reagent_containers/food/snacks/meat/slab/bear, /obj/item/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/reagent_containers/food/snacks/meat/slab/spider, - /obj/item/reagent_containers/food/snacks/meat/rawbacon, /obj/item/reagent_containers/food/snacks/meat/slab/penguin, /obj/item/reagent_containers/food/snacks/spiderleg, /obj/item/reagent_containers/food/snacks/fishmeat/carp, - /obj/item/reagent_containers/food/snacks/meat/slab/human) + /obj/item/reagent_containers/food/snacks/meat/slab/human + ) crate_name = "meat crate" crate_type = /obj/structure/closet/crate/freezer + var/items = 7 /datum/supply_pack/food/ingredients_randomized/fill(obj/structure/closet/crate/C) - for(var/i in 1 to 7) + for(var/i in 1 to items) var/item = pick(contains) new item(C) +/datum/supply_pack/food/ingredients_randomized/meat + name = "Standard Meat Crate" + desc = "Less interesting cuts of meat, but filling nonetheless." + cost = 1500 + contains = list(/obj/item/reagent_containers/food/snacks/meat/slab, + /obj/item/reagent_containers/food/snacks/meat/slab/chicken, + /obj/item/reagent_containers/food/snacks/meat/slab/synthmeat, + /obj/item/reagent_containers/food/snacks/meat/rawbacon, + /obj/item/reagent_containers/food/snacks/meatball + ) + crate_name = "meat crate" + crate_type = /obj/structure/closet/crate/freezer + /datum/supply_pack/food/ingredients_randomized/vegetables name = "Vegetables Crate" desc = "Grown in vats." @@ -99,7 +124,8 @@ /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, /obj/item/reagent_containers/food/snacks/grown/onion, - /obj/item/reagent_containers/food/snacks/grown/pumpkin) + /obj/item/reagent_containers/food/snacks/grown/pumpkin + ) crate_name = "food crate" crate_type = /obj/structure/closet/crate/freezer @@ -109,10 +135,42 @@ cost = 1500 contains = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime, /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon, /obj/item/reagent_containers/food/snacks/grown/watermelon, /obj/item/reagent_containers/food/snacks/grown/apple, /obj/item/reagent_containers/food/snacks/grown/berries, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon) + /obj/item/reagent_containers/food/snacks/grown/banana + ) + crate_name = "food crate" + crate_type = /obj/structure/closet/crate/freezer + +/datum/supply_pack/food/ingredients_randomized/grains + name = "Grains Crate" + desc = "A crate full of various grains. How interesting." + cost = 1000 + contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat, + /obj/item/reagent_containers/food/snacks/grown/wheat, + /obj/item/reagent_containers/food/snacks/grown/wheat, //Weighted to be more common + /obj/item/reagent_containers/food/snacks/grown/oat, + /obj/item/reagent_containers/food/snacks/grown/rice, + /obj/item/reagent_containers/food/snacks/grown/soybeans + ) + crate_name = "food crate" + crate_type = /obj/structure/closet/crate/freezer + items = 10 + +/datum/supply_pack/food/ingredients_randomized/bread + name = "Bread Crate" + desc = "A crate full of various breads. Bready to either be eaten or made into delicious meals." + cost = 1000 + contains = list(/obj/item/reagent_containers/food/snacks/store/bread/plain, + /obj/item/reagent_containers/food/snacks/breadslice/plain, + /obj/item/reagent_containers/food/snacks/breadslice/plain, + /obj/item/reagent_containers/food/snacks/breadslice/plain, //Weighted to be more common + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/tortilla, + /obj/item/reagent_containers/food/snacks/pizzabread + ) crate_name = "food crate" crate_type = /obj/structure/closet/crate/freezer diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 05fb2308702..8ed63f7cfb4 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -62,7 +62,7 @@ /datum/supply_pack/gun/laser name = "Mini Energy Gun Crate" - desc = "Contains a small, versatile energy guns, capable of firing both nonlethal and lethal blasts, but with a limited power cell." + desc = "Contains a small, versatile energy gun, capable of firing both nonlethal and lethal blasts, but with a limited power cell." cost = 500 contains = list(/obj/item/gun/energy/e_gun/mini) crate_name = "laser crate" @@ -89,14 +89,14 @@ /datum/supply_pack/gun/hellfire_shotgun name = "Hellfire Shotgun Crate" - desc = "For when you need to deal with 7 hooligans. Contains a pump shotguns, with a 8-round capacity." + desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity." cost = 2000 contains = list(/obj/item/gun/ballistic/shotgun/hellfire) crate_name = "shotguns crate" /datum/supply_pack/gun/brimstone_shotgun name = "Brimstone Shotgun Crate" - desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotguns, with a 5-round capacity. Warranty voided if sawed off." + desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotgun, with a 5-round capacity. Warranty voided if sawed off." cost = 2000 contains = list(/obj/item/gun/ballistic/shotgun/brimstone) crate_name = "shotguns crate" @@ -107,21 +107,21 @@ /datum/supply_pack/gun/winchester name = "Flaming Arrow Lever Action Rifle Crate" - desc = "Contains a antiquated lever action rifles intended for hunting wildlife. Chambered in .38 rounds." + desc = "Contains a antiquated lever action rifle intended for hunting wildlife. Chambered in .38 rounds." cost = 750 contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow) crate_name = "rifle crate" /datum/supply_pack/gun/cobra20 name = "Cobra-20 SMG Crate" - desc = "Contains a .45 submachine guns, manufactured by Scaraborough Arms and chambered in .45" + desc = "Contains a .45 submachine gun, manufactured by Scaraborough Arms and chambered in .45" cost = 3000 contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra) crate_name = "SMG crate" /datum/supply_pack/gun/illestren name = "Illestren Rifle Crate" - desc = "Contains a expertly made bolt action rifles intended for hunting wildlife. Chambered in 8x50mmR rounds." + desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds." cost = 1250 contains = list(/obj/item/gun/ballistic/rifle/illestren) crate_name = "rifle crate" @@ -135,14 +135,14 @@ /datum/supply_pack/gun/p16 name = "P16 Assault Rifle Crate" - desc = "Contains a high-powered, automatic rifles chambered in 5.56mm." + desc = "Contains a high-powered, automatic rifle chambered in 5.56mm." cost = 5000 contains = list(/obj/item/gun/ballistic/automatic/assault/p16) crate_name = "auto rifle crate" /datum/supply_pack/gun/skm name = "SKM-24 Rifle Crate" - desc = "Contains a high-powered, automatic rifles chambered in 7.62x40mm CLIP." + desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP." cost = 5000 contains = list(/obj/item/gun/ballistic/automatic/assault/skm) crate_name = "auto rifle crate" diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm index 6fb1e2715fe..215b146fad4 100644 --- a/code/modules/cargo/packs/machinery.dm +++ b/code/modules/cargo/packs/machinery.dm @@ -18,33 +18,35 @@ /datum/supply_pack/machinery/t1 name = "T1 parts crate" - desc = "A bundle of basic machine parts, containing 3 of each common part type." - cost = 1500 + desc = "A bundle of basic machine parts, containing 3 of each common part type for when you're too lazy to print them yourself." + cost = 500 contains = list(/obj/item/storage/box/stockparts/basic) - crate_name = "\improper T2 parts crate" + crate_name = "\improper stock parts crate" crate_type = /obj/structure/closet/crate /datum/supply_pack/machinery/t2 name = "T2 parts crate" desc = "A bundle of advanced machine parts, containing 2 of each common part type." - cost = 5000 + cost = 1500 contains = list(/obj/item/storage/box/stockparts/t2) - crate_name = "\improper T2 parts crate" + crate_name = "\improper stock parts crate" crate_type = /obj/structure/closet/crate/science /datum/supply_pack/machinery/t3 name = "T3 parts crate" desc = "A bundle of high-tech machine parts, containing 2 of each common part type." - cost = 13000 + cost = 3000 contains = list(/obj/item/storage/box/stockparts/t3) - crate_name = "\improper T3 parts crate" + crate_name = "\improper stock parts crate" crate_type = /obj/structure/closet/crate/secure/science /datum/supply_pack/machinery/power name = "Power Cell Crate" - desc = "Looking for power overwhelming? Look no further. Contains three high-voltage power cells." + desc = "Looking for power overwhelming? Look no further. Contains five high-voltage power cells." cost = 1000 contains = list(/obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high) crate_name = "power cell crate" diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm index c4608f693b8..e184a837262 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/chameleon.dm b/code/modules/clothing/chameleon.dm index eb629f76ae4..203bcf416b1 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -148,8 +148,9 @@ card.job_icon = outfit.job_icon card.faction_icon = outfit.faction_icon card.assignment = J.name + card.update_appearance() + card.assignment = old_assignment card.update_label() - card.name = "[!card.registered_name ? initial(card.name) : "[card.registered_name]'s ID Card"][" ([old_assignment])"]" // this is terrible, but whatever H.sec_hud_set_ID() qdel(outfit) diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm new file mode 100644 index 00000000000..82e1fdee68b --- /dev/null +++ b/code/modules/clothing/factions/clip.dm @@ -0,0 +1,427 @@ +//under + +/obj/item/clothing/under/clip + name = "clip deck worker jumpsuit" + desc = "A jumpsuit worn by deck workers in the CLIP Minutemen Navy vessels." + + icon = 'icons/obj/clothing/faction/clip/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/uniforms.dmi' + + icon_state = "clip_deck" + item_state = "b_suit" + + alt_covers_chest = TRUE + sensor_mode = SENSOR_COORDS + random_sensor = FALSE + dying_key = DYE_REGISTRY_UNDER //??? // it's for washing machines don't worry about it + + can_adjust = FALSE + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION // a new record! + +/obj/item/clothing/under/clip/minutemen + name = "clip minutemen fatigues" + desc = "Fatigues worn by the CLIP Minutemen's enlisted." + + icon_state = "clip_minuteman" + + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) + strip_delay = 50 + + can_adjust = FALSE + supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION + +/obj/item/clothing/under/clip/formal + name = "formal clip outfit" + desc = "A formal outfit containing a white shirt and navy slacks issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers." + + icon_state = "clip_formal" + + armor = null + supports_variations = null + +/obj/item/clothing/under/clip/formal/alt + name = "formal clip outfit" + desc = "A formal outfit containing a white shirt and a navy skirt issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers." + + icon_state = "clip_formal_skirt" + +/obj/item/clothing/under/clip/formal/with_shirt/Initialize() + . = ..() + var/obj/item/clothing/accessory/clip_formal_overshirt/accessory = new (src) + attach_accessory(accessory) + +/obj/item/clothing/under/clip/formal/with_shirt/alt //because of how fucking skirt code works... + name = "formal clip outfit" + desc = "A formal outfit containing a white shirt and a navy skirt issued to CLIP government workers. Commonly seen on more white collar CLIP bureaucrats than low ranking CLIP Minutemen officers." + + icon_state = "clip_formal_skirt" + +/obj/item/clothing/under/clip/medic + name = "medical clip uniform" + desc = "A uniform with navy slacks and a CLIP blue buttondown shirt. The shoulder markings have a medical symbol. " + + icon_state = "clip_medic" + +/obj/item/clothing/under/clip/officer + name = "clip minutemen officer uniform" + desc = "A uniform used by higher ranking officers of the CLIP Minutemen." + icon_state = "clip_officer" + item_state = "g_suit" + can_adjust = FALSE + +/obj/item/clothing/under/clip/officer/alt + name = "clip minutemen officer uniform" + desc = "A uniform with a pencil skirt used by higher ranking officers of the CLIP Minutemen." + icon_state = "clip_officer_skirt" + +//suit +/obj/item/clothing/suit/toggle/lawyer/clip + name = "CLIP Minutemen suit jacket" + desc = "An enterprising dress jacket used by officers of the CLIP Minutemen." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + + icon_state = "suitjacket_clip" + item_state = "suitjacket_navy" + +/obj/item/clothing/suit/toggle/lawyer/clip/Initialize() + . = ..() + if(!allowed) + allowed = GLOB.security_vest_allowed //it's hop-equivalent gear after all + +/obj/item/clothing/suit/toggle/lawyer/clip/fo + name = "CLIP Minutemen First Officer suit jacket" + desc = "An enterprising dress jacket used by First Officer of CLIP Minutemen vessels." + + icon_state = "suitjacket_clip_command" + item_state = "suitjacket_clip_command" + +//armor + +/obj/item/clothing/suit/armor/vest/capcarapace/clip + name = "CLIP Minutemen general coat" + desc = "A very fancy coat used by generals of the CLIP Minutemen." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + + icon_state = "clip_general" + item_state = "clip_general" + +/obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral + name = "CLIP Minutemen admiral trenchcoat" + desc = "A very fancy trenchcoat used by admirals of the CLIP Minutemen." + + icon_state = "clip_admiral" + item_state = "clip_admiral" + +/obj/item/clothing/suit/armor/riot/clip + name = "black riot suit" + desc = "Designed to protect against close range attacks. This one is painted black. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific by some CLIP members." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + icon_state = "riot_clip" + +/obj/item/clothing/suit/armor/clip_trenchcoat + name = "\improper CLIP trenchcoat" + desc = "A CLIP trenchcoat. Despite it's reputation as a officer coat, it's actually issued to the entire CLIP government and it's branches. Has a lot of pockets." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + + icon_state = "clip_trenchcoat" + item_state = "trenchcoat_solgov" + body_parts_covered = CHEST|LEGS|ARMS + armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) + cold_protection = CHEST|LEGS|ARMS + heat_protection = CHEST|LEGS|ARMS + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/suit/armor/clip_capcoat + name = "\improper CLIP Minutemen captain's coat" + desc = "A well-made coat used by CLIP Minutemen captains. It's thick padding stops some hazards for its user." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + + icon_state = "clip_captaincoat" + item_state = "clip_captaincoat" + body_parts_covered = CHEST|LEGS|ARMS + armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) + cold_protection = CHEST|LEGS|ARMS + heat_protection = CHEST|LEGS|ARMS + supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON + +//spacesuits +/obj/item/clothing/suit/space/hardsuit/security/independent/clip //TODO: replace + name = "\improper CMM Patroller hardsuit" + desc = "A hardsuit used by the CLIP Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + + icon_state = "hardsuit-clip-patrol" + hardsuit_type = "hardsuit-clip-patrol" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/clip + +/obj/item/clothing/head/helmet/space/hardsuit/security/independent/clip //TODO: replace + name = "\improper CMM Patroller hardsuit helmet" + desc = "A hardsuit used by the CLIP Minutemen. To reduce costs, its a modified version of a more popular model from a independent manufacturer, and given to patrol vessels. As should be obvious, it's not extremely armored, as it's made for reconnaissance and speed." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + + icon_state = "hardsuit0-clip-patrol" + hardsuit_type = "clip-patrol" + +/obj/item/clothing/suit/space/hardsuit/clip_spotter + name = "CM-490 'Spotter' Combat Hardsuit" + desc = "CLIP's standard EVA combat hardsuit. Due to CLIP's doctrine on range, it doesn't have advanced components that allow swift movement, and thus slows down the user despite the heavy armor." + + icon = 'icons/obj/clothing/faction/clip/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/suits.dmi' + + icon_state = "clip_spotter" + hardsuit_type = "clip_spotter" + + armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clip_spotter + allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) + + resistance_flags = null + slowdown = 1 + +/obj/item/clothing/head/helmet/space/hardsuit/clip_spotter + name = "CM-490 'Spotter' Combat Hardsuit Helmet" + desc = "CLIP's standard EVA combat hardsuit. Due to CLIP's doctrine on range, it doesn't have advanced components that allow swift movement, and thus slows down the user despite the heavy armor." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + + icon_state = "hardsuit0-clip_spotter" + hardsuit_type = "clip_spotter" + + armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80) + resistance_flags = null + + +//hats +/obj/item/clothing/head/clip + name = "\improper CLIP Minutemen service cap" + desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and volunteers, it's sometimes used by occasionally by some Minutemen." + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' +// lefthand_file = 'icons/mob/inhands/faction/clip/gezena_lefthand.dmi' +// righthand_file = 'icons/mob/inhands/faction/clip/gezena_righthand.dmi' + icon_state = "clip_cap" + item_state = "bluecloth" + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/head/clip/corpsman + name = "\improper CLIP Minutemen corpsman cap" + desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. This one is in corpsman colors." + icon_state = "clip_mediccap" + item_state = "whitecloth" + +/obj/item/clothing/head/clip/slouch + name = "CLIP Minutemen slouch hat" + desc = "A commanding slouch hat used by the CLIP Minutemen." + icon_state = "clip_slouch_hat" + +/obj/item/clothing/head/clip/slouch/officer + name = "CLIP Minutemen officer's slouch hat" + desc = "A commanding slouch hat adorned with a officer's badge, used by the CLIP Minutemen." + icon_state = "clip_officer_hat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + strip_delay = 60 + +/obj/item/clothing/head/clip/boonie + name = "CLIP Minutemen boonie hat" + desc = "A wide brimmed cap to keep yourself cool during blistering hot weather." + icon_state = "clip_boonie" + +/obj/item/clothing/head/clip/bicorne + name = "general's bicorne" + desc = "A fancy bicorne used by generals of the CLIP Minutemen." + icon_state = "clip_general_hat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/head/helmet/bulletproof/x11/clip + name = "\improper Minutemen X11 Helmet" + desc = "A bulletproof helmet worn by members of the CLIP Minutemen." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + + icon_state = "clip_x11" + allow_post_reskins = FALSE + unique_reskin = null + +/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc + name = "\improper Minutemen Vehicle Crewman M10 Helmet" + desc = "A light bulletproof helmet worn by Vehicle Crewmen of the CLIP Minutemen. The ear padding protects the ears from loud noises and the microphone automatically connects with a headset." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + + icon_state = "clip_m10_vc" + allow_post_reskins = FALSE + unique_reskin = null + +/obj/item/clothing/head/helmet/bulletproof/m10/clip_vc/ComponentInitialize() + . = ..() + AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_HEAD)) + +/obj/item/clothing/head/helmet/riot/clip + name = "\improper Minutemen riot helmet" + desc = "Designed to protect against close range attacks. Mainly used by the CMM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + icon_state = "riot_clip" + +//GOLD +/obj/item/clothing/head/fedora/det_hat/clip + name = "GOLD fedora" + desc = "A hat issued by the GOLD division of the CLIP Minutemen. Designed to look fashionable and more casual than standard CLIP attire." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + + icon_state = "clip_fedora" + item_state = "detective" + + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //dets hat is armored for some reaon + +/obj/item/clothing/head/flatcap/clip + name = "GOLD flatcap" + desc = "A hat issued by the GOLD division of the CLIP Minutemen. An office worker's hat." + + icon = 'icons/obj/clothing/faction/clip/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi' + + icon_state = "flatcap_clip" + item_state = "detective" +//mask + +/obj/item/clothing/mask/gas/clip + name = "CM-20 gas mask" + desc = "A close-fitting gas mask that can be connected to an air supply. Created in 420 FS during the Xenofauna war after it was discovered that 20 year old gas masks weren't going cut it against Xenofauna. Standard issue for every Minuteman, but rarely used; it's mostly used as a deterrence against chemical attacks." + + icon = 'icons/obj/clothing/faction/clip/mask.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/mask.dmi' + + icon_state = "clip-gasmask" + strip_delay = 60 + +//gloves + +/obj/item/clothing/gloves/color/latex/nitrile/clip + name = "long white nitrile gloves" + desc = "Thick sterile gloves that reach up to the elbows. Transfers combat medic knowledge into the user via nanochips." + + icon = 'icons/obj/clothing/faction/clip/hands.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/hands.dmi' + + icon_state = "nitrile_clip" + item_state = "nitrile_clip" + +//boots + +//belt +/obj/item/storage/belt/military/clip + name = "CLIP Minutemen chest rig" + desc = "A chest rig worn by the CLIP Minutemen." + + icon = 'icons/obj/clothing/faction/clip/belt.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/belt.dmi' + + icon_state = "clipwebbing" + item_state = "clipwebbing" + + unique_reskin = null + +/obj/item/storage/belt/military/clip/p16/PopulateContents() + for(var/i in 1 to 4) + new /obj/item/ammo_box/magazine/p16(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/military/clip/gal/PopulateContents() + for(var/i in 1 to 4) + new /obj/item/ammo_box/magazine/gal(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/military/clip/cm5/PopulateContents() + for(var/i in 1 to 4) + new /obj/item/ammo_box/magazine/smgm9mm(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/military/clip/cm15/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/ammo_box/magazine/cm15_mag(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/military/clip/e50/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/stock_parts/cell/gun/large(src) + new /obj/item/grenade/frag(src) + new /obj/item/screwdriver/nuke(src) + +/obj/item/storage/belt/military/clip/engi/PopulateContents() + new /obj/item/screwdriver/power(src) + new /obj/item/crowbar/power(src) + new /obj/item/weldingtool/experimental(src) + new /obj/item/multitool(src) + new /obj/item/construction/rcd/combat(src) + new /obj/item/extinguisher/mini(src) + new /obj/item/stack/cable_coil(src) + +/obj/item/storage/belt/military/clip/flamer/PopulateContents() + for(var/i in 1 to 3) + new /obj/item/reagent_containers/glass/beaker/large/fuel(src) + new /obj/item/ammo_box/magazine/co9mm(src) + +/obj/item/storage/belt/medical/webbing/clip + name = "medical webbing" + desc = "A chest rig worn by corpsmen of the CLIP Minutemen ." + + icon = 'icons/obj/clothing/faction/clip/belt.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/clip/belt.dmi' + + icon_state = "clip-medwebbing" + +/obj/item/storage/belt/medical/webbing/clip/prefilled/PopulateContents() + new /obj/item/reagent_containers/medigel/styptic(src) + new /obj/item/reagent_containers/medigel/styptic(src) + new /obj/item/reagent_containers/medigel/silver_sulf(src) + new /obj/item/reagent_containers/medigel/silver_sulf(src) + new /obj/item/reagent_containers/medigel/synthflesh(src) + new /obj/item/reagent_containers/medigel/synthflesh(src) + new /obj/item/stack/medical/splint(src) + +//back +/obj/item/storage/backpack/security/clip + name = "clip backpack" + desc = "It's a very blue backpack." + + icon_state = "clippack" + +/obj/item/storage/backpack/satchel/sec/clip + name = "clip satchel" + desc = "A robust satchel for anti-piracy related needs." + icon_state = "satchel-clip" + + +//neck + +//accessories + +/obj/item/clothing/accessory/clip_formal_overshirt + name = "\improper CLIP overshirt" + desc = "A standard issue shirt designed to be worn over the formal uniform's undershirt." + icon_state = "clip_formal_overshirt" + icon = 'icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'icons/mob/clothing/accessories.dmi' + minimize_when_attached = FALSE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 1b3b5b3f813..f96d23fa9ba 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -12,7 +12,7 @@ strip_delay = 60 clothing_flags = SNUG_FIT flags_cover = HEADCOVERSEYES - flags_inv = HIDEHAIR + //flags_inv = HIDEHAIR // nah dog_fashion = /datum/dog_fashion/head/helmet @@ -207,13 +207,14 @@ can_flashlight = TRUE dog_fashion = null allow_post_reskins = TRUE - unique_reskin = list("Urban" = "helmetalt", + unique_reskin = list( + "None" = "helmetalt", "Desert" = "helmetalt_desert", "Woodland" = "helmetalt_woodland", "Snow" = "helmetalt_snow", + "Urban" = "helmetalt_urban", ) - /obj/item/clothing/head/helmet/marine name = "tactical combat helmet" desc = "A tactical black helmet, sealed from outside hazards with a plate of reinforced glass." @@ -274,12 +275,6 @@ visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF dog_fashion = null -/obj/item/clothing/head/helmet/riot/minutemen - name = "\improper Minutemen riot helmet" - desc = "Designed to protect against close range attacks. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds." - icon_state = "riot_minutemen" - - /obj/item/clothing/head/helmet/justice name = "helmet of justice" desc = "WEEEEOOO. WEEEEEOOO. WEEEEOOOO." @@ -510,14 +505,6 @@ icon_state = "inteq_helmet" can_flashlight = TRUE -/obj/item/clothing/head/helmet/bulletproof/minutemen - name = "\improper Minutemen ballistic helmet" - desc = "A bulletproof helmet that is worn by members of the Colonial Minutemen." - icon_state = "antichristhelm" - allow_post_reskins = TRUE - unique_reskin = null - armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - /obj/item/clothing/head/solgov name = "\improper SolGov officer's cap" desc = "A blue cap worn by high-ranking officers of SolGov." @@ -575,10 +562,12 @@ icon_state = "m10helm" can_flashlight = TRUE dog_fashion = null - unique_reskin = list("Urban" = "m10helm", + unique_reskin = list( + "None" = "m10helm", "Desert" = "m10helm_desert", "Woodland" = "m10helm_woodland", "Snow" = "m10helm_snow", + "Urban" = "m10helm_urban", ) /obj/item/clothing/head/helmet/bulletproof/x11 @@ -588,10 +577,12 @@ can_flashlight = TRUE dog_fashion = null allow_post_reskins = TRUE - unique_reskin = list("Urban" = "x11helm", + unique_reskin = list( + "None" = "x11helm", "Desert" = "x11helm_desert", "Woodland" = "x11helm_woodland", "Snow" = "x11helm_snow", + "Urban" = "x11helm_urban", ) /obj/item/clothing/head/helmet/bulletproof/x11/frontier diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 9392425de55..663af5e6f75 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -42,11 +42,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." @@ -107,8 +102,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) @@ -152,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/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index bc2036523bd..4cae19eb5c8 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -140,7 +140,7 @@ name = "cybersun agent cap" desc = "A black baseball hat emblazoned with a reflective Cybersun patch." icon_state = "agentsoft" - soft_type = "black" + soft_type = "agent" dog_fashion = null /obj/item/clothing/head/soft/cybersun/medical diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 48b88dd7f60..66e329a0e9c 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -46,26 +46,36 @@ slot_flags = ITEM_SLOT_MASK|ITEM_SLOT_NECK custom_price = 150 var/blown_sound = 'sound/misc/whistle.ogg' + actions_types = list(/datum/action/item_action/halt) + COOLDOWN_DECLARE(whistle_cooldown) + +/datum/action/item_action/halt + name = "Blow on the whistle!" /obj/item/clothing/mask/whistle/ui_action_click(mob/user, action) - if(cooldown < world.time - 100) - usr.audible_message("HALT!") - playsound(src, blown_sound, 20, FALSE, 4) - cooldown = world.time + if(!COOLDOWN_FINISHED(src, whistle_cooldown)) + return + user.audible_message("[user] blows on the [src]!") + playsound(src, blown_sound, 80, FALSE, 4) + COOLDOWN_START(src, whistle_cooldown, 5 SECONDS) -/obj/item/clothing/mask/gas/sechailer/inteq - name = "balaclava" - desc = "A fancy balaclava, while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!" - icon_state = "inteq_balaclava" - item_state = "inteq_balaclava" - strip_delay = 60 - alternate_worn_layer = BODY_LAYER - flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR +/obj/item/clothing/mask/whistle/trench + name = "trench whistle" + desc = "A long and unusual looking whistle that makes a distinctive sound. Useful for charging into fortified positions with low chances of survival." + icon_state = "whistle" + item_state = "whistle" + blown_sound = 'sound/misc/trenchwhistle.ogg' -/obj/item/clothing/mask/gas/sechailer/minutemen +/obj/item/clothing/mask/gas/sechailer/balaclava name = "combat balaclava" - desc = "A surprisingly advanced balaclava equipped with internals tubing. Widely used by frontier militias." - icon_state = "rus_balaclava" - item_state = "rus_balaclava" + desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!" + icon_state = "combat_balaclava" + item_state = "combat_balaclava" strip_delay = 60 + alternate_worn_layer = BODY_LAYER flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR + +/obj/item/clothing/mask/gas/sechailer/balaclava/inteq + desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites." + icon_state = "inteq_balaclava" + item_state = "inteq_balaclava" diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm index 2fa4316b644..f0fd3bb81eb 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 c5ef123a21c..b3fc0c61970 100644 --- a/code/modules/clothing/outfits/ert/inteq_ert.dm +++ b/code/modules/clothing/outfits/ert/inteq_ert.dm @@ -1,9 +1,10 @@ /datum/outfit/job/inteq/ert name = "ERT - Inteq Rifleman" + id_assignment = "Enforcer" 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 @@ -22,6 +23,7 @@ /datum/outfit/job/inteq/ert/shotgun name = "ERT - Inteq Shotgunner" + id_assignment = "Enforcer" suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact belt = /obj/item/storage/belt/security/webbing/inteq/alt @@ -30,6 +32,7 @@ /datum/outfit/job/inteq/ert/medic name = "ERT - Inteq Corpsman" + id_assignment = "Corpsman" jobtype = /datum/job/paramedic job_icon = "paramedic" @@ -43,6 +46,7 @@ /datum/outfit/job/inteq/ert/leader name = "ERT - Inteq Vanguard" + id_assignment = "Vanguard" jobtype = /datum/job/hos job_icon = "headofsecurity" diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm index 8acb733e48f..bc440d3bc61 100644 --- a/code/modules/clothing/outfits/ert/minutemen_ert.dm +++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm @@ -1,74 +1,79 @@ -/datum/outfit/job/minutemen/ert - name = "ERT - Minuteman" - jobtype = /datum/job/officer - job_icon = "securityofficerOld" +/datum/outfit/job/clip/minutemen/grunt/dressed/bard + name = "ERT - CLIP Minuteman BARD Specialist" + id_assignment = "Biohazard Assessment Specialist" + job_icon = "clip_cmm2" - head = /obj/item/clothing/head/helmet/bulletproof/minutemen - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - mask = /obj/item/clothing/mask/gas/sechailer/minutemen - ears = /obj/item/radio/headset/minutemen/alt - back = /obj/item/storage/backpack/security/cmm - suit = /obj/item/clothing/suit/armor/vest/bulletproof - suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen - id = /obj/item/card/id - belt = /obj/item/storage/belt/military/minutemen/p16 + suit = /obj/item/clothing/suit/armor/vest/marine/heavy + suit_store = /obj/item/gun/ballistic/shotgun/bulldog/minutemen + mask = /obj/item/clothing/mask/gas/clip + head = /obj/item/clothing/head/helmet/riot/clip + belt = /obj/item/storage/belt/military/clip/cm15 + glasses = /obj/item/clothing/glasses/hud/health/night r_pocket = /obj/item/kitchen/knife/combat - l_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/extinguisher/mini - box = /obj/item/storage/box/survival/security + backpack_contents = list( + /obj/item/flashlight/seclite = 1, + /obj/item/storage/box/flares = 1 + ) -/datum/outfit/job/minutemen/ert/leader - name = "ERT - Minuteman Sergeant" - job_icon = "lieutenant" +/datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic + name = "ERT - CLIP Minuteman BARD Medical Specialist" + id_assignment = "Corpsman" - ears = /obj/item/radio/headset/minutemen/alt/captain - back = /obj/item/storage/backpack/satchel/sec/cmm - head = /obj/item/clothing/head/beret/command + suit = /obj/item/clothing/suit/armor/vest/marine + suit_store = /obj/item/gun/ballistic/automatic/smg/cm5 + belt = /obj/item/storage/belt/medical/webbing/clip/prefilled + r_pocket = /obj/item/grenade/smokebomb + l_pocket = /obj/item/reagent_containers/hypospray/combat -/datum/outfit/job/minutemen/ert/bard - name = "ERT - Minuteman (BARD)" - job_icon = "securityofficerOld" + backpack_contents = list( + /obj/item/flashlight/seclite = 1, + /obj/item/defibrillator/compact/loaded = 1, + /obj/item/storage/firstaid/advanced = 1, + /obj/item/ammo_box/magazine/smgm9mm = 2 + ) + +/datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer + name = "ERT - CLIP Minuteman BARD Flamethrower Specialist" suit = /obj/item/clothing/suit/armor/vest/marine/medium - suit_store = /obj/item/gun/ballistic/automatic/smg/cm5 - head = /obj/item/clothing/head/helmet/riot/minutemen - belt = /obj/item/storage/belt/military/minutemen/cm5 - glasses = /obj/item/clothing/glasses/hud/security/sunglasses - r_pocket = /obj/item/grenade/smokebomb - l_pocket = /obj/item/extinguisher/mini - r_hand = /obj/item/kitchen/knife/combat - l_hand = /obj/item/reagent_containers/hypospray/medipen/stimpack + suit_store = /obj/item/flamethrower/full/tank + belt = /obj/item/storage/belt/military/clip/flamer + r_pocket = /obj/item/grenade/chem_grenade/incendiary + l_pocket = /obj/item/tank/internals/emergency_oxygen/engi backpack_contents = list( /obj/item/flashlight/seclite = 1, - /obj/item/flashlight/flare = 2 + /obj/item/extinguisher = 1, + /obj/item/gun/ballistic/automatic/pistol/commander = 1 // replace commander with the cm23 when it is implemented ) -/datum/outfit/job/minutemen/ert/bard/leader - name = "ERT - Minuteman Sergeant (BARD)" - job_icon = "lieutenant" +/datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader + name = "ERT - CLIP Minuteman BARD Specialist Sergeant" + id_assignment = "Biohazard Assessment Sergeant" + job_icon = "clip_cmm3" - belt = /obj/item/storage/belt/military/assault/minutemen - uniform = /obj/item/clothing/under/rank/command/minutemen - suit = /obj/item/clothing/suit/armor/vest/marine/heavy - suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen - glasses = /obj/item/clothing/glasses/hud/security/night + belt = /obj/item/storage/belt/military/clip/e50 + uniform = /obj/item/clothing/under/clip/officer + suit = /obj/item/clothing/suit/armor/vest/marine + suit_store = /obj/item/gun/energy/laser/e50 r_pocket = /obj/item/grenade/c4 l_pocket = /obj/item/reagent_containers/hypospray/medipen/stimpack backpack_contents = list( - /obj/item/flashlight/flare = 3, + /obj/item/storage/box/flares = 1, /obj/item/grenade/c4 = 2, /obj/item/flashlight/seclite = 1 ) -/datum/outfit/job/minutemen/ert/riot - name = "ERT - Minuteman (Riot Officer)" +/datum/outfit/job/clip/minutemen/grunt/dressed/riot + name = "ERT - CLIP Minuteman Riot Officer" job_icon = "securityofficerOld" - suit = /obj/item/clothing/suit/armor/riot/minutemen - head = /obj/item/clothing/head/helmet/riot/minutemen + suit = /obj/item/clothing/suit/armor/riot/clip + head = /obj/item/clothing/head/helmet/riot/clip l_hand = /obj/item/melee/baton/loaded back = /obj/item/shield/riot belt = /obj/item/gun/ballistic/automatic/smg/cm5/no_mag @@ -78,46 +83,25 @@ backpack_contents = null box = null -/datum/outfit/job/minutemen/ert/riot/leader - name = "ERT - Minutemen Sergeant (Riot Officer)" + backpack = null + duffelbag = null + courierbag = null + satchel = null + +/datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader + name = "ERT - CLIP Minutemen Riot Officer Sergeant" + id_assignment = "Security Sergeant" job_icon = "lieutenant" - ears = /obj/item/radio/headset/minutemen/alt/captain + ears = /obj/item/radio/headset/clip/alt/captain back = /obj/item/shield/riot/flash -/datum/outfit/job/minutemen/ert/inspector - name = "ERT - Inspector (Minutemen GOLD)" - jobtype = /datum/job/head_of_personnel - job_icon = "minutemen" - - head = /obj/item/clothing/head/cowboy/sec/minutemen - mask = null - belt = /obj/item/clipboard - glasses = /obj/item/clothing/glasses/sunglasses - uniform = /obj/item/clothing/under/rank/command/minutemen - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - suit_store = null - ears = /obj/item/radio/headset/minutemen/alt/captain - back = /obj/item/storage/backpack/satchel/leather - id = /obj/item/card/id/silver - - l_pocket = null - r_pocket = null - -/datum/outfit/job/minutemen/ert/pirate_hunter - name = "ERT - Minuteman (Pirate Hunter)" - job_icon = "securityofficerOld" - +/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit + name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)" head = null - suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen - -/datum/outfit/job/minutemen/ert/pirate_hunter/leader - name = "ERT - Minutemen Sergeant (Pirate Hunter)" - job_icon = "lieutenant" - - uniform = /obj/item/clothing/under/rank/command/minutemen - ears = /obj/item/radio/headset/minutemen/alt/captain - belt = /obj/item/storage/belt/military/minutemen/gal - suit_store = /obj/item/gun/ballistic/automatic/gal + suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter - backpack_contents = list(/obj/item/ammo_box/magazine/gal=4) +/datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit + name = "CLIP Minutemen - Field Sergeant (Spotter Hardsuit)" + head = null + suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm index bc09a74c178..da3a1146648 100644 --- a/code/modules/clothing/outfits/ert/solgov_ert.dm +++ b/code/modules/clothing/outfits/ert/solgov_ert.dm @@ -1,5 +1,6 @@ /datum/outfit/job/solgov/ert name = "ERT - SolGov Sonnensöldner" + id_assignment = "Sonnensöldner" jobtype = /datum/job/officer job_icon = "sonnensoldner" @@ -19,6 +20,7 @@ /datum/outfit/job/solgov/ert/inspector name = "ERT - Inspector (SolGov)" + id_assignment = "Inspector" jobtype = /datum/job/head_of_personnel job_icon = "solgovrepresentative" diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm index 99d4f2e5d12..472983e890d 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 @@ -32,7 +32,7 @@ // gorlex loyalist/2nd battlegroup /datum/outfit/job/syndicate/ert/gorlex - name = "ERT - Syndicate Gorlex Loyalist Trooper" + name = "ERT - New Gorlex Republic Trooper" head = /obj/item/clothing/head/helmet/swat uniform = /obj/item/clothing/under/syndicate/combat @@ -42,13 +42,13 @@ suit_store = /obj/item/gun/ballistic/automatic/smg/m90 /datum/outfit/job/syndicate/ert/gorlex/pointman - name = "ERT - Syndicate Gorlex Loyalist Pointman" + name = "ERT - New Gorlex Republic Pointman" suit_store = /obj/item/gun/ballistic/shotgun/bulldog belt = /obj/item/storage/belt/security/webbing/bulldog /datum/outfit/job/syndicate/ert/gorlex/medic - name = "ERT - Syndicate Gorlex Loyalist Medic" + name = "ERT - New Gorlex Republic Medic" jobtype = /datum/job/paramedic job_icon = "paramedic" @@ -65,7 +65,7 @@ backpack_contents = list(/obj/item/ammo_box/magazine/m10mm=2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1) /datum/outfit/job/syndicate/ert/gorlex/sniper - name = "ERT - Syndicate Gorlex Loyalist Sniper" + name = "ERT - New Gorlex Republic Sniper" head = /obj/item/clothing/head/beret/black back = /obj/item/storage/backpack/messenger/sec @@ -81,7 +81,7 @@ backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1) /datum/outfit/job/syndicate/ert/gorlex/leader - name = "ERT - Syndicate Gorlex Loyalist Sergeant" + name = "ERT - New Gorlex Republic Sergeant" job_icon = "lieutenant" uniform = /obj/item/clothing/under/syndicate/gorlex @@ -144,6 +144,7 @@ /datum/outfit/job/syndicate/ert/cybersun/medic/leader name = "ERT - Syndicate Cybersun Lead Paramedic" + id_assignment = "Lead Paramedic" job_icon = "chiefmedicalofficer" head = /obj/item/clothing/head/beret/cmo @@ -157,6 +158,7 @@ /datum/outfit/job/syndicate/ert/inspector name = "ERT - Inspector (Syndicate)" + id_assignment = "Inspector" jobtype = /datum/job/head_of_personnel job_icon = "syndicate" @@ -174,11 +176,3 @@ suit_store = null backpack_contents = list(/obj/item/stamp/syndicate) - -/datum/outfit/job/syndicate/ert/inspector/post_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - var/obj/item/card/id/W = H.wear_id - if(W) - W.registered_name = H.real_name - W.assignment = "Inspector" - W.update_label() diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm index 7e97c7341fe..c30de3d4043 100644 --- a/code/modules/clothing/outfits/factions/frontiersmen.dm +++ b/code/modules/clothing/outfits/factions/frontiersmen.dm @@ -25,6 +25,7 @@ /datum/outfit/job/frontiersmen/assistant name = "Frontiersmen - Rookie" + id_assignment = "Rookie" job_icon = "assistant" jobtype = /datum/job/assistant @@ -71,6 +72,7 @@ /datum/outfit/job/frontiersmen/captain/admiral name = "Frontiersmen - Admiral" + id_assignment = "Admiral" uniform = /obj/item/clothing/under/rank/security/officer/frontier/admiral head = /obj/item/clothing/head/caphat/frontier/admiral @@ -83,7 +85,8 @@ // Chief Engineer /datum/outfit/job/frontiersmen/ce - name = "Frontiersmen - Senior Sapper" + name = "Frontiersmen - Senior Mechanic" + id_assignment = "Senior Mechanic" job_icon = "chiefengineer" jobtype = /datum/job/chief_engineer @@ -97,7 +100,8 @@ // Engineer /datum/outfit/job/frontiersmen/engineer - name = "Frontiersmen - Sapper" + name = "Frontiersmen - Mechanic" + id_assignment = "Mechanic" job_icon = "stationengineer" jobtype = /datum/job/engineer @@ -115,6 +119,7 @@ /datum/outfit/job/frontiersmen/cook name = "Frontiersmen - Steward" + id_assignment = "Steward" job_icon = "cook" jobtype = /datum/job/cook @@ -126,6 +131,7 @@ /datum/outfit/job/frontiersmen/hop name = "Frontiersmen - Helmsman" + id_assignment = "Helmsman" job_icon = "headofpersonnel" jobtype = /datum/job/head_of_personnel @@ -138,7 +144,8 @@ // Head of Security /datum/outfit/job/frontiersmen/hos - name = "Frontiersmen - Shipswain" + name = "Frontiersmen - Deck Boss" + id_assignment = "Deck Boss" job_icon = "headofsecurity" jobtype = /datum/job/hos @@ -155,12 +162,13 @@ /datum/outfit/job/frontiersmen/security name = "Frontiersmen - Boarder" + id_assignment = "Boarder" job_icon = "securityofficer" jobtype = /datum/job/officer 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 @@ -173,7 +181,8 @@ // Medical Doctor /datum/outfit/job/frontiersmen/doctor - name = "Frontiersmen - Aidman" + name = "Frontiersmen - Surgeon" + id_assignment = "Surgeon" job_icon = "medicaldoctor" jobtype = /datum/job/doctor diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm index f34353c0e2d..e2262eb7789 100644 --- a/code/modules/clothing/outfits/factions/gezena.dm +++ b/code/modules/clothing/outfits/factions/gezena.dm @@ -11,6 +11,7 @@ //Playable Roles (put in ships): /datum/outfit/job/gezena/assistant name = "PGF - Crewman" + id_assignment = "Crewman" jobtype = /datum/job/assistant job_icon = "assistant" @@ -20,6 +21,7 @@ /datum/outfit/job/gezena/engineer name = "PGF - Navy Engineer" + id_assignment = "Naval Engineer" jobtype = /datum/job/engineer job_icon = "stationengineer" @@ -38,6 +40,7 @@ /datum/outfit/job/gezena/security name = "PGF - Marine" + id_assignment = "Marine" jobtype = /datum/job/officer job_icon = "securityofficer" @@ -47,6 +50,7 @@ /datum/outfit/job/gezena/hos name = "PGF - Marine Sergeant" + id_assignment = "Sergeant" jobtype = /datum/job/hos job_icon = "headofsecurity" diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index 14845b52e5d..75a36b1a313 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -20,6 +20,7 @@ /datum/outfit/job/inteq/assistant name = "IRMG - Recruit" + id_assignment = "Recruit" jobtype = /datum/job/assistant job_icon = "assistant" @@ -29,6 +30,7 @@ /datum/outfit/job/inteq/captain name = "IRMG - Vanguard (Naked)" + id_assignment = "Vanguard" jobtype = /datum/job/captain job_icon = "captain" @@ -46,7 +48,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 @@ -55,6 +57,7 @@ /datum/outfit/job/inteq/captain/honorable name = "IRMG - Honorable Vanguard" + id_assignment = "Honorable Vanguard" head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable uniform = /obj/item/clothing/under/syndicate/inteq/honorable @@ -65,26 +68,18 @@ belt = /obj/item/storage/belt/military/assault glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq -/datum/outfit/job/inteq/captain/honorable/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/card/id/W = H.wear_id - W.assignment = "Honorable Vanguard" - W.update_label() - ///Chief Engineer /datum/outfit/job/inteq/ce name = "IRMG - Artificer Class II" + id_assignment = "Artificer Class II" job_icon = "chiefengineer" jobtype = /datum/job/chief_engineer 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 @@ -101,6 +96,7 @@ /datum/outfit/job/inteq/paramedic name = "IRMG - Corpsman" + id_assignment = "Corpsman" job_icon = "paramedic" jobtype = /datum/job/paramedic @@ -115,7 +111,7 @@ backpack_contents = list(/obj/item/roller=1) /datum/outfit/job/inteq/paramedic/empty - name = "IRMG Corpsman (Inteq) (Naked)" + name = "IRMG - Corpsman (Naked)" head = null suit = null @@ -126,13 +122,14 @@ /datum/outfit/job/inteq/security name = "IRMG - Enforcer" + id_assignment = "Enforcer" jobtype = /datum/job/officer job_icon = "securityofficer" 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 @@ -171,6 +168,7 @@ /datum/outfit/job/inteq/engineer name = "IRMG - Artificer" + id_assignment = "Artificer" job_icon = "stationengineer" jobtype = /datum/job/engineer @@ -184,6 +182,7 @@ /datum/outfit/job/inteq/warden name = "IRMG - Master At Arms" + id_assignment = "Master at Arms" jobtype = /datum/job/warden job_icon = "warden" @@ -191,7 +190,7 @@ head = /obj/item/clothing/head/warden/inteq uniform = /obj/item/clothing/under/syndicate/inteq glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq - mask = /obj/item/clothing/mask/gas/sechailer/inteq + mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq belt = /obj/item/storage/belt/military/assault suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq @@ -205,7 +204,8 @@ // cmo /datum/outfit/job/inteq/cmo - name = "IRMG Honorable Corpsman (Inteq)" + name = "IRMG - Honorable Corpsman" + id_assignment = "Honorable Corpsman" jobtype = /datum/job/cmo job_icon = "chiefmedicalofficer" diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm index 0b991268c40..9de9c0d152c 100644 --- a/code/modules/clothing/outfits/factions/minutemen.dm +++ b/code/modules/clothing/outfits/factions/minutemen.dm @@ -1,89 +1,77 @@ //top outfit of everything Minuteman. Touch at own risk. -/datum/outfit/job/minutemen - name = "Minutemen - Base Outfit" +/datum/outfit/job/clip + name = "CLIP - Base Outfit" - uniform = /obj/item/clothing/under/rank/security/officer/minutemen + jobtype = /datum/job/assistant + uniform = /obj/item/clothing/under/clip alt_uniform = null - faction_icon = "bg_minutemen" + faction_icon = "bg_clip" - backpack = /obj/item/storage/backpack/security/cmm - satchel = /obj/item/storage/backpack/satchel/sec/cmm - duffelbag = /obj/item/storage/backpack/duffelbag //to-do: bug rye for cmm duffles // rye. rye. give me 20 pound bag of ice - satchel = /obj/item/storage/backpack/messenger //and these + box = /obj/item/storage/box/survival/clip - box = /obj/item/storage/box/survival +// var/list/selectable_alt_titles = list() -/datum/outfit/job/minutemen/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/job/clip/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(visualsOnly) return H.faction |= list(FACTION_PLAYER_MINUTEMAN) +/* if(selectable_alt_titles) + var/selection = input(H, "Select an alternative name for your role.", "Job Title", alt_title) as null|anything in selectable_alt_titles) + if(!selection) + return + + var/obj/item/card/id/W = H.wear_id + if(W) + W.assignment = alt_title +*/ -///assistant +// Base CLIP -/datum/outfit/job/minutemen/assistant - name = "Minutemen - Volunteer" +/datum/outfit/job/clip/assistant + name = "CLIP - Volunteer" job_icon = "assistant" jobtype = /datum/job/assistant + // selectable_alt_titles = list("Volunteer","Civillian") r_pocket = /obj/item/radio -///captains - -/datum/outfit/job/minutemen/captain - name = "Minutemen - Captain" +/datum/outfit/job/clip/captain + name = "CLIP - Captain" job_icon = "captain" jobtype = /datum/job/captain + uniform = /obj/item/clothing/under/clip/formal + alt_uniform = /obj/item/clothing/under/clip/formal/with_shirt + suit = /obj/item/clothing/suit/toggle/lawyer/clip + alt_suit = null + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain + head = /obj/item/clothing/head/clip/slouch id = /obj/item/card/id/gold - gloves = /obj/item/clothing/gloves/color/captain - + ears = /obj/item/radio/headset/clip/alt/captain + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/laceup +// accessory = /obj/item/clothing/accessory/medal/gold/captain backpack = /obj/item/storage/backpack/captain satchel = /obj/item/storage/backpack/satchel/cap duffelbag = /obj/item/storage/backpack/duffelbag/captain courierbag = /obj/item/storage/backpack/messenger/com - accessory = /obj/item/clothing/accessory/medal/gold/captain - - ears = /obj/item/radio/headset/minutemen/alt/captain - uniform = /obj/item/clothing/under/rank/command/minutemen - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - alt_suit = null - dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain - - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/cowboy/sec/minutemen - backpack = /obj/item/storage/backpack - backpack_contents = list(/obj/item/storage/box/ids=1,\ - /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) - -/datum/outfit/job/minutemen/captain/general - name = "Minutemen - General" - - head = /obj/item/clothing/head/caphat/minutemen - ears = /obj/item/radio/headset/minutemen/alt/captain - uniform = /obj/item/clothing/under/rank/command/minutemen - suit = /obj/item/clothing/suit/armor/vest/capcarapace/minutemen - shoes = /obj/item/clothing/shoes/combat - - box = /obj/item/storage/box/survival/engineer/radio - backpack = /obj/item/storage/backpack - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1) - -///chemist + backpack_contents = list( + /obj/item/storage/box/ids = 1, + /obj/item/melee/classic_baton/telescopic = 1, + /obj/item/modular_computer/tablet/preset/advanced = 1) -/datum/outfit/job/minutemen/chemist - name = "Minutemen - Chemical Scientist" +/datum/outfit/job/clip/chemist + name = "CLIP - Pharmacist" job_icon = "chemist" jobtype = /datum/job/chemist glasses = /obj/item/clothing/glasses/science shoes = /obj/item/clothing/shoes/sneakers/white - suit = /obj/item/clothing/suit/toggle/labcoat/chemist backpack = /obj/item/storage/backpack/chemistry satchel = /obj/item/storage/backpack/satchel/chem @@ -93,99 +81,310 @@ box = /obj/item/storage/box/survival/medical chameleon_extras = /obj/item/gun/syringe -///Chief Engineer - -/datum/outfit/job/minutemen/ce - name = "Minutemen - Foreman" - job_icon = "chiefengineer" +/datum/outfit/job/clip/ce + name = "CLIP - Foreman" + job_icon = "clip_navy3" jobtype = /datum/job/chief_engineer id = /obj/item/card/id/silver + gloves = /obj/item/clothing/gloves/color/yellow + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/workboots + head = /obj/item/clothing/head/hardhat/white + ears = /obj/item/radio/headset/clip + uniform = /obj/item/clothing/under/clip + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/clip + alt_suit = null backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering courierbag = /obj/item/storage/backpack/messenger/engi - box = /obj/item/storage/box/survival/engineer - - chameleon_extras = /obj/item/stamp/ce - - - ears = /obj/item/radio/headset/minutemen/alt - uniform = /obj/item/clothing/under/rank/command/minutemen - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - alt_suit = null - gloves = /obj/item/clothing/gloves/combat - belt = /obj/item/storage/belt/utility/full - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/cowboy/sec/minutemen - backpack = /obj/item/storage/backpack backpack_contents = list( /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1 ) -/// Head Of Personnel - -/datum/outfit/job/minutemen/head_of_personnel - name = "Minutemen - Bridge Officer" - job_icon = "headofpersonnel" +/datum/outfit/job/clip/first_officer + name = "CLIP - First Officer" + job_icon = "clip_navy4" jobtype = /datum/job/head_of_personnel id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/clip/alt + uniform = /obj/item/clothing/under/clip/formal + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/clip/fo + alt_suit = null + + shoes = /obj/item/clothing/shoes/combat + head = /obj/item/clothing/head/clip/slouch/officer backpack = /obj/item/storage/backpack/captain satchel = /obj/item/storage/backpack/satchel/cap duffelbag = /obj/item/storage/backpack/duffelbag/captain courierbag = /obj/item/storage/backpack/messenger/com - chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel) + backpack_contents = list( + /obj/item/storage/box/ids=1, + /obj/item/melee/classic_baton/telescopic=1, + /obj/item/modular_computer/tablet/preset/advanced = 1) - ears = /obj/item/radio/headset/minutemen/alt - uniform = /obj/item/clothing/under/rank/command/minutemen - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - alt_suit = null + chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel) - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/cowboy/sec/minutemen - backpack = /obj/item/storage/backpack - backpack_contents = list(/obj/item/storage/box/ids=1,\ - /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) - -/// Medical Doctor -/datum/outfit/job/minutemen/doctor - name = "Minutemen - Field Medic" +/datum/outfit/job/clip/doctor + name = "CLIP - Doctor" job_icon = "medicaldoctor" jobtype = /datum/job/doctor l_hand = /obj/item/storage/firstaid/medical + + box = /obj/item/storage/box/survival/medical + chameleon_extras = /obj/item/gun/syringe + accessory = /obj/item/clothing/accessory/armband/medblue + shoes = /obj/item/clothing/shoes/sneakers/white + head = /obj/item/clothing/head/beret/med + suit = /obj/item/clothing/suit/toggle/labcoat + gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip suit_store = /obj/item/flashlight/pen backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med courierbag = /obj/item/storage/backpack/messenger/med - box = /obj/item/storage/box/survival/medical + +/datum/outfit/job/clip/scientist + name = "CLIP - Researcher" + job_icon = "scientist" + jobtype = /datum/job/scientist + + shoes = /obj/item/clothing/shoes/sneakers/white + suit = /obj/item/clothing/suit/toggle/labcoat/science + + backpack = /obj/item/storage/backpack/science + satchel = /obj/item/storage/backpack/satchel/tox + courierbag = /obj/item/storage/backpack/messenger/tox + +/datum/outfit/job/clip/miner + name = "CLIP - Industrial Miner" + job_icon = "shaftminer" + jobtype = /datum/job/mining + + l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival + uniform = /obj/item/clothing/under/rank/cargo/miner/hazard + alt_uniform = null + alt_suit = /obj/item/clothing/suit/toggle/hazard + + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/combat + + backpack_contents = list( + /obj/item/flashlight/seclite=1, + /obj/item/stack/marker_beacon/ten=1, + /obj/item/weldingtool=1, + /obj/item/clothing/mask/gas/clip=1 + ) + +/datum/outfit/job/clip/mechanic + name = "CLIP - Mechanic" + job_icon = "stationengineer" + jobtype = /datum/job/engineer + + gloves = /obj/item/clothing/gloves/color/yellow + belt = /obj/item/storage/belt/utility/full/engi + shoes = /obj/item/clothing/shoes/workboots + r_pocket = /obj/item/t_scanner + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + duffelbag = /obj/item/storage/backpack/duffelbag/engineering + courierbag = /obj/item/storage/backpack/messenger/engi + + uniform = /obj/item/clothing/under/clip + accessory = /obj/item/clothing/accessory/armband/engine + head = /obj/item/clothing/head/hardhat/dblue + suit = /obj/item/clothing/suit/hazardvest + + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + +/datum/outfit/job/clip/investigator + name = "CLIP GOLD - Investigator" + jobtype = /datum/job/detective + job_icon = "detective" + + head = /obj/item/clothing/head/fedora/det_hat/clip + belt = /obj/item/clipboard + uniform = /obj/item/clothing/under/clip/formal + suit = /obj/item/clothing/suit/armor/clip_trenchcoat + ears = /obj/item/radio/headset/alt + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/color/black + + backpack = /obj/item/storage/backpack/satchel/leather + satchel = /obj/item/storage/backpack/satchel/leather + + l_pocket = /obj/item/toy/crayon/white + r_pocket = /obj/item/radio + + backpack_contents = list(/obj/item/storage/box/evidence=1,\ + /obj/item/detective_scanner=1,\ + /obj/item/melee/classic_baton=1) + +/datum/outfit/job/clip/bureaucrat + name = "CLIP GOLD - Bureaucrat" + job_icon = "scribe" + jobtype = /datum/job/lawyer + + head = /obj/item/clothing/head/flatcap/clip + uniform = /obj/item/clothing/under/clip/formal/with_shirt + shoes = /obj/item/clothing/shoes/laceup + + backpack = /obj/item/storage/backpack/satchel/leather + satchel = /obj/item/storage/backpack/satchel/leather + + r_pocket = /obj/item/radio + +// Colonial League Minutemen + +/datum/outfit/job/clip/minutemen + name = "CLIP Minutemen - Base Outfit" + + jobtype = /datum/job/assistant + uniform = /obj/item/clothing/under/clip/minutemen + + backpack = /obj/item/storage/backpack/security/clip + satchel = /obj/item/storage/backpack/satchel/sec/clip + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + + box = /obj/item/storage/box/survival/clip/balaclava + +/datum/outfit/job/clip/minutemen/deckhand + name = "CLIP Minutemen - Deckhand" + id_assignment = "Deckhand" + job_icon = "clip_navy1" + jobtype = /datum/job/assistant + uniform = /obj/item/clothing/under/clip + shoes = /obj/item/clothing/shoes/sneakers/black + + r_pocket = /obj/item/radio + +/datum/outfit/job/clip/minutemen/captain + name = "CLIP Minutemen - Captain" + job_icon = "clip_navy5" + jobtype = /datum/job/captain + + id = /obj/item/card/id/gold + gloves = /obj/item/clothing/gloves/color/captain + accessory = /obj/item/clothing/accessory/medal/gold/captain + ears = /obj/item/radio/headset/clip/alt/captain + uniform = /obj/item/clothing/under/clip/officer + alt_uniform = null + suit = /obj/item/clothing/suit/armor/clip_capcoat + alt_suit = null + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain + shoes = /obj/item/clothing/shoes/combat + head = /obj/item/clothing/head/clip/slouch/officer + + backpack = /obj/item/storage/backpack/captain + satchel = /obj/item/storage/backpack/satchel/cap + duffelbag = /obj/item/storage/backpack/duffelbag/captain + courierbag = /obj/item/storage/backpack/messenger/com + + backpack_contents = list(/obj/item/storage/box/ids=1, + /obj/item/melee/classic_baton/telescopic=1, + /obj/item/modular_computer/tablet/preset/advanced = 1) + +/datum/outfit/job/clip/minutemen/captain/general + name = "CLIP Minutemen - General" + id_assignment = "General" + job_icon = "clip_cmm6" + + head = /obj/item/clothing/head/clip/slouch/officer + ears = /obj/item/radio/headset/clip/alt/captain + uniform = /obj/item/clothing/under/clip/officer + suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip + shoes = /obj/item/clothing/shoes/combat + + box = /obj/item/storage/box/survival/engineer/radio + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1) + +/datum/outfit/job/clip/minutemen/captain/general/admiral // for flavor, might remove outright + name = "CLIP Minutemen - Admiral" + id_assignment = "Admiral" + job_icon = "clip_navy6" + + head = /obj/item/clothing/head/clip/bicorne + suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral + +///chemist + +/datum/outfit/job/clip/minutemen/chemist + name = "CLIP Minutemen - Chemist" + job_icon = "clip_navy2" + jobtype = /datum/job/chemist + + glasses = /obj/item/clothing/glasses/science + shoes = /obj/item/clothing/shoes/sneakers/white + suit = /obj/item/clothing/suit/toggle/labcoat/chemist + uniform = /obj/item/clothing/under/clip/medic + + backpack = /obj/item/storage/backpack/chemistry + satchel = /obj/item/storage/backpack/satchel/chem + duffelbag = /obj/item/storage/backpack/duffelbag/med + courierbag = /obj/item/storage/backpack/messenger/chem chameleon_extras = /obj/item/gun/syringe - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - accessory = /obj/item/clothing/accessory/armband/medblue +/datum/outfit/job/clip/minutemen/head_of_personnel + name = "CLIP Minutemen - Bridge Officer" + id_assignment = "Bridge Officer" + job_icon = "clip_navy3" + jobtype = /datum/job/head_of_personnel + + id = /obj/item/card/id/silver + head = /obj/item/clothing/head/clip/slouch + ears = /obj/item/radio/headset/clip/alt + uniform = /obj/item/clothing/under/clip/formal + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/clip + alt_suit = null + shoes = /obj/item/clothing/shoes/combat + + backpack = /obj/item/storage/backpack/captain + satchel = /obj/item/storage/backpack/satchel/cap + duffelbag = /obj/item/storage/backpack/duffelbag/captain + courierbag = /obj/item/storage/backpack/messenger/com + + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1) + +/datum/outfit/job/clip/minutemen/doctor + name = "CLIP Minutemen - Corpsman" + id_assignment = "Corpsman" + job_icon = "clip_navy2" + jobtype = /datum/job/doctor + + l_hand = /obj/item/storage/firstaid/medical + + backpack = /obj/item/storage/backpack/security/clip + satchel = /obj/item/storage/backpack/satchel/sec/clip + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + + uniform = /obj/item/clothing/under/clip/medic shoes = /obj/item/clothing/shoes/sneakers/white - head = /obj/item/clothing/head/beret/med + head = /obj/item/clothing/head/clip/corpsman + gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip suit = null suit_store = null -///paramedic -/datum/outfit/job/minutemen/paramedic - name = "Minutemen - BARD Combat Medic" +/datum/outfit/job/clip/minutemen/paramedic + name = "CLIP Minutemen - BARD Combat Medic" job_icon = "paramedic" jobtype = /datum/job/paramedic - uniform = /obj/item/clothing/under/rank/medical/paramedic/emt head = /obj/item/clothing/head/soft/paramedic suit = /obj/item/clothing/suit/armor/vest @@ -202,151 +401,261 @@ box = /obj/item/storage/box/survival/medical -///roboticist -/datum/outfit/job/minutemen/roboticist - name = "Minutemen - Mech Technician" - job_icon = "roboticist" +///vehicle crew + +/datum/outfit/job/clip/minutemen/vehicle_crew + name = "CLIP Minutemen - Vehicle Crewman" + id_assignment = "Vehicle Crewman" + job_icon = "clip_mech1" jobtype = /datum/job/roboticist belt = /obj/item/storage/belt/utility/full - backpack = /obj/item/storage/backpack/science - satchel = /obj/item/storage/backpack/satchel/tox - courierbag = /obj/item/storage/backpack/messenger/tox + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + duffelbag = /obj/item/storage/backpack/duffelbag/engineering + courierbag = /obj/item/storage/backpack/messenger/engi + uniform = /obj/item/clothing/under/clip + shoes = /obj/item/clothing/shoes/jackboots + ears = /obj/item/radio/headset/clip + suit = null + +/datum/outfit/job/clip/minutemen/vehicle_pilot + name = "CLIP Minutemen - Vehicle Pilot" + id_assignment = "Pilot" + job_icon = "clip_mech2" + jobtype = /datum/job/mining - uniform = /obj/item/clothing/under/rank/security/officer/minutemen + head = /obj/item/clothing/head/helmet/bulletproof/m10/clip_vc + uniform = /obj/item/clothing/under/clip/minutemen shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/minutemen - suit = /obj/item/clothing/suit/toggle/labcoat/science - alt_suit = /obj/item/clothing/suit/toggle/suspenders/gray + ears = /obj/item/radio/headset/clip -///scientist -/datum/outfit/job/minutemen/scientist - name = "Minutemen - Scientist" - job_icon = "scientist" - jobtype = /datum/job/scientist + suit = /obj/item/clothing/suit/armor/vest/alt + gloves = /obj/item/clothing/gloves/fingerless + glasses = /obj/item/clothing/glasses/hud/diagnostic - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - backpack = /obj/item/storage/backpack/security/cmm +/datum/outfit/job/clip/minutemen/vehicle_pilot/commander + name = "CLIP Minutemen - Vehicle Commander" + id_assignment = "Vehicle Commander" + job_icon = "clip_mech3" - shoes = /obj/item/clothing/shoes/sneakers/white - suit = /obj/item/clothing/suit/toggle/labcoat/science - alt_suit = /obj/item/clothing/suit/toggle/suspenders/blue + suit = /obj/item/clothing/suit/jacket/miljacket + glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses - backpack = /obj/item/storage/backpack/science - satchel = /obj/item/storage/backpack/satchel/tox - courierbag = /obj/item/storage/backpack/messenger/tox +/datum/outfit/job/clip/minutemen/vehicle_crew/coordinator + name = "CLIP Minutemen - Vehicle Traffic Coordinator" + id_assignment = "Traffic Coordinator" + job_icon = "clip_mech4" + jobtype = /datum/job/roboticist -//security officers + belt = null -/datum/outfit/job/minutemen/security - name = "Minutemen - Minuteman" - job_icon = "securityofficer" + backpack = /obj/item/storage/backpack/captain + satchel = /obj/item/storage/backpack/satchel/cap + duffelbag = /obj/item/storage/backpack/duffelbag/captain + courierbag = /obj/item/storage/backpack/messenger/com + + head = /obj/item/clothing/head/clip/slouch + uniform = /obj/item/clothing/under/clip/minutemen + shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/hazardvest + +/datum/outfit/job/clip/minutemen/engineer + name = "CLIP Minutemen - Engineer" + job_icon = "clip_navy2" + jobtype = /datum/job/engineer + + belt = /obj/item/storage/belt/utility/full/engi + shoes = /obj/item/clothing/shoes/workboots + r_pocket = /obj/item/t_scanner + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + duffelbag = /obj/item/storage/backpack/duffelbag/engineering + courierbag = /obj/item/storage/backpack/messenger/engi + + uniform = /obj/item/clothing/under/clip + head = /obj/item/clothing/head/clip + suit = /obj/item/clothing/suit/hazardvest + + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + +//grunts - for erts as well + +/obj/item/twenty_pounds_of_ice + name = "20 pounds of ice" + desc = "It feels cold and heavy." + icon_state = "20_lb_ice" + w_class = WEIGHT_CLASS_NORMAL + +/datum/outfit/job/clip/minutemen/grunt + name = "CLIP Minutemen - Minuteman" + id_assignment = "Minuteman" jobtype = /datum/job/officer + job_icon = "clip_cmm2" + ears = /obj/item/radio/headset/alt + box = /obj/item/storage/box/survival/clip/balaclava + shoes = null + + backpack = /obj/item/storage/backpack/security/clip + satchel = /obj/item/storage/backpack/satchel/sec/clip + duffelbag = /obj/item/storage/backpack/security/clip //to-do: bug rye for clip duffles // rye. rye. give me 20 pound bag of ice //done + +/datum/outfit/job/clip/minutemen/grunt/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(H.ckey == "meemofcourse") + H.equip_to_slot_if_possible(new /obj/item/twenty_pounds_of_ice, ITEM_SLOT_HANDS, FALSE, FALSE) + + +/datum/outfit/job/clip/minutemen/grunt/reserve + name = "CLIP Minutemen - Reservist" + id_assignment = "Reservist" + job_icon = "clip_cmm1" + jobtype = /datum/job/assistant - head = /obj/item/clothing/head/helmet/bulletproof/minutemen - mask = /obj/item/clothing/mask/gas/sechailer/minutemen + head = /obj/item/clothing/head/clip + shoes = /obj/item/clothing/shoes/combat + +/datum/outfit/job/clip/minutemen/grunt/dressed + name = "CLIP Minutemen - Minuteman (Dressed)" + + head = /obj/item/clothing/head/helmet/bulletproof/x11/clip suit = /obj/item/clothing/suit/armor/vest/bulletproof alt_suit = null - uniform = /obj/item/clothing/under/rank/security/officer/minutemen + uniform = /obj/item/clothing/under/clip/minutemen alt_uniform = null shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/alt + gloves = /obj/item/clothing/gloves/color/black - belt = /obj/item/storage/belt/military/minutemen + belt = /obj/item/storage/belt/military/clip l_pocket = /obj/item/flashlight/seclite r_pocket = /obj/item/tank/internals/emergency_oxygen/double - box = /obj/item/storage/box/survival/engineer/radio - backpack_contents = null -/datum/outfit/job/minutemen/security/armed - name = "Minutemen - Minuteman (Armed)" + backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1) + +/datum/outfit/job/clip/minutemen/grunt/dressed/armed + name = "CLIP Minutemen - Minuteman (Armed - CM-16)" suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen - belt = /obj/item/storage/belt/military/minutemen/p16 + belt = /obj/item/storage/belt/military/clip/p16 -/datum/outfit/job/minutemen/security/mech_pilot - name = "Minutemen - Mech Pilot" +/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4 //f4 is rename of GAL, don't wanna repath upon adding the clip guns though, if i forget to remove this during then, fucking yell at me + name = "CLIP Minutemen - Minuteman (Armed - CM-GAL)" - suit = /obj/item/clothing/suit/armor/vest/alt - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - glasses = /obj/item/clothing/glasses/hud/diagnostic + suit_store = /obj/item/gun/ballistic/automatic/gal + belt = /obj/item/storage/belt/military/clip/gal -///miners +/datum/outfit/job/clip/minutemen/grunt/dressed/armed/cm5 + name = "CLIP Minutemen - Minuteman (Armed - CM-5)" -/datum/outfit/job/minutemen/miner - name = "Minutemen - Industrial Miner" - job_icon = "shaftminer" - jobtype = /datum/job/mining + suit_store = /obj/item/gun/ballistic/automatic/smg/cm5 + belt = /obj/item/storage/belt/military/clip/cm5 - l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival - uniform = /obj/item/clothing/under/rank/cargo/miner/hazard - alt_uniform = null - alt_suit = /obj/item/clothing/suit/toggle/hazard +//ert outfits, i suppose you could use these for non-ert roles although i highly discourage it - gloves = /obj/item/clothing/gloves/color/black - shoes = /obj/item/clothing/shoes/combat - backpack_contents = list( - /obj/item/flashlight/seclite=1, - /obj/item/stack/marker_beacon/ten=1, - /obj/item/weldingtool=1 - ) +/datum/outfit/job/clip/minutemen/grunt/dressed/engi + name = "CLIP Minutemen - Field Engineer (Dressed)" + id_assignment = "Field Engineer" + jobtype = /datum/job/engineer -///engineers + accessory = /obj/item/clothing/accessory/armband/engine + belt = /obj/item/storage/belt/military/clip/engi -/datum/outfit/job/minutemen/engineer - name = "Minutemen - Mechanic" - job_icon = "stationengineer" - jobtype = /datum/job/engineer +/datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed + name = "CLIP Minutemen - Field Engineer (Armed - CM-16)" - belt = /obj/item/storage/belt/utility/full/engi - shoes = /obj/item/clothing/shoes/workboots - r_pocket = /obj/item/t_scanner + suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen + backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chili_macaroni=1, /obj/item/grenade/c4=2, /obj/item/ammo_box/magazine/p16=3) - backpack = /obj/item/storage/backpack/industrial - satchel = /obj/item/storage/backpack/satchel/eng - duffelbag = /obj/item/storage/backpack/duffelbag/engineering - courierbag = /obj/item/storage/backpack/messenger/engi +/datum/outfit/job/clip/minutemen/grunt/dressed/med + name = "CLIP Minutemen - Field Corpsman (Dressed)" + id_assignment = "Field Corpsman" + jobtype = /datum/job/doctor - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - accessory = /obj/item/clothing/accessory/armband/engine - head = /obj/item/clothing/head/hardhat/dblue - suit = /obj/item/clothing/suit/hazardvest + accessory = /obj/item/clothing/accessory/armband/medblue + belt = /obj/item/storage/belt/medical/webbing/clip/prefilled - box = /obj/item/storage/box/survival/engineer - backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) +/datum/outfit/job/clip/minutemen/grunt/dressed/med/armed + name = "CLIP Minutemen - Field Corpsman (Armed - CM-5)" + suit_store = /obj/item/gun/ballistic/automatic/smg/cm5 -///warden + backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/smgm9mm=3) -/datum/outfit/job/minutemen/warden - name = "Minutemen - Field Commander" - job_icon = "warden" - jobtype = /datum/job/warden +/obj/item/storage/belt/military/clip/gunner/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/ammo_box/magazine/skm_762_40/extended(src) + new /obj/item/grenade/frag(src) + +/datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed + name = "CLIP Minutemen - Field Gunner (Armed - SKM-24u)" //See above, replace with CLIP LMG when added + id_assignment = "Machinegunner" - glasses = /obj/item/clothing/glasses/sunglasses - ears = /obj/item/radio/headset/minutemen/alt - uniform = /obj/item/clothing/under/rank/security/officer/minutemen accessory = /obj/item/clothing/accessory/armband - head = /obj/item/clothing/head/cowboy/sec/minutemen + belt = /obj/item/storage/belt/military/clip/gunner + suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended + + backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1) + +///lead, i guess you could reuse this for "Brig Officer" + +/datum/outfit/job/clip/minutemen/grunt/lead + name = "CLIP Minutemen - Field Sergeant" + id_assignment = "Sergeant" + job_icon = "clip_cmm3" + jobtype = /datum/job/warden + + ears = /obj/item/radio/headset/clip/alt + uniform = /obj/item/clothing/under/clip/minutemen + gloves = /obj/item/clothing/gloves/combat + head = /obj/item/clothing/head/clip/slouch suit = /obj/item/clothing/suit/armor/vest/bulletproof - belt = /obj/item/storage/belt/military/minutemen + belt = /obj/item/storage/belt/military/clip shoes = /obj/item/clothing/shoes/combat l_pocket = /obj/item/flashlight/seclite r_pocket = /obj/item/tank/internals/emergency_oxygen/double - box = /obj/item/storage/box/survival/engineer/radio - backpack = /obj/item/storage/backpack - backpack_contents = null + backpack_contents = list(/obj/item/clothing/mask/gas/clip=1) -/datum/outfit/job/minutemen/warden/armed - name = "Minutemen - Field Commander (Armed)" +/datum/outfit/job/clip/minutemen/grunt/lead/armed + name = "CLIP Minutemen - Field Sergeant (Armed)" suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen - belt = /obj/item/storage/belt/military/minutemen/p16 + belt = /obj/item/storage/belt/military/clip/p16 + //replace commander with the cm23 when its impemented, see the cm-f4 above + backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/commander=1) + +/datum/outfit/job/clip/minutemen/grunt/commander + name = "CLIP Minutemen - Field Commander" + id_assignment = "Commander" + job_icon = "clip_cmm4" + jobtype = /datum/job/hos + + ears = /obj/item/radio/headset/clip/alt + uniform = /obj/item/clothing/under/clip/officer + + head = /obj/item/clothing/head/clip/slouch/officer + suit = /obj/item/clothing/suit/toggle/lawyer/clip + + shoes = /obj/item/clothing/shoes/combat + glasses = /obj/item/clothing/glasses/sunglasses + +/datum/outfit/job/clip/minutemen/grunt/major + name = "CLIP Minutemen - Major" + id_assignment = "Major" + job_icon = "clip_cmm5" + jobtype = /datum/job/captain + + ears = /obj/item/radio/headset/clip/alt + uniform = /obj/item/clothing/under/clip/officer - backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1, /obj/item/gun/energy/e_gun/advtaser=1) + head = /obj/item/clothing/head/clip/slouch/officer + suit = /obj/item/clothing/suit/armor/clip_trenchcoat + + shoes = /obj/item/clothing/shoes/combat + + glasses = /obj/item/clothing/glasses/sunglasses diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm index 28ff486e4dc..f0fdb0e4ac1 100644 --- a/code/modules/clothing/outfits/factions/nanotrasen.dm +++ b/code/modules/clothing/outfits/factions/nanotrasen.dm @@ -52,6 +52,7 @@ /datum/outfit/job/nanotrasen/captain/lp name = "Nanotrasen - Loss Prevention Lieutenant" + id_assignment = "Lieutenant" implants = list(/obj/item/implant/mindshield) ears = /obj/item/radio/headset/nanotrasen/alt/captain @@ -138,6 +139,7 @@ /datum/outfit/job/nanotrasen/roboticist name = "Nanotrasen - Mech Technician" + id_assignment = "Mech Technician" job_icon = "roboticist" jobtype = /datum/job/roboticist @@ -152,6 +154,7 @@ /datum/outfit/job/nanotrasen/pilot name = "Nanotrasen - Pilot" + id_assignment = "Pilot" uniform = /obj/item/clothing/under/rank/security/officer/military suit = /obj/item/clothing/suit/jacket/leather/duster @@ -177,10 +180,10 @@ chameleon_extras = /obj/item/stamp/law /datum/outfit/job/nanotrasen/lawyer/corporaterepresentative - name = "Nanotrasen - Lawyer (Corporate Representative)" + name = "Nanotrasen - Corporate Representative" + id_assignment = "Corporate Representative" job_icon = "nanotrasen" - uniform = /obj/item/clothing/under/rank/command/head_of_personnel/suit suit = null ears = /obj/item/radio/headset/headset_cent @@ -254,6 +257,7 @@ /datum/outfit/job/nanotrasen/security/mech_pilot name = "Nanotrasen - Mech Pilot" + id_assignment = "Mech Pilot" uniform = /obj/item/clothing/under/rank/security/officer/military/eng head = /obj/item/clothing/head/beret/sec/officer @@ -262,6 +266,7 @@ /datum/outfit/job/nanotrasen/security/lp name = "Nanotrasen - LP Security Specialist" + id_assignment = "Security Specialist" implants = list(/obj/item/implant/mindshield) ears = /obj/item/radio/headset/nanotrasen/alt/captain @@ -396,6 +401,7 @@ /datum/outfit/job/nanotrasen/doctor/lp name = "Nanotrasen - LP Medical Specialist" + id_assignment = "Medical Specialist" implants = list(/obj/item/implant/mindshield) ears = /obj/item/radio/headset/nanotrasen/alt/captain diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm index 4cf4e56005e..424827e6901 100644 --- a/code/modules/clothing/outfits/factions/roumain.dm +++ b/code/modules/clothing/outfits/factions/roumain.dm @@ -17,6 +17,7 @@ /datum/outfit/job/roumain/assistant name = "Saint-Roumain Militia - Shadow" + id_assignment = "Shadow" jobtype = /datum/job/assistant job_icon = "assistant" @@ -31,6 +32,7 @@ /datum/outfit/job/roumain/captain name = "Saint-Roumain Militia - Hunter Montagne" + id_assignment = "Hunter Montagne" job_icon = "captain" jobtype = /datum/job/captain @@ -54,6 +56,7 @@ /datum/outfit/job/roumain/security name = "Saint-Roumain Militia - Hunter" + id_assignment = "Hunter" jobtype = /datum/job/officer job_icon = "securityofficer" @@ -75,6 +78,7 @@ /datum/outfit/job/roumain/doctor name = "Saint-Roumain Militia - Hunter Doctor" + id_assignment = "Hunter Doctor" job_icon = "medicaldoctor" jobtype = /datum/job/doctor diff --git a/code/modules/clothing/outfits/factions/solgov.dm b/code/modules/clothing/outfits/factions/solgov.dm index 33463c49858..972b863bbbd 100644 --- a/code/modules/clothing/outfits/factions/solgov.dm +++ b/code/modules/clothing/outfits/factions/solgov.dm @@ -11,6 +11,7 @@ /datum/outfit/job/solgov/assistant name = "SolGov - Scribe" + id_assignment = "Scribe" jobtype = /datum/job/assistant job_icon = "scribe" @@ -21,6 +22,7 @@ /datum/outfit/job/solgov/bureaucrat name = "SolGov - Bureaucrat" + id_assignment = "Bureaucrat" jobtype = /datum/job/curator job_icon = "curator" @@ -61,6 +63,7 @@ /datum/outfit/job/solgov/sonnensoldner name = "SolGov - Sonnensöldner" + id_assignment = "Sonnensöldner" jobtype = /datum/job/officer job_icon = "sonnensoldner" @@ -103,6 +106,7 @@ /datum/outfit/job/solgov/overseer name = "SolGov - Overseer" + id_assignment = "Overseer" jobtype = /datum/job/head_of_personnel job_icon = "headofpersonnel" @@ -140,6 +144,7 @@ /datum/outfit/job/solgov/miner name = "SolGov - Field Engineer" + id_assignment = "Field Engineer" jobtype = /datum/job/mining job_icon = "shaftminer" @@ -181,8 +186,9 @@ /datum/outfit/job/solgov/patient name = "SolGov - Attentive Care Patient" + id_assignment = "Attentive Care Patient" jobtype = /datum/job/prisoner - job_icon = "assistant" // todo: bug rye for patient icon + job_icon = "assistant" // todo: bug rye for patient icon // rye. rye. give me 50 gazillion billion dollars paypal id = /obj/item/card/id/patient uniform = /obj/item/clothing/under/rank/medical/gown @@ -191,6 +197,7 @@ /datum/outfit/job/solgov/engineer name = "SolGov - Ship Engineer" + id_assignment = "Ship Engineer" jobtype = /datum/job/engineer job_icon = "stationengineer" @@ -213,6 +220,7 @@ /datum/outfit/job/solgov/quartermaster name = "SolGov - Logistics Deck Officer" + id_assignment = "Logistics Deck Officer" jobtype = /datum/job/qm job_icon = "quartermaster" diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 5eb0b9e5bac..44199ac361a 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -31,6 +31,7 @@ /datum/outfit/job/syndicate/assistant name = "Syndicate - Junior Agent" + id_assignment = "Junior Agent" jobtype = /datum/job/assistant job_icon = "assistant" @@ -60,6 +61,7 @@ /datum/outfit/job/syndicate/assistant/gec name = "Syndicate - Deckhand (GEC)" + id_assignment = "Deckhand" uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/toggle/hazard @@ -76,6 +78,7 @@ /datum/outfit/job/syndicate/assistant/twink name = "Syndicate - Deck Assistant (Twinkleshine)" + id_assignment = "Deck Assistant" uniform = /obj/item/clothing/under/syndicate mask = /obj/item/clothing/mask/gas/syndicate/voicechanger @@ -101,6 +104,7 @@ /datum/outfit/job/syndicate/assistant/suns name = "Syndicate - Freshman (SUNS)" + id_assignment = "Freshman" uniform = /obj/item/clothing/under/syndicate/suns alt_uniform = /obj/item/clothing/under/syndicate/suns/alt @@ -118,12 +122,14 @@ /datum/outfit/job/syndicate/assistant/suns/halfway name = "Syndicate - Junior (SUNS)" + id_assignment = "Junior" uniform = /obj/item/clothing/under/syndicate/suns/uniform2 alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform2/alt /datum/outfit/job/syndicate/assistant/suns/complete name = "Syndicate - Graduate (SUNS)" + id_assignment = "Graduate" uniform = /obj/item/clothing/under/syndicate/suns/uniform3 alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3/alt @@ -226,6 +232,7 @@ /datum/outfit/job/syndicate/botanist/suns name = "Syndicate - Botanist-Chemist (SUNS)" + id_assignment = "Botanist-Chemist" uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit id = /obj/item/card/id/syndicate_command/crew_id @@ -269,6 +276,7 @@ /datum/outfit/job/syndicate/captain/twink name = "Flotilla Admiral (Twinkleshine, ACLF)" + id_assignment = "Flotilla Admiral" uniform = /obj/item/clothing/under/syndicate/ngr/officer head = null @@ -337,6 +345,7 @@ /datum/outfit/job/syndicate/cargo_tech/donk name = "Syndicate - Customer Associate (Donk)" + id_assignment = "Customer Associate" //chemist @@ -416,6 +425,7 @@ /datum/outfit/job/syndicate/cmo name = "Syndicate - Medical Director (Cybersun)" + id_assignment = "Medical Director" jobtype = /datum/job/cmo job_icon = "chiefmedicalofficer" @@ -432,6 +442,7 @@ /datum/outfit/job/syndicate/cmo/suns name = "Syndicate - Medical Instructor (SUNS)" + id_assignment = "Medical Instructor" uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs ears = /obj/item/radio/headset/syndicate/alt/captain @@ -456,6 +467,7 @@ /datum/outfit/job/syndicate/head_of_personnel name = "Syndicate - Bridge Officer" + id_assignment = "Bridge Officer" jobtype = /datum/job/head_of_personnel job_icon = "headofpersonnel" @@ -472,6 +484,7 @@ /datum/outfit/job/syndicate/head_of_personnel/cybersun name = "Syndicate - Intelligence Officer (Cybersun)" + id_assignment = "Intelligence Officer" ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/cybersun/officer @@ -485,6 +498,7 @@ /datum/outfit/job/syndicate/head_of_personnel/suns name = "Syndicate - Academic Staff (SUNS)" + id_assignment = "Academic Staff" uniform = /obj/item/clothing/under/syndicate/suns/xo suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo @@ -522,9 +536,11 @@ /datum/outfit/job/syndicate/hos/gorlex name = "Syndicate - Sergeant (Gorlex)" + id_assignment = "Sergeant" /datum/outfit/job/syndicate/hos/twink name = "Syndicate - Lieutenant (Twinkleshine, NGR)" + id_assignment = "Lieutenant" job_icon = "lieutenant" uniform = /obj/item/clothing/under/syndicate/ngr/officer @@ -557,6 +573,8 @@ /datum/outfit/job/syndicate/hos/suns name = "Syndicate - Senior Peacekeeper (SUNS)" + id_assignment = "Senior Peacekeeper" + uniform = /obj/item/clothing/under/syndicate/suns/pkuniform suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos belt = /obj/item/melee/sabre/suns/telescopic @@ -578,6 +596,7 @@ /datum/outfit/job/syndicate/hos/suns/twink name = "Syndicate - Redshield Officer (Twinkleshine, SUNS)" + id_assignment = "Redshield Officer" suit = null mask = /obj/item/clothing/mask/gas/syndicate/voicechanger @@ -665,6 +684,7 @@ /datum/outfit/job/syndicate/paramedic/cybersun name = "Syndicate - Field Medic (Cybersun Industries)" + id_assignment = "Field Medic" uniform = /obj/item/clothing/under/syndicate/medic head = /obj/item/clothing/head/soft/cybersun/medical @@ -736,6 +756,7 @@ /datum/outfit/job/syndicate/patient name = "Syndicate - Long Term Patient" + id_assignment = "Long Term Patient" jobtype = /datum/job/prisoner job_icon = "assistant" @@ -800,6 +821,7 @@ /datum/outfit/job/syndicate/security name = "Syndicate - Operative" + id_assignment = "Operative" jobtype = /datum/job/officer job_icon = "securityofficer" @@ -856,6 +878,8 @@ /datum/outfit/job/syndicate/security/suns name = "Syndicate - Peacekeeper (SUNS)" + id_assignment = "Peacekeeper" + uniform = /obj/item/clothing/under/syndicate/suns/pkuniform suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat @@ -891,6 +915,7 @@ /datum/outfit/job/syndicate/miner/gorlex name = "Syndicate - Wrecker (Gorlex Marauders)" + id_assignment = "Wrecker" uniform = /obj/item/clothing/under/syndicate/gorlex shoes = /obj/item/clothing/shoes/workboots @@ -923,6 +948,7 @@ /datum/outfit/job/syndicate/miner/cybersun name = "Syndicate - Field Agent (Cybersun)" + id_assignment = "Field Agent" id = /obj/item/card/id/syndicate_command/crew_id ears = /obj/item/radio/headset @@ -949,6 +975,7 @@ /datum/outfit/job/syndicate/engineer name = "Syndicate - Ship Technician" + id_assignment = "Ship Technician" jobtype = /datum/job/engineer job_icon = "stationengineer" @@ -969,6 +996,7 @@ /datum/outfit/job/syndicate/engineer/gec name = "Syndicate - Ship Engineer (GEC)" + id_assignment = "Ship Engineer" uniform = /obj/item/clothing/under/syndicate/gec alt_uniform = null @@ -978,6 +1006,7 @@ /datum/outfit/job/syndicate/engineer/gorlex name = "Syndicate - Mechanic (Gorlex Marauders)" + id_assignment = "Mechanic" uniform = /obj/item/clothing/under/syndicate/gorlex shoes = /obj/item/clothing/shoes/workboots diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 517a51982e7..1ea5af9f1ea 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 c3787de67e8..953899ca40c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -178,12 +178,6 @@ icon_state = "carapace_formal" item_state = "bio_suit" -/obj/item/clothing/suit/armor/vest/capcarapace/minutemen - name = "Colonial Minutemen general coat" - desc = "A very fancy coat used by generals of the Colonial Minutemen." - icon_state = "carapace_minutemen" - item_state = "carapace_minutemen" - /obj/item/clothing/suit/armor/vest/capcarapace/duster name = "captain's duster" desc = "A long, commanding coat worn over a surprisingly sleek set of armor and decorated with gold embroidery. Ideal for protecting its wearer from rain, sun, dust, mutineers, pirates, bears, hordes of angry legions, and so on." @@ -204,12 +198,6 @@ strip_delay = 80 equip_delay_other = 60 -/obj/item/clothing/suit/armor/riot/minutemen - name = "black riot suit" - desc = "Designed to protect against close range attacks. This one is painted black. Mainly used by the CM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds." - icon_state = "riot_minutemen" - - /obj/item/clothing/suit/armor/bone name = "bone armor" desc = "A tribal armor plate, crafted from animal bone." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 12a44cbbd25..0db75bbb192 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -159,17 +159,6 @@ icon_state = "suitjacket_charcoal" item_state = "suitjacket_charcoal" -/obj/item/clothing/suit/toggle/lawyer/minutemen - name = "minutemen suit jacket" - desc = "An enterprising dress jacket used by officers of the Colonial Minutemen." - icon_state = "suitjacket_minuteman" - item_state = "suitjacket_navy" - -/obj/item/clothing/suit/toggle/lawyer/minutemen/Initialize() - . = ..() - if(!allowed) - allowed = GLOB.security_vest_allowed //it's hop-equivalent gear after all - /obj/item/clothing/suit/toggle/lawyer/cmo name = "light blue suit jacket" desc = "A foppish dress jacket." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 77b7297f4c6..126e34db4f4 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -446,7 +446,7 @@ /obj/item/clothing/suit/jacket/miljacket name = "military jacket" - desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." + desc = "A canvas jacket styled after traditional military garb. Feels sturdy, yet comfortable." icon_state = "militaryjacket" item_state = "militaryjacket" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/radio) diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index 231c62eb289..55b20b328ac 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 de9cb15258e..cf08ad4ed4c 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -270,14 +270,6 @@ desc = "A dark colored uniform worn by private military engineers." icon_state = "military_eng" -/obj/item/clothing/under/rank/security/officer/minutemen - name = "colonial minutemen jumpsuit" - desc = "A jumpsuit worn by low ranking members of the Colonial Minutemen." - icon_state = "minuteman" - item_state = "b_suit" - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION - /obj/item/clothing/under/rank/security/officer/camo name = "fatigues" desc = "A combat uniform most often worn by mercenaries and TPLRC soldiers. Features polychromatic design to adjust to different environments." @@ -291,6 +283,10 @@ "Snow" = "camo_snow", ) +/obj/item/storage/belt/military/ComponentInitialize() + . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + /obj/item/clothing/under/rank/security/officer/frontier name = "\improper Frontiersmen uniform" desc = "Worn by members of the Frontiersmen pirate fleet. It's very uncomfortable to move around in." diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index d060dc1c296..318de66636e 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -577,12 +577,33 @@ name = "fortune cookie" desc = "A true prophecy in each cookie!" icon_state = "fortune_cookie" + trash = /obj/item/paper/paperslip bonus_reagents = list(/datum/reagent/consumable/nutriment = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 3) filling_color = "#F4A460" tastes = list("cookie" = 1) foodtype = GRAIN | SUGAR +/obj/item/reagent_containers/food/snacks/fortunecookie/proc/get_fortune() + var/atom/drop_location = drop_location() + var/obj/item/paper/fortune = locate(/obj/item/paper) in src + // If a fortune exists, use that. + if (fortune) + fortune.forceMove(drop_location) + return fortune + + // Otherwise, use a generic one + var/obj/item/paper/paperslip/fortune_slip = new trash(drop_location) + fortune_slip.name = "fortune slip" + // if someone adds lottery tickets in the future, be sure to add random numbers to this + fortune_slip.add_raw_text(pick(GLOB.wisdoms)) + + return fortune_slip + +/obj/item/reagent_containers/food/snacks/fortunecookie/generate_trash() + if(trash) + get_fortune() + /obj/item/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" desc = "It's all twisted up!" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm index 1be13c39f14..4e0ade4fa22 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm @@ -10,7 +10,6 @@ /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit =1, /datum/reagent/consumable/ethanol = 100 ) - blacklist = list(/obj/item/organ/tail/lizard/fake) result = /obj/item/reagent_containers/food/drinks/bottle/lizardwine category = CAT_DRINK diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index f46d7768b1f..67d45dd8d05 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -194,6 +194,8 @@ var/job_icon // the background of the job icon var/faction_icon + // if there is an id, this will get automatically applied to an id's assignment variable + var/id_assignment var/alt_uniform @@ -280,6 +282,9 @@ C.registered_age = H.age C.job_icon = job_icon C.faction_icon = faction_icon + C.update_appearance() + if(id_assignment) + C.assignment = id_assignment C.update_label() for(var/A in SSeconomy.bank_accounts) var/datum/bank_account/B = A diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index 7b51b433add..6e7e10a7cba 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -306,13 +306,13 @@ Key procs /datum/language/machine = list(LANGUAGE_ATOM), /datum/language/draconic = list(LANGUAGE_ATOM), /datum/language/moffic = list(LANGUAGE_ATOM), + /datum/language/calcic = list(LANGUAGE_ATOM), + /datum/language/spider = list(LANGUAGE_ATOM), /datum/language/teceti_unified = list(LANGUAGE_ATOM)) spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/machine = list(LANGUAGE_ATOM), /datum/language/draconic = list(LANGUAGE_ATOM), /datum/language/moffic = list(LANGUAGE_ATOM), - /datum/language/calcic = list(LANGUAGE_ATOM), - /datum/language/spider = list(LANGUAGE_ATOM), /datum/language/teceti_unified = list(LANGUAGE_ATOM)) /datum/language_holder/ipc diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index bf7612e9d94..ec2e8224ad8 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -270,6 +270,15 @@ if(..()) playsound(user.loc, 'sound/machines/chime.ogg', 50) +/datum/emote/living/carbon/human/robot_tongue/no + key = "no" + key_third_person = "no" + message = "emits an negative blip." + +/datum/emote/living/carbon/human/robot_tongue/no/run_emote(mob/user, params) + if(..()) + playsound(user.loc, 'sound/machines/synth_no.ogg', 50) + /datum/emote/living/carbon/human/robot_tongue/ping key = "ping" key_third_person = "pings" @@ -280,28 +289,32 @@ if(..()) playsound(user.loc, 'sound/machines/ping.ogg', 50) -// Clown Robotic Tongue ONLY. Henk. +/datum/emote/living/carbon/human/robot_tongue/warn + key = "warn" + key_third_person = "warn" + message = "blares an alarm!" -/datum/emote/living/carbon/human/robot_tongue/clown/can_run_emote(mob/user, status_check = TRUE , intentional) - if(!..()) - return FALSE - if(user.mind.assigned_role == "Clown") - return TRUE +/datum/emote/living/carbon/human/robot_tongue/warn/run_emote(mob/user, params) + if(..()) + playsound(user.loc, 'sound/machines/warning-buzzer.ogg', 50) -/datum/emote/living/carbon/human/robot_tongue/clown/honk - key = "honk" - key_third_person = "honks" - message = "honks." +/datum/emote/living/carbon/human/robot_tongue/yes + key = "yes" + key_third_person = "yes" + message = "emits an affirmative blip." -/datum/emote/living/carbon/human/robot_tongue/clown/honk/run_emote(mob/user, params) +/datum/emote/living/carbon/human/robot_tongue/yes/run_emote(mob/user, params) if(..()) - playsound(user.loc, 'sound/items/bikehorn.ogg', 50) + playsound(user.loc, 'sound/machines/synth_yes.ogg', 50) + +// the following emote were originally clown-locked and synthetic exclusive +// since clowns have been removed I see no reason to let it collect dust -/datum/emote/living/carbon/human/robot_tongue/clown/sad +/datum/emote/living/carbon/human/robot_tongue/sad key = "sad" key_third_person = "plays a sad trombone..." message = "plays a sad trombone..." -/datum/emote/living/carbon/human/robot_tongue/clown/sad/run_emote(mob/user, params) +/datum/emote/living/carbon/human/robot_tongue/sad/run_emote(mob/user, params) if(..()) playsound(user.loc, 'sound/misc/sadtrombone.ogg', 50) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3b7d3f2f706..612800cb09f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -93,6 +93,10 @@ //Called when we bump onto a mob /mob/living/proc/MobBump(mob/M) + //No bumping/swapping/pushing others if you are on walk intent + if(m_intent == MOVE_INTENT_WALK) + return TRUE + //Even if we don't push/swap places, we "touched" them, so spread fire spreadFire(M) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 405cda36580..1f574f08a45 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -183,7 +183,7 @@ /mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE return TRUE @@ -274,7 +274,7 @@ if(cable) if(get_dist(src, cable) > 1) var/turf/T = get_turf(src) - T.visible_message("[cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.") + T.visible_message(span_warning("[cable] rapidly retracts back into its spool."), span_hear("You hear a click and the sound of wire spooling rapidly.")) QDEL_NULL(cable) if(hacking) process_hack() @@ -298,4 +298,17 @@ else if(istype(W, /obj/item/encryptionkey)) pai.radio.attackby(W, user, params) else - to_chat(user, "Encryption Key ports not configured.") + to_chat(user, span_alert("Encryption Key ports not configured.")) + +//Wipe +/mob/living/silicon/pai/verb/wipe_self() + var/confirm = alert("Are you sure you want to wipe your own personality? This is PERMANENT.", "Confirm Wipe", "Yes", "No") + if(confirm == "Yes") + var/turf/T = get_turf(src.loc) + T.visible_message( + span_notice("[src] flashes a message across its screen,\"Wiping core files. Please acquire a new personality to continue using pAI device functions.\""), null, \ + span_notice("[src] bleeps electronically.")) + death(FALSE) + ghostize(FALSE) // Disallows reentering body and disassociates mind + else + to_chat(src, "Aborting wipe attempt.") diff --git a/code/modules/mob/living/silicon/pai/pai_say.dm b/code/modules/mob/living/silicon/pai/pai_say.dm index b44d2cd0870..cb12258317b 100644 --- a/code/modules/mob/living/silicon/pai/pai_say.dm +++ b/code/modules/mob/living/silicon/pai/pai_say.dm @@ -5,4 +5,4 @@ ..(message) /mob/living/silicon/pai/binarycheck() - return 0 + return radio?.translate_binary diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 08e41f3bee4..061c4a74a4b 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -355,6 +355,7 @@ GLOBAL_LIST_INIT(pai_faces_icons, list( if("encryptionkeys") if(href_list["toggle"]) encryptmod = TRUE + radio.subspace_transmission = TRUE if("translator") if(href_list["toggle"]) //This is permanent. diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 44413137451..08adddd7dad 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -25,12 +25,10 @@ message = "chimes." sound = 'sound/machines/chime.ogg' -/datum/emote/silicon/honk - key = "honk" - key_third_person = "honks" - message = "honks." - vary = TRUE - sound = 'sound/items/bikehorn.ogg' +/datum/emote/silicon/no + key = "no" + message = "emits an negative blip." + sound = 'sound/machines/synth_no.ogg' /datum/emote/silicon/ping key = "ping" @@ -48,3 +46,8 @@ key = "warn" message = "blares an alarm!" sound = 'sound/machines/warning-buzzer.ogg' + +/datum/emote/silicon/yes + key = "yes" + message = "emits an affirmative blip." + sound = 'sound/machines/synth_yes.ogg' diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index a3102c6dfdf..74489d8b84f 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -179,6 +179,7 @@ return id_card.registered_name = new_name id_card.update_label() + id_card.update_appearance() playsound(computer, "terminal_type", 50, FALSE) return TRUE if("PRG_assign") diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm index 1779192f0cb..bbd56e89209 100644 --- a/code/modules/overmap/ships/controlled_ship_datum.dm +++ b/code/modules/overmap/ships/controlled_ship_datum.dm @@ -36,9 +36,13 @@ var/list/datum/mission/missions /// The maximum number of currently active missions that a ship may take on. var/max_missions = 2 - /// Manifest list of people on the ship + + /// Manifest list of people on the ship. Indexed by mob REAL NAME. value is JOB INSTANCE var/list/manifest = list() + /// List of mob refs indexed by their job instance + var/list/datum/weakref/job_holder_refs = list() + var/list/datum/mind/owner_candidates /// The mob of the current ship owner. Tracking mostly uses this; that lets us pick up on logouts, which let us @@ -130,6 +134,7 @@ if(!QDELETED(shipkey)) QDEL_NULL(shipkey) QDEL_LIST(manifest) + job_holder_refs.Cut() job_slots.Cut() blacklisted.Cut() for(var/a_key in applications) @@ -298,6 +303,10 @@ if(!owner_mob) set_owner_mob(H) + if(!(human_job in job_holder_refs)) + job_holder_refs[human_job] = list() + job_holder_refs[human_job] += WEAKREF(H) + /datum/overmap/ship/controlled/proc/set_owner_mob(mob/new_owner) if(owner_mob) // we (hopefully) don't have to hook qdeletion, diff --git a/code/modules/overmap/ships/owner_action.dm b/code/modules/overmap/ships/owner_action.dm index 04169054b2e..96c97bdf542 100644 --- a/code/modules/overmap/ships/owner_action.dm +++ b/code/modules/overmap/ships/owner_action.dm @@ -65,6 +65,34 @@ ui = new(user, src, "ShipOwner", name) ui.open() +/datum/action/ship_owner/proc/allow_job_slot_increase(datum/job/job_target) + var/default_slots = parent_ship.source_template.job_slots[job_target] + var/current_slots = parent_ship.job_slots[job_target] + + var/used_slots = 0 + var/job_holders = parent_ship.job_holder_refs[job_target] + + for(var/datum/weakref/job_holder_ref as anything in job_holders) + var/mob/living/job_holder = job_holder_ref.resolve() + if(isnull(job_holder)) + continue + + if(job_holder.client) + used_slots += 1 + continue + + var/mob/dead/observer/job_holder_ghost + for(var/mob/dead/observer/ghost in GLOB.dead_mob_list) + if(ghost.mind == job_holder.mind) + job_holder_ghost = ghost + break + if(!isnull(job_holder_ghost)) + used_slots += 1 + continue + + var/actual_slots = current_slots + used_slots + return actual_slots < default_slots + /datum/action/ship_owner/ui_data(mob/user) . = list() .["memo"] = parent_ship.memo @@ -72,6 +100,7 @@ .["pending"] = FALSE .["joinMode"] = parent_ship.join_mode .["cooldown"] = COOLDOWN_TIMELEFT(parent_ship, job_slot_adjustment_cooldown) + .["isAdmin"] = !!user.client?.holder .["applications"] = list() for(var/a_key as anything in parent_ship.applications) var/datum/ship_application/app = parent_ship.applications[a_key] @@ -85,6 +114,10 @@ text = app.app_msg, status = app.status )) + var/list/job_increase_allowed = list() + for(var/datum/job/job as anything in parent_ship.job_slots) + job_increase_allowed[job.name] = allow_job_slot_increase(job) + .["jobIncreaseAllowed"] = job_increase_allowed /datum/action/ship_owner/ui_static_data(mob/user) . = list() @@ -197,18 +230,21 @@ if(!target_job || target_job.officer || !COOLDOWN_FINISHED(parent_ship, job_slot_adjustment_cooldown)) return TRUE + var/change_amount = params["delta"] + if(change_amount > 0 && !allow_job_slot_increase(target_job)) + if(!user.client.holder) + to_chat(user, span_warning("You cannot increase the number of slots for this job.")) + return TRUE + message_admins("[key_name_admin(user)] has increased the number of slots for [target_job.name] on [parent_ship.name] by [change_amount].") + + var/new_amount = parent_ship.job_slots[target_job] + change_amount var/job_default_slots = parent_ship.source_template.job_slots[target_job] var/job_max_slots = min(job_default_slots * 2, job_default_slots + 3) - var/new_slots = parent_ship.job_slots[target_job] + params["delta"] - if(new_slots < 0 || new_slots > job_max_slots) + if(new_amount < 0 || new_amount > job_max_slots) return TRUE - var/cooldown_time = 5 SECONDS - if(params["delta"] > 0 && new_slots > job_default_slots) - cooldown_time = 2 MINUTES - COOLDOWN_START(parent_ship, job_slot_adjustment_cooldown, cooldown_time * cooldown_coeff) - - parent_ship.job_slots[target_job] = new_slots + COOLDOWN_START(parent_ship, job_slot_adjustment_cooldown, (5 SECONDS) * cooldown_coeff) + parent_ship.job_slots[target_job] = new_amount update_static_data(user) return TRUE diff --git a/code/modules/paperwork/biscuit.dm b/code/modules/paperwork/biscuit.dm new file mode 100644 index 00000000000..38776e5005b --- /dev/null +++ b/code/modules/paperwork/biscuit.dm @@ -0,0 +1,104 @@ +/obj/item/folder/biscuit + name = "\proper biscuit card" + desc = "An biscuit card. Has label which says DO NOT DIGEST." + icon_state = "paperbiscuit" + bg_color = "#ffffff" + w_class = WEIGHT_CLASS_TINY + max_integrity = 130 + drop_sound = 'sound/items/handling/disk_drop.ogg' + pickup_sound = 'sound/items/handling/disk_pickup.ogg' + /// Is biscuit cracked open or not? + var/cracked = FALSE + +/obj/item/folder/biscuit/update_overlays() + . = ..() + if(contents.len) //This is to prevent the not-sealed biscuit to have the folder_paper overlay when it gets sealed + . -= "folder_paper" + if(cracked) //Shows overlay only when it has content and is cracked open + . += "paperbiscuit_paper" + +///Checks if the biscuit has been already cracked. If its not then it dipsplays "unopened!" ballon alert. If it is cracked then it lets the code continue. +/obj/item/folder/biscuit/proc/crack_check(mob/user) + if (cracked) + return TRUE + balloon_alert(user, "unopened!") + return FALSE + +/obj/item/folder/biscuit/examine() + . = ..() + if(!cracked) + . += span_notice("To reach contents you need to crack it open.") + +//All next is done so you can't reach contents, or put any new contents when its not cracked open +/obj/item/folder/biscuit/remove_item(obj/item/item, mob/user) + if (!crack_check(user)) + return + + return ..() + +/obj/item/folder/biscuit/attack_hand(mob/user, list/modifiers) + if (LAZYACCESS(modifiers, RIGHT_CLICK) && !crack_check(user)) + return + + return ..() + +/obj/item/folder/biscuit/attackby(obj/item/weapon, mob/user, params) + if (is_type_in_typecache(weapon, folder_insertables) && !crack_check(user)) + return + + return ..() + +/obj/item/folder/biscuit/attack_self(mob/user) + add_fingerprint(user) + if (!cracked) + if (tgui_alert(user, "Do you want to crack it open?", "Biscuit Cracking", list("Yes", "No")) != "Yes") + return + cracked = TRUE + playsound(get_turf(user), 'sound/effects/snap.ogg', 60) + icon_state = "[icon_state]_cracked" + update_appearance() + + ui_interact(user) +//Corporate "confidental" biscuit cards +/obj/item/folder/biscuit/confidental + name = "\proper confidental biscuit card" + desc = "An confidental biscuit card. In a tasteful blue color with NT logo, looks like a chocolate bar. Has label which says DO NOT DIGEST." + icon_state = "paperbiscuit_secret" + bg_color = "#355e9f" + +//Biscuits which start not-sealed/cracked initially for the crafting, printing and such +/obj/item/folder/biscuit/unsealed + name = "\proper biscuit card" + desc = "An biscuit card. Has a label which says DO NOT DIGEST." + icon_state = "paperbiscuit_cracked" + cracked = TRUE + ///Was the biscuit already sealed by players? To prevent several tgui alerts + var/sealed = FALSE + ///What is the sprite for when its not cracked? As it starts already cracked, and for re-sealing needs to have a sprite + var/not_cracked_icon = "paperbiscuit" + +/obj/item/folder/biscuit/unsealed/examine() + . = ..() + if(!sealed) + . += span_notice("This one have not been sealed yet. You many insert anything to seal it by pressing it in hand. Once sealed, the contents are inaccessible until cracked open (irreversible).") + +//Asks if you want to seal the biscuit, after you do that it behaves like normal paper biscuit. +/obj/item/folder/biscuit/unsealed/attack_self(mob/user) + add_fingerprint(user) + if (!sealed) + if (tgui_alert(user, "Do you want to seal it? You must crack it open to reach the contents again!", "Biscuit Sealing", list("Yes", "No")) != "Yes") + return + cracked = FALSE + sealed = TRUE + playsound(get_turf(user), 'sound/items/tape.ogg', 60) + icon_state = "[not_cracked_icon]" + update_appearance() + + return ..() + +/obj/item/folder/biscuit/unsealed/confidental + name = "\proper confidental biscuit card" + desc = "An confidental biscuit card. In a tasteful blue color with NT logo, looks like a chocolate bar. To reach contents you need to crack it open. Has label which says DO NOT DIGEST." + icon_state = "paperbiscuit_secret_cracked" + bg_color = "#355e9f" + not_cracked_icon = "paperbiscuit_secret" diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 5fb2731c7b4..bbf0f59afe9 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -17,7 +17,7 @@ . = ..() if(copied) return - . += span_notice("Right-click to tear off the carbon-copy (you must use both hands).") + . += span_notice("Alt-click to tear off the carbon-copy (you must use both hands).") /obj/item/paper/carbon/proc/removecopy(mob/living/user) if(copied) @@ -34,3 +34,8 @@ /obj/item/paper/carbon_copy icon_state = "cpaper" + +/obj/item/paper/carbon/AltClick(mob/living/carbon/user, obj/item/I) + . = ..() + if(!copied) + removecopy(user) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 462c75c1818..54b9b8268cf 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -1,3 +1,6 @@ +/** + * Clipboard + */ /obj/item/clipboard name = "clipboard" icon = 'icons/obj/bureaucracy.dmi' @@ -7,115 +10,166 @@ w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 7 - var/obj/item/pen/haspen //The stored pen. - var/obj/item/paper/toppaper //The topmost piece of paper. slot_flags = ITEM_SLOT_BELT resistance_flags = FLAMMABLE + // The stored pen + var/obj/item/pen/pen + +// Weakref of the topmost piece of paper +// +// This is used for the paper displayed on the clipboard's icon +// and it is the one attacked, when attacking the clipboard. +// (As you can't organise contents directly in BYOND) + + var/datum/weakref/toppaper_ref /obj/item/clipboard/Initialize() update_appearance() . = ..() /obj/item/clipboard/Destroy() - QDEL_NULL(haspen) - QDEL_NULL(toppaper) //let movable/Destroy handle the rest + QDEL_NULL(pen) return ..() +/obj/item/clipboard/examine() + . = ..() + if(pen) + . += "Alt-click to remove [pen]." + var/obj/item/paper/toppaper = toppaper_ref?.resolve() + if(toppaper) + . += "Ctrl-click to remove [toppaper]." + +/// Take out the topmost paper +/obj/item/clipboard/proc/remove_paper(obj/item/paper/paper, mob/user) + if(!istype(paper)) + return + paper.forceMove(user.loc) + user.put_in_hands(paper) + to_chat(user, "You remove [paper] from [src].") + var/obj/item/paper/toppaper = toppaper_ref?.resolve() + if(paper == toppaper) + toppaper_ref = null + var/obj/item/paper/newtop = locate(/obj/item/paper) in src + if(newtop && (newtop != paper)) + toppaper_ref = WEAKREF(newtop) + else + toppaper_ref = null + update_icon() + +/obj/item/clipboard/proc/remove_pen(mob/user) + pen.forceMove(user.loc) + user.put_in_hands(pen) + to_chat(user, "You remove [pen] from [src].") + pen = null + update_icon() + +/obj/item/clipboard/AltClick(mob/user) + ..() + if(pen) + remove_pen(user) + /obj/item/clipboard/update_overlays() . = ..() + var/obj/item/paper/toppaper = toppaper_ref?.resolve() if(toppaper) . += toppaper.icon_state . += toppaper.overlays - if(haspen) + if(pen) . += "clipboard_pen" . += "clipboard_over" -/obj/item/clipboard/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/paper)) - if(!user.transferItemToLoc(W, src)) +/obj/item/clipboard/CtrlClick(mob/user) + var/obj/item/paper/toppaper = toppaper_ref?.resolve() + remove_paper(toppaper, user) + return TRUE + +/obj/item/clipboard/attackby(obj/item/weapon, mob/user, params) + var/obj/item/paper/toppaper = toppaper_ref?.resolve() + if(istype(weapon, /obj/item/paper)) + //Add paper into the clipboard + if(!user.transferItemToLoc(weapon, src)) return - toppaper = W - to_chat(user, "You clip the paper onto \the [src].") - update_appearance() + toppaper_ref = WEAKREF(weapon) + to_chat(user, "You clip [weapon] onto [src].") + else if(istype(weapon, /obj/item/pen) && !pen) + //Add a pen into the clipboard, attack (write) if there is already one + if(!usr.transferItemToLoc(weapon, src)) + return + pen = weapon + to_chat(usr, "You slot [weapon] into [src].") else if(toppaper) toppaper.attackby(user.get_active_held_item(), user) - update_appearance() - + update_appearance() /obj/item/clipboard/attack_self(mob/user) - var/dat = "Clipboard" - if(haspen) - dat += "Remove Pen
" - else - dat += "Add Pen
" - - //The topmost paper. You can't organise contents directly in byond, so this is what we're stuck with. -Pete - if(toppaper) - var/obj/item/paper/P = toppaper - dat += "Write Remove - [P.name]
" - - for(P in src) - if(P == toppaper) - continue - dat += "Write Remove Move to top - [P.name]
" - user << browse(dat, "window=clipboard") - onclose(user, "clipboard") add_fingerprint(usr) + ui_interact(user) + return + +/obj/item/clipboard/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Clipboard") + ui.open() + +/obj/item/clipboard/ui_data(mob/user) + // prepare data for TGUI + var/list/data = list() + data["pen"] = "[pen]" + + var/obj/item/paper/toppaper = toppaper_ref?.resolve() + data["top_paper"] = "[toppaper]" + data["top_paper_ref"] = "[REF(toppaper)]" + + data["paper"] = list() + data["paper_ref"] = list() + for(var/obj/item/paper/paper in src) + if(paper == toppaper) + continue + data["paper"] += "[paper]" + data["paper_ref"] += "[REF(paper)]" + + return data + +/obj/item/clipboard/ui_act(action, params) + . = ..() + if(.) + return - -/obj/item/clipboard/Topic(href, href_list) - ..() if(usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED)) return - if(usr.contents.Find(src)) - - if(href_list["pen"]) - if(haspen) - haspen.forceMove(usr.loc) - usr.put_in_hands(haspen) - haspen = null - - if(href_list["addpen"]) - if(!haspen) - var/obj/item/held = usr.get_active_held_item() - if(istype(held, /obj/item/pen)) - var/obj/item/pen/W = held - if(!usr.transferItemToLoc(W, src)) - return - haspen = W - to_chat(usr, "You slot [W] into [src].") - - if(href_list["write"]) - var/obj/item/P = locate(href_list["write"]) in src - if(istype(P)) - if(usr.get_active_held_item()) - P.attackby(usr.get_active_held_item(), usr) - - if(href_list["remove"]) - var/obj/item/P = locate(href_list["remove"]) in src - if(istype(P)) - P.forceMove(usr.loc) - usr.put_in_hands(P) - if(P == toppaper) - toppaper = null - var/obj/item/paper/newtop = locate(/obj/item/paper) in src - if(newtop && (newtop != P)) - toppaper = newtop - else - toppaper = null - - if(href_list["read"]) - var/obj/item/paper/P = locate(href_list["read"]) in src - if(istype(P)) - usr.examinate(P) - - if(href_list["top"]) - var/obj/item/P = locate(href_list["top"]) in src - if(istype(P)) - toppaper = P - to_chat(usr, "You move [P.name] to the top.") - - //Update everything - attack_self(usr) - update_appearance() + switch(action) + // Take the pen out + if("remove_pen") + if(pen) + remove_pen(usr) + . = TRUE + // Take paper out + if("remove_paper") + var/obj/item/paper/paper = locate(params["ref"]) in src + if(istype(paper)) + remove_paper(paper, usr) + . = TRUE + // Look at (or edit) the paper + if("edit_paper") + var/obj/item/paper/paper = locate(params["ref"]) in src + if(istype(paper)) + paper.ui_interact(usr) + update_icon() + . = TRUE + // Move paper to the top + if("move_top_paper") + var/obj/item/paper/paper = locate(params["ref"]) in src + if(istype(paper)) + toppaper_ref = WEAKREF(paper) + to_chat(usr, "You move [paper] to the top.") + update_icon() + . = TRUE + // Rename the paper (it's a verb) + if("rename_paper") + var/obj/item/paper/paper = locate(params["ref"]) in src + if(istype(paper)) + paper.rename() + update_icon() + . = TRUE diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 0dd736ce993..23e5155fabf 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -299,12 +299,14 @@ id.access = get_all_accesses()+get_all_centcom_access() id.assignment = "Captain" id.update_label() + id.update_appearance() else id = new /obj/item/card/id/gold(user.loc) id.registered_name = user.real_name id.access = get_all_accesses()+get_all_centcom_access() id.assignment = "Captain" id.update_label() + id.update_appearance() if(worn) if(istype(worn, /obj/item/pda)) var/obj/item/pda/PDA = worn diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index e41aaa6fe91..cb5a025da47 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -48,6 +48,7 @@ /obj/item/spacecash, /obj/item/holochip, /obj/item/card, + /obj/item/folder/biscuit ) /// Internal radio for announcing over comms var/obj/item/radio/radio @@ -63,7 +64,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) ) @@ -87,6 +88,7 @@ /obj/machinery/fax/ruin visible_to_network = FALSE + special_networks = list() /obj/machinery/fax/ruin/Initialize(mapload) . = ..() @@ -96,6 +98,7 @@ GLOB.fax_machines -= src QDEL_NULL(loaded_item_ref) QDEL_NULL(wires) + QDEL_NULL(radio) return ..() /obj/machinery/fax/update_overlays() @@ -500,6 +503,55 @@ frontier_network = TRUE visible_to_network = FALSE +/obj/machinery/fax/inteq + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "IRMG Mothership", fax_id = "inteq", color = "yellow", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + +/obj/machinery/fax/clip + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "Colonial League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + +/obj/machinery/fax/indie + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + +/obj/machinery/fax/nanotrasen + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "Nanotrasen Central Command", fax_id = "nanotrasen", color = "green", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + +/obj/machinery/fax/syndicate + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", 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) + ) + +/obj/machinery/fax/solgov + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + +/obj/machinery/fax/roumain + special_networks = list( + list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE), + list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE), + list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE) + ) + + /obj/machinery/fax/admin name = "Central Command Fax Machine" fax_name = "Nanotrasen Central Command" @@ -529,7 +581,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/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 62aa60b70c1..72f5d1326ea 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -30,6 +30,9 @@ /obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete icon_state = "tallcabinet" +/obj/structure/filingcabinet/wide + icon_state = "widecabinet" + /obj/structure/filingcabinet/double name = "filing cabinets" icon_state = "doublefilingcabinet" @@ -37,6 +40,9 @@ /obj/structure/filingcabinet/double/grey icon_state = "doubletallcabinet" +/obj/structure/filingcabinet/double/grey + icon_state = "doublewidecabinet" + /obj/structure/filingcabinet/Initialize(mapload) . = ..() if(mapload) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 01f4547f048..ad18b2bcd0b 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -6,141 +6,116 @@ w_class = WEIGHT_CLASS_SMALL pressure_resistance = 2 resistance_flags = FLAMMABLE + /// The background color for tgui in hex (with a `#`) + var/bg_color = "#7f7f7f" + /// A typecache of the objects that can be inserted into a folder + var/static/list/folder_insertables = typecacheof(list( + /obj/item/paper, + /obj/item/photo, + /obj/item/documents + )) + +/obj/item/folder/Initialize() + update_icon() + . = ..() + +/obj/item/folder/Destroy() + for(var/obj/important_thing in contents) + if(!(important_thing.resistance_flags & INDESTRUCTIBLE)) + continue + important_thing.forceMove(drop_location()) //don't destroy round critical content such as objective documents. + return ..() -/obj/item/folder/blue - desc = "A blue folder." - icon_state = "folder_blue" +/obj/item/folder/examine() + . = ..() + if(contents) + . += "Alt-click to remove [contents[1]]." -/obj/item/folder/red - desc = "A red folder." - icon_state = "folder_red" +/obj/item/folder/proc/rename(mob/user) + if(!user.is_literate()) + to_chat(user, "You scribble illegibly on the cover of [src]!") + return -/obj/item/folder/yellow - desc = "A yellow folder." - icon_state = "folder_yellow" + var/inputvalue = stripped_input(user, "What would you like to label the folder?", "Folder Labelling", "", MAX_NAME_LEN) -/obj/item/folder/white - desc = "A white folder." - icon_state = "folder_white" + if(!inputvalue) + return -/obj/item/folder/solgov - desc = "A blue folder with a SolGov seal." - icon_state = "folder_solgov" + if(user.canUseTopic(src, BE_CLOSE)) + name = "folder[(inputvalue ? " - '[inputvalue]'" : null)]" -/obj/item/folder/terragov - desc = "A green folder with a Terran Regency seal." - icon_state = "folder_terragov" +/obj/item/folder/proc/remove_item(obj/item/Item, mob/user) + if(istype(Item)) + Item.forceMove(user.loc) + user.put_in_hands(Item) + to_chat(user, "You remove [Item] from [src].") + update_icon() + +/obj/item/folder/AltClick(mob/user) + ..() + if(contents) + remove_item(contents[1], user) /obj/item/folder/update_overlays() . = ..() if(contents.len) . += "folder_paper" - -/obj/item/folder/attackby(obj/item/W, mob/user, params) - if(burn_paper_product_attackby_check(W, user)) +/obj/item/folder/attackby(obj/item/weapon, mob/user, params) + if(burn_paper_product_attackby_check(weapon, user)) return - if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/documents) || istype(W, /obj/item/disk)) - if(!user.transferItemToLoc(W, src)) + if(is_type_in_typecache(weapon, folder_insertables)) + /// Add paper, photo or documents into the folder + if(!user.transferItemToLoc(weapon, src)) return - to_chat(user, "You put [W] into [src].") + to_chat(user, "You put [weapon] into [src].") update_appearance() - else if(istype(W, /obj/item/pen)) - if(!user.is_literate()) - to_chat(user, "You scribble illegibly on the cover of [src]!") - return - - var/inputvalue = stripped_input(user, "What would you like to label the folder?", "Folder Labelling", "", MAX_NAME_LEN) - - if(!inputvalue) - return - - if(user.canUseTopic(src, BE_CLOSE)) - name = "folder[(inputvalue ? " - '[inputvalue]'" : null)]" - + else if(istype(weapon, /obj/item/pen)) + rename(user) /obj/item/folder/attack_self(mob/user) - var/dat = "[name]" - - for(var/obj/item/I in src) - dat += "Remove - [I.name]
" - user << browse(dat, "window=folder") - onclose(user, "folder") add_fingerprint(usr) + ui_interact(user) + return + +/obj/item/folder/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Folder") + ui.open() + +/obj/item/folder/ui_data(mob/user) + var/list/data = list() + if(istype(src, /obj/item/folder/syndicate || /obj/item/folder/documents/syndicate)) + data["theme"] = "syndicate" + data["bg_color"] = "[bg_color]" + data["folder_name"] = "[name]" + + data["contents"] = list() + data["contents_ref"] = list() + for(var/Content in src) + data["contents"] += "[Content]" + data["contents_ref"] += "[REF(Content)]" + + return data + +/obj/item/folder/ui_act(action, params) + . = ..() + if(.) + return - -/obj/item/folder/Topic(href, href_list) - ..() if(usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED)) return - if(usr.contents.Find(src)) - - if(href_list["remove"]) - var/obj/item/I = locate(href_list["remove"]) in src - if(istype(I)) - I.forceMove(usr.loc) - usr.put_in_hands(I) - - if(href_list["read"]) - var/obj/item/I = locate(href_list["read"]) in src - if(istype(I)) - usr.examinate(I) - - //Update everything - attack_self(usr) - update_appearance() - -/obj/item/folder/documents - name = "folder- 'TOP SECRET'" - desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\"" - -/obj/item/folder/documents/Initialize() - . = ..() - new /obj/item/documents/nanotrasen(src) - update_appearance() - -/obj/item/folder/syndicate - icon_state = "folder_syndie" - name = "folder- 'TOP SECRET'" - desc = "A folder stamped \"Top Secret - Property of The Syndicate.\"" - -/obj/item/folder/syndicate/red - icon_state = "folder_sred" - -/obj/item/folder/syndicate/red/Initialize() - . = ..() - new /obj/item/documents/syndicate/red(src) - update_appearance() - -/obj/item/folder/syndicate/blue - icon_state = "folder_sblue" - -/obj/item/folder/syndicate/blue/Initialize() - . = ..() - new /obj/item/documents/syndicate/blue(src) - update_appearance() - -/obj/item/folder/syndicate/mining/Initialize() - . = ..() - new /obj/item/documents/syndicate/mining(src) - update_appearance() - -/obj/item/folder/solgov/red - desc = "A blue folder with a SolGov seal." - icon_state = "folder_solgovred" - -/obj/item/folder/solgov/red/Initialize() - . = ..() - new /obj/item/documents/solgov(src) - update_appearance() - - -/obj/item/folder/terragov/red - desc = "A green folder with a Terran Regency seal." - icon_state = "folder_terragovred" - -/obj/item/folder/terragov/red/Initialize() - . = ..() - new /obj/item/documents/terragov(src) - update_appearance() + switch(action) + // Take item out + if("remove") + var/obj/item/Item = locate(params["ref"]) in src + remove_item(Item, usr) + . = TRUE + // Inspect the item + if("examine") + var/obj/item/Item = locate(params["ref"]) in src + if(istype(Item)) + usr.examinate(Item) + . = TRUE diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm new file mode 100644 index 00000000000..a919dce944c --- /dev/null +++ b/code/modules/paperwork/folders_premade.dm @@ -0,0 +1,63 @@ +/obj/item/folder/blue + desc = "A blue folder." + icon_state = "folder_blue" + +/obj/item/folder/red + desc = "A red folder." + icon_state = "folder_red" + +/obj/item/folder/yellow + desc = "A yellow folder." + icon_state = "folder_yellow" + +/obj/item/folder/white + desc = "A white folder." + icon_state = "folder_white" + +/obj/item/folder/solgov + desc = "A blue folder with a SolGov seal." + icon_state = "folder_solgov" + +/obj/item/folder/terragov + desc = "A green folder with a Terran Regency seal." + icon_state = "folder_terragov" + +/obj/item/folder/syndicate + desc = "A folder with a Syndicate color scheme." + icon_state = "folder_syndie" + +/obj/item/folder/documents + var/document = /obj/item/documents/nanotrasen + name = "folder- 'TOP SECRET'" + desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\"" + +/obj/item/folder/documents/Initialize() + . = ..() + new document(src) + update_appearance() + +/obj/item/folder/documents/syndicate + icon_state = "folder_syndie" + name = "folder- 'TOP SECRET'" + desc = "A folder stamped \"Top Secret - Property of The Syndicate.\"" + +/obj/item/folder/documents/syndicate/red + document = /obj/item/documents/syndicate/red + icon_state = "folder_sred" + +/obj/item/folder/documents/syndicate/blue + document = /obj/item/documents/syndicate/blue + icon_state = "folder_sblue" + +/obj/item/folder/documents/syndicate/mining + document = /obj/item/documents/syndicate/mining + +/obj/item/folder/documents/solgov + document = /obj/item/documents/solgov + desc = "A blue folder with a SolGov seal." + icon_state = "folder_solgovred" + +/obj/item/folder/documents/terragov + document = /obj/item/documents/terragov + desc = "A green folder with a Terran Regency seal." + icon_state = "folder_terragovred" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index e30a2bdd973..d858d7a290e 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -489,8 +489,8 @@ var/obj/item/clipboard/clipboard = loc // This is just so you can still use a stamp if you're holding one. Otherwise, it'll // use the clipboard's pen, if applicable. - if(!istype(holding, /obj/item/stamp) && clipboard.haspen) - holding = clipboard.haspen + if(!istype(holding, /obj/item/stamp) && clipboard.pen) + holding = clipboard.pen data["held_item_details"] = istype(holding) ? holding.get_writing_implement_details() : null @@ -562,8 +562,8 @@ var/obj/item/clipboard/clipboard = loc // This is just so you can still use a stamp if you're holding one. Otherwise, it'll // use the clipboard's pen, if applicable. - if(!istype(holding, /obj/item/stamp) && clipboard.haspen) - holding = clipboard.haspen + if(!istype(holding, /obj/item/stamp) && clipboard.pen) + holding = clipboard.pen // As of the time of writing, can_write outputs a message to the user so we don't have to. if(!user.can_write(holding)) @@ -602,8 +602,8 @@ var/obj/item/clipboard/clipboard = loc // This is just so you can still use a stamp if you're holding one. Otherwise, it'll // use the clipboard's pen, if applicable. - if(!istype(holding, /obj/item/stamp) && clipboard.haspen) - holding = clipboard.haspen + if(!istype(holding, /obj/item/stamp) && clipboard.pen) + holding = clipboard.pen // As of the time of writing, can_write outputs a message to the user so we don't have to. if(!user.can_write(holding)) diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 1c1ebd86336..20ff55f0d78 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -28,7 +28,7 @@ /obj/item/papercutter/attackby(obj/item/P, mob/user, params) - if(istype(P, /obj/item/paper) && !storedpaper) + if(istype(P, /obj/item/paper) && !storedpaper && !istype(P, /obj/item/paper/paperslip)) if(!user.transferItemToLoc(P, src)) return playsound(loc, "pageturn", 60, TRUE) @@ -71,8 +71,8 @@ to_chat(user, "You neatly cut [storedpaper].") storedpaper = null qdel(storedpaper) - new /obj/item/paperslip(get_turf(src)) - new /obj/item/paperslip(get_turf(src)) + new /obj/item/paper/paperslip(get_turf(src)) + new /obj/item/paper/paperslip(get_turf(src)) update_appearance() /obj/item/papercutter/MouseDrop(atom/over_object) @@ -89,24 +89,25 @@ M.putItemFromInventoryInHandIfPossible(src, H.held_index) add_fingerprint(M) -/obj/item/paperslip +/obj/item/paper/paperslip name = "paper slip" desc = "A little slip of paper left over after a larger piece was cut. Whoa." icon_state = "paperslip" - icon = 'icons/obj/bureaucracy.dmi' - resistance_flags = FLAMMABLE - max_integrity = 50 - -/obj/item/paperslip/attackby(obj/item/I, mob/living/user, params) - if(burn_paper_product_attackby_check(I, user)) - return - return ..() - -/obj/item/paperslip/Initialize() - . = ..() - pixel_x = base_pixel_x + rand(-5, 5) - pixel_y = base_pixel_y + rand(-5, 5) + lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' + grind_results = list(/datum/reagent/cellulose = 1.5) //It's a normal paper sheet divided in 2. 3 divided by 2 equals 1.5, this way you can't magically dupe cellulose + +/obj/item/paper/paperslip/corporate //More fancy and sturdy paper slip which is a "plastic card", used for things like spare ID safe code + name = "corporate plastic card" + desc = "A plastic card for confidental corporate matters. Can be written on with pen somehow." + icon_state = "corppaperslip" + grind_results = list(/datum/reagent/plastic_polymers = 1.5) //It's a plastic card after all + max_integrity = 130 //Slightly more sturdy because of being made out of a plastic + drop_sound = 'sound/items/handling/disk_drop.ogg' + pickup_sound = 'sound/items/handling/disk_pickup.ogg' + throw_range = 6 + throw_speed = 2 /obj/item/hatchet/cutterblade diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 4de28c0c213..2578fc97961 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/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 6b04646697e..e5df30533e3 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -1,3 +1,5 @@ +//TODO: make this code more readable. weird var names, convoluted logic, etc + //Boxes of ammo /obj/item/ammo_box name = "ammo box (null_reference_exception)" @@ -61,7 +63,7 @@ return b ///puts a round into the magazine -/obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = 0) +/obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = FALSE) // Boxes don't have a caliber type, magazines do. Not sure if it's intended or not, but if we fail to find a caliber, then we fall back to ammo_type. if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type)) return FALSE @@ -87,31 +89,31 @@ /obj/item/ammo_box/proc/can_load(mob/user) return TRUE -/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = FALSE, replace_spent = 0) +/obj/item/ammo_box/attackby(obj/item/attacking_obj, mob/user, params, silent = FALSE, replace_spent = FALSE) var/num_loaded = 0 if(!can_load(user)) return - if(istype(A, /obj/item/ammo_box)) - var/obj/item/ammo_box/AM = A - for(var/obj/item/ammo_casing/AC in AM.stored_ammo) - if(!((instant_load && AM.instant_load) || (stored_ammo.len >= max_ammo) || do_after_mob(user, list(AM), 1 SECONDS,))) + if(istype(attacking_obj, /obj/item/ammo_box)) + var/obj/item/ammo_box/attacking_box = attacking_obj + for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) + if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after_mob(user, list(attacking_box), 1 SECONDS))) break - var/did_load = give_round(AC, replace_spent) + var/did_load = give_round(casing_to_insert, replace_spent) if(!did_load) break - AM.stored_ammo -= AC + attacking_box.stored_ammo -= casing_to_insert if(!silent) - playsound(get_turf(AM), 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) //src is nullspaced, which means internal magazines won't properly play sound, thus we use AM + playsound(get_turf(attacking_box), 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) //src is nullspaced, which means internal magazines won't properly play sound, thus we use attacking_box num_loaded++ - A.update_appearance() + attacking_obj.update_appearance() update_appearance() - if(istype(A, /obj/item/ammo_casing)) - var/obj/item/ammo_casing/AC = A - if(give_round(AC, replace_spent)) - user.transferItemToLoc(AC, src, TRUE) + if(istype(attacking_obj, /obj/item/ammo_casing)) + var/obj/item/ammo_casing/casing_to_insert = attacking_obj + if(give_round(casing_to_insert, replace_spent)) + user.transferItemToLoc(casing_to_insert, src, TRUE) if(!silent) - playsound(AC, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) + playsound(casing_to_insert, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) num_loaded++ update_appearance() diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index c58035ef95f..fbd5ddd214d 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -402,9 +402,9 @@ /obj/item/ammo_box/c8x50mm_box name = "ammo box (8x50mm)" desc = "A box of standard 8x50mm ammo." - icon_state = "8x50mm" + icon_state = "8x50mmbox" ammo_type = /obj/item/ammo_casing/a8_50r - max_ammo = 50 + max_ammo = 20 /obj/item/ammo_box/ferropelletbox name = "ammo box (ferromagnetic pellets)" @@ -429,7 +429,7 @@ /obj/item/ammo_box/c8x50mmhp_box name = "ammo box (8x50mm)" - desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of ." - icon_state = "8x50mm-hp" + desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration.." + icon_state = "8x50mmbox-hp" ammo_type = /obj/item/ammo_casing/a8_50rhp max_ammo = 20 diff --git a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm index e0314f5decd..160e1bd5066 100644 --- a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm +++ b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm @@ -5,8 +5,8 @@ max_ammo = 7 instant_load = TRUE -/obj/item/ammo_box/magazine/internal/cylinder/get_round(keep = 0) - rotate() +/obj/item/ammo_box/magazine/internal/cylinder/get_round(keep = FALSE, counter_clockwise = FALSE) + rotate(counter_clockwise) var/b = stored_ammo[1] if(!keep) @@ -14,10 +14,16 @@ return b -/obj/item/ammo_box/magazine/internal/cylinder/proc/rotate() - var/b = stored_ammo[1] - stored_ammo.Cut(1,2) - stored_ammo.Insert(0, b) +/obj/item/ammo_box/magazine/internal/cylinder/proc/rotate(counter_clockwise = FALSE) + var/b + if(!counter_clockwise) + b = stored_ammo[1] + stored_ammo.Cut(1,2) + stored_ammo.Insert(0, b) + else + b = stored_ammo[max_ammo] + stored_ammo.Cut(max_ammo,max_ammo+1) + stored_ammo.Insert(1, b) /obj/item/ammo_box/magazine/internal/cylinder/proc/spin() for(var/i in 1 to rand(0, max_ammo*2)) @@ -31,6 +37,8 @@ L.Add(bullet) if(drop_list)//We have to maintain the list size, to emulate a cylinder stored_ammo[i] = null + else + L.Add(null) return L /obj/item/ammo_box/magazine/internal/cylinder/give_round(obj/item/ammo_casing/R, replace_spent = 0) @@ -48,3 +56,41 @@ return TRUE return FALSE + +/obj/item/ammo_box/magazine/internal/cylinder/attackby(obj/item/attacking_obj, mob/user, params, silent = FALSE, replace_spent = FALSE) + var/num_loaded = 0 + if(!can_load(user)) + return + if(istype(attacking_obj, /obj/item/ammo_box)) + var/obj/item/ammo_box/attacking_box = attacking_obj + var/list/ammo_list_no_empty = ammo_list(FALSE) + listclearnulls(ammo_list_no_empty) + for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) + if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after_mob(user, list(attacking_box), 1 SECONDS))) //stupid work around for revolvers + break + var/did_load = give_round(casing_to_insert, replace_spent) + if(!did_load) + break + attacking_box.stored_ammo -= casing_to_insert + if(!silent) + playsound(get_turf(attacking_box), 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) //src is nullspaced, which means internal magazines won't properly play sound, thus we use attacking_box + num_loaded++ + ammo_list_no_empty = ammo_list(FALSE) + listclearnulls(ammo_list_no_empty) + attacking_obj.update_appearance() + update_appearance() + + if(istype(attacking_obj, /obj/item/ammo_casing)) + var/obj/item/ammo_casing/casing_to_insert = attacking_obj + if(give_round(casing_to_insert, replace_spent)) + user.transferItemToLoc(casing_to_insert, src, TRUE) + if(!silent) + playsound(casing_to_insert, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) + num_loaded++ + update_appearance() + + + if(num_loaded) + if(!silent) + to_chat(user, "You load [num_loaded] cartridge\s into \the [src]!") + return num_loaded diff --git a/code/modules/projectiles/boxes_magazines/internal/_internal.dm b/code/modules/projectiles/boxes_magazines/internal/_internal.dm index c14e66af82c..1f9b6fcdae3 100644 --- a/code/modules/projectiles/boxes_magazines/internal/_internal.dm +++ b/code/modules/projectiles/boxes_magazines/internal/_internal.dm @@ -2,7 +2,3 @@ desc = "Oh god, this shouldn't be here" flags_1 = CONDUCT_1 item_flags = ABSTRACT - -//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in -/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R) - return ..(R,1) diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm index 0c3bdac1be3..43748f7afe7 100644 --- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm +++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm @@ -35,4 +35,8 @@ ammo_type = /obj/item/ammo_casing/c45 caliber = ".45" max_ammo = 6 + instant_load = FALSE + +/obj/item/ammo_box/magazine/internal/cylinder/rev45/montagne + name = "montagne revolver cylinder" instant_load = TRUE diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f6470af9a84..e9354e68d9d 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -134,6 +134,9 @@ ///If the saftey on? If so, we can't fire the weapon var/safety = FALSE + ///The wording of safety. Useful for guns that have a non-standard safety system, like a revolver + var/safety_wording = "safety" + /obj/item/gun/Initialize() . = ..() RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) @@ -237,6 +240,7 @@ //called after the gun has successfully fired its chambered ammo. /obj/item/gun/proc/process_chamber() + SEND_SIGNAL(src, COMSIG_GUN_CHAMBER_PROCESSED) return FALSE //check if there's enough ammo/energy/whatever to shoot one time @@ -260,9 +264,9 @@ if(muzzle_flash && !muzzle_flash.applied) handle_muzzle_flash(user, muzzle_angle) - if(wielded_fully && recoil) + if(wielded_fully) simulate_recoil(user, recoil, actual_angle) - else if(!wielded_fully && recoil_unwielded) + else if(!wielded_fully) simulate_recoil(user, recoil_unwielded, actual_angle) if(suppressed) @@ -540,8 +544,8 @@ if(!silent) playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE) user.visible_message( - span_notice("[user] turns the safety on [src] [safety ? "ON" : "OFF"]."), - span_notice("You turn the safety on [src] [safety ? "ON" : "OFF"]."), + span_notice("[user] turns the [safety_wording] on [src] [safety ? "ON" : "OFF"]."), + span_notice("You turn the [safety_wording] on [src] [safety ? "ON" : "OFF"]."), ) update_appearance() @@ -735,9 +739,9 @@ var/mutable_appearance/safety_overlay safety_overlay = mutable_appearance('icons/obj/guns/safety.dmi') if(safety) - safety_overlay.icon_state = "safety-on" + safety_overlay.icon_state = "[safety_wording]-on" else - safety_overlay.icon_state = "safety-off" + safety_overlay.icon_state = "[safety_wording]-off" . += safety_overlay /obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params, bypass_timer) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index be6811bda2e..f2cb9504dde 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -88,7 +88,6 @@ var/recent_rack = 0 ///Whether the gun can be sawn off by sawing tools var/can_be_sawn_off = FALSE - var/flip_cooldown = 0 ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it var/tac_reloads = TRUE //Snowflake mechanic no more. @@ -157,6 +156,7 @@ chambered = null if (chamber_next_round && (magazine?.max_ammo > 1)) chamber_round() + SEND_SIGNAL(src, COMSIG_GUN_CHAMBER_PROCESSED) ///Used to chamber a new round and eject the old one /obj/item/gun/ballistic/proc/chamber_round(keep_bullet = FALSE) @@ -269,7 +269,7 @@ if (chambered && !chambered.BB) chambered.on_eject() chambered = null - var/num_loaded = magazine.attackby(A, user, params, TRUE) + var/num_loaded = magazine.attackby(A, user, params) if (num_loaded) to_chat(user, "You load [num_loaded] [cartridge_wording]\s into \the [src].") playsound(src, load_sound, load_sound_volume, load_sound_vary) @@ -359,19 +359,6 @@ return ..() /obj/item/gun/ballistic/unique_action(mob/living/user) - if(HAS_TRAIT(user, TRAIT_GUNFLIP)) - if(flip_cooldown <= world.time) - if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40)) - to_chat(user, "While trying to flip the [src] you pull the trigger and accidently shoot yourself!") - var/flip_mistake = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST) - process_fire(user, user, FALSE, flip_mistake) - user.dropItemToGround(src, TRUE) - return - flip_cooldown = (world.time + 30) - SpinAnimation(7,1) - user.visible_message("[user] spins the [src] around their finger by the trigger. That’s pretty badass.") - playsound(src, 'sound/items/handling/ammobox_pickup.ogg', 20, FALSE) - return if(bolt_type == BOLT_TYPE_NO_BOLT) chambered = null var/num_unloaded = 0 diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm index 565a0e20a0c..d0b69480a10 100644 --- a/code/modules/projectiles/guns/ballistic/assault.dm +++ b/code/modules/projectiles/guns/ballistic/assault.dm @@ -14,6 +14,22 @@ rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg' spread_unwielded = 20 +/obj/item/gun/ballistic/automatic/assault/calculate_recoil(mob/user, recoil_bonus = 0) + var/gunslinger_bonus = 2 + var/total_recoil = recoil_bonus + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_recoil += gunslinger_bonus + total_recoil = clamp(total_recoil,0,INFINITY) + return total_recoil + +/obj/item/gun/ballistic/automatic/assault/calculate_spread(mob/user, bonus_spread) + var/gunslinger_bonus = 8 + var/total_spread = bonus_spread + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_spread += gunslinger_bonus + total_spread = clamp(total_spread,0,INFINITY) + return total_spread + /obj/item/gun/ballistic/automatic/assault/skm name = "\improper SKM-24" desc = "An obsolete model of assault rifle once used by CLIP. Legendary for its durability and low cost, surplus rifles are commonplace on the Frontier, and the design has been widely copied. Chambered in 7.62x40mm CLIP." @@ -84,7 +100,7 @@ /obj/item/gun/ballistic/automatic/assault/p16/minutemen name = "\improper CM-16" - desc = "The standard-issue rifle of the Colonial Minutemen and an extensively modified reproduction of the P-16. Chambered in 5.56mm." + desc = "The standard-issue rifle of CLIP and an extensively modified reproduction of the P-16. Chambered in 5.56mm." icon_state = "cm16" item_state = "cm16" diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 7cbd8574ba8..ec57fd58802 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -134,6 +134,7 @@ righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi' icon_state = "ebr" item_state = "ebr" + zoomable = TRUE mag_display = TRUE weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_BULKY @@ -148,11 +149,12 @@ /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" item_state = "gal" + zoomable = TRUE mag_display = TRUE weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_BULKY @@ -167,7 +169,7 @@ /obj/item/gun/ballistic/automatic/gal/inteq name = "\improper SsG-04" - desc = "A marksman rifle purchased from the Colonial Minutemen and modified to suit IRMG's needs. Chambered in .308." + desc = "A marksman rifle purchased from CLIP and modified to suit IRMG's needs. Chambered in .308." icon_state = "gal-inteq" item_state = "gal-inteq" diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm index 6efc37761ee..3bd143e98b4 100644 --- a/code/modules/projectiles/guns/ballistic/hmg.dm +++ b/code/modules/projectiles/guns/ballistic/hmg.dm @@ -114,17 +114,23 @@ retract_bipod(user=user) /obj/item/gun/ballistic/automatic/hmg/calculate_recoil(mob/user, recoil_bonus = 0) + var/gunslinger_bonus = 1 var/total_recoil = recoil_bonus if(bipod_deployed) total_recoil += deploy_recoil_bonus - total_recoil = clamp(total_recoil,0,INFINITY) + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_recoil += gunslinger_bonus + total_recoil = clamp(total_recoil,0,INFINITY) return total_recoil /obj/item/gun/ballistic/automatic/hmg/calculate_spread(mob/user, bonus_spread) + var/gunslinger_bonus = 4 var/total_spread = bonus_spread if(bipod_deployed) total_spread += deploy_spread_bonus - total_spread = clamp(total_spread,0,INFINITY) + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_spread += gunslinger_bonus + total_spread = clamp(total_spread,0,INFINITY) return total_spread diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 4047f54590b..abbf62543f9 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -1,3 +1,11 @@ +#define REVOLVER_ROTATE_LEFT "rotate chamber left" +#define REVOLVER_ROTATE_RIGHT "rotate chamber right" +#define REVOLVER_AUTO_ROTATE_RIGHT_LOADING "auto rotate right when loading ammo" +#define REVOLVER_AUTO_ROTATE_LEFT_LOADING "auto rotate left when loading ammo" +#define REVOLVER_EJECT_CURRENT "eject current bullet" +#define REVOLVER_EJECT_ALL "auto eject all bullets" +#define REVOLVER_FLIP "flip the revolver by the trigger" + /obj/item/gun/ballistic/revolver name = "\improper .357 revolver" desc = "A weighty revolver with a Scarborough Arms logo engraved on the barrel. Uses .357 ammo." //usually used by syndicates @@ -20,30 +28,47 @@ fire_delay = 2 spread_unwielded = 15 recoil = 0.5 - recoil_unwielded = 1 + recoil_unwielded = 2 semi_auto = FALSE bolt_wording = "hammer" + dry_fire_sound = 'sound/weapons/gun/general/bolt_drop.ogg' + dry_fire_text = "snap" wield_slowdown = 0.3 - has_safety = FALSE //irl revolvers dont have safetys. i think. maybe - safety = FALSE + safety_wording = "hammer" + + var/gate_loaded = FALSE //for stupid wild west shit + var/gate_offset = 5 //for wild west shit 2: instead of ejecting the chambered round, eject the next round if 1 + var/gate_load_direction = REVOLVER_AUTO_ROTATE_RIGHT_LOADING //when we load ammo with a box, which direction do we rotate the cylinder? unused with normal revolvers + + COOLDOWN_DECLARE(flip_cooldown) /obj/item/gun/ballistic/revolver/examine(mob/user) . = ..() . += "You can use the revolver with your other empty hand to empty the cylinder." +/obj/item/gun/ballistic/revolver/update_overlays() + . = ..() + if(semi_auto) + return + if(current_skin) + . += "[unique_reskin[current_skin]][safety ? "_hammer_up" : "_hammer_down"]" + else + . += "[base_icon_state || initial(icon_state)][safety ? "_hammer_up" : "_hammer_down"]" + + +/obj/item/gun/ballistic/revolver/process_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE) + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) + return ..() + /obj/item/gun/ballistic/revolver/attack_hand(mob/user) if(loc == user && user.is_holding(src)) - chambered = null - var/num_unloaded = 0 - for(var/obj/item/ammo_casing/CB in get_ammo_list(FALSE, TRUE)) - CB.forceMove(drop_location()) - CB.bounce_away(FALSE, NONE) - num_unloaded++ - SSblackbox.record_feedback("tally", "station_mess_created", 1, CB.name) + var/num_unloaded = unload_all_ammo(user) if (num_unloaded) to_chat(user, "You unload [num_unloaded] [cartridge_wording]\s from [src].") - playsound(user, eject_sound, eject_sound_volume, eject_sound_vary) + if(!gate_loaded) + playsound(user, eject_sound, eject_sound_volume, eject_sound_vary) + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) update_appearance() return else @@ -51,28 +76,267 @@ else return ..() +/obj/item/gun/ballistic/revolver/proc/unload_all_ammo(mob/living/user) + var/num_unloaded = 0 + + if(!gate_loaded) //"normal" revolvers + for(var/obj/item/ammo_casing/casing_to_eject in get_ammo_list(FALSE, TRUE)) + if(!casing_to_eject) + continue + casing_to_eject.forceMove(drop_location()) + casing_to_eject.bounce_away(FALSE, NONE) + num_unloaded++ + SSblackbox.record_feedback("tally", "station_mess_created", 1, casing_to_eject.name) + chamber_round(FALSE) + return num_unloaded + else + var/num_to_unload = magazine.max_ammo + if(!get_ammo_list(FALSE)) + return num_unloaded + + for(var/i in 1 to num_to_unload) + var/doafter_time = 0.4 SECONDS + if(!do_mob(user,user,doafter_time)) + break + if(!eject_casing()) + doafter_time = 0 SECONDS + else + num_unloaded++ + if(!do_mob(user,user,doafter_time)) + break + chamber_round(TRUE, TRUE) + + if (num_unloaded) + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) + update_appearance() + return num_unloaded + +/obj/item/gun/ballistic/revolver/proc/eject_casing(mob/living/user, obj/item/ammo_casing/casing_to_eject, casing_index) + var/list/rounds = magazine.ammo_list() + if(!casing_to_eject) + casing_to_eject = rounds[gate_offset+1] //byond arrays start at 1, so we add 1 to get the correct index + if(!casing_to_eject) //if theres STILL nothing, we cancel this + if(user) + to_chat(user, "There's nothing in the gate to eject from [src]!") + return FALSE + playsound(src, eject_sound, eject_sound_volume, eject_sound_vary) + casing_to_eject.forceMove(drop_location()) + casing_to_eject.bounce_away(FALSE, NONE) + SSblackbox.record_feedback("tally", "station_mess_created", 1, casing_to_eject.name) + if(!gate_loaded) + magazine.stored_ammo[casing_index] = null + chamber_round(FALSE) + else + magazine.stored_ammo[gate_offset+1] = null + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) + update_appearance() + + + if(user) + to_chat(user, "You eject the [cartridge_wording] from [src].") + return TRUE + +/obj/item/gun/ballistic/revolver/proc/insert_casing(mob/living/user, obj/item/ammo_casing/casing_to_insert, allow_ejection) + if(!casing_to_insert) + return FALSE + var/list/rounds = magazine.ammo_list() + var/obj/item/ammo_casing/slot = rounds[gate_offset+1] //byond arrays start at 1, so we add 1 to get the correct index + var/doafter_time = 0.4 SECONDS + if(!gate_loaded) //"normal" revolvers + for(var/i in 1 to magazine.stored_ammo.len) + var/obj/item/ammo_casing/casing_to_eject = magazine.stored_ammo[i] + if(casing_to_eject) + if(!casing_to_eject.BB && allow_ejection) + eject_casing(user, casing_to_eject, i) + + casing_to_eject = magazine.stored_ammo[i] //check again + if(casing_to_eject) + continue + else + magazine.stored_ammo[i] = casing_to_insert + casing_to_insert.forceMove(magazine) + chamber_round(FALSE) + break + else + if(slot) + if(!slot.BB && allow_ejection) + if(do_mob(user,user,doafter_time)) + eject_casing(user) + + rounds = magazine.ammo_list() + slot = rounds[gate_offset+1] //check again + if(slot) + to_chat(user, "There's already a casing in the gate of [src]!") + return FALSE + + magazine.stored_ammo[gate_offset+1] = casing_to_insert + casing_to_insert.forceMove(magazine) + + playsound(src, load_sound, load_sound_volume, load_sound_vary) + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) + update_appearance() + if(user) + to_chat(user, "You load the [cartridge_wording] into [src].") + return TRUE + + + +/obj/item/gun/ballistic/revolver/attackby(obj/item/attacking_obj, mob/user, params) + if (istype(attacking_obj, /obj/item/ammo_casing) || istype(attacking_obj, /obj/item/ammo_box)) + if(istype(attacking_obj, /obj/item/ammo_casing)) + insert_casing(user, attacking_obj, TRUE) + else + var/obj/item/ammo_box/attacking_box = attacking_obj + var/num_loaded = 0 + var/num_to_load = magazine.max_ammo + var/list/ammo_list_no_empty = get_ammo_list(FALSE) + listclearnulls(ammo_list_no_empty) + + if(ammo_list_no_empty.len >= num_to_load) + to_chat(user, "There's no empty space in [src]!") + return TRUE + + if(!gate_loaded) //"normal" revolvers + var/i = 0 + for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) + if(!casing_to_insert || (magazine.caliber && casing_to_insert.caliber != magazine.caliber) || (!magazine.caliber && casing_to_insert.type != magazine.ammo_type)) + break + var/doafter_time = 0.8 SECONDS + if(magazine.instant_load && attacking_box.instant_load) + doafter_time = 0 SECONDS + if(!do_mob(user,user,doafter_time)) + break + if(!insert_casing(user, casing_to_insert, FALSE)) + break + else + num_loaded++ + attacking_box.update_appearance() + attacking_box.stored_ammo -= casing_to_insert + i++ + if(i >= num_to_load) + break + else + var/i = 0 + for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) + if(!casing_to_insert || (magazine.caliber && casing_to_insert.caliber != magazine.caliber) || (!magazine.caliber && casing_to_insert.type != magazine.ammo_type)) + break + var/doafter_time = 0.4 SECONDS + if(!do_mob(user,user,doafter_time)) + break + if(!insert_casing(null, casing_to_insert, FALSE)) + doafter_time = 0 SECONDS + else + num_loaded++ + attacking_box.update_appearance() + attacking_box.stored_ammo -= casing_to_insert + if(!do_mob(user,user,doafter_time)) + break + switch(gate_load_direction) + if(REVOLVER_AUTO_ROTATE_RIGHT_LOADING) + chamber_round(TRUE) + if(REVOLVER_AUTO_ROTATE_LEFT_LOADING) + chamber_round(TRUE, TRUE) + i++ + if(i >= num_to_load) + break + + if(num_loaded) + to_chat(user, "You load [num_loaded] [cartridge_wording]\s into [src].") + attacking_box.update_appearance() + update_appearance() + return TRUE + else + return ..() /obj/item/gun/ballistic/revolver/unique_action(mob/living/user) rack(user) return ///updates a bunch of racking related stuff and also handles the sound effects and the like -/obj/item/gun/ballistic/revolver/rack(mob/user = null) - if(user) +/obj/item/gun/ballistic/revolver/rack(mob/user = null, toggle_hammer = TRUE) + if(user && !semi_auto) + if(safety && toggle_hammer) + toggle_safety(user, FALSE, FALSE) + else if(toggle_hammer) + to_chat(user, "The [safety_wording] is already [safety ? "UP" : "DOWN"]! Use Ctrl-Click to disengage the [safety_wording]!") + return + else if(!semi_auto) + if(safety && toggle_hammer) + toggle_safety(null, FALSE, FALSE) + else if (toggle_hammer) + return + if(user && semi_auto) to_chat(user, "You rack the [bolt_wording] of \the [src].") + playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + chamber_round(TRUE) - playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + //playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) update_appearance() -/obj/item/gun/ballistic/revolver/chamber_round(spin_cylinder = TRUE) +/obj/item/gun/ballistic/revolver/chamber_round(spin_cylinder = TRUE, counter_clockwise = FALSE) if(spin_cylinder) - chambered = magazine.get_round(TRUE) + chambered = magazine.get_round(TRUE, counter_clockwise) + playsound(src, 'sound/weapons/gun/revolver/spin_single.ogg', 100, FALSE) else chambered = magazine.stored_ammo[1] + SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) /obj/item/gun/ballistic/revolver/AltClick(mob/user) - ..() - spin() + if (unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) + return ..() + + var/chamber_options = list( + REVOLVER_ROTATE_LEFT = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_left"), + REVOLVER_ROTATE_RIGHT = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_right"), + REVOLVER_AUTO_ROTATE_LEFT_LOADING = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_auto_left"), + REVOLVER_EJECT_ALL = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_eject_all"), + REVOLVER_EJECT_CURRENT = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_eject_one"), + REVOLVER_AUTO_ROTATE_RIGHT_LOADING = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_auto_right"), + REVOLVER_FLIP = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_revolver_flip"), + ) + + var/image/editing_image = chamber_options[gate_load_direction] + editing_image.icon_state = "radial_revolver_auto_[gate_load_direction == REVOLVER_AUTO_ROTATE_RIGHT_LOADING ? "right":"left"]_on" + + if(!HAS_TRAIT(user, TRAIT_GUNSLINGER)) //only gunslingers are allowed to flip + chamber_options -= REVOLVER_FLIP + + if(!gate_loaded) //these are completely redundant if you can reload everything with a speedloader + chamber_options -= REVOLVER_AUTO_ROTATE_LEFT_LOADING + chamber_options -= REVOLVER_AUTO_ROTATE_RIGHT_LOADING + chamber_options -= REVOLVER_EJECT_CURRENT + + + var/pick = show_radial_menu(user, src, chamber_options, custom_check = CALLBACK(src, PROC_REF(can_use_radial), user), require_near = TRUE) + switch(pick) + if(REVOLVER_ROTATE_LEFT) + chamber_round(TRUE, TRUE) + if(REVOLVER_ROTATE_RIGHT) + chamber_round(TRUE) + if(REVOLVER_AUTO_ROTATE_RIGHT_LOADING) + gate_load_direction = REVOLVER_AUTO_ROTATE_RIGHT_LOADING + if(REVOLVER_AUTO_ROTATE_LEFT_LOADING) + gate_load_direction = REVOLVER_AUTO_ROTATE_LEFT_LOADING + if(REVOLVER_EJECT_ALL) + unload_all_ammo(user) + return + if(REVOLVER_EJECT_CURRENT) + eject_casing(user) + if(REVOLVER_FLIP) + tryflip(user) + if(null) + return + AltClick(user) + +/obj/item/gun/ballistic/revolver/proc/can_use_radial(mob/user) + if(QDELETED(src)) + return FALSE + if(!istype(user)) + return FALSE + if(user.incapacitated()) + return FALSE + return TRUE /obj/item/gun/ballistic/revolver/verb/spin() set name = "Spin Chamber" @@ -109,6 +373,24 @@ boolets += magazine.ammo_count(countempties) return boolets +/obj/item/gun/ballistic/revolver/toggle_safety(mob/user, silent=FALSE, rack_gun=TRUE) + if(semi_auto)//apogee said double actions should have normal safeties, so... + return ..() + safety = !safety + + if(!silent) + playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) + if(user) + user.visible_message( + span_notice("[user] pulls the [safety_wording] on [src] [safety ? "UP" : "DOWN"]."), + span_notice("You pull the [safety_wording] on [src] [safety ? "UP" : "DOWN"]."), + ) + + update_appearance() + + if(rack_gun) + rack(toggle_hammer= FALSE) + /obj/item/gun/ballistic/revolver/examine(mob/user) . = ..() var/live_ammo = get_ammo(FALSE, FALSE) @@ -116,6 +398,64 @@ if (current_skin) . += "It can be spun with alt+click" +/obj/item/gun/ballistic/revolver/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) + var/fan = FALSE + if(HAS_TRAIT(user, TRAIT_GUNSLINGER) && !semi_auto && !wielded && loc == user && !safety && !user.get_inactive_held_item()) + fan = TRUE + . = ..() + if(fan) + rack() + to_chat(user, "You fan the [bolt_wording] of \the [src]!") + user.changeNext_move(CLICK_CD_RAPID) + +/obj/item/gun/ballistic/revolver/shoot_live_shot(mob/living/user, pointblank, atom/pbtarget, message) + . = ..() + if(!semi_auto) + toggle_safety(silent = TRUE, rack_gun = FALSE) + +/obj/item/gun/ballistic/revolver/shoot_with_empty_chamber(mob/living/user as mob|obj) + if(!safety) + to_chat(user, "*[dry_fire_text]*") + playsound(src, dry_fire_sound, 30, TRUE) + if(!semi_auto) + toggle_safety(silent = TRUE, rack_gun = FALSE) + return + to_chat(user, "The hammer is up on [src]! Pull it down to fire!") + +/obj/item/gun/ballistic/revolver/calculate_recoil(mob/user, recoil_bonus = 0) + var/gunslinger_bonus = -1 + var/total_recoil = recoil_bonus + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger bonus + total_recoil += gunslinger_bonus + total_recoil = clamp(total_recoil,0,INFINITY) + return total_recoil + +/obj/item/gun/ballistic/revolver/calculate_spread(mob/user, bonus_spread) + var/gunslinger_bonus = -4 + var/total_spread = bonus_spread + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger bonus + total_spread += gunslinger_bonus + total_spread = clamp(total_spread,0,INFINITY) + return total_spread + +/obj/item/gun/ballistic/revolver/pickup(mob/user) + . = ..() + tryflip(user) + +/obj/item/gun/ballistic/revolver/proc/tryflip(mob/living/user) + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) + if(COOLDOWN_FINISHED(src, flip_cooldown)) + if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40)) + to_chat(user, "While trying to flip the [src] you pull the trigger and accidently shoot yourself!") + var/flip_mistake = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST) + process_fire(user, user, FALSE, flip_mistake) + user.dropItemToGround(src, TRUE) + return + COOLDOWN_START(src, flip_cooldown, 0.3 SECONDS) + SpinAnimation(5,1) + user.visible_message("[user] spins the [src] around their finger by the trigger. That’s pretty badass.") + playsound(src, 'sound/items/handling/ammobox_pickup.ogg', 20, FALSE) + return /obj/item/gun/ballistic/revolver/detective name = "\improper HP Detective Special" desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds." @@ -123,6 +463,8 @@ icon_state = "detective" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 obj_flags = UNIQUE_RENAME + semi_auto = TRUE //double action + safety_wording = "safety" unique_reskin = list("Default" = "detective", "Stainless Steel" = "detective_stainless", "Gold Trim" = "detective_gold", @@ -132,7 +474,11 @@ ) manufacturer = MANUFACTURER_HUNTERSPRIDE - recoil = 0 //weaker than normal revovler, no recoil + recoil = 0 //weaker than normal revolver, no recoil + +/obj/item/gun/ballistic/revolver/detective/ComponentInitialize() + . = ..() + AddComponent(/datum/component/ammo_hud/revolver) //note that the hud at the moment only supports 6 round revolvers, 7 or 5 isn't supported rn /obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) if(magazine.caliber != initial(magazine.caliber)) @@ -185,6 +531,7 @@ icon_state = "mateba" manufacturer = MANUFACTURER_NONE semi_auto = TRUE + safety_wording = "safety" spread = 0 spread_unwielded = 7 @@ -199,15 +546,18 @@ /obj/item/gun/ballistic/revolver/montagne name = "\improper HP Montagne" - desc = "An ornate break-open revolver issued to high-ranking members of the Saint-Roumain Militia. Chambered in .38 Special." + desc = "An ornate break-open revolver issued to high-ranking members of the Saint-Roumain Militia. Chambered in .45." icon = 'icons/obj/guns/48x32guns.dmi' icon_state = "montagne" manufacturer = MANUFACTURER_HUNTERSPRIDE - spread_unwielded = 12 + spread_unwielded = 15 recoil = 0 - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38/big + mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45/montagne +/obj/item/gun/ballistic/revolver/montagne/ComponentInitialize() + . = ..() + AddComponent(/datum/component/ammo_hud/revolver) /obj/item/gun/ballistic/revolver/ashhand name = "HP Ashhand" @@ -217,15 +567,20 @@ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570 fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg' manufacturer = MANUFACTURER_HUNTERSPRIDE + gate_loaded = TRUE wield_slowdown = 0.5 spread_unwielded = 5 spread = 2 recoil = 2 - recoil_unwielded = 3 + recoil_unwielded = 4 // A gun to play Russian Roulette! // You can spin the chamber to randomize the position of the bullet. +/obj/item/gun/ballistic/revolver/ashhand/ComponentInitialize() + . = ..() + AddComponent(/datum/component/ammo_hud/revolver) + /obj/item/gun/ballistic/revolver/russian name = "\improper Russian revolver" desc = "A Solarian revolver for particularly lethal drinking games. It has a mechanism requiring you to spin the chamber before each trigger pull. Uses .357 ammo." @@ -338,6 +693,7 @@ spread_unwielded = 50 fire_delay = 0 semi_auto = TRUE + safety_wording = "safety" /obj/item/gun/ballistic/revolver/shadow name = "\improper HP Shadow" @@ -348,9 +704,26 @@ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45 manufacturer = MANUFACTURER_HUNTERSPRIDE obj_flags = UNIQUE_RENAME - unique_reskin = list("Default" = "shadow", + gate_loaded = TRUE + unique_reskin = list("Shadow" = "shadow", "Army" = "shadow_army", - "General" = "shadow_general" + "General" = "shadow_general", + "Frontier Scout" = "shadow_frontier", + "Nanotrasen Special" = "shadow_nanotrasen", + "Hired Gun" = "shadow_hiredgun", + "Buntline" = "shadow_buntline", + "Cavalry Special" = "shadow_cavalry" ) - recoil = 0 //weaker than normal revovler, no recoil + recoil = 0 //weaker than normal revolver, no recoil + +/obj/item/gun/ballistic/revolver/shadow/ComponentInitialize() + . = ..() + AddComponent(/datum/component/ammo_hud/revolver) + +/obj/item/gun/ballistic/revolver/shadow/before_firing(atom/target, mob/user) + . = ..() + // if you go through the pain of not only using this shitty gun, but also with the fucking gunslinger quirk, you deserve this bonus. not a BIG bonus, but enough as an incentive to make people actually take the quirk. + if(chambered.BB && (HAS_TRAIT(user, TRAIT_GUNSLINGER))) + chambered.BB.damage += 5 + chambered.armour_penetration += 5 diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 815dde789f3..737a0f4e202 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -1,5 +1,6 @@ /obj/item/gun/ballistic/shotgun name = "shotgun" + desc = "You feel as if you should make a 'adminhelp' if you see one of these, along with a 'github' report. You don't really understand what this means though." item_state = "shotgun" fire_sound = 'sound/weapons/gun/shotgun/shot.ogg' vary_fire_sound = FALSE @@ -41,6 +42,14 @@ return TRUE return FALSE +/obj/item/gun/ballistic/shotgun/calculate_recoil(mob/user, recoil_bonus = 0) + var/gunslinger_bonus = -1 + var/total_recoil = recoil_bonus + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger bonus + total_recoil += gunslinger_bonus + total_recoil = clamp(total_recoil,0,INFINITY) + return total_recoil + // BRIMSTONE SHOTGUN // /obj/item/gun/ballistic/shotgun/brimstone @@ -245,7 +254,7 @@ /obj/item/gun/ballistic/shotgun/bulldog/minutemen //TODO: REPATH name = "\improper CM-15" - desc = "A standard-issue shotgun of the Colonial Minutemen, most often used by boarding crews. Only compatible with specialized 8-round magazines." + desc = "A standard-issue shotgun of CLIP, most often used by boarding crews. Only compatible with specialized 8-round magazines." icon = 'icons/obj/guns/48x32guns.dmi' mag_type = /obj/item/ammo_box/magazine/cm15_mag icon_state = "cm15" @@ -609,18 +618,6 @@ recoil = 0 recoil_unwielded = 2 -//sawn off - weapon_weight = WEAPON_MEDIUM - - wield_slowdown = 0.25 - wield_delay = 0.2 SECONDS //THE COWBOY RIFLE - - spread = 4 - spread_unwielded = 12 - - recoil = 1 - recoil_unwielded = 2 - /obj/item/gun/ballistic/shotgun/flamingarrow/update_icon_state() . = ..() if(current_skin) @@ -629,6 +626,31 @@ icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""]" +/obj/item/gun/ballistic/shotgun/flamingarrow/rack(mob/user = null) + . = ..() + if(!wielded) + SpinAnimation(7,1) + + +/obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(mob/user) + . = ..() + if(.) + var/obj/item/ammo_box/magazine/internal/tube = magazine + tube.max_ammo = 7 + + item_state = "flamingarrow_sawn" + mob_overlay_state = item_state + weapon_weight = WEAPON_MEDIUM + + wield_slowdown = 0.25 + wield_delay = 0.2 SECONDS //THE COWBOY RIFLE + + spread = 4 + spread_unwielded = 12 + + recoil = 0 + recoil_unwielded = 3 + /obj/item/gun/ballistic/shotgun/flamingarrow/factory desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. This example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in .38." icon_state = "flamingarrow_factory" @@ -639,6 +661,7 @@ . = ..() if(.) item_state = "flamingarrow_factory_sawn" + mob_overlay_state = item_state /obj/item/gun/ballistic/shotgun/flamingarrow/bolt name = "HP Flaming Bolt" @@ -651,6 +674,7 @@ . = ..() if(.) item_state = "flamingbolt_sawn" + mob_overlay_state = item_state //Elephant Gun /obj/item/gun/ballistic/shotgun/doublebarrel/twobore diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm index 2d4e72ae873..ce740644d71 100644 --- a/code/modules/projectiles/guns/ballistic/smg.dm +++ b/code/modules/projectiles/guns/ballistic/smg.dm @@ -15,6 +15,22 @@ eject_sound = 'sound/weapons/gun/smg/smg_unload.ogg' eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg' +/obj/item/gun/ballistic/automatic/smg/calculate_recoil(mob/user, recoil_bonus = 0) + var/gunslinger_bonus = 1 + var/total_recoil = recoil_bonus + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_recoil += gunslinger_bonus + total_recoil = clamp(total_recoil,0,INFINITY) + return total_recoil + +/obj/item/gun/ballistic/automatic/smg/calculate_spread(mob/user, bonus_spread) + var/gunslinger_bonus = 4 + var/total_spread = bonus_spread + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_spread += gunslinger_bonus + total_spread = clamp(total_spread,0,INFINITY) + return total_spread + /obj/item/gun/ballistic/automatic/smg/proto name = "\improper Nanotrasen Saber SMG" desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock." @@ -243,7 +259,7 @@ /obj/item/gun/ballistic/automatic/smg/cm5 name = "\improper CM-5" - desc = "The standard issue SMG of the CMM. One of the few firearm designs that were left mostly intact from the designs found on the UNSV Lichtenstein. Chambered in 9mm." + desc = "The standard issue SMG of CLIP. One of the few firearm designs that were left mostly intact from the designs found on the UNSV Lichtenstein. Chambered in 9mm." icon_state = "cm5" item_state = "cm5" mag_type = /obj/item/ammo_box/magazine/smgm9mm @@ -258,6 +274,22 @@ /obj/item/gun/ballistic/automatic/smg/cm5/no_mag spawnwithmagazine = FALSE +/obj/item/gun/ballistic/automatic/smg/cm5/compact + name = "\improper CM-5c" + desc = "The compact conversion of the CM-5. While not exactly restricted, it is looked down upon due to CLIP's doctrine on medium-longrange combat, however it excels at close range and is very lightweight. You feel like this gun is mildly unfinished. Chambered in 9mm." + w_class = WEIGHT_CLASS_NORMAL + spread = 25 + spread_unwielded = 40 + + recoil = 1 + recoil_unwielded = 2 + wield_delay = 0.2 SECONDS + wield_slowdown = 0.15 + +/obj/item/gun/ballistic/automatic/smg/cm5/compact/ComponentInitialize() + . = ..() + AddComponent(/datum/component/automatic_fire, 0.8 SECONDS) + /obj/item/gun/ballistic/automatic/smg/skm_carbine name = "\improper SKM-24v" desc = "The SKM-24v was a carbine modification of the SKM-24 during the Frontiersmen War. This, however, is just a shoddy imitation of that carbine, effectively an SKM-24 with a sawed down barrel and a folding wire stock. Can be fired with the stock folded, though accuracy suffers. Chambered in 4.6x30mm." @@ -339,17 +371,25 @@ /obj/item/gun/ballistic/automatic/smg/skm_carbine/calculate_recoil(mob/user, recoil_bonus = 0) + var/gunslinger_bonus = 1 var/total_recoil = recoil_bonus if(!stock_folded) total_recoil += stock_recoil_bonus - total_recoil = clamp(total_recoil,0,INFINITY) + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_recoil += gunslinger_bonus + + total_recoil = clamp(total_recoil,0,INFINITY) return total_recoil /obj/item/gun/ballistic/automatic/smg/skm_carbine/calculate_spread(mob/user, bonus_spread) + var/gunslinger_bonus = 4 var/total_spread = bonus_spread if(!stock_folded) total_spread += stock_spread_bonus - total_spread = clamp(total_spread,0,INFINITY) + if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty + total_spread += gunslinger_bonus + + total_spread = clamp(total_spread,0,INFINITY) return total_spread /obj/item/gun/ballistic/automatic/smg/skm_carbine/update_icon_state() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index a6be53e82ea..a6e424901d5 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -31,6 +31,11 @@ var/big_gun = FALSE ///if the gun is big and can fit the comically large gun cell var/unscrewing_time = 20 ///Time it takes to unscrew the cell + ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it + var/tac_reloads = FALSE + ///If we allow tacitcal reloads, how long should it take to reload? + var/tactical_reload_delay = 1.2 SECONDS + var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg' //Sound when inserting magazine. UPDATE PLEASE var/eject_sound = 'sound/weapons/gun/general/magazine_remove_full.ogg' //Sound of ejecting a cell. UPDATE PLEASE var/sound_volume = 40 //Volume of loading/unloading sounds @@ -99,6 +104,13 @@ recharge_newshot(TRUE) update_appearance() +//ATTACK HAND IGNORING PARENT RETURN VALUE +/obj/item/gun/energy/attack_hand(mob/user) + if(!internal_cell && loc == user && user.is_holding(src) && cell && tac_reloads) + eject_cell(user) + return + return ..() + /obj/item/gun/energy/unique_action(mob/living/user) if(ammo_type.len > 1) select_fire(user) @@ -109,6 +121,10 @@ var/obj/item/stock_parts/cell/gun/C = A if (!cell) insert_cell(user, C) + else + if (tac_reloads) + eject_cell(user, C) + return ..() /obj/item/gun/energy/proc/insert_cell(mob/user, obj/item/stock_parts/cell/gun/C) @@ -128,18 +144,26 @@ to_chat(user, "You cannot seem to get \the [src] out of your hands!") return FALSE -/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/I) - to_chat(user, "You begin unscrewing and pulling out the cell...") - if(I.use_tool(src, user, unscrewing_time, volume=100)) - to_chat(user, "You remove the power cell.") - playsound(src, load_sound, sound_volume, load_sound_vary) - cell.forceMove(drop_location()) - var/obj/item/stock_parts/cell/gun/old_cell = cell - cell = null - user.put_in_hands(old_cell) - old_cell.update_appearance() - to_chat(user, "You pull the cell out of \the [src].") - update_appearance() +/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/stock_parts/cell/gun/tac_load = null) + playsound(src, load_sound, sound_volume, load_sound_vary) + cell.forceMove(drop_location()) + var/obj/item/stock_parts/cell/gun/old_cell = cell + old_cell.update_appearance() + cell = null + to_chat(user, "You pull the cell out of \the [src].") + update_appearance() + if(tac_load && tac_reloads) + if(do_after(user, tactical_reload_delay, TRUE, src)) + if(insert_cell(user, tac_load)) + to_chat(user, "You perform a tactical reload on \the [src].") + else + to_chat(user, "You dropped the old cell, but the new one doesn't fit. How embarassing.") + else + to_chat(user, "Your reload was interupted!") + return + + user.put_in_hands(old_cell) + update_appearance() /obj/item/gun/energy/get_gun_attachments() if(cell && !internal_cell) @@ -148,8 +172,9 @@ /obj/item/gun/energy/remove_gun_attachments(mob/living/user, obj/item/I, picked_option) if(picked_option == "Cell") - eject_cell(user, I) - return TRUE + if(I.use_tool(src, user, unscrewing_time, volume=100)) + eject_cell(user, I) + return TRUE ..() /obj/item/gun/energy/can_shoot(visuals) @@ -185,6 +210,7 @@ cell.use(shot.e_cost)//... drain the cell cell chambered = null //either way, released the prepared shot recharge_newshot() //try to charge a new shot + SEND_SIGNAL(src, COMSIG_GUN_CHAMBER_PROCESSED) /obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) if(!chambered && can_shoot()) diff --git a/code/modules/projectiles/guns/gunhud.dm b/code/modules/projectiles/guns/gunhud.dm new file mode 100644 index 00000000000..9d1a40db8bb --- /dev/null +++ b/code/modules/projectiles/guns/gunhud.dm @@ -0,0 +1,287 @@ +/* +* Customizable ammo hud +* - Adapted from SR's gun hud. Most of the bad stuff was cut out and sprites were mostly replace by some azlan did years ago. +* - var names and code have been cleaned up, for the most parts. There still some weirdly named stuff like the number hud (wtf does OTH even mean?) +* - Most of this SHOULDN'T be used yet, only instance of this being used at the moment is the revolver which has completely differnt behavior +*/ + +/* +* This hud is controlled namely by the ammo_hud component. Generally speaking this is inactive much like all other hud components until it's needed. +* It does not do any calculations of it's own, you must do this externally. +* If you wish to use this hud, use the ammo_hud component or create another one which interacts with it via the below procs. +* proc/turn_off +* proc/turn_on +* proc/set_hud +* Check the gun_hud.dmi for all available icons you can use. +*/ + +// Ammo counter +#define ui_ammocounter "EAST-1:28,CENTER+1:25" + +///The gun needs to update the gun hud! +#define COMSIG_UPDATE_AMMO_HUD "update_ammo_hud" + +/datum/hud + var/atom/movable/screen/ammo_counter + +/atom/movable/screen/ammo_counter + name = "ammo counter" + icon = 'icons/hud/gun_hud.dmi' + icon_state = "backing" + screen_loc = ui_ammocounter + invisibility = INVISIBILITY_ABSTRACT + + ///This is the color assigned to the OTH backing, numbers and indicator. + var/backing_color = COLOR_RED + /// The prefix used for the hud + var/prefix = "" + + //Below are the OTH numbers, these are assigned by oX, tX and hX, x being the number you wish to display(0-9) + ///OTH position X00 + var/oth_o + ///OTH position 0X0 + var/oth_t + ///OTH position 00X + var/oth_h + ///This is the custom indicator sprite that will appear in the box at the bottom of the ammo hud, use this for something like semi/auto toggle on a gun. + var/indicator + +///This proc simply resets the hud to standard and removes it from the players visible hud. +/atom/movable/screen/ammo_counter/proc/turn_off() + invisibility = INVISIBILITY_ABSTRACT + maptext = null + backing_color = COLOR_RED + oth_o = "" + oth_t = "" + oth_h = "" + indicator = "" + update_appearance() + +///This proc turns the hud on, but does not set it to anything other than the currently set values +/atom/movable/screen/ammo_counter/proc/turn_on() + invisibility = 0 + +///This is the main proc for altering the hud's appeareance, it controls the setting of the overlays. Use the OTH and below variables to set it accordingly. +/atom/movable/screen/ammo_counter/proc/set_hud(_backing_color, _oth_o, _oth_t, _oth_h, _indicator) + backing_color = _backing_color + oth_o = _oth_o + oth_t = _oth_t + oth_h = _oth_h + indicator = _indicator + + update_appearance() + +/atom/movable/screen/ammo_counter/update_overlays(list/rounds) + . = ..() + cut_overlays() + if(oth_o) + var/mutable_appearance/o_overlay = mutable_appearance(icon, oth_o) + o_overlay.color = backing_color + . += o_overlay + if(oth_t) + var/mutable_appearance/t_overlay = mutable_appearance(icon, oth_t) + t_overlay.color = backing_color + . += t_overlay + if(oth_h) + var/mutable_appearance/h_overlay = mutable_appearance(icon, oth_h) + h_overlay.color = backing_color + . += h_overlay + if(indicator) + var/mutable_appearance/indicator_overlay = mutable_appearance(icon, indicator) + indicator_overlay.color = backing_color + . += indicator_overlay + if(!rounds) + return + + for(var/image/round as anything in rounds) + add_overlay(round) + +//*////////////////////////////////////////////////////////////////////////////////////////////////////////////* + +/datum/component/ammo_hud + var/atom/movable/screen/ammo_counter/hud + /// The prefix used for the hud + var/prefix = "" + var/backing_color = "#FFFFFF" // why was this hardcoded dlfhakhjdfj + +/datum/component/ammo_hud/Initialize() + . = ..() + if(!istype(parent, /obj/item/gun) && !istype(parent, /obj/item/weldingtool)) + return COMPONENT_INCOMPATIBLE + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up)) + +/datum/component/ammo_hud/Destroy() + turn_off() + return ..() + +/datum/component/ammo_hud/proc/wake_up(datum/source, mob/user, slot) + SIGNAL_HANDLER + + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.is_holding(parent)) + if(H.hud_used) + hud = H.hud_used.ammo_counter + turn_on() + else + turn_off() + +/datum/component/ammo_hud/proc/turn_on() + SIGNAL_HANDLER + + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(turn_off)) + RegisterSignal(parent, list(COMSIG_UPDATE_AMMO_HUD, COMSIG_GUN_CHAMBER_PROCESSED), PROC_REF(update_hud)) + + hud.turn_on() + update_hud() + +/datum/component/ammo_hud/proc/turn_off() + SIGNAL_HANDLER + + UnregisterSignal(parent, list(COMSIG_ITEM_DROPPED, COMSIG_UPDATE_AMMO_HUD, COMSIG_GUN_CHAMBER_PROCESSED)) + + if(hud) + hud.turn_off() + hud = null + +/// Returns get_ammo() with the appropriate args passed to it - some guns like the revolver and bow are special cases +/datum/component/ammo_hud/proc/get_accurate_ammo_count(obj/item/gun/ballistic/the_gun) + // fucking revolvers indeed - do not count empty or chambered rounds for the display HUD + if(istype(the_gun, /obj/item/gun/ballistic/revolver)) + var/obj/item/gun/ballistic/revolver/the_revolver = the_gun + return the_revolver.get_ammo(countchambered = FALSE, countempties = FALSE) + + // bows are also weird and shouldn't count the chambered + if(istype(the_gun, /obj/item/gun/ballistic/bow)) + return the_gun.get_ammo(countchambered = FALSE) + + return the_gun.get_ammo(countchambered = TRUE) + +/datum/component/ammo_hud/proc/get_accurate_laser_count(obj/item/gun/energy/the_gun) + var/obj/item/ammo_casing/energy/current_mode = the_gun.chambered + if(!current_mode) + return FALSE + return round(the_gun.cell.charge/current_mode.e_cost) + +/datum/component/ammo_hud/proc/update_hud() + SIGNAL_HANDLER + var/obj/item/gun/ballistic/pew = parent + hud.maptext = null + hud.icon_state = "[prefix]backing" + if(!pew.magazine) + hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]no_mag") + return + if(!pew.get_ammo()) + hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]empty_flash") + return + + var/indicator + var/rounds = num2text(get_accurate_ammo_count(pew)) + var/oth_o + var/oth_t + var/oth_h + + switch(length(rounds)) + if(1) + oth_o = "[prefix]o[rounds[1]]" + if(2) + oth_o = "[prefix]o[rounds[2]]" + oth_t = "[prefix]t[rounds[1]]" + if(3) + oth_o = "[prefix]o[rounds[3]]" + oth_t = "[prefix]t[rounds[2]]" + oth_h = "[prefix]h[rounds[1]]" + else + oth_o = "[prefix]o9" + oth_t = "[prefix]t9" + oth_h = "[prefix]h9" + hud.set_hud(backing_color, oth_o, oth_t, oth_h, indicator) + +/datum/component/ammo_hud/laser/update_hud() + var/obj/item/gun/energy/pew = parent + hud.maptext = null + hud.icon_state = "[prefix]backing" + if(!pew.cell) + hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]no_mag") + return + if(!get_accurate_laser_count(pew)) + hud.set_hud(backing_color, "[prefix]oe", "[prefix]te", "[prefix]he", "[prefix]empty_flash") + return + + var/indicator + var/rounds = num2text(get_accurate_laser_count(pew)) + var/oth_o + var/oth_t + var/oth_h + + switch(length(rounds)) + if(1) + oth_o = "[prefix]o[rounds[1]]" + if(2) + oth_o = "[prefix]o[rounds[2]]" + oth_t = "[prefix]t[rounds[1]]" + if(3) + oth_o = "[prefix]o[rounds[3]]" + oth_t = "[prefix]t[rounds[2]]" + oth_h = "[prefix]h[rounds[1]]" + else + oth_o = "[prefix]o9" + oth_t = "[prefix]t9" + oth_h = "[prefix]h9" + hud.set_hud(backing_color, oth_o, oth_t, oth_h, indicator) + +/datum/component/ammo_hud/laser/cybersun + prefix = "cybersun_" + +/datum/component/ammo_hud/revolver + prefix = "revolver_" + +/// Returns get_ammo() with the appropriate args passed to it - some guns like the revolver and bow are special cases +/datum/component/ammo_hud/revolver/get_accurate_ammo_count(obj/item/gun/ballistic/revolver/the_gun) + if(istype(the_gun, /obj/item/gun/ballistic/revolver)) + var/obj/item/gun/ballistic/revolver/the_revolver = the_gun + if(the_revolver.magazine) + return the_revolver.magazine.ammo_list() + +/* //for counter-clockwise, kept here for reference + var/list/round_positions = list( + list("x" = 12,"y" = 22), + + list("x" = 20,"y" = 17), + list("x" = 20,"y" = 7 ), + list("x" = 12,"y" = 2 ), + list("x" = 4 ,"y" = 7 ), + list("x" = 4 ,"y" = 17) + ) +*/ + +/datum/component/ammo_hud/revolver/update_hud() + var/obj/item/gun/ballistic/revolver/pew = parent + hud.icon_state = "[prefix]backing" + + var/list/rounds = get_accurate_ammo_count(pew) + var/list/round_images = list() + var/list/round_positions = list( + list("x" = 12,"y" = 22), + + list("x" = 4 ,"y" = 17), + list("x" = 4 ,"y" = 7 ), + list("x" = 12,"y" = 2 ), + list("x" = 20,"y" = 7 ), + list("x" = 20,"y" = 17) + + ) + + var/bullet_count = 0 + for(var/obj/item/ammo_casing/bullet as anything in rounds) + bullet_count++ + if(!bullet) + continue + var/image/current_bullet_image = image(icon = 'icons/hud/gun_hud.dmi') + var/list/bullet_position = round_positions[bullet_count] + current_bullet_image.pixel_x = bullet_position["x"] + current_bullet_image.pixel_y = bullet_position["y"] + current_bullet_image.icon_state = "revolver_casing[bullet.BB ? "_live" : ""]" + round_images += current_bullet_image + + hud.update_overlays(round_images) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index e5f5f22db67..6682a9ba794 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -213,6 +213,9 @@ name = "epinephrine reserve tank" list_reagents = list(/datum/reagent/medicine/epinephrine = 50) +/obj/item/reagent_containers/glass/beaker/large/fuel + list_reagents = list(/datum/reagent/fuel = 100) + /obj/item/reagent_containers/glass/beaker/synthflesh list_reagents = list(/datum/reagent/medicine/synthflesh = 50) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 59e1ab84454..9bdc513289e 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/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 71d1ae74c0b..9e16f4fb18b 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -1198,3 +1198,20 @@ materials = list(/datum/material/iron = 200, /datum/material/glass = 200) build_path = /obj/item/fishing_rod category = list("initial","Misc","Equipment") + + +/datum/design/paper_biscuit + name = "Paper Biscuit" + id = "biscuit" + build_type = PROTOLATHE | AUTOLATHE + materials = list(/datum/material/plastic = 20) + build_path = /obj/item/folder/biscuit/unsealed + category = list("initial", "Tools", "Misc") + +/datum/design/paper_biscuit_confidental + name = "Confidental Paper Biscuit" + id = "confidental_biscuit" + build_type = PROTOLATHE | AUTOLATHE + materials = list(/datum/material/plastic = 30) + build_path = /obj/item/folder/biscuit/unsealed/confidental + category = list("initial", "Tools", "Misc") diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index bd801e60995..dfd373dcd3d 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -569,18 +569,18 @@ category = list("Phazon") //Exosuit Equipment -/datum/design/cmm_ripley_upgrade +/datum/design/clip_ripley_upgrade name = "Ripley MK-I to MK-IV conversion kit" - id = "cmm_ripley_upgrade" + id = "clip_ripley_upgrade" build_type = AUTOLATHE - build_path = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/cmm + build_path = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip materials = list(/datum/material/iron=10000,/datum/material/plasma=10000) construction_time = 100 category = list("Exosuit Equipment") -/datum/design/cmm_durand_upgrade +/datum/design/clip_durand_upgrade name = "Durand to Paladin conversion kit" - id = "cmm_durand_upgrade" + id = "clip_durand_upgrade" build_type = AUTOLATHE build_path = /obj/item/mecha_parts/mecha_equipment/conversion_kit/paladin materials = list(/datum/material/iron=10000,/datum/material/plasma=10000) diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 68eb25bf2b1..6574fc34922 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -66,4 +66,5 @@ /datum/surgery_step/mechanic_unwrench, /datum/surgery_step/extract_implant, /datum/surgery_step/mechanic_wrench, + /datum/surgery_step/close_hatch, /datum/surgery_step/mechanic_close) diff --git a/code/modules/surgery/ipc_revive.dm b/code/modules/surgery/ipc_revive.dm index 1077a147b4f..b224bc3a2b6 100644 --- a/code/modules/surgery/ipc_revive.dm +++ b/code/modules/surgery/ipc_revive.dm @@ -8,6 +8,7 @@ /datum/surgery_step/open_hatch, /datum/surgery_step/prepare_electronics, /datum/surgery_step/revive/ipc, + /datum/surgery_step/close_hatch, /datum/surgery_step/mechanic_close ) possible_locs = list(BODY_ZONE_CHEST) diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/limb_grafting.dm similarity index 86% rename from code/modules/surgery/prosthetic_replacement.dm rename to code/modules/surgery/limb_grafting.dm index 8b3d4aa1218..f3cc0d08d5c 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/limb_grafting.dm @@ -1,30 +1,35 @@ -/datum/surgery/prosthetic_replacement - name = "Prosthetic replacement" - steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/add_prosthetic) +// Formerly prosthetic_replacement.dm + +/datum/surgery/limb_grafting + name = "Limb grafting" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/graft_limb) target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD) requires_bodypart = FALSE //need a missing limb requires_bodypart_type = 0 -/datum/surgery/prosthetic_replacement/can_start(mob/user, mob/living/carbon/target) +/datum/surgery/limb_grafting/can_start(mob/user, mob/living/carbon/target) if(!iscarbon(target)) return 0 var/mob/living/carbon/C = target if(!C.get_bodypart(user.zone_selected)) //can only start if limb is missing return 1 -/datum/surgery_step/add_prosthetic - name = "add prosthetic" +/datum/surgery_step/graft_limb + name = "graft limb" implements = list( /obj/item/bodypart = 100, - /obj/item/organ_storage = 100, - /obj/item/chainsaw = 100, - /obj/item/melee/synthetic_arm_blade = 100) + /obj/item/organ_storage = 100) +// /obj/item/chainsaw = 100, +// /obj/item/melee/synthetic_arm_blade = 100) +// Frankly these have always bothered me. They fill like a bad fit for Shiptest. +// Marking out for now. Keeping the later code used to install unconventional prostheses just in case someone finds a good use for it. + time = 32 experience_given = MEDICAL_SKILL_ORGAN_FIX //won't get full XP if rejected var/organ_rejection_dam = 0 -/datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) +/datum/surgery_step/graft_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(istype(tool, /obj/item/organ_storage)) if(!tool.contents.len) to_chat(user, "There is nothing inside [tool]!") @@ -65,7 +70,7 @@ to_chat(user, "[tool] must be installed onto an arm.") return -1 -/datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) +/datum/surgery_step/graft_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) . = ..() if(istype(tool, /obj/item/organ_storage)) tool.icon_state = initial(tool.icon_state) diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm index f1fd128c2d9..3730f7cf130 100644 --- a/code/modules/surgery/mechanic_steps.dm +++ b/code/modules/surgery/mechanic_steps.dm @@ -112,3 +112,95 @@ display_results(user, target, "You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]...", "[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].", "[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].") + +//close hatch + +/datum/surgery_step/close_hatch + name = "close the hatch" + accept_hand = TRUE + time = 1 SECONDS + preop_sound = 'sound/machines/doorclick.ogg' + success_sound = 'sound/items/ratchet.ogg' + +/datum/surgery_step/close_hatch/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + display_results(user, target, "You begin to close the hatch holders in [target]'s [parse_zone(target_zone)]...", + "[user] begins to close the hatch holders in [target]'s [parse_zone(target_zone)].", + "[user] begins to close the hatch holders in [target]'s [parse_zone(target_zone)].") + +//manipulate organs (metal edition) +/datum/surgery_step/manipulate_organs/mechanic + name = "manipulate mechanical organs" + preop_sound = 'sound/surgery/organ2.ogg' + success_sound = 'sound/surgery/organ1.ogg' + implements_extract = list( + TOOL_HEMOSTAT = 55, + TOOL_CROWBAR = 100, + /obj/item/kitchen/fork = 35) + +//prosthesis removal +/datum/surgery_step/prosthesis_removal + name = "detach prosthesis" + accept_hand = TRUE //once a prosthesis is unseated, it should be a simple matter of removing it without tools + implements = list( + TOOL_WRENCH = 100, + TOOL_CROWBAR = 100) //exists just in case you want to reflavor your prosthesis as something a little more integrated + time = 2.8 SECONDS + preop_sound = 'sound/items/ratchet.ogg' + success_sound = 'sound/machines/doorclick.ogg' + +/datum/surgery_step/prosthesis_removal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + display_results(user, target, "You begin to unseat [target]'s [parse_zone(target_zone)]...", + "[user] begins to unseat [target]'s [parse_zone(target_zone)]!", + "[user] begins to unseat [target]'s [parse_zone(target_zone)]!") + +/datum/surgery_step/prosthesis_removal/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + var/mob/living/carbon/human/L = target + display_results(user, target, "You detach [L]'s [parse_zone(target_zone)].", + "[user] detaches [L]'s [parse_zone(target_zone)]!", + "[user] detaches [L]'s [parse_zone(target_zone)]!") + if(surgery.operated_bodypart) + var/obj/item/bodypart/target_limb = surgery.operated_bodypart + target_limb.drop_limb() + +//Add prosthetic +/datum/surgery_step/add_prosthetic + name = "add prosthetic" + implements = list( + /obj/item/bodypart = 100) + time = 32 + experience_given = MEDICAL_SKILL_ORGAN_FIX //won't get full XP if rejected + var/organ_rejection_dam = 0 + +/datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(!istype(tool, /obj/item/bodypart)) + to_chat(user, "[tool] isn't a mechanical prosthesis!") + return FALSE + var/obj/item/bodypart/BP = tool + if(ishuman(target)) + if(IS_ORGANIC_LIMB(BP)) + to_chat(user, "[BP] isn't a mechanical prosthesis!") + return -1 + + if(target_zone != BP.body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm. + to_chat(user, "[tool] isn't the right type for [parse_zone(target_zone)].") + return -1 + display_results(user, target, "You begin to replace [target]'s [parse_zone(target_zone)] with [tool]...", + "[user] begins to replace [target]'s [parse_zone(target_zone)] with [tool].", + "[user] begins to replace [target]'s [parse_zone(target_zone)].") + +/datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + if(HAS_TRAIT(tool, TRAIT_NODROP)) + display_results(user, target, "The [tool] is stuck in your hand!", + "The [tool] seems stuck to [user]'s hand!", + "The [tool] seems stuck to [user]'s hand!") + return FALSE + var/obj/item/bodypart/L = tool + if(!L.attach_limb(target)) + display_results(user, target, "You fail to replace [target]'s [parse_zone(target_zone)]! Their body has rejected [L]!", + "[user] fails to replace [target]'s [parse_zone(target_zone)]!", + "[user] fails to replace [target]'s [parse_zone(target_zone)]!") + return FALSE + display_results(user, target, "You succeed in replacing [target]'s [parse_zone(target_zone)].", + "[user] successfully replaces [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully replaces [target]'s [parse_zone(target_zone)]!") + return ..() diff --git a/code/modules/surgery/mechanical.dm b/code/modules/surgery/mechanical.dm index fe7b583d2c3..0c73c34bd0c 100644 --- a/code/modules/surgery/mechanical.dm +++ b/code/modules/surgery/mechanical.dm @@ -8,6 +8,7 @@ /datum/surgery_step/open_hatch, /datum/surgery_step/prepare_electronics, /datum/surgery_step/fix_brain, + /datum/surgery_step/close_hatch, /datum/surgery_step/mechanic_close ) lying_required = FALSE @@ -99,3 +100,29 @@ L.electrocute_act(urdamageamt_burn, target) target.take_bodypart_damage(urdamageamt_brute, urdamageamt_burn) return FALSE + +/datum/surgery/prosthesis_removal + name = "Detach prosthesis" + steps = list(/datum/surgery_step/mechanic_open, /datum/surgery_step/open_hatch, /datum/surgery_step/prepare_electronics, /datum/surgery_step/mechanic_unwrench, /datum/surgery_step/prosthesis_removal) + possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) // adding BODY_ZONE_HEAD would allow IPCs to remove their heads, could be funny if it weren't for the fact that it breaks their mutcolors and kills FBPs. Future explorers, if you want to fix these issues, you have my blessing + requires_bodypart_type = BODYTYPE_ROBOTIC + lying_required = FALSE + self_operable = TRUE + ignore_clothes = TRUE + +/datum/surgery/prosthesis_attachment + name = "Prosthesis attachment" + steps = list(/datum/surgery_step/mechanic_wrench, /datum/surgery_step/prepare_electronics, /datum/surgery_step/add_prosthetic, /datum/surgery_step/close_hatch, /datum/surgery_step/mechanic_close) + possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD) + requires_bodypart = FALSE //need a missing limb + requires_bodypart_type = 0 + lying_required = FALSE + self_operable = TRUE + ignore_clothes = TRUE + +/datum/surgery/prosthesis_attachment/can_start(mob/user, mob/living/carbon/target) + if(!iscarbon(target)) + return FALSE + var/mob/living/carbon/C = target + if(!C.get_bodypart(user.zone_selected)) //can only start if limb is missing + return TRUE diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 2242c4c242e..1b14aed144a 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -49,8 +49,9 @@ /datum/surgery_step/open_hatch, /datum/surgery_step/mechanic_unwrench, /datum/surgery_step/prepare_electronics, - /datum/surgery_step/manipulate_organs, + /datum/surgery_step/manipulate_organs/mechanic, /datum/surgery_step/mechanic_wrench, + /datum/surgery_step/close_hatch, /datum/surgery_step/mechanic_close ) @@ -60,7 +61,8 @@ /datum/surgery_step/mechanic_open, /datum/surgery_step/open_hatch, /datum/surgery_step/prepare_electronics, - /datum/surgery_step/manipulate_organs, + /datum/surgery_step/manipulate_organs/mechanic, + /datum/surgery_step/close_hatch, /datum/surgery_step/mechanic_close ) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 9c4f7c37642..549f6f744f1 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -541,3 +541,56 @@ /obj/item/vending_refill/wardrobe/cent_wardrobe machine_name = "CentDrobe" light_color = LIGHT_COLOR_ELECTRIC_GREEN + + +/obj/machinery/vending/wardrobe/clip_wardrobe + name = "\improper CLIPDrobe" + desc = "A very special vending machine that somehow vends every piece of clothing used by the Confederated League! Wow! You get the feeling this is meant for debugging." + icon_state = "clipdrobe" + product_ads = "Coast guard in style!" + vend_reply = "Thank you for using the CLIPDrobe!" + products = list( + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/jackboots = 3, + /obj/item/clothing/gloves/combat = 3, + /obj/item/clothing/glasses/sunglasses = 3, + + /obj/item/clothing/under/clip = 3, + /obj/item/clothing/under/clip/minutemen = 3, + /obj/item/clothing/under/clip/formal/with_shirt = 3, + /obj/item/clothing/under/clip/formal/with_shirt/alt = 3, + /obj/item/clothing/under/clip/medic = 3, + /obj/item/clothing/under/clip/officer = 3, + /obj/item/clothing/under/clip/officer/alt = 3, + + /obj/item/clothing/mask/gas/clip = 3, + /obj/item/storage/belt/military/clip = 3, + /obj/item/storage/belt/medical/webbing/clip = 3, + /obj/item/clothing/gloves/color/latex/nitrile/clip = 3, + + /obj/item/clothing/suit/toggle/lawyer/clip = 3, + /obj/item/clothing/suit/armor/vest/capcarapace/clip = 3, + /obj/item/clothing/suit/armor/vest/capcarapace/clip/admiral = 3, + /obj/item/clothing/suit/armor/clip_trenchcoat = 3, + /obj/item/clothing/suit/armor/vest/bulletproof = 3, + /obj/item/clothing/suit/armor/riot/clip = 3, + + /obj/item/clothing/suit/space/hardsuit/security/independent/clip = 3, + /obj/item/clothing/suit/space/hardsuit/clip_spotter = 3, + + /obj/item/clothing/head/helmet/bulletproof/x11/clip = 3, + /obj/item/clothing/head/helmet/riot/clip = 3, + /obj/item/clothing/head/clip = 3, + /obj/item/clothing/head/clip/corpsman = 3, + /obj/item/clothing/head/clip/slouch = 3, + /obj/item/clothing/head/clip/slouch/officer = 3, + /obj/item/clothing/head/clip/boonie = 3, + /obj/item/clothing/head/fedora/det_hat/clip = 3, + /obj/item/clothing/head/flatcap/clip = 3, + /obj/item/clothing/head/clip/bicorne = 3, + + ) + refill_canister = /obj/item/vending_refill/wardrobe/clip_wardrobe +/obj/item/vending_refill/wardrobe/clip_wardrobe + machine_name = "CLIPDrobe" + light_color = LIGHT_COLOR_CYAN diff --git a/html/changelogs/AutoChangeLog-pr-2809.yml b/html/changelogs/AutoChangeLog-pr-2809.yml new file mode 100644 index 00000000000..01cbdf98dd1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2809.yml @@ -0,0 +1,4 @@ +author: Martinpachu +changes: + - {spellcheck: Fixes some cargo descriptions.} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2821.yml b/html/changelogs/AutoChangeLog-pr-2821.yml new file mode 100644 index 00000000000..5f0c2c7a515 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2821.yml @@ -0,0 +1,4 @@ +author: Sadhorizon +changes: + - {bugfix: Cybersun cap no longer defaults to black cap's sprite.} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2825.yml b/html/changelogs/AutoChangeLog-pr-2825.yml new file mode 100644 index 00000000000..951737492f5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2825.yml @@ -0,0 +1,7 @@ +author: meemofcourse +changes: + - {code_imp: ID cards' update_label proc no longer calls update_appearance. Please + report any issues that may involve ID cards not updating overlays.} + - {code_imp: 'Outfits now have an id_assignment field. If a job has an id, and an + id_assignment, it will automatically apply.'} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2832.yml b/html/changelogs/AutoChangeLog-pr-2832.yml new file mode 100644 index 00000000000..e55c242c4db --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2832.yml @@ -0,0 +1,11 @@ +author: Skies-Of-Blue +changes: + - {rscadd: 'silicons across the sector have added two new noises to their lexicon, + try them out with *yes and *no!'} + - {tweak: 'silicons across the sector have also overridden their clown inhibitors, + allowing them to play a bummer trombone with *sad'} + - {tweak: borgs have leaked the secrets of *warn to their integrated positronic + counterparts} + - {rscdel: 'due to wide reaching protest, silicons across the galaxy have decided + to give up their ability to *honk in respect for the lives lost during the ICW'} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2837.yml b/html/changelogs/AutoChangeLog-pr-2837.yml new file mode 100644 index 00000000000..12853f1590f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2837.yml @@ -0,0 +1,7 @@ +author: Skies-Of-Blue +changes: + - {soundadd: 'several new roundend audio clips, as well as a new roundstart clip'} + - {sounddel: 'all of the old roundend audio clips, as well as the old roundstart + clip'} + - {rscdel: soul} +delete-after: true diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index f849506c29d..e82de8c17bb 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -76,3 +76,120 @@ 2024-03-14: Ms-Mee: - rscdel: April fools no longer randomizes decal colors + Martinpachu: + - rscadd: The SSG-04, GAL and EBR can now use their scopes! +2024-03-10: + MarkSuckerberg: + - tweak: Makes the basics ingredients crate less barren and useless. + - rscadd: Advanced cooking crate, for buying the condiments you only need a little + bit of. + - rscadd: Standard meat crate, when you don't want to buy the weird exotic meat + crate. + - rscadd: Grains crate, for when you want to make a lot of flour for cooking + - rscadd: Bread crate, for when you're lazy and want bread for recipes. Or to eat. + I don't care. + Martinpachu: + - rscadd: More and appropriate ammo to the Elder-class. + - bugfix: Fixed a few oversights with 8x50 ammo boxes. + Skies-Of-Blue: + - bugfix: silicons have had their language software patched, now capable of understanding + rachnidian and calcic at the cost of no longer being able to speak it + Skrem7: + - bugfix: Sauna decon oversight has been fixed + retlaw34: + - rscadd: Gunslinger quirk! Lets you fling around a revolver like an old western! + Good luck shooting anything newer, though. + - rscadd: Double action revolvers have safeties now! + - tweak: Many revolver tweaks + - balance: Shadow and Ashhand are gate loaded now, and as such take longer to load. + - bugfix: Non-speedloaders now load revolvers slowly again. + 'ryerice, meemofcourse ': + - rscadd: redraws military webbing and camo fatigues, gives webbings recolor options + - rscadd: combat boots and gloves have been given happier colors + - rscadd: A ton of things related to the confederated league have been resprited + and added + - rscdel: Corvus and Asclepius + - tweak: CLIP ERTs have been adjusted to be consistent +2024-03-13: + Sadhorizon: + - tweak: E-cigarettes and e-cigars can now be turned on with tablets and APCs. + Skies-Of-Blue: + - rscadd: creates close_hatch, a step that mirrors open_hatch in prosthetic surgeries + for the sake of consistency. Why you leaving that hatch open?? The final step + before screwing to finish surgery. This affects implant removal, ipc revival, + mechanical brain surgery, and prosthesis organ manipulation + - rscadd: creates manipulate_organs/mechanic, a step that swaps the necessary implements + in synthetic surgery. Use a crowbar instead of a hemostat to remove any organs + on an augmented limb! + - tweak: 'changes implant removal surgery to reflect the above. The new tool order + is as follows: screwdriver, hand, wrench, crowbar, wrench, hand, screwdriver' + - tweak: 'changes the (unused) ipc revival surgery to reflect the above. The new + tool order is as follows: screwdriver, hand, multitool, inducer, hand, screwdriver' + - tweak: 'changes mechanical brain surgery to reflect the above. The new tool order + is as follows: screwdriver, hand, multitool, hemostat, hand, screwdriver' + - tweak: 'changes prosthesis organ manipulation to reflect the above. The new tool + order is as follows: screwdriver, hand, wrench (if head/chest), multitool, crowbar, + wrench (if head/chest), hand, screwdriver' + - rscadd: 'creates the Detach Prosthesis surgery, a less violent alternative to + Amputation. This allows for prosthesis users to remove their own limbs, for + the purposes of maintenance or just plain comfort! The tool order is as follows: + screwdriver, hand, multitool, wrench, crowbar/wrench/hand (so you can flavor + how you remove the limb)' + - tweak: 'changes the Prosthetic Replacement surgery, renaming it to Limb Grafting + surgery. The steps remain the same, but the name needed some retooling, as the + procedure is much more surgically involved than its new sibling:' + - rscadd: 'creates Prosthesis Attachment surgery, a less surgically involved version + of the Limb Grafting surgery. This allows for people with prostheses to re-attach + the limb they took off with Prosthesis Removal! The tool order is as follows: + wrench, multitool, plug in prosthesis, hand, screwdriver' + - rscdel: removes the chainsaw and synthetic arm blade from being viable prostheses. + Left the code intact in case someone wants to do something similar in-future + - tweak: blind characters can now use various scanners, bringing the frontier up + to accessibility standards across the galaxy + - tweak: crewmen have learned the secrets of being polite. While walking, you will + no longer shove or swap places with your crew mates. Be certain to walk around + your ship outside of emergencies! + - rscadd: a pAI's master can now clear the pAI's zeroth law + - bugfix: pAIs are now able to fully utilize installed encryption keys through their + integrated transceiver's menu when they have the encryption key software upgrade + - bugfix: binary encryption keys work in pAIs that have downloaded the encryption + key software + ZephyrTFA: + - balance: Only admins can open job slots + - bugfix: Cryoing correctly opens a job slot + - code_imp: Refactored ShipOwner into tsx + meemofcourse: + - tweak: Faxes on most ships no longer have access to all admin faxes + - tweak: Modified the pixel size of signatures in paper to 15px + mozi_h, DrDiasyl aka DrTuxedo#0931, GoldenAlpharex: + - rscadd: Clipboards have a snazzy new look. + - refactor: 'Gave clipboards some purpose in life: Edit, rename and sort to your + hearts'' desire! Insert a pen by just clicking it in. Rapidly pick up paper + by clicking on it with the clipboard.' + - rscadd: Folders have a snazzy new look. (Check out those colours!) + - refactor: Split and cleaned up folder code. + - refactor: Tidied up folder UI code + - bugfix: Paper that's on a clipboard doesn't need to be poked to realise that its + appearance has changed and to properly display it on a clipboard. + - bugfix: You finally figured that using a stamp on a clipboard was more important + than using the pen that's currently attached to it. Congratulations! + - code_imp: Added support for preventing a pen from being removed from a clipboard. + - rscadd: Added 'biscuit' cards! They can contain documents and can only be accessed + by cracking them open, you can't close them back. Nanotrasen now stores spare + ID safe codes in them. + - rscadd: Placed paper cutters around the station. They're in Bridge, HoP office, + Warden office, and Cargo. + - rscadd: Now you can order paper cutters at cargo. + - bugfix: Now the paper slip is actually paper. + - imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, + added the corporate paper slip. + thgvr: + - rscadd: PAIs can wipe themselves again +2024-03-14: + Spooky: + - tweak: Assorted resprites. + - imageadd: 'A bunch of re-done sprites for various objects. Notably: Sofas, filing + cabinets, reagent tanks.' +2024-03-15: + cuddleandtea: + - rscadd: volume setting for play local sound diff --git a/icons/hud/gun_hud.dmi b/icons/hud/gun_hud.dmi new file mode 100644 index 00000000000..a24f7f2964f Binary files /dev/null and b/icons/hud/gun_hud.dmi differ diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index a7d4e75a77d..08f0c94505e 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ diff --git a/icons/mecha/mecha_96x96.dmi b/icons/mecha/mecha_96x96.dmi index 7a9ba8cc4d6..c284d31561b 100644 Binary files a/icons/mecha/mecha_96x96.dmi and b/icons/mecha/mecha_96x96.dmi differ diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi index 324ea7dac8a..5e08a834a89 100644 Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index aef500b67da..d23ebfae475 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 8c730bf22ba..e8702376efc 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 4c6dd4f78bc..4fad073974a 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/faction/clip/accessory.dmi b/icons/mob/clothing/faction/clip/accessory.dmi new file mode 100644 index 00000000000..733bb3d863e Binary files /dev/null and b/icons/mob/clothing/faction/clip/accessory.dmi differ diff --git a/icons/mob/clothing/faction/clip/belt.dmi b/icons/mob/clothing/faction/clip/belt.dmi new file mode 100644 index 00000000000..befce1b54b1 Binary files /dev/null and b/icons/mob/clothing/faction/clip/belt.dmi differ diff --git a/icons/mob/clothing/faction/clip/hands.dmi b/icons/mob/clothing/faction/clip/hands.dmi new file mode 100644 index 00000000000..8e35e752ab8 Binary files /dev/null and b/icons/mob/clothing/faction/clip/hands.dmi differ diff --git a/icons/mob/clothing/faction/clip/head.dmi b/icons/mob/clothing/faction/clip/head.dmi new file mode 100644 index 00000000000..2122a9a2f32 Binary files /dev/null and b/icons/mob/clothing/faction/clip/head.dmi differ diff --git a/icons/mob/clothing/faction/clip/mask.dmi b/icons/mob/clothing/faction/clip/mask.dmi new file mode 100644 index 00000000000..a46424e6309 Binary files /dev/null and b/icons/mob/clothing/faction/clip/mask.dmi differ diff --git a/icons/mob/clothing/faction/clip/suits.dmi b/icons/mob/clothing/faction/clip/suits.dmi new file mode 100644 index 00000000000..f7a64dc8b32 Binary files /dev/null and b/icons/mob/clothing/faction/clip/suits.dmi differ diff --git a/icons/mob/clothing/faction/clip/uniforms.dmi b/icons/mob/clothing/faction/clip/uniforms.dmi new file mode 100644 index 00000000000..71ad9e1b6a3 Binary files /dev/null and b/icons/mob/clothing/faction/clip/uniforms.dmi differ diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 6b974d5a819..3246bbb24de 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 0c79696e569..bdf9ad412de 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 9d430d39a7a..29d92de9137 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 138650d4fb2..ca1eb949aa4 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index c739d99d2f3..5c13c3f615e 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi index 6350fec5020..457f28fb8ad 100644 Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ diff --git a/icons/mob/clothing/suits/toggle.dmi b/icons/mob/clothing/suits/toggle.dmi index 2059afd5bf4..8ceffd1312c 100644 Binary files a/icons/mob/clothing/suits/toggle.dmi and b/icons/mob/clothing/suits/toggle.dmi differ diff --git a/icons/mob/clothing/under/command.dmi b/icons/mob/clothing/under/command.dmi index fd5f1af01e8..9e62d273cc3 100644 Binary files a/icons/mob/clothing/under/command.dmi and b/icons/mob/clothing/under/command.dmi differ diff --git a/icons/mob/clothing/under/security.dmi b/icons/mob/clothing/under/security.dmi index 7e6c10ec6d6..61b1d798322 100644 Binary files a/icons/mob/clothing/under/security.dmi and b/icons/mob/clothing/under/security.dmi differ diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index a54640fc17b..3926bce0f3b 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/radial.dmi b/icons/mob/radial.dmi index 9b43fa0d710..5654c74396c 100644 Binary files a/icons/mob/radial.dmi and b/icons/mob/radial.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 2078c7e25cd..7149896332b 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/atmospherics/pipes/pressure_tank.dmi b/icons/obj/atmospherics/pipes/pressure_tank.dmi index 95103015cfd..0554350af33 100644 Binary files a/icons/obj/atmospherics/pipes/pressure_tank.dmi and b/icons/obj/atmospherics/pipes/pressure_tank.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 8a042bc0d08..df05a9d601e 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 0b48ccfaf78..e0818c6853d 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 65a951047a3..20cc5db40a4 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/faction/clip/accessory.dmi b/icons/obj/clothing/faction/clip/accessory.dmi new file mode 100644 index 00000000000..dd081c9f9ca Binary files /dev/null and b/icons/obj/clothing/faction/clip/accessory.dmi differ diff --git a/icons/obj/clothing/faction/clip/belt.dmi b/icons/obj/clothing/faction/clip/belt.dmi new file mode 100644 index 00000000000..bd513a28c2f Binary files /dev/null and b/icons/obj/clothing/faction/clip/belt.dmi differ diff --git a/icons/obj/clothing/faction/clip/hands.dmi b/icons/obj/clothing/faction/clip/hands.dmi new file mode 100644 index 00000000000..ad3700cf5f6 Binary files /dev/null and b/icons/obj/clothing/faction/clip/hands.dmi differ diff --git a/icons/obj/clothing/faction/clip/head.dmi b/icons/obj/clothing/faction/clip/head.dmi new file mode 100644 index 00000000000..3982f324b9a Binary files /dev/null and b/icons/obj/clothing/faction/clip/head.dmi differ diff --git a/icons/obj/clothing/faction/clip/mask.dmi b/icons/obj/clothing/faction/clip/mask.dmi new file mode 100644 index 00000000000..646c90868cd Binary files /dev/null and b/icons/obj/clothing/faction/clip/mask.dmi differ diff --git a/icons/obj/clothing/faction/clip/suits.dmi b/icons/obj/clothing/faction/clip/suits.dmi new file mode 100644 index 00000000000..16390028fee Binary files /dev/null and b/icons/obj/clothing/faction/clip/suits.dmi differ diff --git a/icons/obj/clothing/faction/clip/uniforms.dmi b/icons/obj/clothing/faction/clip/uniforms.dmi new file mode 100644 index 00000000000..c736bc109bf Binary files /dev/null and b/icons/obj/clothing/faction/clip/uniforms.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index ff36ce0bce5..ba27bd4c816 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index ce0924a8376..7a1b973759c 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 5f0cb3b84fe..4342a2780f9 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 7123ae5ab1c..5a162a96913 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b596b5f3241..d325c5098a7 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index aad247e5f7b..a81ec697719 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi index bd8b5e13597..fee16c76919 100644 Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ diff --git a/icons/obj/clothing/suits/toggle.dmi b/icons/obj/clothing/suits/toggle.dmi index 806101d0a45..54df84ad5de 100644 Binary files a/icons/obj/clothing/suits/toggle.dmi and b/icons/obj/clothing/suits/toggle.dmi differ diff --git a/icons/obj/clothing/under/command.dmi b/icons/obj/clothing/under/command.dmi index d5d48999bec..17b8285232f 100644 Binary files a/icons/obj/clothing/under/command.dmi and b/icons/obj/clothing/under/command.dmi differ diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi index 5572325faaf..32aea700793 100644 Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index ad39d778789..1617d733b94 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index ef671bc9c0d..f34b502078c 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/flora/pinetrees.dmi b/icons/obj/flora/pinetrees.dmi index 3ee4a89f079..8a4f1649a48 100644 Binary files a/icons/obj/flora/pinetrees.dmi and b/icons/obj/flora/pinetrees.dmi differ diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi index 82c81415ddc..7c2699e7cdc 100644 Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 81c1e3ff9b1..0856132a475 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 340bc0f9a5c..e7cd9797591 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 8b6fc77c772..ea47f805dee 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/icons/obj/robotics.dmi b/icons/obj/robotics.dmi index 8d0627aa958..268c69c6668 100644 Binary files a/icons/obj/robotics.dmi and b/icons/obj/robotics.dmi differ diff --git a/icons/obj/sofa.dmi b/icons/obj/sofa.dmi index 8a8cd951cb5..d738a32a70a 100644 Binary files a/icons/obj/sofa.dmi and b/icons/obj/sofa.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index e88a183d2c4..ec4b8bd200e 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 26b4ebd8a83..ad6944ebbbc 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index a984d69cf03..f5f04901af2 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/structures/signs/sign.dmi b/icons/obj/structures/signs/sign.dmi index c7038f2d412..e5ff1a7cf19 100644 Binary files a/icons/obj/structures/signs/sign.dmi and b/icons/obj/structures/signs/sign.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 06be7b370c0..6905749d1e5 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index eae80ff576a..6483f97570d 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/icons/stamp_icons/large_stamp-clip.png b/icons/stamp_icons/large_stamp-clip.png new file mode 100644 index 00000000000..82872f034be Binary files /dev/null and b/icons/stamp_icons/large_stamp-clip.png differ diff --git a/icons/stamp_icons/large_stamp-cmm.png b/icons/stamp_icons/large_stamp-cmm.png deleted file mode 100644 index 7ae1c93cfdd..00000000000 Binary files a/icons/stamp_icons/large_stamp-cmm.png and /dev/null differ diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 4a05d971bbe..7652322fdfd 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 76eda2d8e9e..a1548441fb8 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1934,6 +1934,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" @@ -2872,12 +2873,14 @@ #include "code\modules\overmap\ships\owner_action.dm" #include "code\modules\overmap\ships\ship_application.dm" #include "code\modules\overmap\ships\ship_datum.dm" +#include "code\modules\paperwork\biscuit.dm" #include "code\modules\paperwork\carbonpaper.dm" #include "code\modules\paperwork\clipboard.dm" #include "code\modules\paperwork\contract.dm" #include "code\modules\paperwork\fax.dm" #include "code\modules\paperwork\filingcabinet.dm" #include "code\modules\paperwork\folders.dm" +#include "code\modules\paperwork\folders_premade.dm" #include "code\modules\paperwork\handlabeler.dm" #include "code\modules\paperwork\paper.dm" #include "code\modules\paperwork\paper_cutter.dm" @@ -2999,6 +3002,7 @@ #include "code\modules\projectiles\boxes_magazines\internal\toy.dm" #include "code\modules\projectiles\guns\ballistic.dm" #include "code\modules\projectiles\guns\energy.dm" +#include "code\modules\projectiles\guns\gunhud.dm" #include "code\modules\projectiles\guns\magic.dm" #include "code\modules\projectiles\guns\powered.dm" #include "code\modules\projectiles\guns\ballistic\assault.dm" @@ -3329,13 +3333,13 @@ #include "code\modules\surgery\implant_removal.dm" #include "code\modules\surgery\ipc_revive.dm" #include "code\modules\surgery\limb_augmentation.dm" +#include "code\modules\surgery\limb_grafting.dm" #include "code\modules\surgery\lobectomy.dm" #include "code\modules\surgery\mechanic_steps.dm" #include "code\modules\surgery\mechanical.dm" #include "code\modules\surgery\organ_manipulation.dm" #include "code\modules\surgery\organic_steps.dm" #include "code\modules\surgery\plastic_surgery.dm" -#include "code\modules\surgery\prosthetic_replacement.dm" #include "code\modules\surgery\remove_embedded_object.dm" #include "code\modules\surgery\revival.dm" #include "code\modules\surgery\stomachpump.dm" diff --git a/sound/misc/trenchwhistle.ogg b/sound/misc/trenchwhistle.ogg new file mode 100644 index 00000000000..24ca6772547 Binary files /dev/null and b/sound/misc/trenchwhistle.ogg differ diff --git a/sound/roundend/apcdestroyed.ogg b/sound/roundend/apcdestroyed.ogg deleted file mode 100644 index 7fe77dd5236..00000000000 Binary files a/sound/roundend/apcdestroyed.ogg and /dev/null differ diff --git a/sound/roundend/bangindonk.ogg b/sound/roundend/bangindonk.ogg deleted file mode 100644 index b3a3624de56..00000000000 Binary files a/sound/roundend/bangindonk.ogg and /dev/null differ diff --git a/sound/roundend/boowomp.ogg b/sound/roundend/boowomp.ogg new file mode 100644 index 00000000000..1a1ed5878b1 Binary files /dev/null and b/sound/roundend/boowomp.ogg differ diff --git a/sound/roundend/deliguana.ogg b/sound/roundend/deliguana.ogg new file mode 100644 index 00000000000..05890027104 Binary files /dev/null and b/sound/roundend/deliguana.ogg differ diff --git a/sound/roundend/disappointed.ogg b/sound/roundend/disappointed.ogg deleted file mode 100644 index 4a35dc5c513..00000000000 Binary files a/sound/roundend/disappointed.ogg and /dev/null differ diff --git a/sound/roundend/gayrights.ogg b/sound/roundend/gayrights.ogg new file mode 100644 index 00000000000..230a421f009 Binary files /dev/null and b/sound/roundend/gayrights.ogg differ diff --git a/sound/roundend/its_only_game.ogg b/sound/roundend/its_only_game.ogg deleted file mode 100644 index 3fe36eee955..00000000000 Binary files a/sound/roundend/its_only_game.ogg and /dev/null differ diff --git a/sound/roundend/leavingtg.ogg b/sound/roundend/leavingtg.ogg deleted file mode 100644 index 455dc9fb119..00000000000 Binary files a/sound/roundend/leavingtg.ogg and /dev/null differ diff --git a/sound/roundend/newroundsexy.ogg b/sound/roundend/newroundsexy.ogg deleted file mode 100644 index afe5630f04d..00000000000 Binary files a/sound/roundend/newroundsexy.ogg and /dev/null differ diff --git a/sound/roundend/petersondisappointed.ogg b/sound/roundend/petersondisappointed.ogg deleted file mode 100644 index 3e8a3a2857b..00000000000 Binary files a/sound/roundend/petersondisappointed.ogg and /dev/null differ diff --git a/sound/roundend/repair.ogg b/sound/roundend/repair.ogg new file mode 100644 index 00000000000..756abb5a4b7 Binary files /dev/null and b/sound/roundend/repair.ogg differ diff --git a/sound/roundend/scrunglartiy.ogg b/sound/roundend/scrunglartiy.ogg deleted file mode 100644 index 8019b567449..00000000000 Binary files a/sound/roundend/scrunglartiy.ogg and /dev/null differ diff --git a/sound/roundend/shiptestingthursday.ogg b/sound/roundend/shiptestingthursday.ogg new file mode 100644 index 00000000000..9943d78f726 Binary files /dev/null and b/sound/roundend/shiptestingthursday.ogg differ diff --git a/sound/roundend/undecided.ogg b/sound/roundend/undecided.ogg new file mode 100644 index 00000000000..604cbe8b6dc Binary files /dev/null and b/sound/roundend/undecided.ogg differ diff --git a/sound/roundend/yeehaw.ogg b/sound/roundend/yeehaw.ogg deleted file mode 100644 index ddc56fbfe9d..00000000000 Binary files a/sound/roundend/yeehaw.ogg and /dev/null differ diff --git a/sound/roundstart/addiguana.ogg b/sound/roundstart/addiguana.ogg new file mode 100644 index 00000000000..8b21b983551 Binary files /dev/null and b/sound/roundstart/addiguana.ogg differ diff --git a/sound/weapons/gun/laser/cs-fire.ogg b/sound/weapons/gun/laser/cs-fire.ogg new file mode 100644 index 00000000000..a773bd203d1 Binary files /dev/null and b/sound/weapons/gun/laser/cs-fire.ogg differ diff --git a/sound/weapons/gun/revolver/spin_single.ogg b/sound/weapons/gun/revolver/spin_single.ogg new file mode 100644 index 00000000000..46cbcb2ad5d Binary files /dev/null and b/sound/weapons/gun/revolver/spin_single.ogg differ diff --git a/strings/ship_names.json b/strings/ship_names.json index 9a637086613..53f56af5555 100644 --- a/strings/ship_names.json +++ b/strings/ship_names.json @@ -1044,7 +1044,7 @@ "Wholesale" ], - "COLONIAL MINUTEMEN": [ + "CLIP MINUTEMEN": [ "A New Day's Sun", "Above and Beyond", "Against All Odds", diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index 59323fbdfaa..e2db02bfde3 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -61,7 +61,7 @@ export const MESSAGE_TYPES = [ name: 'Radio', description: 'All departments of radio messages', selector: - '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .cmmradio, .irmgradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate', + '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .clipradio, .irmgradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate', }, { type: MESSAGE_TYPE_INFO, diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index a3d68ca0aba..4ce7f6fcbef 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -346,7 +346,7 @@ em { color: #dd3535; } -.cmmradio { +.clipradio { color: #57b8f0; } diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 3a61c0f6cc7..e200bd42556 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -366,7 +366,7 @@ em { color: #a30000; } -.cmmradio { +.clipradio { color: #337296; } diff --git a/tgui/packages/tgui/interfaces/Clipboard.js b/tgui/packages/tgui/interfaces/Clipboard.js new file mode 100644 index 00000000000..82e9001335d --- /dev/null +++ b/tgui/packages/tgui/interfaces/Clipboard.js @@ -0,0 +1,107 @@ +import { useBackend } from '../backend'; +import { + Box, + Button, + Divider, + LabeledList, + Flex, + Section, +} from '../components'; +import { Window } from '../layouts'; + +export const Clipboard = (props, context) => { + const { act, data } = useBackend(context); + const { pen, top_paper, top_paper_ref, paper, paper_ref } = data; + return ( + + +
+ {pen ? ( + + act('remove_pen')} /> + } + > + {pen} + + + ) : ( + + No pen attached! + + )} +
+ + {top_paper ? ( + + + {top_paper} + + +