diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm index 6341438965e4..934f0ffe01ef 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm @@ -1232,7 +1232,9 @@ /turf/open/floor/plasteel/dark, /area/ruin/unpowered/listening_post/commons) "vJ" = ( -/obj/machinery/suit_storage_unit/mining/eva, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate, +/obj/item/clothing/head/helmet/space/syndicate, /turf/open/floor/plasteel/tech/grid, /area/ruin/unpowered/listening_post) "vR" = ( @@ -1762,12 +1764,12 @@ /turf/open/floor/plating, /area/ruin/unpowered/listening_post/engineering) "Gy" = ( -/obj/machinery/computer/telecomms/monitor{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, +/obj/machinery/computer/telecomms/server{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ruin/unpowered/listening_post/operations) "GB" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm index 67eb3e648365..ed1febb808b2 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm @@ -3073,7 +3073,7 @@ pixel_x = -3 }, /obj/item/ammo_box/magazine/illestren_a850r, -/obj/item/storage/box/ammo/c9mm/ap, +/obj/item/storage/box/ammo/c9mm_ap, /obj/item/ammo_box/magazine/illestren_a850r, /obj/item/ammo_box/magazine/co9mm{ start_empty = 1 diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json index 0cefb4ca08b3..5044590efb15 100644 --- a/_maps/configs/syndicate_gorlex_komodo.json +++ b/_maps/configs/syndicate_gorlex_komodo.json @@ -1,5 +1,5 @@ { - "faction": "/datum/faction/syndicate", + "faction": "/datum/faction/syndicate/hardliners", "prefix": "ISV", "namelists": [ "GORLEX", diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_ngr_derecho.json similarity index 50% rename from _maps/configs/syndicate_gorlex_hyena.json rename to _maps/configs/syndicate_ngr_derecho.json index df4c6485bb0f..e65ab90e3c7c 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_ngr_derecho.json @@ -6,17 +6,17 @@ "GORLEX", "NATURAL_AGGRESSIVE", "BEASTS", - "WEAPONS", - "ACLF" + "WEAPONS" ], - "map_name": "Hyena-class Wrecking Tug", - "description": "The Hyena is a common salvage tug, frequently operated by the Gorlex Marauders for “salvage” missions on ICW-era Nanotrasen derelicts (and occasionally occupied outposts and ships). The Hyena features a fairly compact floor plan with a dedicated secure armory space and a fairly large cargo bay for its size, as well as a complement of high-grade hardsuits and mining equipment. The Hyena’s low cost and high demand in its niche has made it a very common sight on the Frontier in the years following the ICW, and despite their tight finances nearly all Gorlex Marauder splinter factions continue to acquire more.", + "map_name": "Derecho-class Wrecking Tug", + "description": "The Derecho-class is a series of salvage ships commissioned by the New Gorlex Republic almost as soon as the Republic was founded for the prodigious task of cleaning the space around New Gorlex of countless ICW-era shipwrecks. In recent years, Derechos are operated as auxiliary ships typically tasked with surveying, assessment, and their original mission of salvaging in space controlled or contested by the NGR.", "tags": [ "Mining", + "Salvage", "Combat" ], - "map_short_name": "Hyena-class", - "map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm", + "map_short_name": "Derecho-class", + "map_path": "_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm", "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/ngr", diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm index d0d7523167b9..38d9d1cc6853 100644 --- a/_maps/shuttles/independent/independent_kilo.dmm +++ b/_maps/shuttles/independent/independent_kilo.dmm @@ -661,7 +661,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/item/storage/box/ammo/a12g_rubbershot, +/obj/item/storage/box/ammo/a12g_buckshot, +/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{ + default_ammo_type = 0 + }, /obj/structure/cable/pink{ icon_state = "4-10" }, diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 83af7832fd56..99e4797077d2 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -3987,10 +3987,6 @@ dir = 5 }, /obj/structure/rack, -/obj/item/storage/box/ammo/a12g_rubbershot{ - pixel_x = -4; - pixel_y = 9 - }, /obj/item/storage/box/ammo/a12g_buckshot{ pixel_y = 2; pixel_x = 4 diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 538c5717a840..feef647c1142 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -13080,7 +13080,7 @@ /obj/item/storage/box/ammo/c9mm, /obj/item/storage/box/ammo/c9mm, /obj/item/storage/box/ammo/c9mm, -/obj/item/storage/box/ammo/c9mm/ap, +/obj/item/storage/box/ammo/c9mm_ap, /obj/item/stock_parts/cell/gun{ pixel_x = -3; pixel_y = -5 diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index 67cd0c4e7869..b38ddeee9892 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -9,16 +9,23 @@ /obj/item/toy/plush/moth/redish{ pixel_x = -4 }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, /obj/item/folder/red{ pixel_x = -4; layer = 3.01; pixel_y = -8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light_switch{ + pixel_x = 20; + pixel_y = 11; + dir = 8 + }, /turf/open/floor/wood, -/area/ship/security) +/area/ship/crew/specialized/security) "ad" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34,8 +41,11 @@ pixel_y = 22 }, /obj/effect/decal/cleanable/plasma, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "am" = ( /obj/structure/urinal{ pixel_y = 29 @@ -52,23 +62,18 @@ icon_state = "5-8" }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "az" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light/floor, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/stairs{ + dir = 1; + color = "#a8b2b6" }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/bridge) "aD" = ( /obj/machinery/light/dim/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -79,27 +84,12 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "aG" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/head/beret/eng/hazard, -/obj/item/storage/backpack/satchel/eng, -/obj/item/storage/backpack/messenger/engi, -/obj/item/storage/backpack/industrial, -/obj/item/storage/backpack/duffelbag/engineering, -/obj/item/clothing/under/rank/engineering/engineer/nt/lp, -/obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp, -/obj/item/storage/backpack/ert/engineer, -/obj/item/clothing/suit/nanotrasen/vest, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/structure/table/reinforced, +/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "aI" = ( /obj/structure/cable{ @@ -117,65 +107,50 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/red{ dir = 8 }, -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/effect/turf_decal/siding{ + dir = 4; + color = "#730622" }, /obj/machinery/door/poddoor/shutters{ dir = 4; id = "Ranger_FireFighting_Shut"; name = "Ready Room" }, -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/turf/open/floor/plasteel/dark, +/turf/open/floor/pod/light, /area/ship/storage/equip) "aK" = ( -/obj/machinery/light/dim/directional/north, -/obj/effect/turf_decal/industrial/fire/corner{ - dir = 1 +/obj/structure/sign/poster/official/ion_carbine{ + pixel_x = 32 + }, +/obj/structure/window/reinforced/spawner, +/obj/structure/crate_shelf, +/obj/effect/turf_decal/industrial/fire{ + dir = 8 }, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/suit/space/hardsuit/ancient/lp, /obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 + dir = 5 }, -/obj/item/clothing/mask/gas/vigilitas, -/turf/open/floor/plasteel/lightgrey, +/turf/open/floor/plasteel/tech, /area/ship/storage/equip) "aO" = ( -/obj/structure/closet/secure_closet/lp/medical, -/obj/item/storage/box/gloves, -/obj/item/storage/box/masks, -/obj/item/storage/belt/medical, -/obj/item/flashlight/seclite, -/obj/item/roller, -/obj/item/holosign_creator/medical, -/obj/item/pinpointer/crew, -/obj/item/storage/box/bodybags, -/obj/item/storage/firstaid/regular, -/obj/structure/window/reinforced/tinted{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 6 }, -/obj/structure/window/reinforced/tinted{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/defibrillator/loaded, -/obj/item/roller{ - pixel_x = -3; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/item/roller{ - pixel_x = 5; - pixel_y = 12 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/item/clothing/neck/stethoscope, -/obj/item/gps, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health/prescription, /turf/open/floor/wood, -/area/ship/medical) +/area/ship/crew/specialized/medical) "aP" = ( /turf/open/floor/plating, /area/ship/engineering) @@ -185,8 +160,11 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt/corner{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "bf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -224,7 +202,7 @@ name = "Engine Shutters" }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "bu" = ( /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/lightgrey, @@ -238,22 +216,30 @@ /obj/item/storage/box/handcuffs, /obj/item/restraints/legcuffs/bola/energy, /obj/item/holosign_creator/security, -/obj/item/clothing/suit/armor/vest/security, -/obj/item/clothing/mask/gas/sechailer, /obj/item/gps, /obj/item/ammo_box/magazine/co9mm, /obj/item/storage/belt/security/webbing, -/obj/item/storage/guncase/pistol/commander, /obj/item/clothing/glasses/hud/security/sunglasses, -/obj/structure/window/reinforced/tinted{ - dir = 4 +/obj/effect/turf_decal/techfloor{ + dir = 1 }, -/turf/open/floor/wood, -/area/ship/security) +/obj/effect/turf_decal/techfloor, +/obj/item/reagent_containers/spray/pepper, +/obj/item/restraints/legcuffs/bola/energy, +/obj/item/restraints/legcuffs/bola/energy, +/obj/item/restraints/legcuffs/bola/energy, +/obj/machinery/light/small/directional/north, +/obj/item/storage/box/evidence, +/obj/item/storage/guncase/pistol/commander, +/turf/open/floor/plasteel/tech, +/area/ship/crew/specialized/security) "bD" = ( /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 1 }, +/obj/structure/sign/poster/official/safety_report{ + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "bK" = ( @@ -267,55 +253,44 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "bN" = ( -/obj/item/flashlight/lamp{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/pen/red{ - pixel_x = 6 +/obj/effect/turf_decal/siding/red{ + dir = 4 }, -/obj/structure/table/reinforced{ - color = "#8A9397" +/obj/effect/turf_decal/siding/red{ + dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plasteel/tech, /area/ship/security) "bX" = ( -/obj/machinery/telecomms/bus/preset_four{ - autolinkers = list("hub","processor4","bus"); - network = "nt_commnet"; - id = "Nanotrasen Communications Bus"; - freq_listening = list(1353,1447,1459) - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/machinery/camera/autoname{ + dir = 6 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/turf/open/floor/engine/hull, +/area/ship/external/dark) "ci" = ( /obj/effect/turf_decal/industrial/outline/orange, -/obj/machinery/portable_atmospherics/pump, +/obj/structure/platform/industrial_alt{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "cj" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/medical/paramedic/skirt/lp, -/obj/item/clothing/under/rank/medical/paramedic/lp, -/obj/item/clothing/suit/hooded/wintercoat/medical, -/obj/item/clothing/head/beret/med, -/obj/item/storage/backpack/satchel/med, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/storage/backpack/duffelbag/med, -/obj/structure/window/reinforced/tinted{ - dir = 1 +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/item/storage/backpack/ert/medical, /turf/open/floor/wood, -/area/ship/medical) +/area/ship/crew/specialized/medical) "cv" = ( /obj/structure/chair/comfy/shuttle{ dir = 4; @@ -361,20 +336,21 @@ pixel_y = 10 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "cI" = ( -/obj/structure/chair/handrail{ - dir = 8; - pixel_x = 2 - }, -/obj/machinery/light/dim/directional/north, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/blackbox_recorder, /obj/effect/turf_decal/techfloor{ - dir = 4 + dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint{ - color = "#a8b2b6" +/obj/item/radio/weather_monitor{ + pixel_x = 25; + anchored = 1; + name = "barometric monitor" }, -/area/ship/hallway/central) +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) "cN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -405,14 +381,16 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "cW" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lightgrey{ - dir = 10 +/obj/docking_port/mobile{ + dir = 2; + preferred_direction = 4; + port_direction = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/cryo) +/obj/machinery/camera/autoname, +/obj/machinery/light/floor, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "dd" = ( /obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{ @@ -422,64 +400,31 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "df" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 +/obj/structure/table/reinforced{ + color = "#8A9397" }, -/obj/machinery/firealarm/directional/south, -/obj/structure/table/wood, -/obj/item/toy/plush/moth/deadhead{ - pixel_x = -7; - layer = 4.3 +/turf/open/floor/mineral/plastitanium/red/brig, +/area/ship/security) +"dl" = ( +/obj/structure/bed, +/obj/item/bedsheet/qm, +/obj/structure/curtain/bounty, +/obj/machinery/light/small/directional/south, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 8; + pixel_x = -21 }, -/obj/item/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 13; - layer = 4.2 +/turf/open/floor/carpet/orange, +/area/ship/crew/specialized/cargo) +"dm" = ( +/obj/machinery/camera/autoname{ + dir = 5 }, -/obj/item/folder/yellow{ - pixel_y = -4; - pixel_x = 4 - }, -/obj/item/pen/survival{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/wood, -/area/ship/engineering) -"dl" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "Ranger_FireFighting_Shut"; - name = "Ready Room" - }, -/turf/open/floor/plasteel/dark, -/area/ship/storage/equip) -"dm" = ( -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ + dir = 10 }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) @@ -493,7 +438,7 @@ /obj/effect/turf_decal/steeldecal/steel_decals7{ dir = 4 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/tcomms, /area/ship/engineering/communications) "dq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -514,13 +459,17 @@ /turf/open/floor/plating, /area/ship/engineering) "dx" = ( -/obj/structure/chair/handrail{ +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/floor, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/obj/effect/turf_decal/siding/thinplating{ + dir = 1; + color = "#a8b2b6" + }, +/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "dC" = ( /obj/effect/turf_decal/ntspaceworks_small/right, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -535,7 +484,8 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 4 + dir = 4; + name = "Input to Air" }, /turf/open/floor/plating, /area/ship/hallway/central) @@ -557,13 +507,20 @@ icon_state = "6-8" }, /obj/effect/decal/cleanable/glass, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 1; + name = "Air to Port" + }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Port to Scrubbers Network" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "dN" = ( -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/turf_decal/trimline/transparent/white/filled/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "dP" = ( @@ -577,22 +534,14 @@ /turf/open/floor/plating, /area/ship/engineering) "ec" = ( -/obj/effect/turf_decal/ntspaceworks_small/left, -/obj/structure/cable{ - icon_state = "5-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/camera/autoname{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/blue, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "ef" = ( /obj/docking_port/stationary{ width = 30; @@ -602,19 +551,17 @@ /turf/template_noop, /area/template_noop) "eo" = ( -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/effect/turf_decal/siding/wood{ + dir = 6 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/structure/closet/emcloset/wall/directional/west, -/turf/open/floor/plasteel/lightgrey, -/area/ship/hallway/central) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/ship/crew/specialized/engineering) "er" = ( /obj/structure/cable{ icon_state = "4-8" @@ -631,22 +578,58 @@ /obj/effect/turf_decal/corner/opaque/vired, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) -"eE" = ( -/obj/machinery/computer/cargo{ - dir = 1 +"ex" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 4 }, -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 1; + color = "#a8b2b6" + }, +/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw, +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 }, /turf/open/floor/plasteel/tech, -/area/ship/cargo) +/area/ship/hallway/central) +"eD" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/machinery/photocopier, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/bridge) +"eE" = ( +/obj/effect/turf_decal/ntspaceworks_small/left, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "eN" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/platform/industrial_alt/corner{ + dir = 1 + }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "eT" = ( /obj/machinery/button/door{ dir = 1; @@ -668,39 +651,27 @@ icon_state = "4-9" }, /obj/effect/turf_decal/trimline/transparent/white/filled/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "eU" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/line{ - dir = 5 - }, -/obj/item/stack/tape{ - pixel_y = 10; - pixel_x = 6 - }, -/obj/item/stack/tape{ - pixel_y = 24; - pixel_x = 6; - layer = 3.02 - }, -/obj/item/stack/tape{ - pixel_y = 17; - pixel_x = 7; - layer = 3.01 - }, -/obj/item/hand_labeler{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/folder/yellow{ - pixel_x = 6 +/obj/machinery/computer/helm/viewscreen/directional/north, +/obj/machinery/button/door{ + pixel_x = 12; + pixel_y = 4; + dir = 8; + name = "Supply Quarters Windows"; + id = "Ranger_Supply_Specialist_Quarters"; + req_ship_access = 1 }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/obj/machinery/computer/helm/viewscreen/directional/east, -/turf/open/floor/plasteel/lightgrey, -/area/ship/cargo) +/obj/structure/table/reinforced, +/turf/open/floor/wood/ebony, +/area/ship/crew/specialized/cargo) "eY" = ( /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 1 @@ -711,38 +682,41 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "fd" = ( -/obj/structure/cable{ - icon_state = "6-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "ff" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/techfloor/hole/right, /obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ dir = 8 }, /obj/structure/closet/crate/bin, +/obj/structure/platform/industrial{ + dir = 1 + }, +/obj/structure/platform/industrial{ + dir = 4 + }, +/obj/structure/platform/industrial/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "fo" = ( -/obj/structure/girder/reinforced, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 1 }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/platform/military/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/engineering/communications) "fy" = ( /obj/item/newspaper, /obj/structure/table/reinforced{ @@ -754,29 +728,33 @@ /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "fz" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/nsorange/line{ - dir = 10 +/obj/effect/turf_decal/siding{ + color = "#474747" }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - name = "Cargo Bay"; - id = "Ranger_Cargo_Door" +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/corner{ + dir = 1 }, -/turf/open/floor/plasteel/lightgrey, +/turf/open/floor/plasteel/white, /area/ship/cargo) "fU" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/suit_storage_unit/inherit{ + name = "Emergency EVA Suit" + }, +/obj/item/clothing/suit/space/fragile, +/obj/item/clothing/head/helmet/space/fragile, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor, +/obj/machinery/door/window/brigdoor/northright{ + req_access_txt = "1"; + name = "Secure Lockup"; + req_ship_access = 1 }, -/obj/effect/turf_decal/techfloor/hole/right, /turf/open/floor/plasteel/tech, -/area/ship/engineering/communications) +/area/ship/engineering/engines/starboard) "fV" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/security) @@ -788,54 +766,43 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "gh" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/structure/table/reinforced{ - color = "#8A9397" - }, -/obj/item/wrench, -/obj/item/screwdriver, -/obj/item/stack/cable_coil/cyan, -/obj/item/stack/sheet/rglass{ - amount = 25 +/obj/effect/turf_decal/siding/blue{ + dir = 9 }, -/obj/item/aicard, -/turf/open/floor/circuit, -/area/ship/engineering/communications) -"gi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"gi" = ( /obj/effect/turf_decal/siding/red{ - dir = 1 + dir = 9 }, -/obj/effect/decal/cleanable/confetti, +/obj/structure/closet/crate/bin, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/tech, /area/ship/security) "gk" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/preopen{ - dir = 4; - name = "Intelligence Core"; - id = "AiCore" + icon_state = "2-4" }, -/obj/effect/turf_decal/techfloor{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 6 }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 4 }, -/obj/machinery/door/airlock/engineering/glass{ - dir = 4; - name = "Intelligence Core"; - req_access_txt = "10" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/science/ai_chamber) "gr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -857,14 +824,12 @@ }, /area/ship/crew/cryo) "gz" = ( -/obj/machinery/camera/autoname{ - dir = 9 - }, /obj/effect/turf_decal/industrial/outline/blue, /obj/structure/closet/crate/trashcart, /obj/item/storage/bag/trash, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "gD" = ( /obj/structure/cable/cyan{ icon_state = "4-10" @@ -880,9 +845,8 @@ pixel_x = -10 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "gG" = ( -/obj/effect/turf_decal/corner/opaque/blue/diagonal, /obj/structure/cable{ icon_state = "1-2" }, @@ -895,12 +859,18 @@ /obj/machinery/door/airlock/medical{ name = "Medical Bay" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue, +/turf/open/floor/pod/light, /area/ship/medical) "gL" = ( -/obj/structure/crate_shelf, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/obj/machinery/camera/autoname{ + dir = 9 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "gN" = ( /obj/machinery/light/dim/directional/north, /obj/machinery/power/terminal, @@ -925,6 +895,9 @@ /obj/effect/turf_decal/siding/blue{ dir = 6 }, +/obj/structure/cable{ + icon_state = "2-9" + }, /turf/open/floor/plasteel/white, /area/ship/medical) "gW" = ( @@ -950,34 +923,38 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/security) "hk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/cable{ icon_state = "1-10" }, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "hl" = ( /obj/structure/cable/cyan{ icon_state = "4-9" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/effect/decal/cleanable/plasma, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "hn" = ( /obj/structure/cable{ icon_state = "1-8" @@ -992,9 +969,11 @@ "hp" = ( /obj/effect/turf_decal/industrial/outline/orange, /obj/effect/decal/cleanable/plasma, -/obj/machinery/portable_atmospherics/pump, +/obj/structure/platform/industrial_alt{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "hx" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/rank/security/head_of_security/alt/skirt/lp, @@ -1009,21 +988,78 @@ /obj/machinery/airalarm/directional/south, /obj/item/clothing/head/nanotrasen/beret/security/command, /obj/item/clothing/suit/armor/nanotrasen/sec_director, +/obj/item/clothing/under/nanotrasen/security/director, /turf/open/floor/wood, /area/ship/crew/dorm/captain) "hz" = ( -/obj/docking_port/mobile{ - dir = 2; - preferred_direction = 4; - port_direction = 8 +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "Ranger_Engineering_Specialist_Quarters"; + name = "Engineering Specialist's Quarters" }, -/obj/machinery/camera/autoname, -/obj/machinery/light/floor, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/turf/open/floor/plating, +/area/ship/crew/specialized/engineering) "hF" = ( -/turf/open/floor/plasteel/dark, -/area/ship/bridge) +/obj/machinery/light/dim/directional/north, +/obj/structure/closet/secure_closet/armorycage{ + req_access = list(1) + }, +/obj/effect/turf_decal/industrial/fire, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/item/storage/guncase/pistol/commander{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/gun/ballistic/automatic/smg/skm_carbine/saber{ + pixel_x = 4; + pixel_y = 9 + }, +/obj/item/storage/guncase/pistol{ + pixel_y = -4; + pixel_x = -7 + }, +/obj/item/melee/knife/survival{ + pixel_x = 7; + pixel_y = -8 + }, +/obj/item/melee/knife/survival{ + pixel_x = 7; + pixel_y = -8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/storage/equip) +"hG" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#474747"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#474747"; + dir = 4 + }, +/turf/open/floor/pod/light, +/area/ship/engineering/engines/starboard) "hJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1050,69 +1086,59 @@ /obj/structure/window/reinforced/fulltile/shuttle, /turf/open/floor/plating, /area/ship/engineering) -"hN" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/obj/machinery/light/floor, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "hQ" = ( -/obj/machinery/door/window/survival_pod{ - dir = 4; - opacity = 1; - req_access_txt = "1"; - name = "Security Specialist Quarters"; - req_ship_access = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/turf/open/floor/plasteel/stairs/wood{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/area/ship/security) -"hZ" = ( -/obj/machinery/camera/autoname{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/plasteel/lightgrey, -/area/ship/hallway/central) +/turf/open/floor/wood, +/area/ship/crew/specialized/security) +"hZ" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 19; + pixel_y = -10 + }, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/cell_charger, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) "ib" = ( /obj/structure/cable/cyan{ icon_state = "5-10" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/oil, +/obj/structure/platform/industrial_alt/corner{ + dir = 8 + }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "id" = ( -/obj/machinery/door/airlock/maintenance_hatch{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/starboard) "ih" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1129,43 +1155,49 @@ pixel_x = 7; pixel_y = -20 }, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "iq" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm/directional/east, -/obj/effect/spawner/random/trash/decal, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt/corner{ + dir = 8 + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "iv" = ( /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "ix" = ( -/obj/machinery/camera/autoname, -/obj/effect/turf_decal/siding/blue{ - dir = 5 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 4; - pixel_y = -3 +/obj/item/storage/box/syringes{ + pixel_y = 10; + pixel_x = -5 }, -/obj/item/storage/firstaid/o2{ - pixel_x = 1; - pixel_y = 2 +/obj/item/reagent_containers/glass/bottle/mannitol{ + pixel_y = 8; + pixel_x = 8 }, -/obj/item/storage/firstaid/medical{ - pixel_y = 7; - pixel_x = -2 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = 5 }, +/obj/machinery/light/dim/directional/north, /obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloor/corner, +/obj/effect/turf_decal/industrial/warning{ + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 9 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "iC" = ( @@ -1175,7 +1207,7 @@ /obj/effect/decal/cleanable/robot_debris/old, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "iD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1203,8 +1235,11 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, +/obj/item/stamp/captain{ + pixel_x = 7 + }, /obj/item/folder/blue{ - pixel_x = -1; + pixel_x = 8; pixel_y = 10 }, /obj/effect/turf_decal/techfloor{ @@ -1218,9 +1253,6 @@ pixel_x = -7; pixel_y = -1 }, -/obj/item/stamp/nanotrasen/vigilitas/loss_prevention{ - pixel_x = 7 - }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "iH" = ( @@ -1231,6 +1263,7 @@ name = "Brig Cell Window Shutters" }, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/security) "iI" = ( @@ -1244,8 +1277,16 @@ /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 1 }, +/obj/item/crowbar, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) +"iN" = ( +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "iS" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 @@ -1278,7 +1319,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "jd" = ( /obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ @@ -1286,6 +1327,7 @@ name = "Holding Cell Hall Shutters" }, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/security) "ji" = ( @@ -1312,30 +1354,37 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "jk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/siding/blue/corner{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/siding/blue/corner{ +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"jr" = ( -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ dir = 8 }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" }, -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/electrical{ - pixel_x = 3; - pixel_y = 7 +/turf/open/floor/plasteel/white, +/area/ship/medical) +"jr" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/chair/handrail{ + dir = 4 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/turf/open/floor/engine/hull, +/area/ship/external/dark) "js" = ( /obj/machinery/cryopod, /turf/open/floor/plasteel/telecomms_floor, @@ -1355,22 +1404,43 @@ color = "#efbc43"; pixel_x = 6 }, +/obj/item/paper{ + name = "NT Spaceworks Notice"; + default_raw_text = "Dear engineer, please bring your attention to the advanced control mechanisms present on and around this console. There is an external lighting switch to toggle the vessel's exterior lighting, highlighted in yellow, an air alarm connected to this console which controls external atmospherics fittings, and the console itself, which can read external atmosphere from a main sensor affixed to the fore of the vessel. -NT Spaceworks" + }, /turf/open/floor/plasteel/mono/dark, /area/ship/external/dark) "jv" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/suit/hooded/wintercoat/security, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/head/beret/sec, -/obj/item/clothing/under/rank/security/head_of_security/nt/lp, -/obj/item/clothing/under/rank/security/head_of_security/nt/skirt/lp, -/obj/item/clothing/suit/armor/vest/security/officer, -/obj/item/clothing/under/rank/security/head_of_security/alt/lp, -/obj/machinery/light/dim/directional/west, -/obj/item/storage/backpack/ert/security, -/turf/open/floor/wood, -/area/ship/security) +/obj/machinery/camera/autoname, +/obj/item/storage/firstaid/toxin{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/storage/firstaid/o2{ + pixel_x = 1; + pixel_y = 2 + }, +/obj/item/storage/firstaid/medical{ + pixel_y = 7; + pixel_x = -2 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 5 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "jA" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/port) @@ -1419,26 +1489,14 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) -"jQ" = ( -/obj/structure/sign/nanotrasen/vigilitas, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/starboard) "jZ" = ( -/obj/structure/cable{ - icon_state = "6-8" - }, +/obj/effect/turf_decal/siding/blue, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/effect/turf_decal/corner/opaque/vired/three_quarters{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/plasteel/tech, -/area/ship/storage/equip) +/turf/open/floor/plasteel/white, +/area/ship/medical) "kh" = ( /obj/machinery/light_switch{ dir = 1; @@ -1457,12 +1515,26 @@ /obj/machinery/computer/cryopod/directional/west, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) +"ki" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/corner/opaque/vired/half{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "ks" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/portable_atmospherics/scrubber, /obj/machinery/camera/autoname, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + name = "Air to Port" + }, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "kt" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/airalarm/directional/east, @@ -1491,21 +1563,17 @@ /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "kw" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/obj/structure/grille, -/obj/machinery/door/poddoor/preopen{ - dir = 4; - name = "Intelligence Core"; - id = "AiCore" +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 4 }, -/obj/structure/window/reinforced/fulltile/shuttle, -/turf/open/floor/plating, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/science/ai_chamber) +"kF" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/engineering/engines/starboard) "kK" = ( /obj/machinery/light/dim/directional/south, /obj/structure/table/reinforced{ @@ -1527,20 +1595,21 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "kQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor{ - dir = 4; - id = "Ranger_AI_Core_Ext_Blasts" +/obj/effect/turf_decal/corner/opaque/syndiered/half, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/tech, +/area/ship/storage/equip) "kS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/siding/blue{ dir = 1 }, +/obj/structure/cable{ + icon_state = "6-8" + }, /turf/open/floor/plasteel/white, /area/ship/medical) "lc" = ( @@ -1556,23 +1625,27 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "lj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -22; - pixel_y = 8; - id = "Ranger_Cycler_Shutters"; - name = "Air Cycler Shutters" +/obj/structure/fluff/hedge/opaque, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 6 }, -/obj/structure/chair/handrail{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/window/reinforced/survival_pod, +/obj/structure/window/reinforced/survival_pod{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 +/obj/structure/window/reinforced/survival_pod{ + dir = 6; + density = 0 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/structure/window/reinforced/survival_pod{ + dir = 10; + density = 0 + }, +/turf/open/floor/plasteel/white, +/area/ship/crew/specialized/cargo) "lp" = ( /obj/machinery/button/door{ dir = 8; @@ -1582,7 +1655,7 @@ name = "Ready Room"; req_ship_access = 1; req_one_access_txt = "50,10,5,1,20"; - req_one_access = list(50,10,5,1,20) + req_one_access = list(50, 10, 5, 1, 20) }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1597,47 +1670,67 @@ /obj/effect/turf_decal/corner/opaque/vired/half, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) -"lv" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/warning{ - dir = 1 +"lu" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/obj/effect/turf_decal/siding{ - color = "#474747"; - dir = 1 +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/plasteel/lightgrey, +/obj/structure/grille, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + name = "Intelligence Core"; + id = "AiCore" + }, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/science/ai_chamber) +"lv" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/corner, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, /area/ship/cargo) "lw" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/line{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/fluff/hedge/opaque, -/obj/structure/railing{ - dir = 8 +/obj/machinery/door/poddoor/preopen{ + dir = 4; + name = "Intelligence Core"; + id = "AiCore" }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 +/obj/machinery/door/airlock/engineering/glass{ + dir = 4; + name = "Intelligence Core"; + req_access_txt = "10" }, -/turf/open/floor/plasteel/lightgrey, -/area/ship/cargo) +/turf/open/floor/plasteel/tech/tcomms, +/area/ship/science/ai_chamber) "lB" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 1 +/obj/effect/turf_decal/trimline/transparent/white/filled/corner{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "lD" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/computer/apc_control{ + dir = 4; + icon_state = "computer-left" }, -/turf/open/floor/plasteel/stairs{ - dir = 1; - color = "#a8b2b6" +/obj/effect/turf_decal/techfloor, +/obj/structure/sign/warning/coldtemp{ + pixel_y = -29; + layer = 2.8 }, -/area/ship/bridge) +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) "lL" = ( /obj/structure/cable{ icon_state = "2-9" @@ -1648,12 +1741,12 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "lU" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = 7 - }, -/obj/structure/crate_shelf, +/obj/effect/turf_decal/trimline/opaque/nsorange/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "lW" = ( @@ -1662,17 +1755,16 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "lX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 +/obj/item/toy/plush/spider, +/obj/machinery/camera/autoname{ + dir = 9 }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 +/obj/structure/table/reinforced{ + color = "#8A9397" }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, -/area/ship/engineering) +/area/ship/security) "mh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1710,11 +1802,17 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "mv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/machinery/light/dim/directional/east, +/obj/effect/turf_decal/siding/thinplating{ + dir = 1; + color = "#a8b2b6" }, -/turf/open/floor/wood, -/area/ship/crew/dorm/captain) +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/chair/handrail, +/turf/open/floor/noslip, +/area/ship/crew/toilet) "mw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1732,35 +1830,28 @@ /turf/open/floor/plasteel/tech, /area/ship/security) "mJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -21; - pixel_y = -8 - }, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/table/reinforced, +/obj/machinery/firealarm/directional/north{ + pixel_x = -4 }, -/obj/effect/turf_decal/industrial/fire{ +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloor, +/obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/structure/closet/crate/secure/gear{ - name = "Ammunition Crate" - }, -/obj/structure/chair/handrail{ - dir = 4 +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 1 }, -/obj/item/storage/box/ammo/c9mm, -/obj/item/storage/box/ammo/c9mm, -/obj/item/storage/box/ammo/c9mm_rubber, -/obj/item/storage/box/ammo/c9mm, -/obj/item/storage/box/ammo/c9mm, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 +/turf/open/floor/plasteel/white, +/area/ship/medical) +"mK" = ( +/obj/machinery/camera/autoname{ + dir = 9 }, -/obj/effect/decal/cleanable/wrapping, -/turf/open/floor/plasteel/lightgrey, -/area/ship/storage/equip) +/obj/effect/turf_decal/industrial/outline/blue, +/obj/machinery/space_heater, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/starboard) "mQ" = ( /obj/structure/cable{ icon_state = "2-4" @@ -1774,6 +1865,50 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) +"na" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/recharger{ + dir = 4; + pixel_x = -8 + }, +/obj/machinery/cell_charger{ + dir = 4; + pixel_x = 5 + }, +/obj/structure/table/reinforced, +/obj/item/stack/marker_beacon/thirty{ + icon_state = "markerrandom"; + pixel_x = -9; + pixel_y = 13; + amount = 100 + }, +/obj/item/stack/marker_beacon/thirty{ + icon_state = "markerrandom"; + pixel_x = 11; + pixel_y = 13; + amount = 100 + }, +/obj/item/stack/marker_beacon/thirty{ + icon_state = "markerrandom"; + pixel_x = 5; + pixel_y = 13; + amount = 100 + }, +/obj/item/stack/marker_beacon/thirty{ + icon_state = "markerrandom"; + pixel_x = -2; + pixel_y = 13; + amount = 100 + }, +/obj/item/stock_parts/cell/gun, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/storage/equip) "nh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1806,6 +1941,7 @@ "nA" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "nE" = ( @@ -1815,7 +1951,8 @@ name = "Access Blast Doors"; id = "Ranger_AI_Core_Blasts"; pixel_y = 22; - req_access_txt = "10" + req_access_txt = "10"; + req_ship_access = 1 }, /obj/machinery/button/shieldwallgen{ dir = 2; @@ -1830,7 +1967,7 @@ dir = 4 }, /obj/machinery/recharge_station, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/tcomms, /area/ship/engineering/communications) "nJ" = ( /obj/structure/cable/cyan{ @@ -1840,7 +1977,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "ob" = ( /obj/structure/cable/cyan{ icon_state = "0-4" @@ -1850,7 +1987,7 @@ }, /obj/machinery/light/dim/directional/south, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "of" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1875,15 +2012,12 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "oi" = ( -/obj/effect/turf_decal/siding/blue{ +/obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/wood, +/area/ship/crew/dorm/captain) "ok" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -1905,35 +2039,27 @@ /obj/effect/turf_decal/techfloor{ dir = 8 }, -/turf/open/floor/plasteel/tech/techmaint{ - color = "#a8b2b6" - }, +/turf/open/floor/plasteel/tech, /area/ship/hallway/central) "oq" = ( /obj/structure/cable/cyan{ icon_state = "5-8" }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "or" = ( -/obj/item/bodypart/leg/right/robot, -/obj/item/bodypart/r_arm/robot, -/obj/item/bodypart/leg/left/robot, -/obj/item/bodypart/l_arm/robot, -/obj/item/bodypart/chest/robot, -/obj/item/bodypart/head/robot, -/obj/item/borg/upgrade/ai, -/obj/item/robot_suit, -/obj/structure/closet/crate/engineering{ - name = "Robotics Crate" +/obj/effect/turf_decal/siding/red, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/item/stock_parts/cell/high, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/flash/handheld, -/obj/item/borg/upgrade/restart, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/security) "ox" = ( /obj/structure/chair/sofa/brown/corner/directional/south, /obj/machinery/light/dim/directional/east, @@ -1965,14 +2091,43 @@ name = "Engine Shutters" }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "oQ" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, +/obj/item/storage/belt/medical, +/obj/item/flashlight/seclite, +/obj/item/roller, +/obj/item/holosign_creator/medical, +/obj/item/pinpointer/crew, +/obj/item/storage/box/bodybags, +/obj/item/storage/firstaid/regular, +/obj/item/defibrillator/loaded, +/obj/item/roller{ + pixel_x = -3; + pixel_y = 7 }, -/turf/open/floor/wood, -/area/ship/medical) +/obj/item/roller{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/clothing/neck/stethoscope, +/obj/item/gps, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health/prescription, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/closet/secure_closet/lp/medical, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/item/melee/knife/survival, +/obj/machinery/airalarm/directional/south, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/crew/specialized/medical) "pa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1994,26 +2149,34 @@ icon_state = "4-8" }, /obj/effect/turf_decal/corner/opaque/vired/half, +/obj/item/crowbar, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "pi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/corner/opaque/vired/three_quarters{ - dir = 8 +/obj/machinery/camera/autoname{ + dir = 9 }, -/obj/structure/table/rolling, -/obj/item/chair/plastic, -/obj/item/chair/plastic{ - pixel_y = 4 +/obj/machinery/button/door{ + dir = 8; + pixel_x = 26; + id = "AiCore"; + name = "Core Access"; + req_access_txt = "20"; + pixel_y = 8; + req_ship_access = 1 }, -/obj/item/chair/plastic{ - pixel_y = 6 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 5 }, -/obj/item/chair/plastic{ - pixel_y = 10 +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/starboard) +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 25 + }, +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/science/ai_chamber) "pn" = ( /obj/structure/chair/wood, /obj/item/toy/figure/assistant{ @@ -2056,86 +2219,67 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "ps" = ( -/obj/machinery/light/dim/directional/north, -/obj/item/clothing/gloves/color/yellow{ - pixel_y = -9 - }, -/obj/item/crowbar/power{ - pixel_y = 3 +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/item/clothing/shoes/magboots{ - pixel_x = -6; - pixel_y = -8 +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 5 }, -/obj/item/holosign_creator/engineering{ - pixel_y = 6; - pixel_x = -5 +/obj/item/storage/toolbox/electrical{ + pixel_x = 3; + pixel_y = 7 }, -/obj/item/holosign_creator/atmos{ - pixel_y = 6; - pixel_x = 6 +/obj/item/gear_pack/anglegrinder{ + pixel_x = -10; + pixel_y = 5 }, -/obj/item/flashlight/seclite{ - pixel_x = 2; - pixel_y = 15 +/obj/item/inducer{ + pixel_y = -10 }, -/obj/item/gps{ - pixel_y = 9; - pixel_x = -12 - }, -/obj/item/melee/knife/survival{ - pixel_y = 6; - pixel_x = 5 - }, -/obj/item/clothing/head/welding{ - pixel_y = -9 - }, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/glasses/hud/diagnostic, -/obj/item/pipe_dispenser, +/obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/structure/closet/secure_closet/lp/engineer, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 19; - pixel_y = -10 + dir = 1 }, -/obj/item/radio/headset/alt, -/obj/item/gear_pack/anglegrinder, +/obj/item/stock_parts/cell/super, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "pA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/stairs{ - dir = 1; - color = "#a8b2b6" - }, -/area/ship/bridge) +/obj/machinery/vending/snack, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "pD" = ( -/obj/structure/closet/crate/secure/loot, +/obj/effect/turf_decal/trimline/opaque/nsorange/warning{ + dir = 1 + }, +/obj/structure/crate_shelf, +/obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"pL" = ( -/obj/structure/chair/comfy/blue/directional/east, -/obj/item/toy/plush/moth/royal{ - layer = 3.05; - pixel_x = -6; - pixel_y = 11 +"pG" = ( +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/item/radio/intercom/wideband/directional/south, -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloor/corner{ + dir = 1 }, -/obj/item/toy/plush/moth/lovers{ - layer = 3.05; - pixel_x = 4 +/obj/effect/turf_decal/industrial/warning{ + dir = 6 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"pL" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/floor, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "pU" = ( /obj/machinery/camera/autoname{ dir = 1 @@ -2147,19 +2291,54 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "qb" = ( -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/industrial/outline/blue, /obj/structure/reagent_dispensers/foamtank, -/obj/item/extinguisher/advanced, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "qe" = ( -/obj/structure/girder/reinforced, -/obj/machinery/camera/autoname{ - dir = 6 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/obj/structure/table/wood, +/obj/item/toy/plush/moth/deadhead{ + pixel_x = -7; + layer = 4.3 + }, +/obj/item/folder/yellow{ + pixel_y = -4; + pixel_x = 4 + }, +/obj/item/pen/survival{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/button/door{ + pixel_x = 22; + pixel_y = -2; + dir = 8; + name = "Engineering Quarters Windows"; + id = "Ranger_Engineering_Specialist_Quarters"; + req_ship_access = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + pixel_x = -12; + pixel_y = 21 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = 12; + pixel_y = 13; + layer = 4.2 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/wood, +/area/ship/crew/specialized/engineering) "qn" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -2174,13 +2353,26 @@ }, /obj/machinery/power/shuttle/engine/electric/premium, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) +"qJ" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/obj/effect/turf_decal/techfloor, +/obj/structure/table/reinforced{ + color = "#8A9397" + }, +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) "qQ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ dir = 8 }, +/obj/structure/platform/industrial_alt{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "qR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2188,7 +2380,6 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/corner/opaque/red/full, /obj/machinery/door/airlock/security{ name = "Security Specialist's Office"; req_access_txt = "1" @@ -2196,7 +2387,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red, +/turf/open/floor/pod/light, /area/ship/security) "qS" = ( /obj/structure/railing{ @@ -2205,24 +2400,48 @@ /obj/effect/decal/cleanable/oil/streak, /obj/machinery/light/dim/directional/north, /obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + name = "Port to Scrubbers Network" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "qZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 1 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/tech, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 4; + color = "#730622" + }, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "Ranger_FireFighting_Shut"; + name = "Ready Room" + }, +/turf/open/floor/pod/light, /area/ship/storage/equip) "rg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/industrial/fire{ +/obj/effect/turf_decal/siding/red{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/plasteel/lightgrey, -/area/ship/storage/equip) +/obj/effect/decal/cleanable/confetti, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/security) "rq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2277,17 +2496,15 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "rM" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/trimline/opaque/vired/arrow_cw{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ - dir = 8 +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "Ranger_Supply_Specialist_Quarters"; + name = "Supply Specialist's Quarters" }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/starboard) +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/crew/specialized/cargo) "rT" = ( /obj/machinery/light_switch{ dir = 1; @@ -2316,18 +2533,16 @@ icon_state = "0-8" }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "rX" = ( -/obj/structure/railing{ - dir = 5; - layer = 4.1 +/obj/effect/turf_decal/spline/fancy/opaque/orange{ + dir = 6 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/obj/structure/closet/firecloset/wall/directional/west, -/turf/open/floor/plasteel/lightgrey, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/engineering) "rZ" = ( /obj/effect/turf_decal/atmos/air, /obj/machinery/atmospherics/components/unary/outlet_injector/on{ @@ -2354,24 +2569,30 @@ pixel_y = 21; id = "BridgeAtrium"; name = "Atrium Shutters"; - pixel_x = 9 + pixel_x = 9; + req_ship_access = 1 }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "sl" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 1 +/obj/machinery/telecomms/processor/preset_four{ + autolinkers = list("processor4","bus"); + network = "nt_commnet"; + id = "Nanotrasen Communications Processor"; + layer = 3.09 }, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 9 +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/structure/platform/military{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms, /area/ship/engineering/communications) "sm" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -2380,12 +2601,15 @@ }, /obj/effect/decal/cleanable/plasma, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "sp" = ( /obj/machinery/camera/autoname, /obj/machinery/light/floor, /turf/open/floor/engine/hull, /area/ship/external/dark) +"su" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/specialized/medical) "sw" = ( /obj/structure/cable{ icon_state = "6-8" @@ -2399,68 +2623,58 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "sF" = ( -/obj/item/storage/box/syringes{ - pixel_y = 10; - pixel_x = -5 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 9 +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/obj/item/reagent_containers/glass/bottle/mannitol{ - pixel_y = 8; - pixel_x = 8 +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/machinery/suit_storage_unit/inherit{ + name = "Emergency EVA Suit" }, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = 5 +/obj/item/clothing/head/helmet/space/fragile, +/obj/item/clothing/suit/space/fragile, +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/autoname{ + dir = 10 }, -/obj/machinery/light/dim/directional/north, -/obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "sJ" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) "sR" = ( -/obj/machinery/light/dim/directional/south, -/obj/effect/turf_decal/siding/red/end, -/obj/machinery/computer/security/telescreen{ - dir = 1; - pixel_y = -32; - network = list("ss13") +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 10 }, -/obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/confetti, -/turf/open/floor/plasteel/tech, -/area/ship/security) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/engineering/communications) "sU" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 9 +/obj/machinery/button/door{ + dir = 4; + pixel_x = -22; + pixel_y = 8; + id = "Ranger_Cycler_Shutters"; + name = "Air Cycler Shutters"; + req_ship_access = 1 }, -/obj/effect/turf_decal/siding/thinplating/light{ - dir = 9 +/obj/structure/chair/handrail{ + dir = 4 }, -/obj/effect/turf_decal/borderfloorwhite/corner, -/obj/structure/sink{ - dir = 8; - pixel_x = 12; - pixel_y = 4 +/obj/effect/turf_decal/corner/opaque/vired/half{ + dir = 8 }, -/obj/machinery/button/door{ - pixel_x = 26; - dir = 8; - name = "Medical Shutters"; - id = "MedShutters"; - req_ship_access = 1; - req_access_txt = "5" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 25; - pixel_y = -9 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "tb" = ( /obj/structure/table/wood, /obj/machinery/light/dim/directional/north, @@ -2497,12 +2711,12 @@ }, /obj/machinery/power/shuttle/engine/electric/premium, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "tj" = ( /obj/machinery/door/airlock/command{ dir = 4; name = "Bridge"; - req_one_access_txt = list(50,10,5,1,20) + req_one_access_txt = list(50, 10, 5, 1, 20) }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2519,26 +2733,34 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/pod/light, /area/ship/bridge) "tk" = ( -/obj/machinery/light/dim/directional/east, -/obj/effect/turf_decal/spline/fancy/opaque/orange{ - dir = 6 - }, +/obj/effect/turf_decal/spline/fancy/opaque/orange, /turf/open/floor/plasteel/tech, /area/ship/engineering) "tq" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/wood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, /area/ship/medical) "tr" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "tK" = ( /obj/structure/railing{ dir = 4 @@ -2553,23 +2775,16 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "tQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/effect/turf_decal/siding/red{ dir = 1 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/siding/red{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/machinery/light_switch{ - pixel_x = 20; - pixel_y = 11; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, +/obj/machinery/holopad, /turf/open/floor/plasteel/tech, /area/ship/security) "tR" = ( @@ -2586,7 +2801,7 @@ "tT" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning, /obj/effect/turf_decal/spline/fancy/opaque/black, -/turf/open/floor/plasteel/telecomms_floor, +/turf/open/floor/plasteel/telecomms_floor/tatmos, /area/ship/engineering/communications) "tZ" = ( /obj/machinery/button/door{ @@ -2598,75 +2813,97 @@ pixel_y = 5 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "uk" = ( -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/emergency_oxygen, -/obj/effect/turf_decal/siding/yellow{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 +/obj/machinery/light/dim/directional/west{ + pixel_x = -27 }, -/obj/machinery/suit_storage_unit/inherit{ - name = "Emergency EVA Suit" +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/obj/item/clothing/suit/space/fragile, -/obj/item/clothing/head/helmet/space/fragile, /turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "up" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/table/reinforced, +/obj/item/screwdriver{ + pixel_x = -7; + pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/item/screwdriver{ + pixel_x = -7 }, -/obj/machinery/holopad, -/obj/effect/turf_decal/spline/fancy/opaque/orange{ - dir = 1 +/obj/item/hand_labeler{ + pixel_x = 8; + pixel_y = 13 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 }, /turf/open/floor/plasteel/tech, -/area/ship/engineering) +/area/ship/storage/equip) "us" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 +/obj/machinery/light/dim/directional/north, +/obj/item/clothing/gloves/color/yellow{ + pixel_y = -9 }, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/item/crowbar/power{ + pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -8 }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1; - color = "#a8b2b6" +/obj/item/holosign_creator/engineering{ + pixel_y = 6; + pixel_x = -5 }, -/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw, -/turf/open/floor/plasteel/tech/techmaint{ - color = "#a8b2b6" +/obj/item/holosign_creator/atmos{ + pixel_y = 6; + pixel_x = 6 }, -/area/ship/hallway/central) -"ux" = ( -/obj/machinery/light/dim/directional/south, -/obj/machinery/telecomms/relay{ - freq_listening = list(1353,1447,1459); - id = "Nanotrasen Relay"; - name = "Nanotrasen relay"; - network = "nt_commnet" +/obj/item/flashlight/seclite{ + pixel_x = 2; + pixel_y = 15 }, +/obj/item/gps{ + pixel_y = 9; + pixel_x = -12 + }, +/obj/item/melee/knife/survival{ + pixel_y = 6; + pixel_x = 5 + }, +/obj/item/clothing/head/welding{ + pixel_y = -9 + }, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/hud/diagnostic, +/obj/item/pipe_dispenser, +/obj/structure/closet/secure_closet/lp/engineer, +/obj/item/clothing/glasses/meson/prescription, +/obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 10 +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"ux" = ( +/obj/machinery/telecomms/hub{ + network = "nt_commnet"; + id = "Nanotrasen Communications Hub"; + autolinkers = list("hub","bus","relay","messaging","nanotrasen","broadcasterB","receiverB") + }, +/obj/effect/turf_decal/techfloor{ + dir = 1 }, -/turf/open/floor/circuit, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/circuit/telecomms, /area/ship/engineering/communications) "uE" = ( /obj/structure/cable{ @@ -2696,16 +2933,46 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "uW" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 5 }, -/obj/effect/turf_decal/siding/blue, -/obj/machinery/holopad, /turf/open/floor/plasteel/white, /area/ship/medical) +"vc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/corner/opaque/vired/three_quarters{ + dir = 8 + }, +/obj/structure/table/rolling, +/obj/item/chair/plastic, +/obj/item/chair/plastic{ + pixel_y = 4 + }, +/obj/item/chair/plastic{ + pixel_y = 6 + }, +/obj/item/chair/plastic{ + pixel_y = 10 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) +"vg" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lightgrey{ + dir = 10 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel/dark, +/area/ship/crew/cryo) "vh" = ( /obj/effect/turf_decal/corner/opaque/blue/diagonal, /obj/machinery/door/window{ @@ -2718,16 +2985,16 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "vj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ - icon_state = "2-9" + icon_state = "0-8" }, -/obj/effect/turf_decal/corner/opaque/vired/half{ +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/turf/open/floor/wood, +/area/ship/crew/dorm/captain) "vk" = ( /obj/structure/sink{ dir = 8; @@ -2762,15 +3029,12 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) "vo" = ( -/obj/structure/crate_shelf, -/obj/structure/sign/nanotrasen/ns{ - pixel_x = 32 - }, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/structure/chair/handrail, +/obj/structure/sign/nanotrasen/vigilitas{ + pixel_y = 32 }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) +/turf/open/floor/engine/hull, +/area/ship/external/dark) "vp" = ( /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 5 @@ -2795,58 +3059,77 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/reagent_dispensers/fueltank, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/decal/cleanable/oil, +/obj/structure/platform/industrial_alt{ + dir = 1; + layer = 2.89 + }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "vz" = ( -/obj/structure/closet/crate/hydroponics{ - name = "Sustenance Crate" - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/storage/ration/assorted_salted_offal, -/obj/item/storage/ration/battered_fish_sticks, -/obj/item/storage/ration/beef_goulash, -/obj/item/storage/ration/beef_strips, -/obj/item/storage/ration/fried_fish, -/obj/machinery/airalarm/directional/south, +/obj/structure/crate_shelf, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/autoname{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "vB" = ( -/obj/machinery/camera/autoname, -/obj/machinery/cryopod, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/crew/cryo) +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/structure/railing{ + dir = 5; + layer = 4.1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/structure/closet/firecloset/wall/directional/west, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "vF" = ( -/obj/structure/window/reinforced/tinted{ - dir = 1 +/obj/structure/sink{ + dir = 8; + pixel_x = 12; + pixel_y = 4 }, -/obj/machinery/door/window/survival_pod{ - dir = 4; - opacity = 1; - name = "Medical Specialist's Quarters"; - req_access_txt = "5"; - req_ship_access = 1 +/obj/machinery/button/door{ + pixel_x = 26; + dir = 8; + name = "Medical Shutters"; + id = "MedShutters"; + req_ship_access = 1; + req_access_txt = "5" }, -/turf/open/floor/plasteel/stairs/wood{ - dir = 8 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 25; + pixel_y = -9 + }, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloorwhite/corner, +/obj/effect/turf_decal/industrial/warning{ + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 9 }, +/turf/open/floor/plasteel/white, /area/ship/medical) +"vJ" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/specialized/engineering) "vO" = ( +/obj/machinery/light/floor, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/science/ai_chamber) "vR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -2861,12 +3144,13 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "vS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 10 - }, +/obj/structure/crate_shelf, +/obj/structure/closet/crate/freezer/blood, +/obj/machinery/iv_drip, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/industrial/warning/cee, +/obj/effect/turf_decal/siding/thinplating/light/end, /turf/open/floor/plasteel/white, /area/ship/medical) "vT" = ( @@ -2894,8 +3178,8 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/plating, -/area/ship/maintenance/port) +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/port) "vV" = ( /obj/effect/turf_decal/corner/opaque/blue/diagonal, /obj/structure/window/reinforced/spawner{ @@ -2923,32 +3207,40 @@ name = "Engine Shutters" }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "wf" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, /obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 + dir = 8; + pixel_x = 19; + pixel_y = 8 }, -/obj/machinery/photocopier, -/turf/open/floor/plasteel/patterned/brushed, -/area/ship/bridge) +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east{ + pixel_y = -6 + }, +/obj/structure/platform/military{ + dir = 4 + }, +/turf/open/floor/plasteel/tech/tcomms, +/area/ship/engineering/communications) "wh" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 4; id = "Ranger_Starboard_holofield" }, /obj/machinery/door/poddoor{ - id = "Rangar_Starboard_Blasts" + id = "Rangar_Starboard_Blasts"; + name = "Starboard Access" }, /obj/structure/cable, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "wp" = ( /obj/item/clothing/mask/breath, @@ -2971,30 +3263,39 @@ /turf/open/floor/engine/hull, /area/ship/external/dark) "wu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/telecomms/server/presets/nanotrasen{ + autolinkers = list("nanotrasen","hub"); + network = "nt_commnet"; + freq_listening = list(1353,1447,1459) }, -/obj/effect/turf_decal/corner/opaque/vired/half, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/plasteel/tech, -/area/ship/storage/equip) +/obj/item/disk/holodisk/lp/stations, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms, +/area/ship/engineering/communications) "ww" = ( /obj/machinery/light/dim/directional/west, -/obj/structure/chair/handrail, /turf/open/floor/engine/hull, /area/ship/external/dark) "wC" = ( -/obj/effect/turf_decal/steeldecal/steel_decals6, -/obj/machinery/telecomms/receiver/preset_right{ - autolinkers = list("receiverB","hub"); - freq_listening = list(1353,1447,1459); - network = "nt_commnet" +/obj/item/storage/box/donkpockets{ + pixel_x = -3 }, -/obj/effect/turf_decal/techfloor{ - dir = 8 +/obj/item/storage/box/donkpockets/donkpocketpizza{ + pixel_x = 2; + pixel_y = 4 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/item/storage/box/donkpockets/donkpocketspicy{ + pixel_y = 9; + pixel_x = 7 + }, +/obj/structure/table/reinforced{ + color = "#8A9397" + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/lightgrey, +/area/ship/hallway/central) "wE" = ( /obj/machinery/button/door{ pixel_y = 21; @@ -3079,17 +3380,11 @@ /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "xA" = ( -/obj/structure/tank_dispenser/oxygen, +/obj/structure/crate_shelf, +/obj/structure/closet/crate/secure/loot, /obj/machinery/light/dim/directional/west, -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /turf/open/floor/plasteel/tech, -/area/ship/hallway/starboard) +/area/ship/cargo) "xB" = ( /obj/structure/cable{ icon_state = "1-4" @@ -3100,9 +3395,6 @@ /obj/structure/cable/cyan{ icon_state = "4-9" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -3113,8 +3405,12 @@ dir = 1 }, /obj/effect/decal/cleanable/plasma, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "xK" = ( /obj/structure/table/reinforced{ color = "#c1b6a5" @@ -3125,6 +3421,25 @@ /obj/item/binoculars, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"xY" = ( +/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/decal/cleanable/plasma, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/port) +"yf" = ( +/obj/machinery/camera/autoname, +/obj/machinery/cryopod, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/crew/cryo) "yi" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/button/shieldwallgen{ @@ -3139,7 +3454,8 @@ name = "Access Blast Doors"; id = "Ranger_AI_Core_Blasts"; pixel_y = 1; - req_access_txt = "10" + req_access_txt = "10"; + req_ship_access = 1 }, /obj/structure/cable{ icon_state = "1-2" @@ -3167,47 +3483,61 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "yo" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/corner/opaque/vired/half{ +/obj/structure/bodycontainer/morgue, +/obj/structure/window/reinforced/spawner, +/obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/effect/decal/cleanable/confetti, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/starboard) +/obj/effect/turf_decal/techfloor, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/port) "yA" = ( -/obj/machinery/telecomms/hub{ - network = "nt_commnet"; - id = "Nanotrasen Communications Hub"; - autolinkers = list("hub","bus","relay","messaging","nanotrasen","broadcasterB","receiverB") +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/wood, +/area/ship/crew/dorm/captain) "yC" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1; - color = "#a8b2b6" +/obj/structure/fluff/hedge/opaque, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 5 }, -/obj/item/bikehorn/rubberducky, -/turf/open/floor/noslip, -/area/ship/crew/toilet) -"yG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/handrail{ +/obj/structure/window/reinforced/survival_pod{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 +/obj/structure/window/reinforced/survival_pod{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/structure/window/reinforced/survival_pod{ + dir = 5; + density = 0 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 9; + density = 0 + }, +/turf/open/floor/plasteel/white, +/area/ship/crew/specialized/cargo) +"yF" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/specialized/security) +"yG" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + name = "Security Specialist's Quarters"; + id = "Ranger_Security_Specialist_Quarters" + }, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/crew/specialized/security) "yK" = ( /obj/machinery/camera/autoname{ dir = 9 @@ -3216,14 +3546,59 @@ /turf/open/floor/engine/hull, /area/ship/external/dark) "yU" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/helm/viewscreen/directional/south, -/obj/machinery/cell_charger, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/obj/machinery/door/window/brigdoor/eastright{ + dir = 2; + req_access_txt = "1"; + name = "Armory"; + req_ship_access = 1 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/item/storage/box/ammo/c9mm{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/storage/box/ammo/c9mm{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/storage/box/ammo/c9mm{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/storage/box/ammo/c9mm{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/storage/box/ammo/c9mm_rubber{ + pixel_x = -9 + }, +/obj/structure/closet/crate/secure/gear{ + name = "Ammunition Crate" + }, +/obj/effect/decal/cleanable/wrapping, +/obj/item/ammo_box/magazine/smgm9mm{ + pixel_x = 11 + }, +/obj/item/ammo_box/magazine/smgm9mm{ + pixel_x = 11 + }, +/obj/item/ammo_box/magazine/smgm9mm{ + pixel_x = 11 + }, +/obj/item/ammo_box/magazine/smgm9mm{ + pixel_x = 11 + }, +/obj/item/ammo_box/magazine/co9mm, +/turf/open/floor/plasteel/lightgrey, +/area/ship/storage/equip) "yZ" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable{ @@ -3233,9 +3608,9 @@ name = "Medical Specialist's Storage Unit" }, /obj/item/clothing/suit/space/hardsuit/ert/lp/med, +/obj/item/clothing/mask/breath, /obj/item/tank/internals/oxygen, /obj/effect/turf_decal/industrial/outline/blue, -/obj/item/clothing/mask/gas/vigilitas, /turf/open/floor/plasteel/lightgrey, /area/ship/storage/equip) "zc" = ( @@ -3269,21 +3644,14 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "zB" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/line, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 8 - }, -/obj/structure/chair/office{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/turf/open/floor/plasteel/lightgrey, -/area/ship/cargo) +/turf/open/floor/wood/ebony, +/area/ship/crew/specialized/cargo) "zC" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -3291,27 +3659,31 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 +/obj/structure/filingcabinet/chestdrawer{ + dir = 4; + pixel_x = -6; + density = 0 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/opaque/nsorange/line{ - dir = 9 +/obj/item/paper/crumpled{ + pixel_x = 6; + pixel_y = -1 }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - name = "Cargo Bay"; - id = "Ranger_Cargo_Door" +/obj/item/paper/crumpled{ + pixel_y = -6; + pixel_x = -4 }, -/obj/machinery/button/door{ - name = "Cargo Bay Shutters"; - id = "Ranger_Cargo_Door"; - pixel_y = 23; - req_ship_access = 1 +/obj/item/paper/crumpled{ + pixel_x = -10; + pixel_y = 6 }, -/turf/open/floor/plasteel/lightgrey, +/obj/item/paper/crumpled, +/obj/structure/cable{ + icon_state = "6-8" + }, +/turf/open/floor/plasteel/white, /area/ship/cargo) "zF" = ( /obj/structure/cable{ @@ -3319,6 +3691,34 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) +"zM" = ( +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ + name = "Security Specialist's Quarters"; + id = "Ranger_Security_Specialist_Quarters" + }, +/obj/structure/grille, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/crew/specialized/security) +"zO" = ( +/obj/machinery/light/dim/directional/east, +/obj/machinery/shower{ + dir = 8; + pixel_y = 2 + }, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) "zW" = ( /turf/template_noop, /area/template_noop) @@ -3330,14 +3730,22 @@ /turf/open/floor/plasteel/tech, /area/ship/security) "Ao" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /obj/effect/turf_decal/siding/wood{ - dir = 10 + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/button/door{ + pixel_x = -22; + pixel_y = 1; + dir = 4; + name = "Medical Quarters Windows"; + id = "Ranger_Medical_Specialist_Quarters"; + req_ship_access = 1 }, /turf/open/floor/wood, -/area/ship/crew/dorm/captain) +/area/ship/crew/specialized/medical) "Av" = ( /obj/item/toy/cards/deck{ pixel_x = -1; @@ -3352,8 +3760,26 @@ /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Aw" = ( -/turf/open/floor/wood, -/area/ship/medical) +/obj/item/clothing/under/rank/medical/paramedic/skirt/lp, +/obj/item/clothing/under/rank/medical/paramedic/lp, +/obj/item/clothing/suit/hooded/wintercoat/medical, +/obj/item/clothing/head/beret/med, +/obj/item/storage/backpack/satchel/med, +/obj/item/storage/backpack/messenger/med, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/ert/medical, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/closet/cabinet, +/obj/machinery/light/small/directional/south, +/obj/item/clothing/head/nanotrasen/cap/security, +/obj/item/clothing/under/nanotrasen/science, +/obj/item/clothing/under/nanotrasen/medical/paramedic, +/turf/open/floor/plasteel/tech, +/area/ship/crew/specialized/medical) "AF" = ( /obj/structure/chair/comfy/shuttle{ dir = 4; @@ -3367,36 +3793,39 @@ pixel_y = 20; pixel_x = -5; name = "Starboard Corridor Shutters"; - id = "RangerStarboardShutters" + id = "RangerStarboardShutters"; + req_ship_access = 1 }, /obj/machinery/button/door{ pixel_y = 20; pixel_x = 5; name = "Port Corridor Shutters"; - id = "RangerPortShutters" + id = "RangerPortShutters"; + req_ship_access = 1 }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "AH" = ( -/obj/effect/turf_decal/steeldecal/steel_decals7{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/techfloor, -/obj/effect/turf_decal/techfloor{ +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/spline/fancy/opaque/orange{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/button/door{ - dir = 4; - pixel_x = -26; - id = "AiCore"; - name = "Core Access"; - req_access_txt = "20" +/obj/structure/cable{ + icon_state = "2-4" }, /turf/open/floor/plasteel/tech, -/area/ship/engineering/communications) +/area/ship/engineering) "AP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -3418,12 +3847,25 @@ /obj/machinery/camera/autoname{ dir = 1 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "AZ" = ( -/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/wood, -/area/ship/security) +/area/ship/crew/specialized/security) "Be" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/button/door{ @@ -3434,15 +3876,20 @@ pixel_y = 6; req_one_access_txt = "50,10,5,1,20"; req_ship_access = 1; - req_one_access = list(50,10,5,1,20) + req_one_access = list(50, 10, 5, 1, 20) }, /obj/item/clothing/suit/space/hardsuit/ert/lp/sec, /obj/machinery/suit_storage_unit/inherit{ name = "Security Specialist's Storage Unit" }, +/obj/item/clothing/mask/breath, /obj/item/tank/internals/oxygen/red, /obj/effect/turf_decal/industrial/outline/red, -/obj/item/clothing/mask/gas/vigilitas, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -21; + pixel_y = -3 + }, /turf/open/floor/plasteel/lightgrey, /area/ship/storage/equip) "Bg" = ( @@ -3451,7 +3898,8 @@ id = "Ranger_Starboard_holofield" }, /obj/machinery/door/poddoor{ - id = "Rangar_Starboard_Blasts" + id = "Rangar_Starboard_Blasts"; + name = "Starboard Access" }, /obj/structure/cable{ icon_state = "0-9" @@ -3460,28 +3908,31 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "Bh" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/obj/structure/cable{ + icon_state = "6-8" }, -/obj/structure/window/reinforced/tinted{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/wood, -/area/ship/engineering) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "Bl" = ( /obj/structure/chair/handrail{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "Bo" = ( /obj/effect/turf_decal/steeldecal/steel_decals4, @@ -3498,8 +3949,11 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 6 }, -/turf/open/floor/plasteel/telecomms_floor, +/turf/open/floor/plasteel/telecomms_floor/tatmos, /area/ship/engineering/communications) +"Bv" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/specialized/cargo) "BA" = ( /obj/machinery/light/small/directional/east, /obj/structure/toilet{ @@ -3535,7 +3989,7 @@ name = "Engine Shutters" }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "BX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3576,15 +4030,12 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "Cb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/machinery/light/dim/directional/west, -/obj/effect/turf_decal/industrial/hatch/blue, /obj/structure/bed/roller, +/obj/effect/turf_decal/industrial/hatch/blue, +/obj/structure/sign/poster/official/pda_ad{ + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "Cg" = ( @@ -3597,48 +4048,71 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) -"Cq" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/techfloor{ +"Cn" = ( +/obj/effect/turf_decal/trimline/opaque/nsorange/warning{ dir = 1 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) -"Ct" = ( -/obj/machinery/light/dim/directional/east, -/obj/effect/turf_decal/industrial/warning{ - dir = 10 +/obj/structure/crate_shelf, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 8; + pixel_x = -21 }, -/obj/effect/turf_decal/siding/thinplating/light{ - dir = 10 +/obj/machinery/button/door{ + pixel_x = -22; + dir = 4; + name = "Cargo Privacy Shutters"; + id = "Ranger_Cargo_Privacy"; + pixel_y = -1; + req_ship_access = 1 }, -/obj/effect/turf_decal/borderfloorwhite/corner{ - dir = 4 +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Cq" = ( +/obj/machinery/button/door{ + dir = 4; + pixel_x = -21; + name = "Outer Window Blast Doors"; + id = "Ranger_AI_Core_Ext_Blasts" }, -/obj/machinery/shower{ - dir = 8; - pixel_y = 2 +/obj/machinery/light/dim/directional/south, +/obj/machinery/telecomms/message_server/preset{ + autolinkers = list("messaging","hub"); + network = "nt_commnet"; + layer = 3.1 }, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) +"Ct" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "CB" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 10 +/obj/machinery/telecomms/bus/preset_four{ + autolinkers = list("hub","processor4","bus"); + network = "nt_commnet"; + id = "Nanotrasen Communications Bus"; + freq_listening = list(1353,1447,1459) }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/circuit/telecomms, /area/ship/engineering/communications) "CD" = ( /obj/machinery/computer/helm/viewscreen/directional/east, -/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "CG" = ( /obj/machinery/door/airlock/public/glass, @@ -3658,29 +4132,30 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "CJ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/camera/autoname{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/structure/railing{ + dir = 4; + layer = 4.1 }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 }, -/turf/open/floor/plating, +/obj/structure/closet/emcloset/wall/directional/west, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "CN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ - piping_layer = 2; - dir = 8; - layer = 2 - }, /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/engine/air, /area/ship/hallway/central) "CP" = ( @@ -3701,9 +4176,7 @@ /obj/effect/turf_decal/techfloor{ dir = 8 }, -/turf/open/floor/plasteel/tech/techmaint{ - color = "#a8b2b6" - }, +/turf/open/floor/plasteel/tech, /area/ship/hallway/central) "CW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3724,9 +4197,12 @@ /area/ship/crew/cryo) "Dd" = ( /obj/effect/turf_decal/industrial/outline/orange, -/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/platform/industrial_alt{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "Dr" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ id = "AI_Core_Field_Engi"; @@ -3763,7 +4239,10 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 5 }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/structure/platform/military{ + dir = 1 + }, +/turf/open/floor/plasteel/telecomms_floor/tatmos, /area/ship/engineering/communications) "Dx" = ( /obj/machinery/recharger{ @@ -3812,44 +4291,13 @@ /turf/open/floor/mineral/plastitanium/red/brig, /area/ship/security) "DE" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/recharger{ - dir = 4; - pixel_x = -8 - }, -/obj/machinery/cell_charger{ - dir = 4; - pixel_x = 5 - }, -/obj/structure/table/reinforced, -/obj/item/stack/marker_beacon/thirty{ - icon_state = "markerrandom"; - pixel_x = -9; - pixel_y = 13; - amount = 100 - }, -/obj/item/stack/marker_beacon/thirty{ - icon_state = "markerrandom"; - pixel_x = 11; - pixel_y = 13; - amount = 100 - }, -/obj/item/stack/marker_beacon/thirty{ - icon_state = "markerrandom"; - pixel_x = 5; - pixel_y = 13; - amount = 100 - }, -/obj/item/stack/marker_beacon/thirty{ - icon_state = "markerrandom"; - pixel_x = -2; - pixel_y = 13; - amount = 100 +/obj/machinery/holopad, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/vired/three_quarters{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/item/stock_parts/cell/gun, /turf/open/floor/plasteel/tech, /area/ship/storage/equip) "DQ" = ( @@ -3873,11 +4321,43 @@ }, /obj/machinery/light/dim/directional/north, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "DZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/filingcabinet/double, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/trimline/opaque/nsorange/line{ + dir = 6 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_y = 16 + }, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = -4 + }, +/obj/item/pen/fountain{ + pixel_x = 6; + pixel_y = -5 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/item/paper/crumpled{ + pixel_y = -6; + pixel_x = -4 + }, +/obj/item/paper/crumpled/muddy{ + name = "coffee-stained paper scrap"; + pixel_x = -9; + pixel_y = 6 + }, +/obj/item/toy/plush/moth/atlas{ + pixel_x = 9; + pixel_y = 16 + }, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 1 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plasteel/white, /area/ship/cargo) "Ek" = ( /obj/machinery/computer/telecomms/server, @@ -3890,29 +4370,84 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Ep" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 10 +/obj/structure/chair/comfy/blue/directional/east, +/obj/item/toy/plush/moth/royal{ + layer = 3.05; + pixel_x = -6; + pixel_y = 11 }, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 8 +/obj/item/radio/intercom/wideband/directional/south, +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/item/toy/plush/moth/lovers{ + layer = 3.05; + pixel_x = 4 + }, +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) "Eq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/opaque/nsorange/warning, /obj/effect/turf_decal/siding{ color = "#474747" }, -/turf/open/floor/plasteel/lightgrey, +/obj/structure/cable{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/white, /area/ship/cargo) +"Et" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/corner/opaque/vired/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "EA" = ( -/obj/structure/crate_shelf, -/obj/machinery/light/dim/directional/west, +/obj/structure/closet/crate/hydroponics{ + name = "Sustenance Crate" + }, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/storage/ration/assorted_salted_offal, +/obj/item/storage/ration/battered_fish_sticks, +/obj/item/storage/ration/beef_goulash, +/obj/item/storage/ration/beef_strips, +/obj/item/storage/ration/fried_fish, +/obj/item/reagent_containers/food/snacks/popcorn{ + icon_state = "seed-sunflower"; + icon = 'icons/obj/hydroponics/seeds.dmi'; + desc = "Dehydrated, salted sunflower seeds, for snacking!"; + name = "Snacking Sunflower Seeds"; + list_reagents = list(/datum/reagent/consumable/nutriment = 4) + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/storage/ration/cheese_pizza_slice, +/obj/item/storage/ration/pepperoni_pizza_slice, /turf/open/floor/plasteel/tech, /area/ship/cargo) +"EE" = ( +/obj/machinery/camera/autoname{ + dir = 10 + }, +/obj/item/weldingtool/empty{ + name = "sand-covered welding tool" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "EL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only{ @@ -3924,9 +4459,20 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "EP" = ( -/obj/effect/spawner/random/vending/snack, -/turf/open/floor/plasteel/lightgrey, -/area/ship/hallway/central) +/obj/effect/turf_decal/steeldecal/steel_decals6, +/obj/machinery/telecomms/receiver/preset_right{ + autolinkers = list("receiverB","hub"); + freq_listening = list(1353,1447,1459); + network = "nt_commnet" + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/platform/military{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms, +/area/ship/engineering/communications) "Ff" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3934,49 +4480,32 @@ /obj/effect/turf_decal/corner/opaque/vired/half{ dir = 1 }, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Fg" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/corner{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/chair/office{ dir = 4 }, -/obj/item/paper/crumpled, -/obj/item/paper/crumpled{ - pixel_x = 6; - pixel_y = -1 +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/item/paper/crumpled{ - pixel_x = -10; - pixel_y = 6 +/turf/open/floor/wood/ebony, +/area/ship/crew/specialized/cargo) +"Fw" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/paper/crumpled{ - pixel_y = -6; - pixel_x = -4 - }, -/turf/open/floor/plasteel/lightgrey, -/area/ship/cargo) -"Fh" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1; - color = "#a8b2b6" - }, -/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw, -/turf/open/floor/plasteel/tech/techmaint{ - color = "#a8b2b6" - }, -/area/ship/hallway/central) -"Fw" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, /obj/machinery/door/airlock/wood{ name = "Restroom"; @@ -4024,14 +4553,23 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/siding/yellow{ dir = 4 }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/pod/light, /area/ship/engineering) +"FM" = ( +/obj/machinery/door/poddoor/shutters{ + id = "Ranger_Engineering_Specialist_Quarters"; + name = "Engineering Specialist's Quarters" + }, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/crew/specialized/engineering) "FQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4042,10 +4580,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/airalarm/directional/south, /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "Gc" = ( /obj/machinery/light/dim/directional/north, /obj/machinery/camera/autoname{ @@ -4059,8 +4596,8 @@ }, /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/hardsuit/ert/lp, +/obj/item/clothing/mask/breath, /obj/item/tank/internals/emergency_oxygen/double, -/obj/item/clothing/mask/gas/vigilitas, /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/captain) "Ge" = ( @@ -4095,24 +4632,19 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Gn" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/toy/plush/moth/snow{ - pixel_x = -3 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/item/folder/blue{ - pixel_x = -3; - pixel_y = -10 +/obj/machinery/door/window{ + opacity = 1; + name = "Toilet" }, -/obj/item/flashlight/pen{ - pixel_x = -5; - pixel_y = -9 +/obj/item/soap/nanotrasen, +/obj/structure/closet/wall/directional/west{ + name = "Soap Holder" }, -/turf/open/floor/wood, -/area/ship/medical) +/turf/open/floor/plasteel/showroomfloor, +/area/ship/crew/toilet) "Gs" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 10 @@ -4129,7 +4661,7 @@ /obj/effect/turf_decal/steeldecal/steel_decals7{ dir = 4 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/tcomms, /area/ship/engineering/communications) "GC" = ( /obj/effect/turf_decal/corner/opaque/blue/diagonal, @@ -4166,39 +4698,24 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "GY" = ( -/obj/effect/turf_decal/siding/wood, -/obj/item/radio/intercom/directional/south, -/obj/item/bedsheet/orange, -/obj/structure/bed, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood, -/area/ship/engineering) +/obj/structure/girder/reinforced, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "Ha" = ( -/obj/item/melee/classic_baton/telescopic, -/obj/item/melee/knife/survival, -/obj/item/gps, -/obj/item/screwdriver, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 7; - pixel_y = -20 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/storage/guncase/energy/egun, -/obj/item/megaphone/command, -/obj/structure/closet/secure_closet/lp/lieutenant, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/spline/fancy/opaque/orange{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/techfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/captain) +/area/ship/engineering) "Hd" = ( /obj/structure/grille, /obj/structure/cable{ @@ -4213,17 +4730,26 @@ /obj/structure/window/reinforced/fulltile/shuttle, /turf/open/floor/plating, /area/ship/engineering) +"Hp" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/structure/curtain/bounty, +/turf/open/floor/plasteel/stairs{ + dir = 8 + }, +/area/ship/crew/specialized/cargo) "Hs" = ( +/obj/effect/turf_decal/spline/fancy/opaque/orange{ + dir = 1 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/orange{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plasteel/tech, @@ -4235,10 +4761,10 @@ /obj/effect/turf_decal/trimline/opaque/vired/arrow_cw{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "HA" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ @@ -4246,7 +4772,8 @@ id = "Ranger_Port_holofields" }, /obj/machinery/door/poddoor{ - id = "Ranger_Port_Blasts" + id = "Ranger_Port_Blasts"; + name = "Portside Access" }, /obj/structure/cable{ icon_state = "0-6" @@ -4256,7 +4783,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "HZ" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -4264,7 +4791,7 @@ }, /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Ib" = ( /obj/machinery/button/door{ dir = 4; @@ -4273,9 +4800,14 @@ id = "Ranger_Port_maint_shut"; req_ship_access = 1 }, -/obj/effect/spawner/random/trash/decal, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Ih" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -4319,49 +4851,31 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "Iz" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-10" - }, -/obj/structure/closet/secure_closet{ - icon_state = "qm"; - name = "Logistics Specialist's Locker"; - req_ship_access = 1; - req_one_access = list(50) - }, -/obj/item/clothing/suit/hooded/wintercoat/cargo{ - pixel_x = 14 - }, -/obj/item/clothing/shoes/sneakers/brown{ - pixel_x = -10; - pixel_y = -12 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/item/storage/backpack/satchel/leather{ - pixel_y = -6 +/obj/effect/turf_decal/siding/red{ + dir = 1 }, -/obj/item/clothing/under/nanotrasen/supply/qm, -/obj/item/gps{ - pixel_x = 11; - pixel_y = 9 +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/siding/red{ + dir = 5 }, -/obj/item/stack/packageWrap{ - pixel_x = -10; - pixel_y = 12 +/obj/machinery/light_switch{ + pixel_x = 20; + pixel_y = 11; + dir = 8 }, -/obj/item/stack/packageWrap{ - pixel_x = -10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/obj/item/stack/packageWrap{ - pixel_x = -10; - pixel_y = 6 +/obj/structure/cable{ + icon_state = "1-10" }, /turf/open/floor/plasteel/tech, -/area/ship/cargo) +/area/ship/security) "IC" = ( -/obj/effect/turf_decal/corner/opaque/orange/full, -/obj/machinery/door/airlock/engineering/glass{ - name = "Electrical Bay" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -4371,22 +4885,24 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/turf_decal/techfloor, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/siding/yellow, +/obj/machinery/door/airlock/engineering/glass{ + name = "Electrical Bay" + }, +/turf/open/floor/pod/light, /area/ship/engineering) "IE" = ( -/obj/machinery/light/floor, -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 8 +/obj/structure/AIcore, +/obj/item/mmi/posibrain, +/obj/item/circuitboard/aicore, +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) "IM" = ( /obj/structure/chair/sofa/brown/directional/west, /obj/item/toy/plush/blahaj{ @@ -4419,12 +4935,33 @@ /turf/open/floor/plasteel/tech, /area/ship/security) "Js" = ( -/obj/machinery/holopad, +/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/effect/turf_decal/siding/red{ + dir = 4 + }, /obj/effect/turf_decal/siding/red{ dir = 8 }, -/obj/effect/turf_decal/siding/red/corner, -/turf/open/floor/plasteel/tech, +/obj/machinery/door/airlock/security{ + name = "Security Specialist's Office"; + req_access_txt = "1"; + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/light, /area/ship/security) "Jw" = ( /obj/structure/cable/cyan{ @@ -4433,26 +4970,36 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "JK" = ( -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/ship/engineering) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "JO" = ( -/obj/machinery/door/airlock/command{ - req_access_txt = "20"; - name = "Lieutenant's Quarters" +/obj/effect/turf_decal/industrial/outline/blue, +/obj/structure/rack, +/obj/item/extinguisher/advanced{ + pixel_x = 5; + pixel_y = 6 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/item/extinguisher/advanced{ + pixel_y = 10; + pixel_x = 12 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/item/extinguisher{ + pixel_x = -3 }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/wood, -/area/ship/crew/dorm/captain) +/obj/item/extinguisher{ + pixel_x = -9; + pixel_y = -5 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/port) "JP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4463,6 +5010,7 @@ /obj/machinery/camera/autoname{ dir = 1 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plating, /area/ship/engineering) "JR" = ( @@ -4484,8 +5032,11 @@ }, /obj/effect/decal/cleanable/plasma, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Kl" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -4493,13 +5044,40 @@ /obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) +"Kq" = ( +/obj/machinery/door/airlock/command{ + req_access_txt = "20"; + name = "Lieutenant's Quarters" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/turf/open/floor/pod/light, +/area/ship/crew/dorm/captain) "Kt" = ( -/obj/effect/turf_decal/siding/blue{ +/obj/machinery/computer/helm/viewscreen/directional/west, +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloor/corner{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning/corner, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 8 }, +/obj/effect/turf_decal/siding/thinplating/light/corner, /turf/open/floor/plasteel/white, /area/ship/medical) "Kw" = ( @@ -4513,12 +5091,20 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "KC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/vired/three_quarters{ - dir = 4 +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/autoname{ + dir = 5 }, -/turf/open/floor/plasteel/tech, -/area/ship/storage/equip) +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/wood, +/area/ship/crew/specialized/engineering) "KQ" = ( /obj/structure/closet, /obj/item/pickaxe, @@ -4535,8 +5121,62 @@ dir = 4; layer = 4.1 }, +/obj/structure/sign/poster/official/safety_internals{ + pixel_x = -32 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) +"KT" = ( +/obj/structure/table/reinforced{ + color = "#8A9397" + }, +/obj/item/flashlight/lamp{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/pen/red{ + pixel_x = 6 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/ship/security) +"KU" = ( +/obj/effect/turf_decal/trimline/opaque/nsorange/line{ + dir = 5 + }, +/obj/item/stack/tape{ + pixel_y = 10; + pixel_x = 6 + }, +/obj/item/stack/tape{ + pixel_y = 17; + pixel_x = 7; + layer = 3.01 + }, +/obj/item/hand_labeler{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/folder/yellow{ + pixel_x = 6 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 9 + }, +/obj/item/radio/intercom/directional/west{ + pixel_x = -28 + }, +/obj/structure/sign/nanotrasen/ns{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, +/area/ship/cargo) "KX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4562,22 +5202,24 @@ dir = 1 }, /obj/effect/turf_decal/siding/red, +/obj/structure/cable{ + icon_state = "5-8" + }, /turf/open/floor/plasteel/tech, /area/ship/security) "Lk" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/bridge) "Lt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/door/window{ - opacity = 1; - name = "Toilet" +/obj/effect/turf_decal/corner/opaque/vired/half{ + dir = 1 }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/crew/toilet) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "Lu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4596,20 +5238,30 @@ "Lw" = ( /obj/effect/turf_decal/industrial/outline/orange, /obj/effect/decal/cleanable/plasma, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/platform/industrial_alt{ + dir = 8 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "LM" = ( -/obj/machinery/telecomms/processor/preset_four{ - autolinkers = list("processor4","bus"); - network = "nt_commnet"; - id = "Nanotrasen Communications Processor" +/obj/effect/turf_decal/siding/red/corner, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 8 }, -/obj/effect/turf_decal/techfloor{ +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/security) "LQ" = ( /obj/structure/cable{ icon_state = "0-4" @@ -4632,37 +5284,38 @@ /area/ship/bridge) "LV" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Ma" = ( -/obj/effect/turf_decal/siding/red{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/corner/opaque/vired/half{ + dir = 1 }, -/obj/effect/turf_decal/siding/red{ - dir = 8 +/obj/structure/chair/plastic{ + dir = 4 }, -/turf/open/floor/plasteel/tech, -/area/ship/security) +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "Mc" = ( -/obj/machinery/light/dim/directional/east, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1; - color = "#a8b2b6" - }, -/obj/machinery/shower{ - dir = 1 +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + name = "Medical Specialist's Quarters"; + id = "Ranger_Medical_Specialist_Quarters" }, -/obj/item/soap/nanotrasen, -/turf/open/floor/noslip, -/area/ship/crew/toilet) +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/crew/specialized/medical) "Md" = ( -/obj/structure/AIcore, -/obj/item/mmi/posibrain, -/obj/item/circuitboard/aicore, -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/structure/grille, +/obj/machinery/door/poddoor{ + dir = 4; + id = "Ranger_AI_Core_Ext_Blasts" }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/machinery/door/firedoor/window, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/science/ai_chamber) "Mf" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm/captain) @@ -4673,30 +5326,27 @@ /obj/structure/cable{ icon_state = "1-6" }, -/obj/effect/turf_decal/trimline/opaque/vired/arrow_cw{ +/obj/structure/chair/handrail{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/effect/turf_decal/techfloor{ dir = 8 }, -/obj/structure/chair/handrail{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/starboard) "Mh" = ( -/obj/machinery/computer/apc_control{ - dir = 4; - icon_state = "computer-left" - }, -/obj/effect/turf_decal/techfloor, -/turf/open/floor/plasteel/mono/dark, -/area/ship/engineering) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/science/ai_chamber) "Mm" = ( /obj/structure/cable{ icon_state = "5-8" }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning, +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/effect/turf_decal/trimline/transparent/white/filled/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Mn" = ( @@ -4713,7 +5363,8 @@ name = "Ranger Bridge Shutters"; id = "Ranger_Bridge_Shutters"; dir = 1; - pixel_x = 6 + pixel_x = 6; + req_ship_access = 1 }, /obj/effect/turf_decal/steeldecal/steel_decals4, /obj/effect/turf_decal/techfloor{ @@ -4722,26 +5373,26 @@ /obj/machinery/door/window/survival_pod{ dir = 8; name = "Captain's Nest"; - req_one_access_txt = list(50,10,5,1,20) + req_one_access_txt = list(50, 10, 5, 1, 20); + req_ship_access = 1 }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Mt" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-4" - }, +/obj/machinery/holopad, /obj/effect/turf_decal/spline/fancy/opaque/orange{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Mu" = ( @@ -4764,16 +5415,31 @@ /turf/open/floor/wood, /area/ship/crew/dorm/captain) "Mx" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 19; - pixel_y = 8 +/obj/effect/turf_decal/steeldecal/steel_decals7{ + dir = 1 }, /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/techfloor{ dir = 1 }, -/turf/open/floor/plasteel/tech, +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/machinery/button/door{ + dir = 4; + pixel_x = -26; + id = "AiCore"; + name = "Core Access"; + req_access_txt = "20"; + req_ship_access = 1 + }, +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/structure/platform/military{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/tcomms, /area/ship/engineering/communications) "Mz" = ( /obj/structure/cable{ @@ -4814,7 +5480,10 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/structure/platform/military/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor/tatmos, /area/ship/engineering/communications) "MI" = ( /obj/machinery/airalarm/directional/north, @@ -4830,15 +5499,25 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "MK" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = 32 +/obj/item/aiModule/core/freeformcore{ + pixel_x = -2; + pixel_y = 1 }, -/obj/effect/turf_decal/techfloor, -/obj/structure/table/reinforced{ - color = "#8A9397" +/obj/item/aiModule/reset/purge{ + pixel_y = 6; + pixel_x = 1 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/item/aiModule/reset{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/machinery/light/dim/directional/north, +/obj/effect/turf_decal/techfloor, +/obj/structure/table/reinforced{ + color = "#8A9397" + }, +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) "ML" = ( /obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/industrial/outline/blue, @@ -4852,8 +5531,10 @@ pixel_y = -10 }, /obj/item/clothing/suit/hooded/wintercoat, +/obj/item/storage/backpack/duffelbag, +/obj/item/storage/backpack/duffelbag, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "MR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -4903,51 +5584,36 @@ /turf/open/floor/plating, /area/ship/engineering) "Nf" = ( -/obj/machinery/button/door{ +/obj/machinery/newscaster/security_unit/directional/south, +/obj/structure/chair/office{ dir = 4; - pixel_x = -21; - name = "Outer Window Blast Doors"; - id = "Ranger_AI_Core_Ext_Blasts" - }, -/obj/machinery/light/dim/directional/south, -/obj/machinery/telecomms/message_server/preset{ - autolinkers = list("messaging","hub"); - network = "nt_commnet"; - layer = 3.1 + name = "tactical swivel chair" }, -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/machinery/computer/security/telescreen{ + dir = 1; + pixel_y = -28; + network = list("ss13") }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/turf/open/floor/mineral/plastitanium/red/brig, +/area/ship/security) "Nn" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 6 + dir = 10 }, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/science/ai_chamber) "Nu" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Ny" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/door/window/survival_pod{ - dir = 1; - opacity = 1; - req_one_access_txt = "10"; - name = "Engineering Specialist's Quarters" - }, -/turf/open/floor/wood, +/obj/machinery/light/dim/directional/east, +/obj/structure/frame/machine, +/turf/open/floor/plasteel/tech, /area/ship/engineering) "NC" = ( /obj/machinery/camera/autoname{ @@ -4956,9 +5622,13 @@ /obj/machinery/light/floor{ pixel_y = -9 }, +/obj/structure/flora/driftwood{ + name = "twigs" + }, /turf/open/floor/engine/hull, /area/ship/external/dark) "NM" = ( +/obj/structure/railing, /turf/open/floor/plasteel/stairs{ dir = 4; color = "#a8b2b6" @@ -4975,119 +5645,237 @@ dir = 9 }, /obj/effect/turf_decal/corner/opaque/vired/half, -/obj/effect/decal/cleanable/plasma, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "NS" = ( -/obj/structure/crate_shelf, -/obj/structure/closet/crate/freezer/blood, +/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 = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/effect/turf_decal/siding/blue{ - dir = 10 + dir = 8 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/machinery/door/airlock/medical{ + name = "Medical Specialist's Quarters"; + dir = 8; + req_access_txt = "5" }, -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"NZ" = ( /obj/structure/cable{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/ship/crew/dorm/captain) -"Og" = ( -/obj/machinery/camera/autoname{ - dir = 1 +/turf/open/floor/pod/light, +/area/ship/crew/specialized/medical) +"NV" = ( +/obj/structure/closet/crate/secure/plasma{ + name = "Relay Parts Crate" }, -/obj/machinery/air_sensor/external, -/obj/machinery/light/dim/directional/south, -/turf/open/floor/engine/hull, -/area/ship/external/dark) -"Om" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/corner{ - dir = 1 +/obj/item/storage/box/stockparts/basic, +/obj/item/circuitboard/machine/telecomms/relay{ + pixel_x = -5; + pixel_y = 9 }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1; - color = "#474747" +/obj/item/circuitboard/machine/telecomms/relay{ + pixel_x = -5; + pixel_y = 9 }, -/turf/open/floor/plasteel/lightgrey, -/area/ship/cargo) -"On" = ( -/obj/machinery/light/dim/directional/east, -/obj/effect/turf_decal/trimline/opaque/nsorange/line{ - dir = 6 +/obj/item/circuitboard/machine/telecomms/relay{ + pixel_x = -5; + pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_y = 16 +/obj/item/encryptionkey/nanotrasen{ + pixel_x = -1 }, -/obj/item/paper_bin{ +/obj/item/encryptionkey/nanotrasen{ + pixel_x = 3 + }, +/obj/item/encryptionkey/nanotrasen{ + pixel_x = 7 + }, +/obj/item/stack/cable_coil/cyan{ + pixel_x = 6 + }, +/obj/item/stock_parts/subspace/filter{ + pixel_x = -8 + }, +/obj/item/stock_parts/subspace/filter{ + pixel_x = -8 + }, +/obj/item/stock_parts/subspace/filter{ + pixel_x = -8 + }, +/obj/item/stock_parts/subspace/filter{ + pixel_x = -8 + }, +/obj/item/stock_parts/subspace/filter{ + pixel_x = -8 + }, +/obj/item/stock_parts/subspace/filter{ + pixel_x = -8 + }, +/obj/item/stock_parts/manipulator{ pixel_x = 7; - pixel_y = -4 + pixel_y = 7 }, -/obj/item/pen/fountain{ - pixel_x = 6; - pixel_y = -5 +/obj/item/stock_parts/manipulator{ + pixel_x = 7; + pixel_y = 7 }, -/obj/structure/table/reinforced{ - color = "#c1b6a5" +/obj/item/stock_parts/manipulator{ + pixel_x = 7; + pixel_y = 7 }, -/obj/item/toy/plush/moth/atlas{ - pixel_x = 9; - pixel_y = 16 +/obj/item/stock_parts/manipulator{ + pixel_x = 7; + pixel_y = 7 }, -/obj/machinery/camera/autoname{ - dir = 1 +/obj/item/stock_parts/manipulator{ + pixel_x = 7; + pixel_y = 7 }, -/obj/item/paper/crumpled{ - pixel_y = -6; - pixel_x = -4 +/obj/item/stock_parts/manipulator{ + pixel_x = 7; + pixel_y = 7 }, -/obj/item/paper/crumpled/muddy{ - name = "coffee-stained paper scrap"; - pixel_x = -9; - pixel_y = 6 +/obj/structure/crate_shelf, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/plating, +/area/ship/engineering) +"NZ" = ( +/obj/item/melee/classic_baton/telescopic, +/obj/item/melee/knife/survival, +/obj/item/gps, +/obj/item/screwdriver, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 7; + pixel_y = -20 + }, +/obj/item/megaphone/command, +/obj/structure/closet/secure_closet/lp/lieutenant, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/item/stock_parts/cell/gun, +/obj/item/flashlight/seclite, +/obj/item/storage/guncase/energy/egun, +/turf/open/floor/plasteel/tech, +/area/ship/crew/dorm/captain) +"Oc" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access_txt = "1"; + name = "Armory"; + req_ship_access = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/camera/autoname{ + dir = 4 }, /turf/open/floor/plasteel/lightgrey, -/area/ship/cargo) -"Ou" = ( +/area/ship/storage/equip) +"Og" = ( /obj/structure/cable{ - icon_state = "4-9" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/techfloor/hole/right, +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/structure/platform/military/corner, +/turf/open/floor/plasteel/tech/tcomms, +/area/ship/engineering/communications) +"Om" = ( +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/ship/security) +"On" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp/green{ + pixel_x = 9; + pixel_y = 11; + layer = 4.2 + }, +/turf/open/floor/wood/ebony, +/area/ship/crew/specialized/cargo) +"Ou" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/starboard) +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "Ranger_Cargo_Privacy"; + name = "N+S Office Shutters" + }, +/obj/structure/grille, +/obj/structure/cable{ + icon_state = "4-9" + }, +/turf/open/floor/plating, +/area/ship/cargo) "Ov" = ( -/obj/machinery/light/dim/directional/east, -/obj/machinery/telecomms/broadcaster/preset_right{ - autolinkers = list("broadcasterB","hub"); - network = "nt_commnet" +/obj/machinery/door/window/eastright{ + dir = 2; + name = "Morgue Access"; + req_access_txt = "5"; + req_ship_access = 1 }, /obj/effect/turf_decal/techfloor{ - dir = 8 + dir = 1 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/obj/effect/turf_decal/techfloor, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines/port) "Ox" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 9 +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 8 +/obj/structure/table/reinforced{ + color = "#8A9397" }, -/obj/item/gps/computer{ - pixel_x = 32; - pixel_y = 0; - density = 0 +/obj/item/wrench, +/obj/item/screwdriver, +/obj/item/stack/cable_coil/cyan, +/obj/item/stack/sheet/rglass{ + amount = 25 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/item/aicard, +/turf/open/floor/circuit/telecomms, +/area/ship/science/ai_chamber) "OC" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -5105,20 +5893,14 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "OK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner, -/obj/machinery/autolathe, -/obj/item/disk/design_disk/ammo_c9mm, -/obj/item/stack/sheet/metal/ten, -/obj/item/stack/sheet/glass{ - amount = 10 - }, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 1 +/obj/effect/turf_decal/siding/thinplating{ + dir = 1; + color = "#a8b2b6" }, -/obj/effect/turf_decal/trimline/opaque/nsorange/filled/corner, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/starboard) +/obj/item/bikehorn/rubberducky, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/noslip, +/area/ship/crew/toilet) "OP" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5128,34 +5910,31 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) -"Pd" = ( -/obj/item/aiModule/core/freeformcore{ - pixel_x = -2; - pixel_y = 1 - }, -/obj/item/aiModule/reset/purge{ - pixel_y = 6; - pixel_x = 1 +"Pa" = ( +/obj/structure/catwalk/over/plated_catwalk/dark{ + name = "sensor protection plate" }, -/obj/item/aiModule/reset{ - pixel_x = 4; - pixel_y = -2 +/obj/machinery/air_sensor/external, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/external/dark) +"Pd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/light/dim/directional/north, -/obj/effect/turf_decal/techfloor, -/obj/structure/table/reinforced{ - color = "#8A9397" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/circuit, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/dark, +/area/ship/hallway/starboard) "Ph" = ( /obj/effect/turf_decal/industrial/warning, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/machinery/firealarm/directional/east, +/obj/structure/platform/industrial_alt/corner, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "Po" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/siding/yellow{ @@ -5164,16 +5943,19 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = 32 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Pr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/corner/opaque/vired{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Pu" = ( @@ -5186,6 +5968,32 @@ }, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) +"PC" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/head/beret/eng/hazard, +/obj/item/storage/backpack/satchel/eng, +/obj/item/storage/backpack/messenger/engi, +/obj/item/storage/backpack/industrial, +/obj/item/storage/backpack/duffelbag/engineering, +/obj/item/clothing/under/rank/engineering/engineer/nt/lp, +/obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp, +/obj/item/storage/backpack/ert/engineer, +/obj/item/clothing/suit/nanotrasen/vest, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/small/directional/west, +/obj/item/clothing/head/nanotrasen/cap/security, +/obj/item/clothing/under/nanotrasen/science/robotics, +/obj/item/clothing/under/nanotrasen/engineering, +/obj/item/clothing/under/nanotrasen/engineering/atmos, +/obj/item/clothing/under/nanotrasen/engineering/director, +/turf/open/floor/wood, +/area/ship/crew/specialized/engineering) "PG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5202,11 +6010,68 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) +"PM" = ( +/obj/structure/closet/secure_closet{ + icon_state = "qm"; + name = "Logistics Specialist's Locker"; + req_ship_access = 1; + req_one_access = list(50) + }, +/obj/item/clothing/suit/hooded/wintercoat/cargo{ + pixel_x = 14 + }, +/obj/item/clothing/shoes/sneakers/brown{ + pixel_x = -10; + pixel_y = -12 + }, +/obj/item/storage/backpack/satchel/leather{ + pixel_y = -6 + }, +/obj/item/clothing/under/nanotrasen/supply/qm, +/obj/item/gps{ + pixel_x = 11; + pixel_y = 9 + }, +/obj/item/stack/packageWrap{ + pixel_x = -10; + pixel_y = 12 + }, +/obj/item/stack/packageWrap{ + pixel_x = -10 + }, +/obj/item/stack/packageWrap{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/melee/knife/letter_opener{ + pixel_x = 13; + pixel_y = -12 + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/obj/item/clothing/under/nanotrasen/supply, +/obj/item/clothing/under/nanotrasen/supply/miner, +/turf/open/floor/plasteel/tech, +/area/ship/crew/specialized/cargo) "PR" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/corner/opaque/vired/half, +/obj/structure/sign/poster/official/help_others{ + pixel_y = -32 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "PV" = ( @@ -5223,10 +6088,34 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "Qf" = ( -/obj/effect/turf_decal/corner/opaque/vired/half, +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 1 + }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/tech, /area/ship/storage/equip) +"Qr" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 8; + name = "Valve - Air to External Scrubber" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) "Qt" = ( /obj/effect/turf_decal/industrial/hatch/orange, /obj/machinery/power/ship_gravity, @@ -5259,24 +6148,56 @@ /turf/open/floor/engine/hull, /area/ship/external/dark) "Rn" = ( -/obj/machinery/light/dim/directional/north, -/obj/structure/crate_shelf, -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 2; - req_access_txt = "1"; - name = "Armory"; - req_ship_access = 1 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 +/obj/structure/closet/secure_closet/armorycage{ + req_access = list(1) }, +/obj/effect/turf_decal/industrial/fire, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, -/turf/open/floor/plasteel/lightgrey, +/obj/item/clothing/suit/armor/nanotrasen/slim{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/clothing/suit/armor/nanotrasen/slim{ + pixel_x = -10; + pixel_y = -1 + }, +/obj/item/clothing/head/helmet/swat{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/clothing/head/helmet/swat{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/item/flashlight/seclite{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/flashlight/seclite{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/storage/belt/security/webbing, +/obj/item/storage/belt/security/webbing, +/obj/item/radio/headset/alt{ + pixel_x = 5; + pixel_y = -11 + }, +/obj/item/clothing/mask/gas/vigilitas, +/obj/item/clothing/mask/gas/vigilitas, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -1; + pixel_y = -14; + name = "half-mask respirator" + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -1; + pixel_y = -14; + name = "half-mask respirator" + }, +/turf/open/floor/plasteel/tech, /area/ship/storage/equip) "Ro" = ( /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line{ @@ -5300,14 +6221,15 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "RB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/structure/chair/handrail{ + dir = 8; + pixel_x = 2 }, -/obj/machinery/camera/autoname{ - dir = 10 +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "RM" = ( /obj/structure/chair/sofa/brown/left/directional/west, /obj/machinery/light/dim/directional/east, @@ -5317,8 +6239,11 @@ /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/industrial/outline/orange, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "Sa" = ( /obj/effect/turf_decal/ntspaceworks_small, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -5330,101 +6255,54 @@ /obj/effect/turf_decal/spline/fancy/opaque/blue, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"Sl" = ( -/obj/structure/closet/crate/secure/plasma{ - name = "Relay Parts Crate" - }, -/obj/item/storage/box/stockparts/basic, -/obj/item/circuitboard/machine/telecomms/relay{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/circuitboard/machine/telecomms/relay{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/circuitboard/machine/telecomms/relay{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/encryptionkey/nanotrasen{ - pixel_x = -1 - }, -/obj/item/encryptionkey/nanotrasen{ - pixel_x = 3 - }, -/obj/item/encryptionkey/nanotrasen{ - pixel_x = 7 - }, -/obj/item/stack/cable_coil/cyan{ - pixel_x = 6 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/subspace/filter{ - pixel_x = -8 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 +"Sd" = ( +/obj/effect/decal/cleanable/shreds, +/obj/effect/decal/cleanable/wrapping, +/obj/effect/turf_decal/corner/opaque/syndiered/half{ + dir = 1 }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/item/stock_parts/manipulator{ - pixel_x = 7; - pixel_y = 7 +/obj/structure/chair/handrail, +/turf/open/floor/plasteel/tech, +/area/ship/storage/equip) +"Sl" = ( +/obj/item/bodypart/leg/right/robot, +/obj/item/bodypart/r_arm/robot, +/obj/item/bodypart/leg/left/robot, +/obj/item/bodypart/l_arm/robot, +/obj/item/bodypart/chest/robot, +/obj/item/bodypart/head/robot, +/obj/item/borg/upgrade/ai, +/obj/item/robot_suit, +/obj/structure/closet/crate/engineering{ + name = "Robotics Crate" }, -/obj/structure/crate_shelf, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/light/dim/directional/east, +/obj/item/stock_parts/cell/high, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/borg/upgrade/restart, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, /turf/open/floor/plating, /area/ship/engineering) "So" = ( -/obj/structure/cable{ - icon_state = "5-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/effect/turf_decal/trimline/opaque/nsorange/warning{ +/obj/effect/decal/cleanable/wrapping, +/obj/structure/chair/office{ dir = 1 }, -/obj/effect/turf_decal/siding{ - color = "#474747"; - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/wrapping, -/turf/open/floor/plasteel/lightgrey, +/turf/open/floor/plasteel/white, /area/ship/cargo) "Sv" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -5434,27 +6312,16 @@ /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "SC" = ( -/obj/item/storage/box/donkpockets{ - pixel_x = -3 - }, -/obj/item/storage/box/donkpockets/donkpocketpizza{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/box/donkpockets/donkpocketspicy{ - pixel_y = 9; - pixel_x = 7 - }, -/obj/structure/table/reinforced{ - color = "#8A9397" - }, -/turf/open/floor/plasteel/lightgrey, -/area/ship/hallway/central) +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) "SE" = ( /obj/effect/turf_decal/industrial/outline/orange, /obj/machinery/portable_atmospherics/canister/toxins, +/obj/structure/platform/industrial_alt{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "SG" = ( /obj/structure/toilet{ dir = 1 @@ -5462,12 +6329,27 @@ /turf/open/floor/plating/catwalk_floor, /area/ship/security) "SN" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ +/obj/machinery/door/airlock/mining{ + dir = 8; + name = "N+S Office" + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/starboard) +/obj/effect/turf_decal/siding{ + dir = 8; + color = "#FF6600" + }, +/obj/effect/turf_decal/siding{ + dir = 4; + color = "#FF6600" + }, +/turf/open/floor/pod/light, +/area/ship/cargo) "Tb" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/storage/equip) @@ -5482,35 +6364,66 @@ /obj/structure/cable/cyan{ icon_state = "6-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Tl" = ( /obj/structure/sign/nanotrasen/vigilitas, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) "Tz" = ( -/obj/effect/turf_decal/corner/opaque/vired/three_quarters, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/port) -"TG" = ( -/obj/item/toy/plush/spider, -/obj/machinery/camera/autoname{ - dir = 9 +/obj/structure/chair/office{ + dir = 4; + name = "tactical swivel chair" }, -/obj/structure/table/reinforced{ - color = "#8A9397" +/obj/effect/turf_decal/corner/opaque/blue/diagonal, +/obj/effect/turf_decal/borderfloor{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/siding/thinplating/light, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"TC" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor, +/obj/structure/closet/secure_closet/brig{ + name = "Secure Holding Locker" + }, +/obj/machinery/door/window/brigdoor/northleft{ + req_access_txt = "1"; + name = "Secure Lockup"; + req_ship_access = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/security) -"TL" = ( -/obj/machinery/light/dim/directional/north, -/obj/effect/turf_decal/trimline/opaque/nsorange/line{ +/area/ship/engineering/engines/starboard) +"TG" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/item/bedsheet/qm, -/obj/structure/bed, -/obj/structure/curtain/bounty, -/turf/open/floor/plasteel/lightgrey, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ship/crew/specialized/engineering) +"TL" = ( +/obj/machinery/computer/cargo, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/plasteel/white, /area/ship/cargo) "TR" = ( /obj/machinery/light/dim/directional/north, @@ -5526,32 +6439,26 @@ /obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/turf_decal/techfloor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Ua" = ( -/obj/machinery/camera/autoname{ - dir = 9 - }, -/obj/machinery/button/door{ - dir = 8; - pixel_x = 26; - id = "AiCore"; - name = "Core Access"; - req_access_txt = "20"; - pixel_y = 8 - }, /obj/effect/turf_decal/spline/fancy/opaque/black{ - dir = 5 + dir = 9 }, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/telecomms_floor, -/area/ship/engineering/communications) +/obj/item/gps/computer{ + pixel_x = 32; + pixel_y = 0; + density = 0 + }, +/turf/open/floor/plasteel/telecomms_floor/tatmos, +/area/ship/science/ai_chamber) "Uj" = ( /obj/structure/table/reinforced{ color = "#c1b6a5" @@ -5582,21 +6489,31 @@ /obj/effect/turf_decal/trimline/opaque/vired/arrow_cw{ dir = 8 }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/effect/turf_decal/techfloor{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Us" = ( -/obj/effect/turf_decal/siding/red{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/structure/closet/crate/bin, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 }, -/turf/open/floor/plasteel/tech, -/area/ship/security) +/obj/machinery/door/airlock/engineering{ + name = "Engineering Specialist's Quarters"; + req_access_txt = "10" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/pod/light, +/area/ship/crew/specialized/engineering) "Ut" = ( /obj/structure/urinal{ pixel_y = 29 @@ -5605,8 +6522,24 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "UQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ + piping_layer = 2; + dir = 8; + layer = 2 + }, /turf/open/floor/engine/air, /area/ship/hallway/central) +"UR" = ( +/obj/machinery/light/dim/directional/east, +/obj/machinery/telecomms/broadcaster/preset_right{ + autolinkers = list("broadcasterB","hub"); + network = "nt_commnet" + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/turf/open/floor/circuit/telecomms, +/area/ship/engineering/communications) "UU" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5631,8 +6564,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt/corner, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Vg" = ( /obj/machinery/camera/autoname{ dir = 10 @@ -5664,7 +6598,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "Vp" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/starboard) @@ -5673,18 +6607,21 @@ /obj/effect/decal/cleanable/plasma, /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Vt" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/platform/industrial_alt, /obj/machinery/space_heater, -/obj/structure/railing, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "VC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/stairs{ @@ -5725,16 +6662,15 @@ /obj/item/toy/plush/tali{ pixel_y = 14 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "VP" = ( -/obj/machinery/newscaster/security_unit/directional/south, -/obj/structure/chair/office{ - dir = 4; - name = "tactical swivel chair" - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/obj/machinery/light/dim/directional/south, +/obj/effect/turf_decal/siding/red/end, +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plasteel/tech, /area/ship/security) "VQ" = ( /obj/machinery/camera/autoname{ @@ -5754,15 +6690,33 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, -/obj/structure/closet/crate/bin, +/obj/item/radio/intercom/directional/north, +/obj/machinery/autolathe, +/obj/item/disk/design_disk/ammo_c9mm, +/obj/item/stack/sheet/glass{ + amount = 10 + }, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Wj" = ( /obj/structure/bed, -/obj/item/radio/intercom/directional/south, /obj/item/bedsheet/red, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/button/door{ + pixel_x = -22; + pixel_y = -2; + dir = 4; + name = "Security Quarters Windows"; + id = "Ranger_Security_Specialist_Quarters"; + req_ship_access = 1 + }, /turf/open/floor/wood, -/area/ship/security) +/area/ship/crew/specialized/security) "Wp" = ( /obj/machinery/door/poddoor{ dir = 2; @@ -5792,6 +6746,7 @@ /obj/effect/turf_decal/corner/opaque/vired{ dir = 4 }, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/corner, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Wv" = ( @@ -5809,9 +6764,16 @@ /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "Wz" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner, +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "Ranger_Cargo_Privacy"; + name = "N+S Office Shutters" + }, +/turf/open/floor/plating, +/area/ship/cargo) "WF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5823,26 +6785,32 @@ dir = 4 }, /obj/machinery/light/dim/directional/south, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/tcomms, /area/ship/engineering/communications) "WG" = ( -/obj/machinery/telecomms/server/presets/nanotrasen{ - autolinkers = list("nanotrasen","hub"); - network = "nt_commnet"; - freq_listening = list(1353,1447,1459) +/obj/machinery/light/dim/directional/south, +/obj/machinery/telecomms/relay{ + freq_listening = list(1353,1447,1459); + id = "Nanotrasen Relay"; + name = "Nanotrasen relay"; + network = "nt_commnet" }, -/obj/item/disk/holodisk/lp/stations, /obj/effect/turf_decal/techfloor{ dir = 1 }, -/turf/open/floor/circuit, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/circuit/telecomms, /area/ship/engineering/communications) "WR" = ( -/obj/effect/turf_decal/corner/opaque/vired/half{ +/obj/effect/turf_decal/corner/opaque/syndiered/three_quarters{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/effect/decal/cleanable/shreds, -/obj/effect/decal/cleanable/wrapping, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/tech, /area/ship/storage/equip) "WZ" = ( @@ -5888,12 +6856,26 @@ /obj/machinery/suit_storage_unit/inherit{ name = "Engineering Specialist's Storage Unit" }, +/obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/hardsuit/ert/lp/engi, /obj/item/tank/internals/oxygen/yellow, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/clothing/mask/gas/vigilitas, /turf/open/floor/plasteel/lightgrey, /area/ship/storage/equip) +"Xz" = ( +/obj/effect/turf_decal/corner/opaque/vired/half, +/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/decal/cleanable/plasma, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) "XA" = ( /obj/structure/cable{ icon_state = "1-10" @@ -5927,10 +6909,17 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/structure/closet/wall/directional/south, +/obj/structure/closet/wall/directional/south{ + name = "Intern's Locker" + }, /obj/effect/turf_decal/corner/opaque/lightgrey{ dir = 10 }, +/obj/item/clothing/under/nanotrasen, +/obj/item/clothing/shoes/sneakers/black{ + pixel_y = -10 + }, +/obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/plasteel/dark, /area/ship/crew/cryo) "XL" = ( @@ -6007,14 +6996,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Yk" = ( -/obj/effect/turf_decal/trimline/opaque/nsorange/warning, /obj/effect/turf_decal/siding{ color = "#474747" }, -/turf/open/floor/plasteel/lightgrey, +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/ship/cargo) "Yw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -6038,7 +7030,8 @@ id = "Ranger_Port_holofields" }, /obj/machinery/door/poddoor{ - id = "Ranger_Port_Blasts" + id = "Ranger_Port_Blasts"; + name = "Portside Access" }, /obj/structure/cable{ icon_state = "0-2" @@ -6047,51 +7040,63 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Yz" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, /obj/machinery/door/airlock/security/brig{ dir = 8; id_tag = "SecureCell"; name = "Holding Cell"; req_access_txt = "1" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#474747"; + dir = 4 + }, +/turf/open/floor/pod/light, /area/ship/security) "YJ" = ( -/obj/effect/turf_decal/corner/opaque/vired/three_quarters, -/obj/structure/table/reinforced, -/obj/item/screwdriver{ - pixel_x = -7; - pixel_y = 7 +/obj/effect/turf_decal/corner/opaque/syndiered/half, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/screwdriver{ - pixel_x = -7 +/turf/open/floor/plasteel/tech, +/area/ship/storage/equip) +"YK" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 9; + pixel_y = 3 }, -/obj/item/hand_labeler{ - pixel_x = 8; - pixel_y = 13 +/obj/item/toy/plush/moth/snow{ + pixel_x = -3 }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ +/obj/item/folder/blue{ + pixel_x = -3; + pixel_y = -10 + }, +/obj/item/flashlight/pen{ + pixel_x = -5; + pixel_y = -9 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light_switch{ + pixel_x = 20; + pixel_y = 11; dir = 8 }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plasteel/tech, -/area/ship/storage/equip) -"YK" = ( -/obj/machinery/firealarm/directional/north{ - pixel_x = -4 +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/structure/table/reinforced, -/obj/machinery/computer/helm/viewscreen/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/turf/open/floor/wood, +/area/ship/crew/specialized/medical) "YP" = ( /obj/structure/cable{ icon_state = "2-4" @@ -6114,24 +7119,23 @@ /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 8 }, +/obj/structure/railing, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) +/area/ship/engineering/engines/starboard) "YW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 6 }, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/corner/opaque/vired/half{ - dir = 8 +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech, +/area/ship/engineering) "Zj" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ dir = 4 @@ -6145,31 +7149,38 @@ name = "Engine Shutters" }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "Zk" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/machinery/suit_storage_unit/inherit{ - name = "Emergency EVA Suit" +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/clothing/head/helmet/space/fragile, -/obj/item/clothing/suit/space/fragile, -/turf/open/floor/plasteel/tech/techmaint{ - color = "#a8b2b6" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, +/turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Zl" = ( /obj/effect/turf_decal/industrial/outline/orange, /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/decal/cleanable/plasma, +/obj/structure/platform/industrial_alt{ + dir = 4 + }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) +"Zn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/port) "Zs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ @@ -6187,24 +7198,47 @@ /obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw{ dir = 4 }, -/obj/effect/turf_decal/trimline/opaque/vired/filled/line{ +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/turf_decal/techfloor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/hallway/port) "Zv" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/camera/autoname{ - dir = 4 +/obj/structure/closet/cabinet, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/hooded/wintercoat/security, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/head/beret/sec, +/obj/item/clothing/under/rank/security/head_of_security/nt/lp, +/obj/item/clothing/under/rank/security/head_of_security/nt/skirt/lp, +/obj/item/clothing/under/rank/security/head_of_security/alt/lp, +/obj/item/storage/backpack/ert/security, +/obj/effect/turf_decal/techfloor{ + dir = 1 }, -/turf/open/floor/wood, -/area/ship/security) +/obj/effect/turf_decal/techfloor, +/obj/item/clothing/head/soft/black, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/item/clothing/glasses/hud/security/prescription, +/obj/item/clothing/mask/gas/sechailer, +/obj/item/clothing/suit/armor/nanotrasen, +/obj/item/clothing/suit/armor/nanotrasen/slim, +/obj/item/clothing/suit/armor/vest/security/officer, +/obj/item/clothing/suit/armor/vest/bulletproof, +/obj/machinery/airalarm/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/item/clothing/head/nanotrasen/beret/security, +/obj/item/clothing/head/nanotrasen/cap/security, +/obj/item/clothing/under/nanotrasen/security, +/obj/item/clothing/under/nanotrasen/security/director, +/turf/open/floor/plasteel/tech, +/area/ship/crew/specialized/security) "Zw" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/trimline/opaque/nsorange/filled/warning{ + dir = 4 }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning, +/obj/effect/turf_decal/trimline/transparent/white/filled/corner, /turf/open/floor/plasteel/dark, /area/ship/hallway/starboard) "Zx" = ( @@ -6218,9 +7252,13 @@ "ZF" = ( /obj/machinery/light/dim/directional/south, /obj/effect/turf_decal/industrial/outline/blue, -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/suit_storage_unit/inherit/industrial{ + name = "dusty industrial suit storage unit" + }, +/obj/item/clothing/suit/space/hardsuit/ancient/lp, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) +/area/ship/engineering/engines/port) "ZI" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6235,42 +7273,23 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/tcomms, /area/ship/engineering/communications) "ZL" = ( /obj/machinery/vending/coffee, /turf/open/floor/plasteel/lightgrey, /area/ship/hallway/central) "ZS" = ( -/obj/structure/closet/syndicate{ - desc = "It's the armory closet. A closet with shelving, in an armory!" - }, -/obj/machinery/door/window/brigdoor/eastright{ - dir = 2; - req_access_txt = "1"; - name = "Armory"; - req_ship_access = 1 - }, -/obj/item/storage/guncase/pistol/commander, -/obj/item/ammo_box/magazine/co9mm, -/obj/item/clothing/suit/armor/nanotrasen/slim, -/obj/item/clothing/suit/armor/nanotrasen/slim, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/storage/guncase/pistol, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/stairs{ + dir = 1; + color = "#a8b2b6" }, -/obj/item/gun/ballistic/automatic/smg/skm_carbine/saber, -/turf/open/floor/plasteel/lightgrey, -/area/ship/storage/equip) +/area/ship/bridge) "ZW" = ( /obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{ @@ -6318,7 +7337,7 @@ zW zW yK zW -QT +kF qs qs QT @@ -6353,13 +7372,13 @@ zW zW zW zW -QT +kF tr -QT +kF BO rW -QT -QT +kF +kF zW zW zW @@ -6390,13 +7409,13 @@ zW zW zW zW -QT +kF br -QT +kF DW nJ iC -QT +kF zW zW zW @@ -6427,14 +7446,14 @@ zW zW zW zW -QT +kF Vm tZ oq an cE -QT -QT +kF +kF zW zW "} @@ -6464,14 +7483,14 @@ zW zW zW zW -QT +kF qQ gD ib eN Lw Dd -QT +kF zW zW "} @@ -6480,7 +7499,7 @@ zW zW zW zW -vm +LV Vq Zl iq @@ -6492,23 +7511,23 @@ zW zW zW zW -Kg -kQ -kQ -kQ -Kg zW zW zW zW -QT +zW +zW +zW +zW +zW +kF VM YP vv Ph RS SE -fV +kF zW zW "} @@ -6516,11 +7535,11 @@ zW zW zW zW -vm -vm -vm -vm -vm +su +su +su +su +su LV ad ZF @@ -6528,124 +7547,161 @@ LV zW zW zW -Kg -Kg -gh +zW +Mh Md -pL -Kg -Kg +Md +Md +Mh zW zW zW -QT +zW +kF ML ih -QT -QT -QT -fV -fV -fV +kF +yF +yF +yF +yF +yF zW "} (8,1,1) = {" zW zW -hN -vm -vm +Te +Mc +Ao cj oQ -tq -LV +su +yo sm qb LV zW zW zW -Kg -Pd +Mh +Mh Ox IE Ep -Nf -Kg +Mh +Mh zW zW zW -QT +kF gz FQ -QT -jv +TC +yF Zv AZ Wj -fV -sp +yG +Te "} (9,1,1) = {" zW zW -vm -vm +gL +Mc YK aO Aw -Gn -LV -vT -LV +su +Ov +xY +JO LV zW zW -yK -Kg +zW +Mh MK Ua vO Nn Cq -Kg -yK +Mh zW zW -QT -QT +zW +kF +mK id -QT -fV +fU +yF bw hQ ab -fV -fV +zM +gL "} (10,1,1) = {" zW zW vm -sF -oi +su +su NS -vF +su +su +LV +vT +LV +LV +zW +zW +yK +Mh +qJ +pi +kw +gk +cI +Mh +yK +zW +zW +kF +kF +hG +kF +fV +fV +Js +fV +fV +fV +"} +(11,1,1) = {" +zW +zW vm -jA +ix +Kt +jk +vS +vm +Cb zc jA zW zW wU wU -Kg -Kg -Kg -kw -gk -Kg -Kg +Mh +Mh +Mh +lu +lw +Mh +Mh Kg Kg zW @@ -6654,87 +7710,124 @@ Vp cN vR nq -Us -Js -Ma -sR +gi +LM +bN +VP fV "} -(11,1,1) = {" +(12,1,1) = {" zW zW vm -ix -Kt -jk -vS +mJ +Tz +gh +uW Qu -Cb -NR +SC +Xz jA -qe +bX wU wU jt WZ -Mh +lD wU nE WF Kg -LM -bX +sl +CB Kg Kg -fo +EE Vp Ff +Pd +nq +tQ +or +KT +Om +fV +"} +(13,1,1) = {" +zW +zW +vm +jv +pG +tq +jZ +Qu +Zn +NR +jA +GY +wU +LQ +aP +Pu +xq +Wp +Gz +dn +Mx +fo +sR +ux +Kg +GY +Vp +Lt wT nq -gi +rg Lg -bN -VP +df +Nf fV "} -(12,1,1) = {" +(14,1,1) = {" zW zW vm vV GC kS -uW +Ct Qu XQ PR jA zW wU -LQ -aP -Pu -xq -Wp -Gz -dn -AH -sl -CB -yA +gN +dr +rC +yi +Dr +ZJ +Og +wf +MD +tT +WG Kg zW Vp no Vh qR -tQ +Iz nh Dx yk fV "} -(13,1,1) = {" +(15,1,1) = {" zW zW vm @@ -6748,17 +7841,17 @@ pU jA zW wU -gN -dr -rC -yi -Dr -ZJ -fU -Mx -MD -tT -ux +Ge +Sl +JP +wU +wU +hK +Hd +wU +Ds +Bo +wu Kg zW Vp @@ -6771,31 +7864,31 @@ iH iH fV "} -(14,1,1) = {" +(16,1,1) = {" zW zW vm XS Xb -sU -Ct +vF +zO Qu bf tR jA zW wU -Ge -or -JP -wU -wU -hK -Hd wU -Ds -Bo -WG +NV +Nd +IC +Mz +jF +PV +dP +EP +UR +Kg Kg zW Vp @@ -6808,7 +7901,7 @@ Ji SG fV "} -(15,1,1) = {" +(17,1,1) = {" zW zW JR @@ -6821,31 +7914,31 @@ jH uE jA zW +zW wU wU -Sl -Nd -IC -Mz -jF -PV -dP -wC -Ov +Qt +wU +Ca +rA +aG +wU +Kg Kg Kg zW +zW Vp -yo +Ma Cg of jd -TG +lX my xv fV "} -(16,1,1) = {" +(18,1,1) = {" zW zW JR @@ -6859,21 +7952,21 @@ Kf jA zW zW +Vg wU wU -Qt -wU -Ca -rA -yU wU -Kg -Kg -Kg +Mt +hn +Ny +vJ +vJ +vJ +sp zW zW Vp -pi +vc iZ ji gg @@ -6882,7 +7975,7 @@ gg gg gg "} -(17,1,1) = {" +(19,1,1) = {" zW zW JR @@ -6892,21 +7985,21 @@ VC CW EL ml -Tz +jA jA zW zW -Vg -wU +zW wU wU -up -hn -aG -df -Kg -Kg -sp +ps +Hs +tk +vJ +vJ +PC +hz +zW zW zW Vp @@ -6919,12 +8012,12 @@ BI BA gg "} -(18,1,1) = {" +(20,1,1) = {" zW zW JR -vB -cW +yf +vg lc JR Ro @@ -6934,15 +8027,15 @@ zW zW zW zW -zW -wU -jr -Mt -lX -Ny -JK +wq wU -zW +us +AH +YW +Us +KC +TG +hz zW zW zW @@ -6956,7 +8049,7 @@ gg gg gg "} -(19,1,1) = {" +(21,1,1) = {" zW zW JR @@ -6971,15 +8064,15 @@ zW zW zW zW -zW -wU -ps -Hs -tk -Bh -GY +wq wU -zW +hZ +Ha +rX +vJ +qe +eo +FM zW zW zW @@ -6989,11 +8082,11 @@ iI xj Fw Kw -Lt -yC +Gn +OK gg "} -(20,1,1) = {" +(22,1,1) = {" zW zW JR @@ -7013,10 +8106,10 @@ wU wU FB wU -wU -wU -wU -wU +vJ +vJ +vJ +vJ zW zW zW @@ -7027,10 +8120,10 @@ XV gg vk pp -Mc +mv gg "} -(21,1,1) = {" +(23,1,1) = {" zW zW JR @@ -7047,12 +8140,12 @@ sJ sJ sJ We -hZ +ec VJ -rX +vB Sv Kl -eo +CJ sJ sJ sJ @@ -7067,7 +8160,7 @@ gg gg gg "} -(22,1,1) = {" +(24,1,1) = {" zW zW zW @@ -7084,27 +8177,27 @@ ZY CG mw MR -vj -fd -yG +ki +Bh +BX BX Gk bK mw zi -lj -YW +sU +Et Yw Zx nA Mm uk -xA -jQ +Mg +wh ww zW "} -(23,1,1) = {" +(25,1,1) = {" zW zW zW @@ -7129,19 +8222,19 @@ GG XE OP XR +Zk mh -az XL Wr hk Zw -rM -Mg -wh +CD +Bl +Bg wq zW "} -(24,1,1) = {" +(26,1,1) = {" zW zW zW @@ -7153,7 +8246,7 @@ lB rL IR jA -CJ +Qr dG sJ Wv @@ -7166,23 +8259,23 @@ tf iS rT sJ -sJ ok sJ -OK +sJ +Wz Ou SN -CD -Bl -Bg -wq +XT +XT +XT +vo zW "} -(25,1,1) = {" +(27,1,1) = {" zW zW ef -Og +pL jA Po iX @@ -7203,19 +8296,19 @@ AP Ih kK sJ -Zk -us +ex +sF sJ -XT +KU zC fz +Cn +xA XT -XT -XT -hz +cW zW "} -(26,1,1) = {" +(28,1,1) = {" zW zW zW @@ -7223,7 +8316,7 @@ zW Tb Tb Tb -dl +qZ aI Tb Tb @@ -7233,15 +8326,15 @@ Mf Mf Mf sJ -EP +pA ZL Nu MY xw -SC +wC sJ -cI -Fh +dx +RB sJ DZ So @@ -7252,23 +8345,23 @@ XT zW zW "} -(27,1,1) = {" +(29,1,1) = {" zW zW zW zW Tb Rn -mJ -KC -jZ +Oc +WR +Qf Be Tb sJ sJ Mf Gc -Ha +NZ Lk VE VE @@ -7277,10 +8370,10 @@ tj Lk sJ sJ -Tl CP +Tl XT -Iz +TL lv Yk pD @@ -7289,44 +8382,44 @@ XT zW zW "} -(28,1,1) = {" +(30,1,1) = {" zW zW zW zW Tb -ZS -rg -qZ -wu +hF +yU +DE +YJ yZ Tb NC Mf jC -mv -Ao -JO -pA -lD -hF -ec -wf +oi +yA +Kq +az +ZS +JK +eE +eD Lk -Wz -dx -RB -XT -lw -Om -Yk -gL -vo -XT +fd +iN +jr +Bv +yC +lj +Hp +Bv +Bv +Bv zW zW "} -(29,1,1) = {" +(31,1,1) = {" zW zW zW @@ -7334,15 +8427,15 @@ zW Tb Tb aK -WR -Qf +Sd +kQ Xt Tb zW Mf Mu Vk -NZ +vj Lk sf iF @@ -7350,20 +8443,20 @@ XA Sa xp Lk -wq +bX zW zW -XT -TL +Bv +PM Fg zB -eE -XT -XT +dl +Bv +Bv zW zW "} -(30,1,1) = {" +(32,1,1) = {" zW zW zW @@ -7371,8 +8464,8 @@ zW zW Tb Tb -DE -YJ +na +up Tb Tb zW @@ -7390,17 +8483,17 @@ Lk wq zW zW -XT -XT +Bv +Bv eU On -XT -XT +Bv +Bv zW zW zW "} -(31,1,1) = {" +(33,1,1) = {" zW zW zW @@ -7428,16 +8521,16 @@ zW zW zW zW -XT -XT -XT -XT +Bv +rM +rM +Bv zW zW zW zW "} -(32,1,1) = {" +(34,1,1) = {" zW zW zW @@ -7474,7 +8567,7 @@ zW zW zW "} -(33,1,1) = {" +(35,1,1) = {" zW zW zW @@ -7511,7 +8604,7 @@ zW zW zW "} -(34,1,1) = {" +(36,1,1) = {" zW zW zW @@ -7548,7 +8641,7 @@ zW zW zW "} -(35,1,1) = {" +(37,1,1) = {" zW zW zW @@ -7563,7 +8656,7 @@ zW zW zW zW -wq +Pa zW Lk LU @@ -7585,7 +8678,7 @@ zW zW zW "} -(36,1,1) = {" +(38,1,1) = {" zW zW zW diff --git a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm index a04c729df8ef..0e6a33de1aeb 100644 --- a/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm +++ b/_maps/shuttles/pgf/pgf_woeful_cthonian.dmm @@ -120,7 +120,7 @@ }, /obj/structure/catwalk/over, /obj/structure/platform{ - dir = 8 + dir = 4 }, /turf/open/floor/plating, /area/ship/engineering) @@ -922,7 +922,7 @@ }, /obj/structure/catwalk/over, /obj/structure/platform{ - dir = 8 + dir = 4 }, /turf/open/floor/plating, /area/ship/engineering) @@ -983,7 +983,7 @@ /obj/machinery/light/directional/north, /obj/machinery/power/ship_gravity, /obj/structure/platform{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/tech, /area/ship/engineering) @@ -1033,9 +1033,6 @@ /obj/machinery/turretid/ship{ pixel_x = 26 }, -/obj/machinery/computer/cargo{ - dir = 8 - }, /obj/effect/turf_decal/techfloor{ dir = 4 }, @@ -1046,7 +1043,12 @@ name = "bridge shutter control" }, /obj/structure/platform/ship_two{ - dir = 8 + dir = 5 + }, +/obj/machinery/computer/cargo{ + dir = 8; + layer = 3.1; + pixel_y = -2 }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -1094,10 +1096,12 @@ dir = 4 }, /obj/machinery/computer/helm{ - dir = 8 + dir = 8; + layer = 3.1; + pixel_y = 5 }, /obj/structure/platform/ship_two{ - dir = 8 + dir = 6 }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -1366,13 +1370,14 @@ /obj/structure/table/reinforced, /obj/item/radio/intercom/wideband/table{ dir = 4; - pixel_y = 4 + pixel_y = 0; + pixel_x = 1 }, /obj/item/desk_flag/gezena{ pixel_x = 8 }, /obj/structure/platform/ship_two{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -3246,7 +3251,7 @@ }, /obj/machinery/light/directional/south, /obj/structure/platform{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/tech, /area/ship/engineering) diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm deleted file mode 100644 index 711a9f2033ae..000000000000 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ /dev/null @@ -1,3901 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"aH" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/firealarm/directional/east, -/obj/effect/decal/cleanable/oil, -/obj/structure/sign/warning/nosmoking{ - pixel_y = -28 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"aN" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"bd" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"bl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=crew"; - location = "cargo" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"bH" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "hos"; - name = "captain's locker"; - req_access = list(20) - }, -/obj/item/storage/backpack/security, -/obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/suit/armor/ngr/captain, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/item/clothing/head/ngr/peaked, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/ammo_box/a357/match, -/obj/item/pen/edagger, -/obj/item/storage/guncase/pistol/a357, -/obj/item/storage/box/ammo/a357, -/turf/open/floor/carpet/black, -/area/ship/bridge) -"bJ" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "armor locker" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom/directional/west{ - pixel_y = -5 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/light/small/directional/west{ - pixel_y = 7 - }, -/obj/item/clothing/glasses/hud/security/sunglasses/ngr, -/obj/item/clothing/glasses/hud/security/sunglasses/ngr, -/obj/item/clothing/suit/armor/ngr, -/obj/item/clothing/suit/armor/ngr, -/obj/item/clothing/head/helmet/ngr, -/obj/item/clothing/head/helmet/ngr, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"bN" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"bS" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"bV" = ( -/obj/machinery/door/poddoor/shutters{ - id = "wreckerarmory"; - name = "Security Shutters" - }, -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"cg" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/turretid/lethal{ - pixel_y = -24 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"ch" = ( -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"cs" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"cB" = ( -/obj/structure/weightmachine/weightlifter, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"cH" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/storage) -"cV" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/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/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/trimline/opaque/red/filled/corner{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 23 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"dh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/landmark/start/shaft_miner, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"dA" = ( -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 5 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/structure/closet/crate{ - name = "food crate" - }, -/obj/item/storage/cans/sixbeer, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"dG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) -"dQ" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"dU" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wrecker_engine_stbd" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"ec" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"fg" = ( -/obj/structure/sign/number/eight{ - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/fore) -"fi" = ( -/obj/machinery/power/port_gen/pacman/super, -/obj/effect/turf_decal/radiation/white, -/obj/effect/turf_decal/industrial/outline, -/obj/effect/turf_decal/radiation/white, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) -"fv" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "ammunition locker" - }, -/obj/machinery/light/small/directional/east{ - pixel_y = -8 - }, -/obj/machinery/firealarm/directional/east{ - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/industrial/outline, -/obj/item/storage/box/ammo/a12g_buckshot, -/obj/item/storage/box/ammo/c10mm, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"fC" = ( -/obj/structure/sign/number/four{ - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/fore) -"fL" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/cargo/office) -"fV" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"fW" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/oil/streak, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"fY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) -"ge" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 2; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm) -"gg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/outline, -/obj/structure/bed/roller, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"gM" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"hc" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/rnd/production/techfab/department/cargo, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"hh" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/oil/slippery, -/obj/structure/sign/warning/nosmoking{ - pixel_y = -28 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"hD" = ( -/obj/structure/sign/syndicate{ - pixel_y = 2 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"hT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"ia" = ( -/obj/effect/turf_decal/arrows{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"ir" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastleft{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wrecker_engine_port" - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"iv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/red, -/obj/effect/turf_decal/corner/opaque/red{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"ix" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=bridge"; - location = "crew" - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"iC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/arrows{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"iI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"iL" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/light/small/directional/west, -/obj/item/clothing/suit/space/syndicate/black/orange, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/helmet/space/syndicate/black/orange, -/obj/item/tank/jetpack/carbondioxide, -/obj/machinery/suit_storage_unit/inherit/industrial{ - req_one_access = list(48,56) - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"iT" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) -"jf" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/dorm) -"ji" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -9 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"jt" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/storage) -"jB" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "firearms locker" - }, -/obj/structure/sign/poster/contraband/stechkin{ - pixel_x = 32 - }, -/obj/effect/turf_decal/industrial/outline, -/obj/item/gun/ballistic/shotgun/brimstone, -/obj/machinery/button/door{ - dir = 1; - id = "wreckerarmory"; - name = "armory shutters"; - pixel_y = -21; - req_access = null - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"jG" = ( -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/corner_techfloor_grid, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"jH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"jI" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage) -"jP" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/button/door{ - dir = 1; - id = "wrecker_engine_port"; - name = "thruster doors"; - pixel_y = -21 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) -"jT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"jY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/carpet/red, -/area/ship/cargo/office) -"kg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/crate/medical, -/obj/item/bodybag, -/obj/item/storage/firstaid/regular, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"kM" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"kR" = ( -/obj/docking_port/stationary{ - dwidth = 10; - height = 15; - width = 30 - }, -/turf/template_noop, -/area/template_noop) -"lg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/crate/freezer, -/obj/machinery/airalarm/directional/west, -/obj/item/reagent_containers/blood/random, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"lt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"lX" = ( -/obj/structure/sign/syndicate, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew) -"mf" = ( -/obj/structure/window/reinforced/tinted/frosted{ - dir = 4 - }, -/obj/structure/chair/stool, -/obj/structure/window/reinforced/tinted/frosted, -/obj/effect/landmark/start/captain, -/turf/open/floor/carpet/black, -/area/ship/bridge) -"mL" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/fore) -"mX" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/crew) -"nn" = ( -/turf/template_noop, -/area/template_noop) -"no" = ( -/obj/structure/bed, -/obj/item/bedsheet/syndie, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/black, -/area/ship/bridge) -"nG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"nK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/grunge{ - name = "Foreman's Office"; - req_access = list(56) - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo/office) -"nR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/vending/cola/sodie, -/obj/structure/sign/poster/contraband/smoke{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"nS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"nT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/button/door{ - dir = 8; - id = "wrecker_engine_stbd"; - name = "thruster doors"; - pixel_x = 21 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"nX" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastleft{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wrecker_engine_stbd" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"ob" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"ol" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin/carbon, -/obj/item/folder/syndicate, -/obj/item/pen/fourcolor, -/obj/item/gps/mining{ - pixel_x = 9; - pixel_y = -6 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/item/stamp/ngr/foreman, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "hyena_cargo"; - pixel_x = -10; - pixel_y = -24 - }, -/obj/machinery/button/door{ - dir = 1; - id = "wreckercargobay"; - name = "cargo bay doors"; - pixel_y = -25 - }, -/turf/open/floor/carpet/red, -/area/ship/cargo/office) -"or" = ( -/obj/structure/sign/number/nine{ - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/fore) -"oz" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/bridge) -"oF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/filingcabinet{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/borderfloorblack, -/obj/item/folder/documents/syndicate/ngr, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"oJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"oO" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/fore) -"oQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - dir = 8; - id = "wreckerwindows"; - name = "Window Shutters"; - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/gps{ - pixel_x = 7 - }, -/obj/item/megaphone/sec{ - name = "syndicate megaphone"; - pixel_x = -4; - pixel_y = 7 - }, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"oS" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/machinery/firealarm/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/syndicate/random{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/ship/crew) -"oV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"pi" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastright{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wrecker_engine_stbd" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"pu" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 8 - }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"pv" = ( -/obj/structure/dresser, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"px" = ( -/obj/effect/turf_decal/corner/opaque/red, -/obj/effect/turf_decal/corner/opaque/red{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"pz" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-6" - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"pH" = ( -/obj/machinery/holopad/emergency/command, -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"pI" = ( -/obj/item/radio/intercom/wideband/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/cargo{ - dir = 1 - }, -/obj/effect/turf_decal/borderfloorblack, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"pP" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/autolathe, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"qt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/borderfloor{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/light/small/directional/west, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/oxygen, -/obj/item/clothing/suit/space/syndicate/surplus, -/obj/item/clothing/head/helmet/space/syndicate/surplus, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"qO" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/landmark/start/shaft_miner, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"rd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"rF" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "eng_secure"; - name = "mechanic's locker"; - req_access = list(11) - }, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/accessory/armband/engine, -/obj/item/storage/belt/utility, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -16 - }, -/obj/item/clothing/under/syndicate/ngr, -/obj/item/clothing/suit/hazardvest/ngr, -/obj/item/clothing/head/hardhat/ngr, -/obj/item/clothing/gloves/color/red/insulated, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"rM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"rP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/chair/sofa/brown/left/directional/south, -/obj/effect/landmark/start/assistant, -/turf/open/floor/carpet/red, -/area/ship/crew) -"rR" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/industrial/outline, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"si" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/arrows{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"so" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "wreckercargobay"; - name = "Cargo Bay Exterior Blast Door" - }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - id = "hyena_cargo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"sx" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wreckercargobay"; - name = "Cargo Bay Exterior Blast Door" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"sA" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"sE" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) -"sG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/hatch{ - name = "External Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"tl" = ( -/obj/machinery/shower{ - pixel_y = 19 - }, -/obj/structure/curtain, -/obj/item/bikehorn/rubberducky, -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = -32 - }, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/dorm) -"tn" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/simple/green/hidden, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"tI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=storage"; - location = "bridge" - }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"tS" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/arrows{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"uk" = ( -/obj/machinery/vending/cigarette/syndicate, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"un" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"uq" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer4{ - dir = 10 - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"ut" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/computer/helm/viewscreen/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"vi" = ( -/obj/structure/table, -/obj/item/toy/cards/deck/syndicate{ - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/lighter{ - pixel_x = -5; - pixel_y = -1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet/red, -/area/ship/crew) -"vv" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/effect/turf_decal/industrial/outline, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"vG" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 1; - piping_layer = 4 - }, -/obj/effect/turf_decal/industrial/fire{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -16 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) -"vN" = ( -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/turf/open/floor/plasteel, -/area/ship/crew) -"vR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/door/airlock/grunge{ - name = "Break Room" - }, -/turf/open/floor/plasteel/tech, -/area/ship/crew) -"wp" = ( -/obj/structure/sign/number/nine{ - dir = 1; - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"wE" = ( -/obj/item/toy/nuke, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) -"wO" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/item/reagent_containers/food/snacks/syndicake, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew) -"wP" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/crate{ - desc = "A rectangular steel crate containing supplies to survive a desert environment more easily."; - name = "desert equipment crate" - }, -/obj/item/clothing/neck/shemagh/ngr, -/obj/item/clothing/neck/shemagh/ngr, -/obj/item/clothing/neck/shemagh/ngr, -/obj/item/clothing/neck/shemagh/ngr, -/obj/item/clothing/head/ngr/flap, -/obj/item/clothing/head/ngr/flap, -/obj/item/clothing/head/ngr/flap, -/obj/item/clothing/head/ngr/flap, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"xm" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"xx" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"xK" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -21 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/suit_storage_unit/inherit/industrial, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/oxygen, -/obj/item/clothing/suit/space/syndicate/surplus, -/obj/item/clothing/head/helmet/space/syndicate/surplus, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) -"yd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/carpet/red, -/area/ship/crew) -"yn" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo/office) -"yw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"yD" = ( -/obj/structure/closet/crate/radiation{ - name = "fuel crate" - }, -/obj/item/stack/sheet/mineral/uranium/five, -/obj/effect/turf_decal/radiation/white, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"yG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/syndicate/random{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"yH" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/gun/energy/plasmacutter{ - pixel_y = 10 - }, -/obj/item/gun/energy/plasmacutter, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"yM" = ( -/obj/item/lighter{ - pixel_x = -8; - pixel_y = 8 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 4 - }, -/turf/open/floor/carpet/black, -/area/ship/bridge) -"yV" = ( -/obj/machinery/door/airlock/grunge{ - dir = 8; - name = "Bridge"; - req_access = list(19) - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/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 - }, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"zn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/steeldecal/steel_decals_central4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/landmark/observer_start, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"zq" = ( -/obj/structure/closet/wall/red/directional/east{ - name = "uniform closet" - }, -/obj/item/tank/jetpack/suit, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/under/syndicate/ngr, -/obj/item/clothing/under/syndicate/ngr, -/obj/item/clothing/under/syndicate/ngr, -/obj/item/clothing/under/syndicate/ngr, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/item/clothing/under/syndicate/ngr/jumpsuit, -/obj/item/clothing/under/syndicate/ngr/jumpsuit, -/obj/item/clothing/under/syndicate/ngr/jumpsuit, -/obj/item/clothing/under/syndicate/ngr/jumpsuit, -/obj/item/clothing/head/ngr, -/obj/item/clothing/head/ngr, -/obj/item/clothing/head/ngr, -/obj/item/clothing/head/ngr, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"zA" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) -"zQ" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "4-10" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) -"zZ" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"Af" = ( -/obj/structure/closet/emcloset/wall/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ap" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"Ax" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) -"Ay" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"Az" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"AE" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -9 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"AF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"AY" = ( -/obj/structure/sign/number/eight{ - dir = 1; - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"Bg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/carpet/red, -/area/ship/cargo/office) -"Bn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/catwalk/over, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=dorms"; - location = "storage" - }, -/turf/open/floor/plating, -/area/ship/storage) -"BB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"BG" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 8; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage) -"BR" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 1; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) -"BZ" = ( -/obj/structure/window/reinforced/tinted/frosted, -/obj/machinery/suit_storage_unit/inherit{ - name = "captain's suit storage unit"; - req_access = list(20) - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20 - }, -/obj/item/clothing/suit/space/hardsuit/syndi/ngr, -/obj/item/clothing/mask/gas/syndicate, -/turf/open/floor/carpet/black, -/area/ship/bridge) -"Ck" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, -/obj/structure/mirror{ - pixel_x = -25 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/dorm) -"CW" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/starboard) -"Dp" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Dq" = ( -/obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"DE" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 - }, -/turf/open/floor/engine/hull, -/area/ship/external) -"DF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/number/zero{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) -"DO" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerarmory"; - name = "Security Shutters" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"DU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/light/small/directional/north, -/obj/machinery/light_switch{ - pixel_x = 7; - pixel_y = 22 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"DW" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/sign/warning/nosmoking{ - pixel_y = -28 - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"EH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) -"EL" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-5" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"Fe" = ( -/obj/structure/table/reinforced, -/obj/item/soap/syndie, -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/borderfloorblack, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/dorm) -"Ff" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/west, -/obj/structure/closet/wall/white/med{ - dir = 1; - name = "medicine locker"; - pixel_y = -28 - }, -/obj/item/storage/pill_bottle/lsd, -/obj/effect/turf_decal/borderfloorblack, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/dorm) -"Fl" = ( -/obj/machinery/door/airlock/hatch{ - name = "Starboard Thrusters"; - req_access = list(10) - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/fire{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"Fq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -16 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Fr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"Ft" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"FA" = ( -/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 = 6 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"FQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/steeldecal/steel_decals_central4{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"FR" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp{ - pixel_x = -12; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/paper_bin/carbon, -/obj/item/pen/fountain/captain, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 - }, -/obj/item/stamp/ngr{ - pixel_x = 13; - pixel_y = 7 - }, -/obj/item/stamp/ngr/captain{ - pixel_x = 13 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"Ge" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 8 - }, -/obj/structure/sign/poster/syndicate/random{ - pixel_y = -32 - }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"Gj" = ( -/obj/structure/chair/sofa/brown/corner/directional/east, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom/directional/north, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 - }, -/turf/open/floor/carpet/red, -/area/ship/crew) -"Gm" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/door/airlock/hatch{ - name = "External Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Gw" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1; - piping_layer = 2 - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) -"GM" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "mining"; - name = "wrecker's locker"; - req_access = list(48) - }, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/storage/belt/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding, -/obj/machinery/airalarm/directional/north, -/obj/item/clothing/under/syndicate/ngr/jumpsuit, -/obj/item/clothing/suit/hazardvest/ngr, -/obj/item/clothing/head/hardhat/ngr, -/obj/item/pickaxe/drill, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"GV" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm) -"HJ" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security/armory) -"HT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/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/tech, -/area/ship/hallway/central) -"Ib" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/landmark/start/chief_engineer, -/turf/open/floor/carpet/red, -/area/ship/cargo/office) -"Ic" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/industrial/fire, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 8; - name = "Distribution" - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"Ii" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ik" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/mineral/ore_redemption{ - dir = 1; - output_dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"Iz" = ( -/obj/machinery/cryopod{ - dir = 1 - }, -/obj/machinery/computer/cryopod/directional/south, -/obj/effect/turf_decal/industrial/warning/full, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"IO" = ( -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/structure/closet/crate/bin, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/food/egg_smudge, -/turf/open/floor/plasteel, -/area/ship/crew) -"Jf" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/bridge) -"Jv" = ( -/obj/machinery/modular_computer/console/preset/command{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"JD" = ( -/obj/machinery/door/airlock/grunge{ - dir = 4; - name = "Locker Room"; - req_one_access = list(10,48) - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/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 = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"JL" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/port) -"JP" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/storage) -"JS" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wreckercargobay"; - name = "Cargo Bay Exterior Blast Door" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"Kb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/number/five{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) -"Kf" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/storage) -"Ki" = ( -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "4-9" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"Kn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet/red, -/area/ship/crew) -"Ky" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/hardline_small/right{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) -"KA" = ( -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Captain's Bunk" - }, -/turf/open/floor/carpet/black, -/area/ship/bridge) -"KH" = ( -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 4; - name = "Input to Air" - }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 4; - name = "Input to Fuel" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"KJ" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"KQ" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"KT" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerarmory"; - name = "Security Shutters" - }, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"KW" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/suit_storage_unit/inherit{ - name = "foreman's suit storage unit"; - req_access = list(56) - }, -/obj/item/clothing/shoes/magboots/syndie, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/head/helmet/space/syndicate, -/turf/open/floor/carpet/red, -/area/ship/cargo/office) -"KX" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"La" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer4{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/fire, -/obj/item/analyzer, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"Lv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Ml" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) -"Mp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ms" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"MF" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"MP" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Nl" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4; - name = "Helm" - }, -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"NA" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 2; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) -"NF" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/cargo) -"NN" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 1; - id = "hyena_cargo"; - locked = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wreckercargobay"; - name = "Cargo Bay Exterior Blast Door" - }, -/turf/open/floor/plating, -/area/ship/cargo) -"NS" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wreckercargobay"; - name = "Cargo Bay Exterior Blast Door" - }, -/obj/docking_port/mobile{ - can_move_docking_ports = 1; - dir = 8; - launch_status = 0; - name = "mining ship"; - preferred_direction = 4 - }, -/turf/open/floor/plating, -/area/ship/cargo) -"Ok" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/storage) -"Or" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/machinery/light/small/directional/south, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/power/ship_gravity, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"Oy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/storage) -"OL" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"Pd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/spider/stickyweb, -/obj/structure/closet/crate/secure/loot, -/obj/effect/turf_decal/number/three{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) -"Pn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"Px" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"PG" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerarmory"; - name = "Security Shutters" - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"PL" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, -/obj/machinery/door/window/eastleft{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wrecker_engine_port" - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"PT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Qy" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/turf_decal/arrows{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Qz" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 6; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/fore) -"QG" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "warden"; - name = "foreman's locker"; - req_access = list(56) - }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/gloves/combat, -/obj/item/storage/belt/utility/chief{ - name = "\improper Foreman's toolbelt" - }, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding, -/obj/item/storage/toolbox/syndicate, -/obj/item/wrench/combat, -/obj/item/clothing/accessory/holster, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/machinery/airalarm/directional/west, -/obj/item/clothing/suit/ngr, -/obj/item/clothing/head/hardhat/ngr/foreman, -/obj/item/tank/jetpack/suit, -/obj/item/storage/guncase/pistol/ringneck, -/turf/open/floor/carpet/red, -/area/ship/cargo/office) -"QW" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/cargo/office) -"QZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/storage) -"Rc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/ship/storage) -"Rl" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/directional/east{ - pixel_y = 7 - }, -/obj/item/toy/figure/syndie{ - pixel_x = 11; - pixel_y = -3 - }, -/obj/machinery/fax/syndicate, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"RD" = ( -/obj/machinery/door/airlock/hatch{ - name = "Port Thrusters"; - req_access = list(10) - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/borderfloor, -/obj/effect/turf_decal/industrial/fire, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"RE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/hardline_small{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) -"RQ" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/button/door{ - dir = 1; - id = "wreckercargobay"; - name = "cargo bay doors"; - pixel_y = -21 - }, -/obj/machinery/light/floor, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "hyena_cargo"; - pixel_x = -10; - pixel_y = -19 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Sa" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/suit_storage_unit/inherit/industrial{ - req_access = list(11) - }, -/obj/item/clothing/suit/space/syndicate/black/engie, -/obj/item/clothing/head/helmet/space/syndicate/black/engie, -/obj/item/clothing/mask/breath, -/obj/item/tank/jetpack/carbondioxide, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"Sd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=cargo"; - location = "dorms" - }, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"Sg" = ( -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/turf/open/floor/plating, -/area/ship/crew/dorm) -"Sh" = ( -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Sm" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet{ - anchored = 1; - icon_door = "eng_tool"; - icon_state = "eng" - }, -/obj/item/storage/toolbox/syndicate{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/stack/cable_coil/random, -/obj/item/stack/cable_coil/random, -/obj/item/stack/cable_coil/random, -/obj/structure/sign/poster/syndicate/random{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"Sv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/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, -/obj/effect/turf_decal/trimline/opaque/red/filled/corner{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "wreckerarmory"; - name = "armory shutters"; - pixel_y = 23; - req_access = list(19) - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"Sy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"SE" = ( -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"SJ" = ( -/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, -/obj/item/analyzer, -/obj/effect/turf_decal/steeldecal/steel_decals_central4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"SK" = ( -/obj/structure/sign/number/four{ - dir = 1; - pixel_y = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) -"SP" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/door/window/eastright{ - name = "Engine Access" - }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "wrecker_engine_port" - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"SV" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 8; - name = "Input to Waste" - }, -/obj/effect/decal/cleanable/oil, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"Tg" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/light/floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Th" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/red, -/obj/effect/turf_decal/corner/opaque/red{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/trimline/opaque/red/filled/corner{ - dir = 8 - }, -/obj/machinery/button/door{ - dir = 1; - id = "wreckerarmory"; - name = "armory shutters"; - pixel_y = -21; - req_access = list(19) - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Tq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/brown/right/directional/east, -/obj/effect/landmark/start/assistant, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/carpet/red, -/area/ship/crew) -"Tu" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"TK" = ( -/obj/structure/closet/secure_closet/freezer{ - anchored = 1; - locked = 0; - name = "fridge" - }, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/item/storage/cans/sixbeer, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/crew) -"TR" = ( -/obj/structure/curtain/cloth/fancy{ - name = "blood-red curtains" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/bridge) -"TT" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) -"TX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/steeldecal/steel_decals_central4{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Ua" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"Uh" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/trimline/opaque/red/filled/corner, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -16 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Ui" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/turretid{ - pixel_x = 32; - pixel_y = 22; - req_access = list(19) - }, -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"Up" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 4; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) -"UI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"UN" = ( -/obj/machinery/porta_turret/ship/syndicate{ - dir = 1; - id = "hyena_grid" - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/hallway/central) -"UX" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew) -"Ve" = ( -/obj/structure/curtain, -/obj/structure/toilet, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/window/reinforced/spawner/west, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/crew/dorm) -"VA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) -"VC" = ( -/obj/machinery/computer/helm{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"VD" = ( -/obj/item/reagent_containers/food/drinks/bottle/wine{ - pixel_x = -15; - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/remains/human, -/obj/effect/turf_decal/hardline_small/left{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ship/maintenance/fore) -"VG" = ( -/turf/open/floor/engine/hull, -/area/ship/external) -"VX" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/suit/space/syndicate/black/orange, -/obj/machinery/suit_storage_unit/inherit/industrial{ - req_one_access = list(48,56) - }, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/helmet/space/syndicate/black/orange, -/obj/item/tank/jetpack/carbondioxide, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"Wc" = ( -/obj/structure/table, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/red, -/area/ship/crew/dorm) -"Wd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/hallway/central) -"We" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) -"Wp" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerarmory"; - name = "Security Shutters" - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"Wt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"WN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"WS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/grunge{ - name = "Dormitory" - }, -/turf/open/floor/plasteel/tech, -/area/ship/crew) -"Xb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/contraband/peacemaker{ - pixel_y = 32 - }, -/obj/machinery/rnd/server, -/obj/effect/turf_decal/borderfloorblack{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/bridge) -"Xj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/crew{ - dir = 8 - }, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo/office) -"Xv" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/storage/belt/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding, -/obj/machinery/light/small/directional/north, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "mining"; - name = "wrecker's locker"; - req_access = list(48) - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/industrial/outline, -/obj/item/clothing/under/syndicate/ngr/jumpsuit, -/obj/item/clothing/suit/hazardvest/ngr, -/obj/item/clothing/head/hardhat/ngr, -/obj/item/pickaxe/drill, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"Xz" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"XA" = ( -/obj/structure/bed/dogbed/cayenne{ - desc = "An ordinary dog bed, dusted with ash..."; - name = "David's bed" - }, -/mob/living/simple_animal/hostile/asteroid/goliath/pup{ - a_intent = "help"; - desc = "A small goliath pup. Its tendrils have not yet fully grown. Someone, somehow, has managed to fit a large dog collar around its neck."; - environment_smash = 0; - faction = list("neutral","playerSyndicate"); - mob_size = 2; - move_force = 1000; - move_resist = 1000; - name = "David"; - pull_force = 1000 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/bridge) -"XO" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/mining_scanner, -/obj/item/mining_scanner, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) -"XP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/item/wrench/syndie, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) -"XQ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/effect/turf_decal/trimline/opaque/red/filled/warning{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/cargo) -"XR" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "syndicate"; - name = "explosives locker"; - req_access = "list(56, 20)" - }, -/obj/structure/sign/warning/explosives/alt{ - pixel_x = -32 - }, -/obj/item/storage/backpack/duffelbag/syndie/c4{ - name = "bag of mining charges" - }, -/obj/item/storage/belt/grenade, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/industrial/outline, -/obj/machinery/button/door{ - id = "wreckerarmory"; - name = "armory shutters"; - pixel_y = 23; - req_access = null - }, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 23 - }, -/turf/open/floor/mineral/plastitanium, -/area/ship/security/armory) -"XU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/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-8" - }, -/obj/structure/closet/emcloset/wall/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Yv" = ( -/obj/machinery/nuclearbomb/beer{ - desc = "An evidently-decommissioned nuclear warhead. Sloppy paint on the casing declares 'VICTORY OVER NANOTRASEN,' followed by a badly-smudged date of 25-something. A drink tap has been drilled directly into the metal."; - name = "comemmorative nuclear fission explosive" - }, -/obj/effect/turf_decal/corner_techfloor_grid, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"YH" = ( -/obj/machinery/door/airlock/grunge{ - dir = 4; - name = "Cargo Bay" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/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 = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/turf_decal/borderfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/crew) -"YI" = ( -/obj/machinery/door/poddoor/shutters{ - id = "wreckerwindows"; - name = "Blast Shutters" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/open/floor/plating, -/area/ship/hallway/central) -"YV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) -"Zb" = ( -/obj/structure/catwalk/over, -/turf/open/floor/plating/airless, -/area/ship/external) -"Zg" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/shutters{ - id = "wreckerarmory"; - name = "Security Shutters" - }, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"Zi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/arrows{ - dir = 1 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"Zn" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo) -"ZL" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/rdconsole/core{ - dir = 8 - }, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -10; - pixel_y = -19 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/cargo/office) -"ZM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/outline, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) -"ZR" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) - -(1,1,1) = {" -nn -iT -Ua -Xz -Ua -iT -nn -nn -nn -nn -nn -nn -nn -nn -sE -MF -TT -Ua -sE -"} -(2,1,1) = {" -nn -BR -ir -PL -SP -iT -nn -nn -nn -nn -nn -nn -nn -nn -sE -nX -dU -pi -NA -"} -(3,1,1) = {" -nn -iT -OL -xm -fW -iT -JL -VG -VG -VG -VG -DE -VG -Kf -sE -zZ -Tu -KQ -sE -"} -(4,1,1) = {" -nn -iT -KJ -EL -DW -iT -iT -iT -jt -BG -jI -cH -jI -jI -sE -oV -AF -Or -sE -"} -(5,1,1) = {" -nn -iT -zQ -pz -SV -tn -jP -iT -XO -VX -iL -yH -Sm -Sa -sE -DU -Ml -rR -sE -"} -(6,1,1) = {" -nn -iT -zA -XP -Ki -un -Ft -RD -QZ -Rc -Bn -Ok -QZ -QZ -Fl -nT -gM -aH -sE -"} -(7,1,1) = {" -nn -iT -fi -rM -KH -Ic -vG -iT -GM -dh -Oy -KX -jI -GV -GV -GV -GV -sE -sE -"} -(8,1,1) = {" -nn -JL -iT -yD -uq -La -Gw -iT -Xv -qO -xx -rF -jI -tl -Ck -Ff -GV -sE -CW -"} -(9,1,1) = {" -nn -Zb -JL -iT -iT -iT -iT -iT -jI -JD -JP -jI -jI -Ve -jf -Fe -GV -CW -Zb -"} -(10,1,1) = {" -nn -Zb -nn -cs -nR -uk -UX -Gj -Tq -jT -IO -oS -UX -pu -Ay -Ge -GV -nn -Zb -"} -(11,1,1) = {" -nn -Zb -nn -YI -Sh -BB -mX -rP -vi -UI -vN -wO -UX -Ms -Sd -dQ -Sg -nn -Zb -"} -(12,1,1) = {" -nn -Zb -nn -cs -FA -Px -vR -yd -Kn -ix -vN -TK -UX -Wc -Az -pv -GV -nn -Zb -"} -(13,1,1) = {" -nn -Zb -Zb -cs -yG -Lv -lX -Yv -cB -ut -ob -ec -WS -We -zq -Iz -GV -Zb -Zb -"} -(14,1,1) = {" -nn -Zb -nn -cs -HT -jG -HJ -HJ -HJ -HJ -YH -mX -UX -GV -GV -GV -ge -nn -Zb -"} -(15,1,1) = {" -nn -UN -cs -cs -XU -Uh -HJ -XR -bJ -HJ -Sv -bN -Zn -fL -KW -QG -QW -nn -Zb -"} -(16,1,1) = {" -nn -hD -qt -cs -ZR -iI -DO -EH -dG -bV -Pn -Fr -iv -nK -Bg -jY -yn -oO -Zb -"} -(17,1,1) = {" -nn -YI -lt -sG -YV -Sy -Wp -Ax -wE -Zg -oJ -nG -hc -fL -Ib -ol -yn -mL -oO -"} -(18,1,1) = {" -kR -Gm -aN -Wd -nS -tI -PG -fY -VA -KT -XQ -yw -pP -fL -Xj -ZL -yn -Pd -mL -"} -(19,1,1) = {" -nn -hD -xK -AE -px -Th -HJ -fv -jB -HJ -cV -jH -Ik -fL -fL -fL -yn -DF -mL -"} -(20,1,1) = {" -nn -SK -Ap -Ap -TR -yV -Ap -NF -NF -NF -TX -SJ -Dp -dA -Dp -hh -mL -Kb -fC -"} -(21,1,1) = {" -nn -AY -bH -BZ -Dq -rd -Ap -lg -ZM -Ii -Zi -bl -si -Wt -ia -SE -mL -Ky -or -"} -(22,1,1) = {" -nn -wp -no -KA -WN -cg -Ap -Af -hT -PT -FQ -zn -bd -sA -wP -vv -mL -RE -fg -"} -(23,1,1) = {" -nn -SK -yM -mf -aF -Fq -Ap -kg -gg -Mp -iC -Tg -Qy -MP -tS -RQ -mL -VD -fC -"} -(24,1,1) = {" -nn -Ap -Xb -XA -ch -bS -Ap -NF -NF -NF -ji -so -JS -NS -sx -NN -mL -mL -mL -"} -(25,1,1) = {" -nn -oz -FR -kM -pH -ch -oF -oz -nn -nn -nn -nn -nn -nn -nn -nn -oO -mL -mL -"} -(26,1,1) = {" -nn -oz -Rl -Ui -ch -Nl -pI -oz -nn -nn -nn -nn -nn -nn -nn -nn -nn -mL -mL -"} -(27,1,1) = {" -nn -Up -Ap -Jv -oQ -VC -Ap -Up -nn -nn -nn -nn -nn -nn -nn -nn -nn -mL -mL -"} -(28,1,1) = {" -nn -nn -fV -Jf -Jf -Jf -fV -nn -nn -nn -nn -nn -nn -nn -nn -nn -nn -oO -Qz -"} diff --git a/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm b/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm new file mode 100644 index 000000000000..fd082ec1ddca --- /dev/null +++ b/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm @@ -0,0 +1,7037 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/structure/chair/sofa/brown/right/directional/north, +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/ship/crew) +"au" = ( +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"av" = ( +/obj/structure/marker_beacon{ + picked_color = "Burgundy" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"aA" = ( +/obj/structure/chair/sofa/brown/left/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/carpet/red, +/area/ship/crew) +"aD" = ( +/obj/structure/guncloset{ + anchored = 1; + can_be_unanchored = 1; + open = 0; + req_access_txt = "3" + }, +/obj/item/gun/ballistic/shotgun/automatic/bulldog/no_mag, +/obj/item/gun/ballistic/automatic/pistol/asp/no_mag, +/obj/item/gun/ballistic/automatic/pistol/asp/no_mag, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 4 + }, +/obj/structure/sign/flag/ngr{ + dir = 4; + pixel_x = -32 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"aE" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/surplus, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/head/helmet/space/syndicate/surplus, +/turf/open/floor/pod/dark, +/area/ship/hallway/central) +"aM" = ( +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"aP" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/engineering/electrical) +"aS" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/electrical) +"aU" = ( +/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/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Command Deck"; + normalspeed = 0; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/office) +"aX" = ( +/obj/machinery/suit_storage_unit/inherit{ + name = "wrecker's suit storage unit"; + req_access_txt = "48" + }, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/item/clothing/suit/space/syndicate/black/green, +/obj/item/clothing/head/helmet/space/syndicate/black/green, +/obj/item/clothing/mask/gas/syndicate, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/storage/equip) +"aY" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"aZ" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/cargo/office) +"bp" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/corner/opaque/tan/mono, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"bt" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/folder/syndicate{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/pen/blue{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/pen/red{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/flashlight/lamp{ + pixel_x = -8; + pixel_y = 13 + }, +/obj/effect/turf_decal/corner/opaque/tan/half{ + dir = 1 + }, +/obj/effect/turf_decal/borderfloorblack, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/office) +"bM" = ( +/obj/structure/chair/handrail, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_y = 22 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/storage/equip) +"bT" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/tank_dispenser, +/turf/open/floor/pod/dark, +/area/ship/hallway/central) +"bW" = ( +/obj/machinery/door/airlock/hatch{ + name = "Foreman's Office"; + normalspeed = 0; + req_access_txt = "56" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo/office) +"cc" = ( +/obj/structure/closet/wardrobe/black{ + name = "wardrobe"; + populate = 0 + }, +/obj/item/storage/backpack, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/radio/headset, +/obj/item/clothing/head/ngr, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/suit/hooded/wintercoat/security/ngr, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"ce" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/chair/handrail{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/closet/wall/directional/west{ + name = "closet" + }, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/turf/open/floor/pod/dark, +/area/ship/crew/cryo) +"cy" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/captain) +"cB" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/hydrogen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"cE" = ( +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/structure/chair/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/pod, +/area/ship/crew/cryo) +"cG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"cJ" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/structure/chair/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light/small/directional/east, +/turf/open/floor/pod/dark, +/area/ship/hallway/central) +"cR" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/surplus, +/obj/item/clothing/head/helmet/space/syndicate/surplus, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"cU" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"cX" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/piloting{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"dn" = ( +/obj/machinery/porta_turret/ship/ngr{ + dir = 5; + id = "derecho_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/science/workshop) +"dB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"dC" = ( +/obj/machinery/porta_turret/ship/ngr{ + dir = 5; + id = "derecho_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/hallway/central) +"dW" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = -6 + }, +/obj/machinery/light/dim/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door{ + id = "derecho_entrance_blast"; + name = "Blast Door Control"; + pixel_x = -4; + pixel_y = 23 + }, +/obj/machinery/button/shieldwallgen{ + id = "derecho_entrance_holo"; + pixel_x = 7; + pixel_y = 21 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"dX" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/chair/handrail, +/obj/item/radio/intercom/directional/north, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"dZ" = ( +/obj/structure/crate_shelf, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"ea" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/item/cutting_board{ + pixel_y = 3 + }, +/obj/item/melee/knife, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) +"eb" = ( +/obj/effect/turf_decal/rechargefloor, +/obj/structure/mecha_wreckage/ripley/mkii, +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"ep" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/storage/toolbox/syndicate{ + name = "syndicate toolbox"; + pixel_x = 3; + pixel_y = 1 + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_y = -20 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"er" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/item/paper_bin/carbon{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/desk_flag/ngr{ + pixel_x = -8; + pixel_y = 13 + }, +/obj/item/folder/syndicate{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/pen/blue{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/pen/red{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/lighter{ + pixel_x = -10; + pixel_y = 2 + }, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"eu" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4; + layer = 2.04 + }, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/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, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/drinks/waterbottle, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/structure/closet/crate{ + name = "food crate" + }, +/obj/structure/chair/handrail, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"ex" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs{ + dir = 8; + icon = 'icons/obj/stairs.dmi' + }, +/area/ship/hallway/fore) +"eA" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"eB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line{ + dir = 1 + }, +/obj/structure/cabinet/fireaxe{ + pixel_y = 21 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"eC" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/storage/equip) +"eD" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/button/door{ + dir = 4; + id = "derecho_atmos_shut"; + name = "Atmospherics Shutters"; + pixel_x = -21; + pixel_y = -3 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"eL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = 7; + pixel_y = 22 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"fa" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/closet/emcloset, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 7; + pixel_y = -19 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/south{ + pixel_x = -7 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/crew/cryo) +"fe" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/aft) +"fB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -3 + }, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_foreman_door"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 21; + pixel_y = 7; + req_access_txt = "3"; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) +"fC" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 8; + name = "Thrusters"; + req_access_txt = "10" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/engines) +"fD" = ( +/obj/item/cigbutt{ + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/carpet/red, +/area/ship/crew) +"fF" = ( +/obj/machinery/vending/cola/sodie, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/sign/poster/syndicate/random{ + pixel_y = -32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"fQ" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "derecho_starboard_engine_blast" + }, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"fX" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/modglass{ + icon_state = "mglass-6-"; + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/modglass{ + icon_state = "mglass-6-"; + pixel_x = -3 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"gc" = ( +/obj/structure/crate_shelf, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"gx" = ( +/obj/machinery/autolathe, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"gD" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/obj/structure/closet/crate/bin, +/obj/structure/noticeboard{ + dir = 8; + name = "menu board"; + pixel_x = 28 + }, +/obj/machinery/button/door{ + id = "derecho_mess_shut"; + name = "Canteen Shutters"; + pixel_x = 3; + pixel_y = 23 + }, +/obj/machinery/light_switch{ + pixel_x = -7; + pixel_y = 22 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/chips, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"gF" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"gK" = ( +/obj/machinery/mineral/processing_unit_console{ + machinedir = 2; + pixel_y = 26 + }, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/chair/handrail, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"gU" = ( +/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 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Life Support"; + normalspeed = 0; + req_access_txt = "10" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) +"gV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"gW" = ( +/obj/structure/rack, +/obj/item/gun/energy/plasmacutter{ + pixel_y = 15 + }, +/obj/item/screwdriver/power{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/crowbar/power{ + pixel_x = -9; + pixel_y = -1 + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/storage/equip) +"hf" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate{ + name = "syndicate toolbox"; + pixel_x = -3; + pixel_y = -2 + }, +/obj/machinery/cell_charger{ + pixel_y = 7 + }, +/obj/item/clothing/head/welding{ + pixel_x = 9; + pixel_y = -2 + }, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500"; + layer = 2.04 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"hg" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/tan/half{ + dir = 1 + }, +/obj/item/desk_flag/ngr{ + pixel_x = 14; + pixel_y = 1 + }, +/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/item/stamp/denied{ + pixel_x = -12; + pixel_y = 7 + }, +/obj/item/stamp{ + pixel_x = -12; + pixel_y = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"hk" = ( +/obj/machinery/porta_turret/ship/ngr{ + dir = 5; + id = "derecho_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) +"hr" = ( +/obj/machinery/computer/mech_bay_power_console, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"hI" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/effect/turf_decal/corner/opaque/tan/full, +/obj/structure/sign/flag/ngr{ + dir = 1; + pixel_y = -32 + }, +/obj/item/trash/popcorn, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"hL" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"in" = ( +/obj/structure/closet/secure_closet/armorycage{ + anchored = 1; + can_be_unanchored = 1; + name = "equipment locker" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 4 + }, +/obj/item/storage/box/ammo/a357{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/storage/box/ammo/c57x39{ + pixel_x = 13; + pixel_y = 1 + }, +/obj/item/storage/box/ammo/c57x39{ + pixel_x = 13; + pixel_y = 1 + }, +/obj/item/storage/box/ammo/a12g_buckshot{ + pixel_y = -5 + }, +/obj/item/storage/box/ammo/a12g_buckshot{ + pixel_y = -5 + }, +/obj/item/ammo_box/magazine/m57_39_asp/empty, +/obj/item/ammo_box/magazine/m57_39_asp/empty, +/obj/item/ammo_box/magazine/m57_39_asp/empty, +/obj/item/ammo_box/magazine/m57_39_asp/empty, +/obj/item/ammo_box/magazine/m12g_bulldog/empty, +/obj/item/ammo_box/magazine/m12g_bulldog/empty, +/obj/machinery/light/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"iy" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"iA" = ( +/obj/machinery/door/poddoor/shutters{ + id = "derecho_bridge_shut" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/turf/open/floor/plating, +/area/ship/bridge) +"iC" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"iE" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"iH" = ( +/obj/structure/table, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"iK" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/glass/five, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"iO" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"iZ" = ( +/obj/structure/closet/wardrobe/black{ + name = "wardrobe"; + populate = 0 + }, +/obj/item/storage/backpack, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/radio/headset, +/obj/item/clothing/head/ngr, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/suit/hooded/wintercoat/security/ngr, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"jn" = ( +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"js" = ( +/obj/structure/sign/warning/docking{ + pixel_y = -8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/central) +"ju" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"jA" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/cargo) +"jN" = ( +/obj/effect/turf_decal/corner/opaque/tan/mono, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"jW" = ( +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"jX" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = -7; + pixel_y = 22 + }, +/obj/machinery/button/door{ + id = "derecho_dorms_shut"; + name = "Crew Quarters Shutters"; + pixel_x = 3; + pixel_y = 23 + }, +/obj/machinery/light/dim/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"kg" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/crew/canteen) +"ki" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"ks" = ( +/obj/structure/sign/warning/gasmask, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/fore) +"ky" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/external/dark) +"kG" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "derecho_bridge_shut" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/bridge) +"kH" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 9 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_engine_blast"; + name = "Engine Blast Doors"; + pixel_x = 21; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"kU" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/obj/machinery/light/dim/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"kX" = ( +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"ld" = ( +/obj/machinery/suit_storage_unit/inherit{ + name = "wrecker's suit storage unit"; + req_access_txt = "48" + }, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/item/clothing/suit/space/syndicate/black/green, +/obj/item/clothing/head/helmet/space/syndicate/black/green, +/obj/item/clothing/mask/gas/syndicate, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/storage/equip) +"lg" = ( +/obj/structure/closet/secure_closet/engineering_personal{ + populate = 0 + }, +/obj/item/storage/backpack/industrial, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/suit/hazardvest/ngr, +/obj/item/clothing/accessory/armband/engine, +/obj/item/clothing/head/hardhat/ngr, +/obj/item/storage/belt/utility, +/obj/item/clothing/suit/hooded/wintercoat/security/ngr, +/obj/item/clothing/head/ngr, +/obj/item/radio/headset/alt, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/item/clothing/mask/balaclava/ngr, +/obj/item/clothing/mask/gas/syndicate, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/item/clothing/glasses/meson, +/obj/item/pipe_dispenser{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"lh" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/structure/chair/handrail{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"li" = ( +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"ln" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/science/workshop) +"lt" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"lv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"lF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"lQ" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/computer/atmos_alert{ + dir = 4; + icon_state = "computer-left" + }, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"lS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"lU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"lY" = ( +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/cigbutt{ + pixel_x = 14; + pixel_y = -3 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"mb" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/cable{ + icon_state = "0-9" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"mu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"mv" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/structure/table, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold{ + pixel_x = 3; + pixel_y = 14 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/lighter/greyscale{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/item/storage/belt/mining{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/pod, +/area/ship/storage/equip) +"mJ" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"mM" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"mO" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/chair/handrail{ + dir = 4 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ + dir = 1; + piping_layer = 4 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"mR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"mT" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"mU" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{ + pixel_x = 10; + pixel_y = 16 + }, +/obj/structure/punching_bag, +/obj/effect/decal/cleanable/dirt, +/obj/item/cigbutt{ + pixel_x = -10; + pixel_y = 4 + }, +/turf/open/floor/pod, +/area/ship/storage/equip) +"nb" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/starboard) +"ng" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line{ + dir = 8 + }, +/obj/structure/chair/handrail, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"nk" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/hatch{ + dir = 1; + name = "Engineering"; + normalspeed = 0; + req_access_txt = "10" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/electrical) +"nt" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"nz" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + layer = 2.04 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"nY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/airlock/external, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/central) +"oa" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/noticeboard{ + pixel_y = 28 + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan/half, +/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 = "2-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"oc" = ( +/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 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 8; + name = "Cargo Bay"; + req_ship_access = 0 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/fore) +"oe" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 8 + }, +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -3 + }, +/obj/machinery/button/door{ + dir = 4; + id = "derecho_mess_shut"; + name = "Canteen Shutters"; + pixel_x = -21; + pixel_y = 7 + }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) +"oh" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"ok" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"om" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"ot" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"ox" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"oy" = ( +/obj/effect/turf_decal/steeldecal/steel_decals_central4, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"oz" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan/half, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/button/door{ + dir = 4; + id = "derecho_office_shut"; + name = "Office Shutters"; + pixel_x = -21; + pixel_y = 7 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -3 + }, +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -6 + }, +/obj/machinery/firealarm/directional/north{ + pixel_x = -7 + }, +/obj/structure/extinguisher_cabinet/directional/north{ + pixel_x = 7 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"oF" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) +"oQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 7; + pixel_y = -19 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"oS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/firealarm/directional/west{ + pixel_y = -4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"oZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"pa" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"pd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"pe" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"pg" = ( +/obj/structure/table, +/obj/machinery/jukebox/boombox, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"pk" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4; + name = "Helm" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"pn" = ( +/obj/structure/closet/crate/secure/loot, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"px" = ( +/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/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/aft) +"pF" = ( +/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/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Workshop"; + req_access = null; + req_one_access = list(10, 48) + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"pH" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/turretid/ship{ + id = "derecho_grid"; + pixel_x = -3; + pixel_y = 24 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"pJ" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"pL" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"pR" = ( +/obj/structure/marker_beacon{ + picked_color = "Yellow" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"pS" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500"; + layer = 2.04 + }, +/obj/effect/turf_decal/techfloor, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = 22 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"qc" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/pod/dark, +/area/ship/crew/cryo) +"qf" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/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/mono/dark, +/area/ship/cargo/office) +"qh" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/computer/monitor{ + dir = 4; + icon_state = "computer-right" + }, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 4 + }, +/obj/machinery/light/dim/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"qi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"qn" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/machinery/light/dim/directional/east, +/obj/item/instrument/guitar, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/ship/crew) +"qr" = ( +/obj/machinery/shower{ + dir = 8 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/structure/chair/handrail{ + dir = 1 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/crew/canteen) +"qA" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/engines) +"qB" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/atmospherics) +"qD" = ( +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) +"qE" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/crew) +"qF" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 1 + }, +/obj/item/paper/guides/jobs/engi/combustion_thruster, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"qH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/hatch{ + name = "Crew Quarters"; + req_ship_access = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"qS" = ( +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/techfloor, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/platform/military, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"qY" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_mess_shut"; + name = "Canteen Shutters"; + pixel_x = 21; + pixel_y = -3 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"rD" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"rL" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/storage/equip) +"rW" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + 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/mono/dark, +/area/ship/crew) +"sa" = ( +/obj/structure/chair/bench/orange/directional/east, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) +"se" = ( +/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/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Control Room"; + normalspeed = 0; + req_access_txt = "10" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/electrical) +"sg" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"sm" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -7; + pixel_y = -19 + }, +/obj/machinery/button/door{ + dir = 1; + id = "derecho_eng_shut"; + name = "Engineering Shutters"; + pixel_x = 3; + pixel_y = -20 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"sn" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/structure/chair/handrail{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/can, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"sv" = ( +/obj/structure/closet/firecloset/wall/directional/south, +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"sC" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy{ + pixel_x = -2; + pixel_y = 20 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{ + pixel_x = 9; + pixel_y = 17 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk{ + pixel_x = 3; + pixel_y = 14 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/storage/equip) +"sD" = ( +/obj/machinery/porta_turret/ship/ngr{ + id = "derecho_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/canteen) +"sG" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/closet/crate/medical, +/obj/item/storage/box/bodybags, +/obj/item/storage/firstaid/regular, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/military{ + dir = 10 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"sH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/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, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/storage/equip) +"sL" = ( +/obj/machinery/door/airlock/hatch{ + dir = 4; + id_tag = "derecho_bathroom_door"; + name = "Restroom"; + req_ship_access = 0 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/canteen) +"sM" = ( +/obj/machinery/portable_atmospherics/canister/hydrogen, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/light/dim/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"sN" = ( +/obj/machinery/telecomms/relay/preset/mining{ + autolinkers = list("relay","hub"); + freq_listening = list(1213); + id = "NGR Relay"; + name = "NGR Relay"; + network = "ngr_commnet" + }, +/obj/machinery/door/window/brigdoor/westright{ + dir = 1; + req_access = list(20); + req_ship_access = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"sU" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/closet/crate/secure/loot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/military, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"sZ" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"te" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/tan/full, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"tg" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"tp" = ( +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/tank_dispenser, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door{ + id = "derecho_storage_shut"; + name = "Storage Shutters"; + pixel_x = -3; + pixel_y = 20; + req_ship_access = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"tZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"ua" = ( +/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 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 8; + name = "Storage Bay" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) +"uE" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"uK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/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, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"uX" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"vc" = ( +/obj/structure/sign/number/random{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/science/workshop) +"vd" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"vi" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/button/door{ + dir = 1; + id = "derecho_storage_shut"; + name = "Storage Shutters"; + pixel_x = 3; + pixel_y = -20 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -7; + pixel_y = -19 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"vr" = ( +/obj/structure/closet/syndicate/personal{ + name = "foreman's closet"; + populate = 0 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/item/storage/backpack/industrial, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/suit/ngr, +/obj/item/clothing/gloves/color/red/insulated, +/obj/item/radio/headset/syndicate/alt, +/obj/item/clothing/head/hardhat/ngr/foreman, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/mask/breath/ngr, +/obj/item/clothing/mask/balaclava/ngr, +/obj/item/megaphone, +/obj/item/storage/guncase/pistol/pc76, +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) +"vs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"vv" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"vA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Canteen"; + req_ship_access = 0 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/canteen) +"vC" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"vF" = ( +/obj/machinery/conveyor{ + dir = 5; + id = "derecho_belt" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"vJ" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "derecho_belt" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"vS" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/obj/structure/bed/dogbed, +/mob/living/simple_animal/hostile/asteroid/goliath/pup{ + a_intent = "help"; + desc = "A small goliath pup. Its tendrils have not yet fully grown. Someone, somehow, has managed to fit a large dog collar around its neck."; + environment_smash = 0; + faction = list("neutral","playerSyndicate"); + mob_size = 2; + move_resist = 1000; + name = "David"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"vV" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Equipment Storage"; + req_access_txt = "10" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/atmospherics) +"wa" = ( +/obj/structure/cable{ + icon_state = "1-10" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Starboard Thrusters"; + req_access_txt = "10" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/engines) +"wg" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Canteen"; + req_ship_access = 0 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"wj" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi' + }, +/area/ship/hallway/central) +"ws" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"wE" = ( +/obj/effect/turf_decal/corner/opaque/tan/mono, +/obj/structure/cable{ + icon_state = "1-8" + }, +/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 = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"wF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/bar/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"wG" = ( +/obj/structure/sign/flag/ngr{ + dir = 4; + pixel_x = -32 + }, +/turf/open/floor/carpet/red, +/area/ship/crew) +"wN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"wR" = ( +/obj/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, +/turf/open/floor/engine/air, +/area/ship/engineering/atmospherics) +"wV" = ( +/obj/machinery/computer/helm{ + dir = 8; + icon_state = "computer-left" + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"wY" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/tan/half{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/closet/crate/bin, +/obj/machinery/light/dim/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"xD" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "derecho_belt" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/mineral/processing_unit{ + input_dir = 8; + output_dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"xQ" = ( +/obj/machinery/door/airlock/hatch{ + name = "Foreman's Office"; + normalspeed = 0; + req_access_txt = "56" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo/office) +"xU" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"yb" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"yh" = ( +/obj/machinery/light_switch{ + pixel_x = 7; + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs{ + dir = 8; + icon = 'icons/obj/stairs.dmi' + }, +/area/ship/hallway/fore) +"yi" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan/half, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"yq" = ( +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"yu" = ( +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/effect/turf_decal/industrial/stand_clear{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"yv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/light/directional/south, +/obj/structure/closet/emcloset/wall/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"yz" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/storage/toolbox/syndicate{ + name = "syndicate toolbox"; + pixel_x = 8; + pixel_y = -2 + }, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 8 + }, +/obj/machinery/cell_charger{ + pixel_y = 7 + }, +/obj/machinery/firealarm/directional/south, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"yD" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"yO" = ( +/obj/machinery/power/shuttle/engine/fire{ + dir = 4 + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "derecho_engine_blast" + }, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"yS" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "derecho_port_engine_blast" + }, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"yW" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"zk" = ( +/obj/structure/closet/crate/radiation{ + name = "fuel crate" + }, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/item/stack/sheet/mineral/uranium/ten, +/obj/effect/turf_decal/radiation/white, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"zn" = ( +/obj/structure/table/wood, +/obj/item/paper{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/stamp/ngr/captain{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/stamp/ngr{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/pen/fountain/captain{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = 11; + pixel_y = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_x = 32 + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm/captain) +"zr" = ( +/obj/structure/chair/comfy/grey/directional/west, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm/captain) +"zz" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1; + name = "Operations" + }, +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"zA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"zB" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/central) +"zC" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"zI" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/item/storage/box/gum/nicotine, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"zJ" = ( +/obj/machinery/nuclearbomb/beer/empty{ + desc = "An evidently-decommissioned nuclear warhead. Faded paint on the casing reads \"VICTORY OVER NANOTRASEN\", with a much newer plaque installed on top commemorating the end of the ICW in 497. A drink tap has been drilled directly into the metal."; + name = "comemmorative nuclear fission explosive" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"zL" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"zN" = ( +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/sign/flag/ngr{ + dir = 4; + pixel_x = -32 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"zV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"zW" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm/captain) +"Ad" = ( +/obj/effect/turf_decal/industrial/outline{ + color = "#791500"; + layer = 2.04 + }, +/obj/structure/crate_shelf, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"Ae" = ( +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/structure/sink/kitchen{ + dir = 4 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) +"Ah" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"Aq" = ( +/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/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Bridge"; + normalspeed = 0; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"Au" = ( +/obj/structure/toilet, +/obj/structure/sink{ + dir = 8; + pixel_x = 12 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -3 + }, +/obj/machinery/button/door{ + dir = 4; + id = "derecho_bathroom_door"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -20; + pixel_y = 7; + req_access_txt = "3"; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/crew/canteen) +"AV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"AW" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"AZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/storage/equip) +"Ba" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"By" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"BE" = ( +/obj/structure/bed, +/obj/structure/curtain/cloth/fancy, +/obj/item/bedsheet/syndie{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) +"BH" = ( +/obj/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ + piping_layer = 2 + }, +/turf/open/floor/engine/air, +/area/ship/engineering/atmospherics) +"BK" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/power/ship_gravity, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Ca" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/closet/secure_closet/engineering_electrical{ + req_access = null; + req_access_txt = "11"; + req_one_access = null + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Ci" = ( +/obj/machinery/door/poddoor/shutters{ + id = "derecho_bridge_shut" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/bridge) +"Cl" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"Cn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi' + }, +/area/ship/engineering/electrical) +"Cs" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/door/poddoor/shutters{ + id = "derecho_atmos_shut" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/engineering/atmospherics) +"CB" = ( +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/techfloor, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/platform/military, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"CI" = ( +/obj/machinery/computer/crew{ + icon_state = "computer-right" + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"CN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"CX" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_starboard_engine_blast"; + name = "Engine Blast Doors"; + pixel_x = 21; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"CY" = ( +/obj/structure/rack, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -6 + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/storage/equip) +"Dq" = ( +/obj/structure/rack, +/obj/item/pickaxe/drill{ + pixel_y = 9 + }, +/obj/item/pickaxe/drill, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/storage/equip) +"DD" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"DI" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"DL" = ( +/obj/structure/railing/corner, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + layer = 2.04 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"DP" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "5-6" + }, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"DS" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -3 + }, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_port_engine_blast"; + name = "Engine Blast Doors"; + pixel_x = 21; + pixel_y = 7 + }, +/obj/item/trash/syndi_cakes, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"DT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"Ef" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_chief{ + name = "\proper foreman's equipment locker"; + populate = 0 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/airalarm/directional/east, +/obj/item/storage/belt/utility/chief, +/obj/item/clothing/glasses/meson/engine, +/obj/item/screwdriver/power{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/crowbar/power{ + pixel_x = -9; + pixel_y = -1 + }, +/obj/item/t_scanner, +/obj/item/clothing/mask/gas/syndicate{ + pixel_x = 7; + pixel_y = 6 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"Eh" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm) +"Ei" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/hardline_small/left, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Ej" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/turf_decal/hardline_small, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Ep" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/light/dim/directional/east, +/obj/effect/turf_decal/hardline_small/right, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Et" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"Ez" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 1; + pixel_x = 7; + pixel_y = 3 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"ED" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/pod/dark, +/area/ship/crew/cryo) +"EF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"EM" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi' + }, +/area/ship/hallway/central) +"ER" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"EY" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ + dir = 1; + piping_layer = 4 + }, +/obj/structure/sign/poster/contraband/atmosia_independence{ + pixel_x = -32 + }, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"EZ" = ( +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"Fk" = ( +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"Fp" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1; + layer = 2.04 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"FC" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"Gb" = ( +/obj/structure/bed{ + dir = 1 + }, +/obj/structure/curtain/cloth/fancy, +/obj/item/bedsheet/syndie{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm/captain) +"Gc" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"Gg" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_y = 22 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"Gl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Port Thrusters"; + req_access_txt = "10" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering/engines) +"Gr" = ( +/obj/structure/chair/sofa/brown/corner/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/ship/crew) +"GC" = ( +/obj/structure/sign/number/random{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/cargo) +"GD" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"GI" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"GS" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + layer = 2.04 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/binary/pump/layer4, +/obj/machinery/light/dim/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"Hf" = ( +/obj/structure/chair/handrail{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/number/right_four, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Hv" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2, +/obj/machinery/airalarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"HJ" = ( +/obj/machinery/porta_turret/ship/ngr{ + dir = 1; + id = "derecho_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/electrical) +"HP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/number/left_nine, +/obj/effect/turf_decal/number/right_nine, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"HX" = ( +/obj/machinery/door/poddoor/shutters{ + id = "derecho_office_shut" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/crew/office) +"Id" = ( +/obj/machinery/computer/cargo{ + icon_state = "computer-left" + }, +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/red/half, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"Im" = ( +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = 22 + }, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Iq" = ( +/obj/effect/turf_decal/techfloor, +/turf/open/floor/pod/dark, +/area/ship/crew/cryo) +"IV" = ( +/obj/structure/filingcabinet/double{ + density = 0; + dir = 8; + pixel_x = 10 + }, +/obj/effect/turf_decal/corner/opaque/tan/mono, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_office_shut"; + name = "Office Shutters"; + pixel_x = 21; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"Jh" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/pod/dark, +/area/ship/crew/cryo) +"Jj" = ( +/obj/structure/grille, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 1 + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"Jv" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"JA" = ( +/obj/docking_port/stationary{ + dwidth = 15; + height = 30; + width = 30 + }, +/turf/template_noop, +/area/template_noop) +"JD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"JE" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "engine fuel pump" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"JM" = ( +/obj/structure/chair/bench/orange/directional/west, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"JP" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"JS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/pod, +/area/ship/storage/equip) +"JV" = ( +/obj/machinery/door/poddoor/shutters{ + id = "derecho_eng_shut" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/engineering) +"Ki" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "derecho_belt" + }, +/obj/machinery/mineral/unloading_machine{ + input_dir = 2; + output_dir = 1 + }, +/obj/structure/plasticflaps/opaque, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"Kn" = ( +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, +/turf/open/floor/carpet/red, +/area/ship/crew) +"Ko" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/hatch{ + id_tag = "derecho_foreman_door"; + name = "Foreman's Quarters"; + req_access_txt = "56" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm) +"Kz" = ( +/obj/structure/crate_shelf, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"KD" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/structure/sign/poster/contraband/aclf{ + pixel_y = -32 + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_y = -20 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"KF" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan/half, +/obj/structure/sign/flag/ngr{ + pixel_y = 32 + }, +/obj/structure/chair/handrail, +/obj/structure/cable{ + icon_state = "4-8" + }, +/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-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"KL" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 8 + }, +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/tan/half{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/dim/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"KR" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 1 + }, +/obj/machinery/light/dim/directional/west, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/radio/intercom/directional/south{ + pixel_x = -7 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 7; + pixel_y = -19 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"KX" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/structure/chair/handrail{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"La" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/chair/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/computer/cryopod/directional/east, +/turf/open/floor/pod/dark, +/area/ship/crew/cryo) +"Ld" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/cryo) +"LC" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/pod, +/area/ship/crew/cryo) +"LI" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/office) +"LP" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/poddoor/shutters{ + id = "derecho_storage_shut" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) +"LT" = ( +/obj/machinery/power/port_gen/pacman/super, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/electrical) +"Ma" = ( +/obj/structure/bookcase/random/fiction, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/ship/crew) +"Ml" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"Mo" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/tan/full, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = 22 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Ms" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/cargo/office) +"MA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_cw, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"MB" = ( +/obj/structure/mopbucket, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/mop, +/turf/open/floor/pod, +/area/ship/crew/cryo) +"ME" = ( +/obj/structure/table, +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/toy/cards/deck/kotahi{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/dice/d6{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/dice/d6{ + pixel_x = -5; + pixel_y = 11 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/ship/crew) +"MG" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/crew/cryo) +"MH" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/structure/sign/poster/contraband/gec{ + pixel_x = 32 + }, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/shoes/magboots/syndie, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 8 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"MK" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"MM" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 1; + layer = 2.04 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 8 + }, +/obj/structure/closet/emcloset/wall/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"MN" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/crew/canteen) +"MU" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 1; + layer = 2.04 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Nk" = ( +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"Nm" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"Np" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -7; + pixel_y = -19 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"Nq" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"Nw" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/platform/military, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"Nz" = ( +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering) +"NK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"NW" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/obj/structure/dresser{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/airalarm/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"NY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + dir = 1; + name = "Cryo Bay" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) +"Oh" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/platform/military{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"Oj" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/tan/half{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/machinery/photocopier, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"OC" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"OI" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light/floor/hangar, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"OK" = ( +/obj/structure/crate_shelf, +/obj/machinery/light/dim/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"OR" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/syndicate/surplus, +/obj/item/clothing/head/helmet/space/syndicate/surplus, +/obj/machinery/light/dim/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"Pc" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/tan/half, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"Pk" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/fore) +"Pq" = ( +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"Py" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering) +"PD" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "derecho_entrance_blast" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "derecho_entrance_holo"; + locked = 1 + }, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/fore) +"PF" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"PG" = ( +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/platform/military{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"PH" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/corner/opaque/red/half{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/inherit{ + name = "foreman's suit storage unit"; + req_access = list(56) + }, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/item/clothing/shoes/magboots/syndie, +/obj/structure/sign/poster/contraband/engis_unite{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"PV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -3 + }, +/obj/machinery/button/door{ + dir = 4; + id = "derecho_captain_door"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -21; + pixel_y = 7; + req_access_txt = "3"; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm/captain) +"PY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/tan, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"Qj" = ( +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/effect/turf_decal/arrows{ + dir = 1 + }, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"Qq" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "waste pump" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"Qw" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -7; + pixel_y = -19 + }, +/obj/machinery/button/door{ + dir = 1; + id = "derecho_bridge_shut"; + name = "Bridge Shutters"; + pixel_x = 3; + pixel_y = -20 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"QB" = ( +/obj/structure/closet/secure_closet/freezer{ + anchored = 1; + locked = 0; + name = "fridge" + }, +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/storage/fancy/egg_box, +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/contraband/robustmore_drinkfoods{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) +"QC" = ( +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/item/storage/backpack, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/accessory/armband/cargo, +/obj/item/clothing/suit/hazardvest/ngr, +/obj/item/clothing/head/hardhat/ngr, +/obj/item/radio/headset/alt, +/obj/item/clothing/gloves/explorer, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/head/ngr, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/mask/balaclava/ngr, +/obj/item/clothing/suit/hooded/wintercoat/security/ngr, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/closet/wardrobe/cargotech{ + name = "wrecker's wardrobe"; + populate = 0 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/official/moth/hardhats{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/melee/knife/survival, +/turf/open/floor/pod, +/area/ship/storage/equip) +"QD" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"QZ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 25 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Re" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"Ry" = ( +/obj/structure/table, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/sign/poster/syndicate/random{ + pixel_x = -32 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 8; + pixel_y = 14 + }, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/stamp/ngr/foreman{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/stamp/ngr{ + pixel_x = 5; + pixel_y = 2 + }, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) +"RD" = ( +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, +/obj/structure/sign/poster/syndicate/random{ + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/ship/crew) +"RO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"RP" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/structure/closet/emcloset/wall/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"RU" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"RY" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/central) +"RZ" = ( +/obj/effect/turf_decal/techfloor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"Sf" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"Su" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/item/radio/intercom/wideband/table{ + dir = 1; + pixel_x = -6; + pixel_y = 3 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"Sy" = ( +/obj/machinery/suit_storage_unit/inherit{ + req_access_txt = "3" + }, +/obj/item/clothing/suit/space/hardsuit/syndi/ngr, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/beige, +/obj/machinery/firealarm/directional/west, +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"SC" = ( +/obj/machinery/door/poddoor/shutters{ + id = "derecho_dorms_shut" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/crew) +"SD" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"SG" = ( +/obj/effect/turf_decal/corner/opaque/red/mono, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo/office) +"SK" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"SP" = ( +/obj/machinery/door/poddoor/shutters{ + id = "derecho_mess_shut" + }, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/crew/canteen) +"ST" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/obj/structure/sign/poster/syndicate/random{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"Ta" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 7; + pixel_y = -19 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Tb" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = 6 + }, +/obj/item/folder/documents/syndicate/ngr, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"Tg" = ( +/obj/effect/turf_decal/borderfloorblack, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + layer = 2.04 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/atmospherics) +"Tk" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/transparent/bar/diagonal, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -11; + pixel_y = 10 + }, +/obj/item/paper{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/plasteel, +/area/ship/crew/canteen) +"Tm" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"To" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"Tq" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"Ty" = ( +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/structure/closet/secure_closet/engineering_welding{ + req_access = null; + req_access_txt = "11"; + req_one_access = null + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/tools{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/engineering/electrical) +"TC" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/cryo) +"TG" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "derecho_belt" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/science/workshop) +"TJ" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "derecho_entrance_blast" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 1; + id = "derecho_entrance_holo"; + locked = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/fore) +"TT" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{ + dir = 9 + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = 22 + }, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"TW" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/sign/directions/engineering{ + dir = 1; + pixel_y = 25 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"Uh" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/turf/open/floor/plating, +/area/ship/crew) +"Ui" = ( +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"Ul" = ( +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -28 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/cryo) +"Un" = ( +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/item/storage/backpack, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/accessory/armband/cargo, +/obj/item/clothing/suit/hazardvest/ngr, +/obj/item/clothing/head/hardhat/ngr, +/obj/item/radio/headset/alt, +/obj/item/clothing/gloves/explorer, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/head/ngr, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/mask/balaclava/ngr, +/obj/item/clothing/suit/hooded/wintercoat/security/ngr, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/closet/wardrobe/cargotech{ + name = "wrecker's wardrobe"; + populate = 0 + }, +/obj/structure/sign/poster/contraband/hacking_guide{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/melee/knife/survival, +/turf/open/floor/pod, +/area/ship/storage/equip) +"UA" = ( +/obj/machinery/porta_turret/ship/ngr{ + dir = 6; + id = "derecho_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/crew/office) +"UB" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"Ve" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -3 + }, +/obj/machinery/light/dim/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"Vj" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/starboard) +"Vn" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/chair/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/machinery/advanced_airlock_controller{ + pixel_x = 25; + req_access = null + }, +/turf/open/floor/pod/dark, +/area/ship/hallway/central) +"Vq" = ( +/obj/machinery/computer/card{ + dir = 8; + icon_state = "computer-right" + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"VC" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew) +"VG" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/canteen) +"VH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/hatch{ + id_tag = "derecho_captain_door"; + name = "Captain's Quarters"; + req_access_txt = "20" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/captain) +"VL" = ( +/obj/machinery/holopad/emergency/command, +/obj/effect/turf_decal/industrial/outline{ + color = "#791500" + }, +/obj/effect/turf_decal/corner/opaque/tan/mono, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/office) +"VW" = ( +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"Wg" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Custodial Closet" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) +"Wl" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Wn" = ( +/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/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Command Deck"; + normalspeed = 0; + req_access_txt = "19" + }, +/obj/structure/sign/directions/command{ + dir = 4; + pixel_y = 25 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/starboard) +"Wo" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/science/workshop) +"Wp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/beige/half, +/obj/effect/turf_decal/corner/opaque/beige{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"Wu" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 8 + }, +/obj/machinery/button/door{ + dir = 8; + id = "derecho_dorms_shut"; + name = "Crew Quarters Shutters"; + pixel_x = 21; + pixel_y = 7 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -3 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"Wx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"WD" = ( +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engines) +"WE" = ( +/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 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Locker Room"; + req_access_txt = "48" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage/equip) +"WJ" = ( +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, +/obj/structure/sign/poster/syndicate/random{ + pixel_y = 32 + }, +/turf/open/floor/carpet/red, +/area/ship/crew) +"WP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew) +"WR" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 4; + height = 30; + width = 7 + }, +/turf/template_noop, +/area/template_noop) +"Xb" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) +"Xd" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/crew/canteen) +"Xi" = ( +/obj/effect/turf_decal/corner/opaque/beige/mono, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"Xu" = ( +/obj/structure/marker_beacon{ + picked_color = "Lime" + }, +/obj/structure/catwalk/over, +/obj/docking_port/mobile{ + dir = 4; + launch_status = 0; + port_direction = 2; + preferred_direction = 4 + }, +/turf/open/floor/plating, +/area/ship/external/dark) +"Xx" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engines) +"XF" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -7; + pixel_y = -19 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod, +/area/ship/crew/cryo) +"XJ" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 7 + }, +/obj/structure/sign/directions/service{ + pixel_y = -20 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"XM" = ( +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, +/obj/structure/sign/poster/rilena/random{ + pixel_x = -32 + }, +/obj/item/trash/cheesie{ + pixel_x = 5; + pixel_y = 8 + }, +/turf/open/floor/carpet/red, +/area/ship/crew) +"XR" = ( +/obj/structure/sink/kitchen{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/glass/bucket, +/obj/item/pushbroom, +/obj/item/soap, +/obj/structure/closet/wall/directional/south{ + name = "custodial closet" + }, +/obj/item/storage/bag/trash, +/turf/open/floor/pod, +/area/ship/crew/cryo) +"XY" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Yj" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Yn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/airalarm/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Yp" = ( +/obj/structure/closet/syndicate/personal{ + name = "captain's closet"; + populate = 0 + }, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/ngr/officer, +/obj/item/clothing/suit/armor/ngr/captain, +/obj/item/clothing/gloves/combat, +/obj/item/radio/headset/syndicate/alt/captain, +/obj/item/clothing/head/ngr/peaked, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/mask/breath/ngr, +/obj/item/clothing/mask/balaclava/ngr, +/obj/item/megaphone, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/obj/item/storage/guncase/pistol/a357, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm/captain) +"Yq" = ( +/obj/machinery/door/poddoor{ + dir = 4; + id = "derecho_entrance_blast" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/fore) +"Yv" = ( +/obj/structure/chair/handrail{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/button/shieldwallgen{ + dir = 4; + id = "derecho_entrance_holo"; + pixel_x = -20; + pixel_y = 7; + req_one_access = null; + req_ship_access = 1 + }, +/obj/machinery/button/door{ + dir = 4; + id = "derecho_entrance_blast"; + name = "Blast Door Control"; + pixel_x = -21; + pixel_y = -4; + req_one_access = null; + req_ship_access = 1 + }, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"Yw" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ + piping_layer = 4 + }, +/obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/pod/dark, +/area/ship/engineering/atmospherics) +"YA" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/beige/half{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"YD" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 9 + }, +/obj/effect/turf_decal/spline/plain/opaque/solgovgold{ + layer = 2.04 + }, +/obj/effect/turf_decal/trimline/opaque/bar/filled/shrink_ccw{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"YM" = ( +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/conveyor_switch{ + id = "derecho_belt" + }, +/turf/open/floor/pod/dark, +/area/ship/science/workshop) +"YR" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/pod, +/area/ship/hallway/fore) +"YZ" = ( +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/external/dark) +"Zm" = ( +/obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light/floor/hangar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"Zx" = ( +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 4 + }, +/obj/structure/bed/roller, +/obj/structure/platform/military{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"ZE" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"ZF" = ( +/obj/structure/chair/handrail{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/fore) +"ZG" = ( +/obj/effect/turf_decal/corner/opaque/tan{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/bar/line, +/obj/structure/chair/handrail{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/aft) +"ZQ" = ( +/turf/template_noop, +/area/template_noop) +"ZR" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/steeldecal/steel_decals_central4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) +"ZY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/fore) + +(1,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +pR +ZQ +ZQ +ZQ +ZQ +qA +yO +yO +qA +ZQ +ZQ +ZQ +ZQ +pR +ZQ +ZQ +ZQ +"} +(2,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +qA +yS +yS +qA +ZQ +qA +WD +WD +qA +ZQ +qA +fQ +fQ +qA +ZQ +ZQ +ZQ +"} +(3,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +qA +uX +DP +qA +qA +qA +Xx +kH +qA +qA +qA +DP +AW +qA +ZQ +ZQ +ZQ +"} +(4,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +qA +By +DS +Gl +PF +qA +fC +qA +qA +tg +wa +CX +mb +qA +ZQ +ZQ +ZQ +"} +(5,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ky +qA +qA +qA +qA +QD +EY +JE +mO +Gc +zL +qA +qA +qA +qA +ky +ZQ +ZQ +"} +(6,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +kX +qB +BH +DT +GS +Re +lv +yD +cU +qF +GI +vV +eD +Qq +Cs +Jj +ZQ +ZQ +"} +(7,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +kX +qB +wR +Hv +Tg +SK +Yw +ER +TT +sM +cB +qB +SD +iy +qB +kX +ZQ +ZQ +"} +(8,1,1) = {" +ZQ +ZQ +ZQ +aP +aS +aS +qB +qB +qB +qB +gU +qB +qB +qB +VC +VC +VC +VC +VC +VC +VC +qE +ZQ +"} +(9,1,1) = {" +ZQ +ZQ +ZQ +aS +LT +kU +CB +BK +Ei +Hf +Ta +aS +TW +RP +VC +XM +wG +RD +iZ +oh +NW +VC +qE +"} +(10,1,1) = {" +ZQ +ZQ +ZQ +aS +LT +lt +qS +Ca +Ej +HP +To +nk +zC +yW +VC +WJ +fD +Kn +cc +sZ +aA +Gr +SC +"} +(11,1,1) = {" +ZQ +ZQ +ZQ +aS +zk +lF +rD +Cn +Ep +Im +Ty +aS +zA +mu +qH +WP +rW +rW +Ui +GD +ME +ab +VC +"} +(12,1,1) = {" +ZQ +ZQ +ZQ +HJ +VW +VW +se +Ld +Ld +Ld +Ld +Ld +CN +Np +VC +jX +JM +Wu +yq +mJ +qn +Ma +SC +"} +(13,1,1) = {" +ZQ +ZQ +ZQ +Py +qh +lQ +sm +Ld +Jh +ce +fa +Ld +eL +ZG +VC +VC +VC +VC +wg +Uh +VC +VC +VC +"} +(14,1,1) = {" +ZQ +ZQ +ZQ +JV +Nz +lY +sv +Ld +ED +Iq +TC +NY +JD +OC +VG +QB +Ae +oe +ok +sn +fF +VG +ZQ +"} +(15,1,1) = {" +ZQ +ZQ +ZQ +Py +MH +lg +yz +Ld +qc +La +Ul +Ld +dB +yW +kg +ea +qD +Tk +ok +Xd +gF +VG +sD +"} +(16,1,1) = {" +ZQ +ZQ +eC +rL +rL +rL +rL +rL +rL +Ld +Wg +Ld +Ba +qi +vA +Et +oZ +NK +Wp +MK +yb +te +SP +"} +(17,1,1) = {" +ZQ +ZQ +rL +ld +aX +mv +sC +CY +rL +LC +XF +Ld +pd +XJ +VG +gD +iO +DD +au +gV +iH +hI +VG +"} +(18,1,1) = {" +ZQ +ZQ +rL +bM +AZ +AZ +JS +gW +rL +MB +cE +Ld +px +fe +VG +VG +sL +VG +pg +gV +YA +Mo +SP +"} +(19,1,1) = {" +ZQ +ZQ +rL +QC +Un +mU +sH +Dq +rL +MG +XR +Ld +lS +uE +VG +Au +qr +VG +zJ +zV +qY +VG +MN +"} +(20,1,1) = {" +ZQ +RY +RY +RY +RY +rL +WE +rL +rL +Ld +Ld +Ld +QZ +KD +Eh +Eh +Eh +Eh +Eh +Wn +nb +nb +ZQ +"} +(21,1,1) = {" +ZQ +js +aE +bT +RY +ng +uK +YD +wj +MM +Yj +XY +wF +KX +Eh +vr +sa +Ry +Eh +tZ +ST +nb +ZQ +"} +(22,1,1) = {" +JA +zB +Vn +cJ +nY +nz +vd +DL +EM +MU +Yn +mR +pe +Tm +Eh +BE +oF +fB +Ko +Vj +sg +nb +ZQ +"} +(23,1,1) = {" +ZQ +RY +RY +RY +RY +jA +ua +jA +Pk +Pk +Pk +oc +Pk +Pk +cy +cy +cy +cy +cy +eB +lh +nb +ZQ +"} +(24,1,1) = {" +ZQ +dC +jA +cR +OR +om +cG +jA +Jv +ki +Yv +wN +oS +yv +cy +Gb +zW +PV +VH +Sf +eA +nb +ZQ +"} +(25,1,1) = {" +ZQ +ZQ +jA +dX +hL +Wl +vi +jA +yh +Nq +YR +Tq +zI +pL +cy +zn +zr +Yp +cy +Ve +MA +nb +ZQ +"} +(26,1,1) = {" +ZQ +ZQ +GC +dZ +Kz +oy +vs +LP +FC +Oh +Zx +PG +sG +oQ +aZ +aZ +aZ +aZ +aZ +LI +aU +LI +LI +"} +(27,1,1) = {" +ZQ +ZQ +GC +eu +iC +pa +vv +LP +Wx +mM +aM +Fk +sU +UB +bW +Fp +zN +KR +aZ +oz +wE +wY +HX +"} +(28,1,1) = {" +ZQ +ZQ +GC +gc +OK +RO +vC +jA +tp +ox +pn +ZR +Nw +ex +Ms +Id +Nk +qf +xQ +Pc +jN +Oj +LI +"} +(29,1,1) = {" +ZQ +ZQ +vc +ln +ln +pF +ln +ln +Gg +ox +ZE +EF +RZ +ju +Ms +CI +zz +ep +aZ +KF +VL +bt +HX +"} +(30,1,1) = {" +ZQ +ZQ +ln +Ad +iK +pJ +vF +Ki +Qj +Nm +ZY +Fk +ot +ZF +Ms +er +SG +PH +aZ +yi +bp +hg +LI +"} +(31,1,1) = {" +ZQ +ZQ +ln +gx +lU +Ah +vJ +ln +jW +OI +iE +DI +Zm +li +aZ +dW +Pq +Ef +aZ +oa +IV +KL +HX +"} +(32,1,1) = {" +ZQ +ZQ +ln +gK +jn +YM +xD +ln +Pk +PD +Yq +Yq +TJ +ks +Pk +Cl +Cl +Cl +Cl +Aq +Cl +LI +UA +"} +(33,1,1) = {" +ZQ +ZQ +ln +hr +AV +xU +TG +ln +ZQ +ZQ +ZQ +WR +ZQ +ZQ +ZQ +Cl +Sy +aD +in +PY +sN +Cl +ZQ +"} +(34,1,1) = {" +ZQ +ZQ +ln +eb +Ml +ws +yu +ln +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +Cl +pH +JP +nt +Qw +Cl +Xb +ZQ +"} +(35,1,1) = {" +ZQ +EZ +ln +aY +hf +pS +ln +Wo +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +Ci +Tb +Xi +RU +vS +iA +ZQ +ZQ +"} +(36,1,1) = {" +ZQ +av +dn +ln +ln +ln +Wo +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +Ci +Ez +pk +mT +fX +iA +ZQ +ZQ +"} +(37,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +Cl +Su +wV +Vq +cX +Cl +ZQ +ZQ +"} +(38,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +hk +kG +kG +kG +kG +Cl +ZQ +ZQ +"} +(39,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +YZ +ZQ +ZQ +"} +(40,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +YZ +ZQ +ZQ +"} +(41,1,1) = {" +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +ZQ +Xu +ZQ +ZQ +"} diff --git a/auxmos.dll b/auxmos.dll index 0df77c97b287..ae9b9dbf5294 100644 Binary files a/auxmos.dll and b/auxmos.dll differ diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm index 596060d6610e..1fa102e8687a 100644 --- a/code/__DEFINES/factions.dm +++ b/code/__DEFINES/factions.dm @@ -16,6 +16,7 @@ #define FACTION_SYNDICATE "Syndicate" #define FACTION_NGR "New Gorlex Republic" #define FACTION_CYBERSUN "CyberSun" + #define FACTION_HARDLINERS "Hardliners" #define FACTION_SUNS "Student-Union of Naturalistic Sciences" #define FACTION_SOLGOV "SolGov" #define FACTION_SRM "Saint-Roumain Militia" @@ -31,6 +32,7 @@ #define PREFIX_SYNDICATE list("SEV", "SSV") #define PREFIX_NGR list("NGRV") #define PREFIX_CYBERSUN list("CSSV") + #define PREFIX_HARDLINERS list("ISV") #define PREFIX_SUNS list("SUNS") #define PREFIX_SOLGOV list("SCSV") #define PREFIX_SRM list("SRSV") diff --git a/code/__DEFINES/projectiles.dm b/code/__DEFINES/projectiles.dm index db31a4b5552d..4f42e0902291 100644 --- a/code/__DEFINES/projectiles.dm +++ b/code/__DEFINES/projectiles.dm @@ -13,3 +13,19 @@ #define PROJECTILE_BONUS_DAMAGE_WALLS (1<<1) // walls #define PROJECTILE_BONUS_DAMAGE_RWALLS (1<<2) //reinforced walls +//vibes based bullet speed + +#define BULLET_SPEED_SHOTGUN 0.5 +#define BULLET_SPEED_HANDGUN 0.4 +#define BULLET_SPEED_REVOLVER 0.4 //why do we have multiple defines for the same thing? future proofing. +#define BULLET_SPEED_PDW 0.3 +#define BULLET_SPEED_RIFLE 0.3 +#define BULLET_SPEED_SNIPER 0.2 + +//speed modifiers +#define BULLET_SPEED_AP_MOD -0.05 +#define BULLET_SPEED_HP_MOD 0.05 +#define BULLET_SPEED_RUBBER_MOD 0.1 +#define BULLET_SPEED_HV_MOD -0.1 +#define BULLET_SPEED_SURPLUS_MOD 0.05 + diff --git a/code/__HELPERS/bindings.dm b/code/__HELPERS/bindings.dm index c2c19136854e..ee88cb703800 100644 --- a/code/__HELPERS/bindings.dm +++ b/code/__HELPERS/bindings.dm @@ -11,174 +11,235 @@ #define AUXMOS (__auxmos || __detect_auxmos()) +/proc/byondapi_stack_trace(msg) + CRASH(msg) + +/// Returns: true. Parses gas strings like "o2=2500;plasma=5000;TEMP=370" and turns src mixes into the parsed gas mixture, invalid patterns will be ignored /datum/gas_mixture/proc/__auxtools_parse_gas_string(string) return call_ext(AUXMOS, "byond:parse_gas_string_ffi")(src, string) +/// Returns: the total amount of gas mixtures in the arena, including "free" ones. /datum/controller/subsystem/air/proc/get_max_gas_mixes() return call_ext(AUXMOS, "byond:hook_max_gas_mixes_ffi")() +/// Returns: the amount of gas mixtures that are attached to a byond gas mixture. /datum/controller/subsystem/air/proc/get_amt_gas_mixes() return call_ext(AUXMOS, "byond:hook_amt_gas_mixes_ffi")() +/// Args: (list). Takes every gas in the list and makes them all identical, scaled to their respective volumes. The total heat and amount of substance in all of the combined gases is conserved. /proc/equalize_all_gases_in_list(gas_list) return call_ext(AUXMOS, "byond:equalize_all_hook_ffi")(gas_list) +/// Args: (temperature). Returns: how much oxidizer for fire is in the mixture at the given temperature. If temperature is omitted, just uses current temperature instead. /datum/gas_mixture/proc/get_oxidation_power(temp) return call_ext(AUXMOS, "byond:oxidation_power_hook_ffi")(src, temp) +/// Args: (temperature). Returns: how much fuel for fire is in the mixture at the given temperature. If temperature is omitted, just uses current temperature instead. /datum/gas_mixture/proc/get_fuel_amount(temp) return call_ext(AUXMOS, "byond:fuel_amount_hook_ffi")(src, temp) +/// Args: (mixture). Makes `src` a copy of `mixture`, with volumes taken into account. /datum/gas_mixture/proc/equalize_with(total) return call_ext(AUXMOS, "byond:equalize_with_hook_ffi")(src, total) +/// Args: (mixture, ratio). Transfers `ratio` of `src` to `mixture`. /datum/gas_mixture/proc/transfer_ratio_to(other, ratio) return call_ext(AUXMOS, "byond:transfer_ratio_hook_ffi")(src, other, ratio) +/// Args: (mixture, amount). Takes the `amount` given and transfers it from `src` to `mixture`. /datum/gas_mixture/proc/transfer_to(other, moles) return call_ext(AUXMOS, "byond:transfer_hook_ffi")(src, other, moles) +/// Args: (heat). Adds a given amount of heat to the mixture, i.e. in joules taking into account capacity. /datum/gas_mixture/proc/adjust_heat(temp) return call_ext(AUXMOS, "byond:adjust_heat_hook_ffi")(src, temp) +/// Args: (holder). Runs all reactions on this gas mixture. Holder is used by the reactions, and can be any arbitrary datum or null. /datum/gas_mixture/proc/react(holder) return call_ext(AUXMOS, "byond:react_hook_ffi")(src, holder) +/// Returns: true if the two mixtures are different enough for processing, false otherwise. /datum/gas_mixture/proc/compare(other) return call_ext(AUXMOS, "byond:compare_hook_ffi")(src, other) +/// Clears the gas mixture my removing all of its gases. /datum/gas_mixture/proc/clear() return call_ext(AUXMOS, "byond:clear_hook_ffi")(src) +/// Marks the mix as immutable, meaning it will never change. This cannot be undone. /datum/gas_mixture/proc/mark_immutable() return call_ext(AUXMOS, "byond:mark_immutable_hook_ffi")(src) +/// Args: (mixture, ratio, gas_list). Takes gases given by `gas_list` and moves `ratio` amount of those gases from `src` into `mixture`. /datum/gas_mixture/proc/scrub_into(into, ratio_v, gas_list) return call_ext(AUXMOS, "byond:scrub_into_hook_ffi")(src, into, ratio_v, gas_list) +/// Args: (flag). As get_gases(), but only returns gases with the given flag. /datum/gas_mixture/proc/get_by_flag(flag_val) return call_ext(AUXMOS, "byond:get_by_flag_hook_ffi")(src, flag_val) +/// Args: (mixture, flag, amount). Takes `amount` from src that have the given `flag` and puts them into the given `mixture`. Returns: 0 if gas didn't have any with that flag, 1 if it did. /datum/gas_mixture/proc/__remove_by_flag(into, flag_val, amount_val) return call_ext(AUXMOS, "byond:remove_by_flag_hook_ffi")(src, into, flag_val, amount_val) +/// Args: (coefficient). Divides all gases by this amount. /datum/gas_mixture/proc/divide(num_val) return call_ext(AUXMOS, "byond:divide_hook_ffi")(src, num_val) +/// Args: (coefficient). Multiplies all gases by this amount. /datum/gas_mixture/proc/multiply(num_val) return call_ext(AUXMOS, "byond:multiply_hook_ffi")(src, num_val) +/// Args: (amount). Subtracts the given amount from each gas. /datum/gas_mixture/proc/subtract(num_val) return call_ext(AUXMOS, "byond:subtract_hook_ffi")(src, num_val) +/// Args: (amount). Adds the given amount to each gas. /datum/gas_mixture/proc/add(num_val) return call_ext(AUXMOS, "byond:add_hook_ffi")(src, num_val) +/// Args: (gas_id_1, amount_1, gas_id_2, amount_2, ...). As adjust_moles, but with variadic arguments. /datum/gas_mixture/proc/adjust_multi(...) var/list/args_copy = args.Copy() args_copy.Insert(1, src) return call_ext(AUXMOS, "byond:adjust_multi_hook_ffi")(arglist(args_copy)) +/// Args: (gas_id, moles, temp). Adjusts the given gas's amount by the given amount, with that gas being treated as if it is at the given temperature. /datum/gas_mixture/proc/adjust_moles_temp(id_val, num_val, temp_val) return call_ext(AUXMOS, "byond:adjust_moles_temp_hook_ffi")(src, id_val, num_val, temp_val) +/// Args: (gas_id, moles). Adjusts the given gas's amount by the given amount, e.g. (GAS_O2, -0.1) will remove 0.1 moles of oxygen from the mixture. /datum/gas_mixture/proc/adjust_moles(id_val, num_val) return call_ext(AUXMOS, "byond:adjust_moles_hook_ffi")(src, id_val, num_val) +/// Args: (gas_id, moles). Sets the amount of substance of the given gas, in moles. /datum/gas_mixture/proc/set_moles(gas_id, amt_val) return call_ext(AUXMOS, "byond:set_moles_hook_ffi")(src, gas_id, amt_val) +/// Args: (gas_id). Returns: the amount of substance of the given gas, in moles. /datum/gas_mixture/proc/get_moles(gas_id) return call_ext(AUXMOS, "byond:get_moles_hook_ffi")(src, gas_id) +/// Args: (volume). Sets the volume of the gas. /datum/gas_mixture/proc/set_volume(vol_arg) return call_ext(AUXMOS, "byond:set_volume_hook_ffi")(src, vol_arg) +/// Args: (gas_id). Returns the heat capacity from the given gas, in J/K (probably). /datum/gas_mixture/proc/partial_heat_capacity(gas_id) return call_ext(AUXMOS, "byond:partial_heat_capacity_ffi")(src, gas_id) +/// Args: (temperature). Sets the temperature of the mixture. Will be set to 2.7 if it's too low. /datum/gas_mixture/proc/set_temperature(arg_temp) return call_ext(AUXMOS, "byond:set_temperature_hook_ffi")(src, arg_temp) +/// Returns: a list of the gases in the mixture, associated with their IDs. /datum/gas_mixture/proc/get_gases() return call_ext(AUXMOS, "byond:get_gases_hook_ffi")(src) +/// Args: (src, mixture, conductivity) or (src, conductivity, temperature, heat_capacity). Adjusts temperature of src based on parameters. Returns: temperature of sharer after sharing is complete. /datum/gas_mixture/proc/temperature_share(...) var/list/args_copy = args.Copy() args_copy.Insert(1, src) return call_ext(AUXMOS, "byond:temperature_share_hook_ffi")(arglist(args_copy)) +/// Arg: (mixture). Makes src into a copy of the argument mixture. /datum/gas_mixture/proc/copy_from(giver) return call_ext(AUXMOS, "byond:copy_from_hook_ffi")(src, giver) +/// Args: (mixture, amount). Takes the given amount of gas from src and puts it into the argument mixture. Amount is amount of substance in moles. /datum/gas_mixture/proc/__remove(into, amount_arg) return call_ext(AUXMOS, "byond:remove_hook_ffi")(src, into, amount_arg) +/// Args: (mixture, ratio). Takes the given ratio of gas from src and puts it into the argument mixture. Ratio is a number between 0 and 1. /datum/gas_mixture/proc/__remove_ratio(into, ratio_arg) return call_ext(AUXMOS, "byond:remove_ratio_hook_ffi")(src, into, ratio_arg) +/// Args: (mixture). Merges the gas from the giver into src, without modifying the giver mix. /datum/gas_mixture/proc/merge(giver) return call_ext(AUXMOS, "byond:merge_hook_ffi")(src, giver) +/// Returns: the mix's thermal energy, the product of the mixture's heat capacity and its temperature. /datum/gas_mixture/proc/thermal_energy() return call_ext(AUXMOS, "byond:thermal_energy_hook_ffi")(src) +/// Returns: the mix's volume, in liters. /datum/gas_mixture/proc/return_volume() return call_ext(AUXMOS, "byond:return_volume_hook_ffi")(src) +/// Returns: the mix's temperature, in kelvins. /datum/gas_mixture/proc/return_temperature() return call_ext(AUXMOS, "byond:return_temperature_hook_ffi")(src) +/// Returns: the mix's pressure, in kilopascals. /datum/gas_mixture/proc/return_pressure() return call_ext(AUXMOS, "byond:return_pressure_hook_ffi")(src) +/// Returns: Amount of substance, in moles. /datum/gas_mixture/proc/total_moles() return call_ext(AUXMOS, "byond:total_moles_hook_ffi")(src) +/// Args: (min_heat_cap). Sets the mix's minimum heat capacity. /datum/gas_mixture/proc/set_min_heat_capacity(arg_min) return call_ext(AUXMOS, "byond:min_heat_cap_hook_ffi")(src, arg_min) +/// Returns: Heat capacity, in J/K (probably). /datum/gas_mixture/proc/heat_capacity() return call_ext(AUXMOS, "byond:heat_cap_hook_ffi")(src) +/// Adds the gas mixture's ID to the queue of mixtures that have been deleted, to be reused later. +/// This version is only if auxcleanup is not being used; it should be called from /datum/gas_mixture/Del. /datum/gas_mixture/proc/__gasmixture_unregister() return call_ext(AUXMOS, "byond:unregister_gasmixture_hook_ffi")(src) +/// Fills in the first unused slot in the gas mixtures vector, or adds another one, then sets the argument ByondValue to point to it. /datum/gas_mixture/proc/__gasmixture_register() return call_ext(AUXMOS, "byond:register_gasmixture_hook_ffi")(src) +/// Args: (ms). Runs callbacks until time limit is reached. If time limit is omitted, runs all callbacks. /proc/process_atmos_callbacks(remaining) return call_ext(AUXMOS, "byond:atmos_callback_handle_ffi")(remaining) +/// Updates adjacency infos for turfs, only use this in immediateupdateturfs. /turf/proc/__update_auxtools_turf_adjacency_info() return call_ext(AUXMOS, "byond:hook_infos_ffi")(src) +/// Returns: null. Updates turf air infos, whether the turf is closed, is space or a regular turf, or even a planet turf is decided here. /turf/proc/update_air_ref(flag) return call_ext(AUXMOS, "byond:hook_register_turf_ffi")(src, flag) +/// Returns: If this cycle is interrupted by overtiming or not. Starts a katmos equalize cycle, does nothing if process_turfs isn't ran. /datum/controller/subsystem/air/proc/process_turf_equalize_auxtools(remaining) return call_ext(AUXMOS, "byond:equalize_hook_ffi")(src, remaining) -/datum/controller/subsystem/air/proc/process_excited_groups_auxtools(remaining) - return call_ext(AUXMOS, "byond:groups_hook_ffi")(src, remaining) - +/// Returns: If this cycle is interrupted by overtiming or not. Starts a processing turfs cycle. /datum/controller/subsystem/air/proc/process_turfs_auxtools(remaining) return call_ext(AUXMOS, "byond:process_turf_hook_ffi")(src, remaining) +/// Returns: If this cycle is interrupted by overtiming or not. Calls all outstanding callbacks created by other processes, usually ones that can't run on other threads and only the main thread. /datum/controller/subsystem/air/proc/finish_turf_processing_auxtools(time_remaining) return call_ext(AUXMOS, "byond:finish_process_turfs_ffi")(time_remaining) +/// Returns: If a processing thread is running or not. /datum/controller/subsystem/air/proc/thread_running() return call_ext(AUXMOS, "byond:thread_running_hook_ffi")() +/// Returns: If this cycle is interrupted by overtiming or not. Starts a processing excited groups cycle, does nothing if process_turfs isn't ran. +/datum/controller/subsystem/air/proc/process_excited_groups_auxtools(remaining) + return call_ext(AUXMOS, "byond:groups_hook_ffi")(src, remaining) + +/// For updating reagent gas fire products, do not use for now. /proc/finalize_gas_refs() return call_ext(AUXMOS, "byond:finalize_gas_refs_ffi")() +/// For updating reaction informations for auxmos, only call this when it is changed. /datum/controller/subsystem/air/proc/auxtools_update_reactions() return call_ext(AUXMOS, "byond:update_reactions_ffi")() +/// Registers gases, and get reaction infos for auxmos, only call when ssair is initing. /proc/auxtools_atmos_init(gas_data) return call_ext(AUXMOS, "byond:hook_init_ffi")(gas_data) +/// For registering gases, do not touch this. /proc/_auxtools_register_gas(gas) return call_ext(AUXMOS, "byond:hook_register_gas_ffi")(gas) + diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index b5026c71247f..5dacaec1b4cf 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -420,9 +420,11 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." return if (length(last_whisper)) - living_owner.dying_breath("[last_whisper]") living_owner.say("#[last_whisper]") - living_owner.succumb(whispered = length(last_whisper) > 0) + //Say handles everything else for us + return + + living_owner.succumb(FALSE) //ALIENS diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 2f325a1b2322..e74c04bf6ec5 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -66,6 +66,8 @@ SUBSYSTEM_DEF(air) var/equalize_hard_turf_limit = 2000 // Whether equalization should be enabled at all. var/equalize_enabled = TRUE + // The ratio of gas "shared" from the immutable planetary atmos mix to planetary tiles + var/planet_share_ratio = 0.25 // Whether turf-to-turf heat exchanging should be enabled. var/heat_enabled = FALSE // Max number of times process_turfs will share in a tick. diff --git a/code/datums/components/bandage.dm b/code/datums/components/bandage.dm index 16f6a2f0b059..05a31ec4ee32 100644 --- a/code/datums/components/bandage.dm +++ b/code/datums/components/bandage.dm @@ -41,7 +41,7 @@ SIGNAL_HANDLER var/obj/item/bodypart/heal_target = parent - lifespan -= 1 + heal_target.bleeding // particularly nasty bleeding can burn through dressing faster + lifespan-- heal_target.adjust_bleeding(-bleed_reduction) if(lifespan <= 0 || !heal_target.bleeding) //remove treatment once it's no longer able to treat drop_bandage(TRUE) diff --git a/code/datums/components/fantasy/suffixes.dm b/code/datums/components/fantasy/suffixes.dm index 7035c143ae4f..89a26ca60f7f 100644 --- a/code/datums/components/fantasy/suffixes.dm +++ b/code/datums/components/fantasy/suffixes.dm @@ -128,12 +128,10 @@ /obj/projectile/meteor = 1, /obj/projectile/energy/nuclear_particle = 1, /obj/projectile/beam/pulse = 1, - /obj/projectile/bullet/honker = 15, /obj/projectile/temp = 15, /obj/projectile/ion = 15, /obj/projectile/beam/emitter = 15, /obj/projectile/energy/net = 15, - /obj/projectile/bullet/incendiary/c9mm = 15, /obj/projectile/temp/hot = 15, /obj/projectile/beam/disabler = 15 ) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 2ec75a2945ab..58fe88b13bb1 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -80,7 +80,7 @@ if(!has_space(material_amount)) to_chat(user, "[parent] is full. Please remove materials from [parent] in order to insert more.") return - if(I.contents.len && !istype(I, /obj/item/stack)) + if(I.contents.len && !istype(I, /obj/item/stack) && !istype(I, /obj/item/ammo_box/magazine/ammo_stack)) to_chat(user, span_warning("[I] has items inside of it. Please remove them before inserting it.")) return user_insert(I, user) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index e9779644c211..5d57ac443ad2 100644 --- a/code/datums/elements/_element.dm +++ b/code/datums/elements/_element.dm @@ -60,7 +60,7 @@ var/datum/element/ele = SSdcs.GetElement(arguments) arguments[1] = src if(ele.Attach(arglist(arguments)) == ELEMENT_INCOMPATIBLE) - CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]") + CRASH("Incompatible [ele] assigned to a [type]! args: [json_encode(args)]") /** * Finds the singleton for the element type given and detaches it from src diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index e6733b8d5612..d394d7707be8 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -112,7 +112,7 @@ var/area/A = get_area(connected_holopad) calling_holopad.say("[A] holopad disconnected.") else if(H == calling_holopad && connected_holopad) - connected_holopad.say("[user] disconnected.") + connected_holopad.say("[caller_location] disconnected.") ConnectionFailure(H, TRUE) diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm index b1d47670aa2d..20d299dc290c 100644 --- a/code/game/area/ship_areas.dm +++ b/code/game/area/ship_areas.dm @@ -163,6 +163,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ship/crew/crewfive name = "Crew Quarters 5" +/area/ship/crew/specialized + name = "???" + +/area/ship/crew/specialized/medical + name = "Medical Specialist's Quarters" + +/area/ship/crew/specialized/security + name = "Security Specialist's Quarters" + +/area/ship/crew/specialized/engineering + name = "Engineering Specialist's Quarters" + +/area/ship/crew/specialized/cargo + name = "Cargo Specialist's Quarters" + /area/ship/crew/cryo name = "Cryopod Room" icon_state = "cryo" @@ -306,6 +321,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "ai_chamber" ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg') +/area/ship/science/workshop + name = "Workshop" + icon_state = "workshop" + /// Engineering /// /area/ship/engineering name = "Engineering" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 84744a9187d6..acc2797b360a 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1603,10 +1603,9 @@ * Produces a signal [COMSIG_PARENT_EXAMINE_MORE] */ /atom/proc/examine_more(mob/user) + SHOULD_CALL_PARENT(TRUE) . = list() SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .) - if(!LAZYLEN(.)) // lol ..length - return list("You examine [src] closer, but find nothing of interest...") ///Passes Stat Browser Panel clicks to the game and calls client click on an atom /atom/Topic(href, list/href_list) diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index 6dceae3a38dd..1721c1242e55 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -178,72 +178,3 @@ /obj/item/clothing/mask/fakemoustache/sticky/proc/unstick() REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT) - -//DARK H.O.N.K. AND CLOWN MECH WEAPONS - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana - name = "bombanana mortar" - desc = "Equipment for clown exosuits. Launches exploding banana peels." - icon_state = "mecha_bananamrtr" - projectile = /obj/item/grown/bananapeel/bombanana - projectiles = 8 - projectile_energy_cost = 1000 - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/mecha/combat/honker/M) - if(..()) - if(istype(M)) - return TRUE - return FALSE - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache - name = "\improper HONKeR-6 grenade launcher" - desc = "A weapon for combat exosuits. Launches primed tear-stache grenades." - icon_state = "mecha_grenadelnchr" - projectile = /obj/item/grenade/chem_grenade/teargas/moustache - fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg' - projectiles = 6 - missile_speed = 1.5 - projectile_energy_cost = 800 - equip_cooldown = 60 - det_time = 20 - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/mecha/combat/honker/M) - if(..()) - if(istype(M)) - return TRUE - return FALSE - -/obj/mecha/combat/honker/dark - desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. This one has been painted black for maximum fun. HONK!" - name = "\improper Dark H.O.N.K" - icon_state = "darkhonker" - max_integrity = 300 - deflect_chance = 15 - armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) - max_temperature = 35000 - operation_req_access = list(ACCESS_SYNDICATE) - internals_req_access = list(ACCESS_SYNDICATE) - wreckage = /obj/structure/mecha_wreckage/honker/dark - max_equip = 4 - -/obj/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C) - if(C) - C.forceMove(src) - cell = C - return - cell = new /obj/item/stock_parts/cell/hyper(src) - -/obj/mecha/combat/honker/dark/loaded/Initialize() - . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/thrusters/ion(src) - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker() - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana()//Needed more offensive weapons. - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache()//The mousetrap mortar was not up-to-snuff. - ME.attach(src) - -/obj/structure/mecha_wreckage/honker/dark - name = "\improper Dark H.O.N.K wreckage" - icon_state = "darkhonker-broken" diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 0e5507a5b7f3..3def408de874 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -126,3 +126,4 @@ /obj/machinery/computer/examine_more(mob/user) ui_interact(user) + return ..() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4caca6b376d3..fa09867a4807 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -360,13 +360,13 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( return /obj/machinery/computer/arcade/battle/examine_more(mob/user) - var/list/msg = list("You notice some writing scribbled on the side of [src]...") - msg += "\tsmart -> defend, defend, light attack" - msg += "\tshotgun -> defend, defend, power attack" - msg += "\tshort temper -> counter, counter, counter" - msg += "\tpoisonous -> light attack, light attack, light attack" - msg += "\tchonker -> power attack, power attack, power attack" - return msg + . = ..() + . += "You notice some writing scribbled on the side of [src]..." + . += "\tsmart -> defend, defend, light attack" + . += "\tshotgun -> defend, defend, power attack" + . += "\tshort temper -> counter, counter, counter" + . += "\tpoisonous -> light attack, light attack, light attack" + . += "\tchonker -> power attack, power attack, power attack" /obj/machinery/computer/arcade/battle/emag_act(mob/user) if(obj_flags & EMAGGED) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index a3ec24abc8ac..d8c3f460911b 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -46,6 +46,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) /obj/machinery/computer/crew/examine_more(mob/user) interact(user) //crew monitors use the interact method instead of ui_interact, for some reason. Not very consistent. + return ..() /datum/crewmonitor/ui_close(mob/user) ui_sources -= user diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 809fba0790bc..a9e69edc00e9 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -772,24 +772,6 @@ DEFINE_BITFIELD(turret_flags, list( stun_projectile = /obj/projectile/bullet/syndicate_turret lethal_projectile = /obj/projectile/bullet/syndicate_turret -/obj/machinery/porta_turret/syndicate/shuttle - scan_range = 9 - shot_delay = 3 - stun_projectile = /obj/projectile/bullet/p50/penetrator/shuttle - lethal_projectile = /obj/projectile/bullet/p50/penetrator/shuttle - lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg' - stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg' - armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 80, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) - -/obj/machinery/porta_turret/syndicate/shuttle/target(atom/movable/target) - if(target) - setDir(get_dir(base, target))//even if you can't shoot, follow the target - shootAt(target) - addtimer(CALLBACK(src, PROC_REF(shootAt), target), 5) - addtimer(CALLBACK(src, PROC_REF(shootAt), target), 10) - addtimer(CALLBACK(src, PROC_REF(shootAt), target), 15) - return TRUE - /obj/machinery/porta_turret/ai faction = list("silicon") turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS | TURRET_FLAG_SHOOT_HEADS @@ -1082,6 +1064,9 @@ DEFINE_BITFIELD(turret_flags, list( shot_delay = 2 scan_range = 6 +/obj/machinery/porta_turret/ship/frontiersmen/assess_perp(mob/living/carbon/human/perp) + return 10 //Syndicate turrets shoot everything not in their faction //this needs to be default behavior and im gonna refactor it soon + /obj/machinery/porta_turret/ship/frontiersmen/light name = "Pounder Turret" desc = "A low caliber SMG with an atrociously high cycle rate, frankensteined together with a targetting assembly." diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index b46ccaca9f60..4d37127659cd 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -144,7 +144,3 @@ /obj/item/sbeacondrop/heavylaserturret desc = "A label on it reads: Warning: Activating this device will send a heavy laser turret to your location." droptype = /obj/machinery/porta_turret/syndicate/energy/heavy - -/obj/item/sbeacondrop/penetratorturret - desc = "A label on it reads: Warning: Activating this device will send a penetrator turret to your location." - droptype = /obj/machinery/porta_turret/syndicate/shuttle diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm index 402ea5aa5c6b..4c30bbdc3a4a 100644 --- a/code/game/machinery/teambuilder.dm +++ b/code/game/machinery/teambuilder.dm @@ -23,7 +23,7 @@ /obj/machinery/teambuilder/examine_more(mob/user) . = ..() - . += "You see a hastily written note on the side, it says '1215-1217, PICK A SIDE'." + . += span_notice("You see a hastily written note on the side, it says '1215-1217, PICK A SIDE'.") /obj/machinery/teambuilder/proc/on_entered(datum/source, atom/movable/AM, oldloc) SIGNAL_HANDLER diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm deleted file mode 100644 index b63487ca17a5..000000000000 --- a/code/game/mecha/combat/reticence.dm +++ /dev/null @@ -1,28 +0,0 @@ -/obj/mecha/combat/reticence - desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins." - name = "\improper reticence" - icon_state = "reticence" - step_in = 2 - dir_in = 1 //Facing North. - max_integrity = 100 - deflect_chance = 3 - armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) - max_temperature = 15000 - wreckage = /obj/structure/mecha_wreckage/reticence - operation_req_access = list(ACCESS_THEATRE) - internals_req_access = list(ACCESS_MECH_SCIENCE, ACCESS_THEATRE) - add_req_access = 0 - internal_damage_threshold = 25 - max_equip = 2 - base_step_energy_drain = 8 - color = "#87878715" - stepsound = null - turnsound = null - - -/obj/mecha/combat/reticence/loaded/Initialize() - . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced - ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/rcd //HAHA IT MAKES WALLS GET IT - ME.attach(src) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 39b39ffeeff0..2ae460ae2484 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -179,53 +179,6 @@ projectile = /obj/projectile/energy/electrode fire_sound = 'sound/weapons/taser.ogg' - -/obj/item/mecha_parts/mecha_equipment/weapon/honker - name = "\improper HoNkER BlAsT 5000" - desc = "Equipment for clown exosuits. Spreads fun and joy to everyone around. Honk!" - icon_state = "mecha_honker" - energy_drain = 200 - equip_cooldown = 150 - range = MECHA_MELEE|MECHA_RANGED - kickback = FALSE - -/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M) - if(..()) - if(istype(M)) - return 1 - return 0 - -/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params) - if(!action_checks(target)) - return - playsound(chassis, 'sound/items/airhorn.ogg', 100, TRUE) - chassis.occupant_message("HONK") - for(var/mob/living/carbon/M in ohearers(6, chassis)) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(istype(H.ears, /obj/item/clothing/ears/earmuffs)) - continue - var/turf/turf_check = get_turf(M) - if(isspaceturf(turf_check) && !turf_check.Adjacent(src)) //in space nobody can hear you honk. - continue - to_chat(M, "HONK") - M.SetSleeping(0) - M.stuttering += 20 - M.adjustEarDamage(0, 30) - M.Paralyze(60) - if(prob(30)) - M.Stun(200) - M.Unconscious(80) - else - M.Jitter(500) - - log_message("Honked from [src.name]. HONK!", LOG_MECHA) - var/turf/T = get_turf(src) - message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Mecha Honker in [ADMIN_VERBOSEJMP(T)]") - log_game("[key_name(chassis.occupant)] used a Mecha Honker in [AREACOORD(T)]") - return 1 - - //Base ballistic weapon type /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "general ballistic weapon" @@ -311,17 +264,6 @@ harmful = TRUE ammo_type = "incendiary" -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced - name = "\improper S.H.H. \"Quietus\" Carbine" - desc = "A weapon for combat exosuits. A mime invention, field tests have shown that targets cannot even scream before going down." - fire_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' - icon_state = "mecha_mime" - equip_cooldown = 30 - projectile = /obj/projectile/bullet/mime - projectiles = 6 - projectile_energy_cost = 50 - harmful = TRUE - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot name = "\improper LBX-10 \"Scattershot\" Heavy Shotgun" desc = "A weapon for combat exosuits. Shoots a spread of pellets." @@ -439,7 +381,7 @@ var/turf/T = get_turf(src) message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_VERBOSEJMP(T)]") log_game("[key_name(chassis.occupant)] fired a [src] in [AREACOORD(T)]") - addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, prime)), det_time) + F.preprime(delayoverride = det_time) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze name = "\improper SOB-3 grenade launcher" diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm index 6477446a2b72..39d21639a116 100644 --- a/code/game/objects/effects/anomalies/_anomalies.dm +++ b/code/game/objects/effects/anomalies/_anomalies.dm @@ -84,7 +84,8 @@ /obj/effect/anomaly/Destroy() STOP_PROCESSING(SSobj, src) - QDEL_NULL(countdown) + if(countdown) + QDEL_NULL(countdown) QDEL_NULL(core) return ..() diff --git a/code/game/objects/effects/turf_fire.dm b/code/game/objects/effects/turf_fire.dm index 0bed49a3709c..46baaf691e87 100644 --- a/code/game/objects/effects/turf_fire.dm +++ b/code/game/objects/effects/turf_fire.dm @@ -65,11 +65,17 @@ /obj/effect/abstract/turf_fire/Initialize(mapload, power, fire_color) . = ..() - particles = new /particles/smoke/turf_fire var/turf/open/open_turf = loc if(open_turf.turf_fire) return INITIALIZE_HINT_QDEL + var/datum/gas_mixture/environment = open_turf.air + var/oxy = environment.get_moles(GAS_O2) + if (oxy < TURF_FIRE_BURN_MINIMUM_OXYGEN_REQUIRED) + return INITIALIZE_HINT_QDEL + + particles = new /particles/smoke/turf_fire + var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) @@ -100,27 +106,28 @@ var/turf/open/open_turf = loc if(open_turf.planetary_atmos) return TRUE + var/datum/gas_mixture/cached_air = open_turf.air + var/oxy = cached_air.get_moles(GAS_O2) if (oxy < TURF_FIRE_BURN_MINIMUM_OXYGEN_REQUIRED) return FALSE + var/temperature = cached_air.return_temperature() var/old_heat_capacity = cached_air.heat_capacity() + var/burn_rate = TURF_FIRE_BURN_RATE_BASE + fire_power * TURF_FIRE_BURN_RATE_PER_POWER - if(burn_rate > oxy) - burn_rate = oxy + burn_rate = max(oxy, burn_rate) - var/new_o2 = (cached_air.get_moles(GAS_O2) - burn_rate) - cached_air.set_moles(GAS_O2, new_o2) + cached_air.adjust_moles(GAS_O2, -burn_rate) - var/new_co2 = (cached_air.get_moles(GAS_O2) + burn_rate * TURF_FIRE_BURN_CARBON_DIOXIDE_MULTIPLIER) - cached_air.set_moles(GAS_CO2, new_co2) + cached_air.adjust_moles(GAS_CO2, burn_rate * TURF_FIRE_BURN_CARBON_DIOXIDE_MULTIPLIER) var/new_heat_capacity = cached_air.heat_capacity() var/energy_released = burn_rate * TURF_FIRE_ENERGY_PER_BURNED_OXY_MOL cached_air.adjust_heat((temperature * old_heat_capacity + energy_released) / new_heat_capacity) - open_turf.air = cached_air - open_turf.air_update_turf(TRUE) + + open_turf.air_update_turf() return TRUE /obj/effect/abstract/turf_fire/process() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 8782d3d30280..ef5b92641d53 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -179,6 +179,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 31) /obj/item/radio/intercom/wideband/examine_more(mob/user) interact(user) + return ..() /obj/item/radio/intercom/wideband/unscrewed unscrewed = TRUE diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 79b37d41e52c..2e5c9275d8df 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -332,7 +332,7 @@ /obj/item/book/granter/spell/random/Initialize() . = ..() - var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade, /obj/item/book/granter/spell/mimery_guns) + var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade) var/real_type = pick(subtypesof(/obj/item/book/granter/spell) - banned_spells) new real_type(loc) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index a086cf85b055..b9ad8730b652 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -79,7 +79,7 @@ var/obj/item/grenade/P = new type(loc) if(istype(P)) P.active = TRUE - addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60)) + P.preprime(delayoverride = P.det_time + rand(1.5 SECONDS, 6 SECONDS)) var/steps = rand(1,4) for(var/i in 1 to steps) step_away(src,loc) diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm index a83d69c53145..fb4730dadf14 100644 --- a/code/game/objects/items/implants/implant_track.dm +++ b/code/game/objects/items/implants/implant_track.dm @@ -9,17 +9,18 @@ ///The id of the timer that's qdeleting us var/timerid -/obj/item/implant/tracking/c38 +/obj/item/implant/tracking/bullet name = "TRAC implant" desc = "A smaller tracking implant that supplies power for only a few minutes." var/lifespan = 3000 //how many deciseconds does the implant last? allow_teleport = FALSE -/obj/item/implant/tracking/c38/Initialize() +/obj/item/implant/tracking/bullet/Initialize() . = ..() timerid = QDEL_IN(src, lifespan) + AddComponent(/datum/component/gps/item, "*TRAC") -/obj/item/implant/tracking/c38/Destroy() +/obj/item/implant/tracking/bullet/Destroy() deltimer(timerid) return ..() diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm index db676e60fc3c..c95f0fded445 100644 --- a/code/game/objects/items/shrapnel.dm +++ b/code/game/objects/items/shrapnel.dm @@ -31,6 +31,37 @@ name = "\improper .38 DumDum bullet" embedding = list(embed_chance=70, fall_chance=7, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10, embed_chance_turf_mod=-100) +/obj/item/shrapnel/bullet/tracker + name = "\improper bullet tracker" + embedding = list(embed_chance=100, fall_chance=0, jostle_chance=1, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=1, jostle_pain_mult=2, rip_time=100, embed_chance_turf_mod=-100) + var/lifespan = 3000 + var/gps_tag = "*TRAC" + var/timer_id + +/obj/item/shrapnel/bullet/tracker/Initialize() + . = ..() + timer_id = QDEL_IN(src, lifespan) + AddComponent(/datum/component/gps/item, gps_tag) + +/obj/item/shrapnel/bullet/tracker/Destroy() + deltimer(timer_id) + return ..() + +/obj/item/shrapnel/bullet/tracker/c38 + name = ".38 Tracker" + +/obj/item/shrapnel/bullet/tracker/a8_50r + name = "8x50mm Tracker" + +/obj/item/shrapnel/bullet/tracker/a858 + name = "8x58mm Tracker" + +/obj/item/shrapnel/bullet/tracker/a65clip + name = "6.5x57mm Tracker" + +/obj/item/shrapnel/bullet/tracker/a308 + name = ".308 Tracker" + /obj/projectile/bullet/shrapnel name = "flying shrapnel shard" damage = 10 diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 97f8452e831e..26b9b790b2f8 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -500,7 +500,6 @@ /obj/item/storage/box/syndie_kit/mimery/PopulateContents() new /obj/item/book/granter/spell/mimery_blockade(src) - new /obj/item/book/granter/spell/mimery_guns(src) /obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents() new /obj/item/clothing/under/rank/centcom/official(src) diff --git a/code/game/objects/structures/crateshelf.dm b/code/game/objects/structures/crateshelf.dm index a637829bd2c2..65a20a128829 100644 --- a/code/game/objects/structures/crateshelf.dm +++ b/code/game/objects/structures/crateshelf.dm @@ -81,7 +81,7 @@ balloon_alert(user, "adding additional shelf to rack") if(do_after(user, 3 SECONDS, src)) add_shelf(1) - our_sheet.add(-2) + our_sheet.use(2) return TRUE to_chat(user, span_notice("Adding a shelf to [src] requires more metal.")) return FALSE @@ -169,8 +169,12 @@ shelf_contents[shelf_contents.Find(crate)] = null if(!(flags_1&NODECONSTRUCT_1)) density = FALSE - var/obj/item/rack_parts/shelf/newparts = new(loc) - transfer_fingerprints_to(newparts) + var/obj/item/rack_parts/shelf/new_parts = new(loc) + if(capacity >= 2) + var/obj/item/stack/sheet/metal/new_metal = new(loc) + new_metal.amount = (capacity-1)*2 + transfer_fingerprints_to(new_metal) + transfer_fingerprints_to(new_parts) return ..() /obj/item/rack_parts/shelf diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 7b8d68b7b2f9..a8c64aea67f6 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -134,9 +134,13 @@ /turf/closed/mineral/attack_animal(mob/living/simple_animal/user) - if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS) || (user.environment_smash & ENVIRONMENT_SMASH_MINERALS)) - gets_drilled(user) - ..() + if((!(user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS) || (user.environment_smash & ENVIRONMENT_SMASH_MINERALS))) + return ..() + + //This scrapes us away and turns us into a floor, so don't call parent. + user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) + gets_drilled(user) /turf/closed/mineral/attack_alien(mob/living/carbon/alien/M) balloon_alert(M, "digging...") diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 92f6d3b64782..e2c6caa8be7e 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -155,7 +155,7 @@ baseturfs = /turf/open/indestructible/airblock /turf/open/Initalize_Atmos(times_fired) - if(!istype(air,/datum/gas_mixture/turf)) + if(!istype(air, /datum/gas_mixture)) air = new(2500, src) air.copy_from_turf(src) update_air_ref(planetary_atmos ? AIR_REF_PLANETARY_TURF : AIR_REF_OPEN_TURF) diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index d38a0ca6956a..1b5009d8245b 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -171,6 +171,8 @@ base_icon_state = "tcomms" icon = 'icons/turf/floors/misc.dmi' color = null +/turf/open/floor/plasteel/telecomms_floor/tatmos + initial_gas_mix = TCOMMS_ATMOS //ship turfs /turf/open/floor/ship diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm index 1feb9d0921e0..e77e07e71d3a 100644 --- a/code/game/turfs/open/floor/plasteel_floor.dm +++ b/code/game/turfs/open/floor/plasteel_floor.dm @@ -59,6 +59,9 @@ base_icon_state = "techfloor" floor_tile = /obj/item/stack/tile/plasteel/tech +/turf/open/floor/plasteel/tech/tcomms + initial_gas_mix = TCOMMS_ATMOS + /turf/open/floor/plasteel/tech/airless initial_gas_mix = AIRLESS_ATMOS diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm index 6de774313697..250ab5f45569 100644 --- a/code/game/turfs/open/floor/plating/wasteplanet.dm +++ b/code/game/turfs/open/floor/plating/wasteplanet.dm @@ -266,19 +266,62 @@ //closed turfs are a thing /turf/closed/wall/r_wall/wasteplanet + max_integrity = 800 + integrity = 800 baseturfs = /turf/open/floor/plating/wasteplanet +/turf/closed/wall/r_wall/wasteplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(25)) + alter_integrity(-rand(200,400)) + + /turf/closed/wall/r_wall/rust/wasteplanet + max_integrity = 600 + integrity = 600 baseturfs = /turf/open/floor/plating/wasteplanet/rust +/turf/closed/wall/r_wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(25)) + alter_integrity(-rand(0,400)) + /turf/closed/wall/wasteplanet + max_integrity = 200 + integrity = 200 baseturfs = /turf/open/floor/plating/wasteplanet +/turf/closed/wall/wasteplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(25)) + alter_integrity(-rand(0,150)) + /turf/closed/wall/rust/wasteplanet + max_integrity = 100 + integrity = 100 baseturfs = /turf/open/floor/plating/wasteplanet/rust +/turf/closed/wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(25)) + alter_integrity(-rand(0,100)) + /turf/closed/wall/concrete/wasteplanet + max_integrity = 200 + integrity = 200 baseturfs = /turf/open/floor/concrete/wasteplanet +/turf/closed/wall/concrete/wasteplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(25)) + alter_integrity(-rand(0,100)) + /turf/closed/wall/concrete/reinforced/wasteplanet + max_integrity = 700 + integrity = 700 baseturfs = /turf/open/floor/concrete/wasteplanet + +/turf/closed/wall/concrete/reinforced/wasteplanet/Initialize(mapload, inherited_virtual_z) + . = ..() + if(prob(25)) + alter_integrity(-rand(0,500)) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 8a90ac9fe614..4da6e25703bb 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -378,7 +378,7 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists) /turf/open/Entered(atom/movable/AM) . =..() //melting - if(isobj(AM) && air && air.return_temperature() > T0C) + if(isobj(AM) && air?.return_temperature() > T0C) var/obj/O = AM if(O.obj_flags & FROZEN) O.make_unfrozen() diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index af4b5bd60892..e18f6ff922e2 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -523,6 +523,10 @@ return TRUE return ..() +/obj/machinery/nuclearbomb/beer/empty/Initialize() + . = ..() + keg.reagent_id = null + /obj/machinery/nuclearbomb/beer/actually_explode() //Unblock roundend, we're not actually exploding. SSticker.roundend_check_paused = FALSE diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 1162f1d3b6cf..7368e05f1b44 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -71,7 +71,7 @@ return secured /obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj) - if (istype(AM, /obj/effect/beam)) + if(istype(AM, /obj/effect/beam) || istype(AM, /obj/projectile) || istype(AM, /obj/effect/projectile)) return sense() diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 18b7b99a7310..d5c0a9fead1d 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -20,7 +20,7 @@ var/pressure_direction = 0 var/turf/pressure_specific_target - var/datum/gas_mixture/turf/air + var/datum/gas_mixture/air var/obj/effect/hotspot/active_hotspot var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time @@ -184,14 +184,14 @@ /turf/proc/handle_decompression_floor_rip() /turf/open/floor/handle_decompression_floor_rip(sum) - if(sum > 20 && prob(clamp(sum / 10, 0, 30)) && !blocks_air) + if(!blocks_air && sum > 20 && prob(clamp(sum / 10, 0, 30))) remove_tile() /turf/open/process_cell(fire_count) //////////////////////////SPACEWIND///////////////////////////// -/turf/proc/consider_pressure_difference() +/turf/proc/consider_pressure_difference(turf/T, difference) return /turf/open/consider_pressure_difference(turf/T, difference) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index fa3ba14457d5..1aff4ddadb7f 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -210,8 +210,6 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() 10 = 2.5/5*20 */ -/datum/gas_mixture/turf - /// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure. /datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure) var/output_starting_pressure = output_air.return_pressure() diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 0e9c7b2888f7..bfd869247f8c 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -280,6 +280,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27) /obj/machinery/airalarm/examine_more(mob/user) ui_interact(user) + return ..() /obj/machinery/airalarm/ui_data(mob/user) var/data = list( diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index e67f8a810004..24a39c848ff1 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -304,3 +304,32 @@ stock_min = 3 stock_max = 8 availability_prob = 50 + +/datum/blackmarket_item/ammo/a8x50match + name = "8x50mm Match Box" + desc = "We found this dead guy with a recording of him going \"Watch this!\", and richoetting something before crumbling over. This is the ammo he had!" + item = /obj/item/storage/box/ammo/a8_50r/match + price_min = 500 + price_max = 1000 + stock_min = 1 + stock_max = 4 + availability_prob = 30 + +/datum/blackmarket_item/ammo/c22rub + name = ".22lr Rubbers" + desc = "A 100 round box of .22 rubbershot from some godsforsaken frontier world. We're pretty sure the use-case is making someone think that they just pissed off a beehive" + item = /obj/item/storage/box/ammo/c22lr/rubber + price_min = 400 + price_max = 800 + stock_min = 1 + stock_max = 4 + availability_prob = 40 + +/datum/blackmarket_item/ammo/a8x58trac + name = "8x58mm Tracker" + desc = "We hot glued a GPS onto the inside of this 8x58mm shell! For the low low price of. Whatever the price is. You can have it!" + item = /obj/item/ammo_casing/caseless/a858/trac + price_min = 50 + price_max = 500 + stock_min = 4 + stock_max = 8 diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 5ebf45ef1d85..641247c2612a 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -19,29 +19,42 @@ contains = list(/obj/item/storage/box/ammo/c22lr) cost = 250 +/datum/supply_pack/ammo/c22lr_hp + name = ".22 LR HP Ammo Box Crate" + desc = "Contains a 100-round hollow point ammo box for refilling .22 LR weapons." + contains = list(/obj/item/storage/box/ammo/c22lr/hp) + cost = 600 + +/datum/supply_pack/ammo/c22lr_ap + name = ".22 LR AP Ammo Box Crate" + desc = "Contains a 100-round armour piercing ammo box for refilling .22 LR weapons." + contains = list(/obj/item/storage/box/ammo/c22lr/ap) + cost = 600 + + /* 9mm */ /datum/supply_pack/ammo/c9mm_ammo_box name = "9mm Ammo Box Crate" - desc = "Contains a 48-round 9mm box for pistols and SMGs such as the Commander or Saber." + desc = "Contains a 60-round 9mm box for pistols and SMGs such as the Commander or Saber." contains = list(/obj/item/storage/box/ammo/c9mm) cost = 200 /datum/supply_pack/ammo/c9mmap_ammo_box name = "9mm AP Ammo Box Crate" - desc = "Contains a 48-round 9mm box loaded with armor piercing ammo." - contains = list(/obj/item/storage/box/ammo/c9mm/ap) + desc = "Contains a 60-round 9mm box loaded with armor piercing ammo." + contains = list(/obj/item/storage/box/ammo/c9mm_ap) cost = 400 /datum/supply_pack/ammo/c9mmhp_ammo_box name = "9mm HP Ammo Box Crate" - desc = "Contains a 48-round 9mm box loaded with hollow point ammo, great against unarmored targets." + desc = "Contains a 60-round 9mm box loaded with hollow point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/c9mm_hp) cost = 400 /datum/supply_pack/ammo/c9mmrubber_ammo_box name = "9mm Rubber Ammo Box Crate" - desc = "Contains a 48-round 9mm box loaded with less-than-lethal rubber rounds." + desc = "Contains a 60-round 9mm box loaded with less-than-lethal rubber rounds." contains = list(/obj/item/storage/box/ammo/c9mm_rubber) cost = 200 @@ -151,18 +164,51 @@ /datum/supply_pack/ammo/c46x30mm_boxcrate name = "4.6x30mm Ammo Box Crate" - desc = "Contains a 60-round 4.6x30mm box for PDWs such as the WT-550." + desc = "Contains an 80-round 4.6x30mm box for PDWs such as the WT-550." contains = list(/obj/item/storage/box/ammo/c46x30mm) cost = 250 +/datum/supply_pack/ammo/c46x30mm_ap + name = "4.6x30mm Armour Piercing Ammo Box Crate" + desc = "Contains a 80-round 4.6x30mm armour piercing box for PDWs such as the WT-550." + contains = list(/obj/item/storage/box/ammo/c46x30mm/ap) + cost = 500 + +/datum/supply_pack/ammo/c46x30mm_hp + name = "4.6x30mm Hollow Point Ammo Box Crate" + desc = "Contains a 80-round 4.6x30mm hollow point box for PDWs such as the WT-550." + contains = list(/obj/item/storage/box/ammo/c46x30mm/hp) + cost = 500 + + /* 5.7x39 */ /datum/supply_pack/ammo/c57x39mm_boxcrate name = "5.7x39mm Ammo Box Crate" - desc = "Contains a 48-round 5.7x39mm box for PDWs such as the Sidewinder." - contains = list(/obj/item/storage/box/ammo/c57x39) - cost = 250 - + desc = "Contains two 48-round 5.7x39mm box for PDWs such as the Sidewinder." + contains = list( + /obj/item/storage/box/ammo/c57x39, + /obj/item/storage/box/ammo/c57x39, + ) + cost = 350 + +/datum/supply_pack/ammo/c57x39mm_ap + name = "5.7x39mm Armour Piercing Ammo Box Crate" + desc = "Contains two 48-round 5.7x39mm box for PDWs such as the Sidewinder." + contains = list( + /obj/item/storage/box/ammo/c57x39/ap, + /obj/item/storage/box/ammo/c57x39/ap, + ) + cost = 700 + +/datum/supply_pack/ammo/c57x39mm_hp + name = "5.7x39mm Hollow Point Ammo Box Crate" + desc = "Contains two 48-round 5.7x39mm Hollow Point boxes for PDWs such as the Sidewinder." + contains = list( + /obj/item/storage/box/ammo/c57x39/hp, + /obj/item/storage/box/ammo/c57x39/hp, + ) + cost = 700 /* 12 Gauge */ @@ -219,6 +265,20 @@ /obj/item/storage/box/ammo/a762_40) cost = 500 +/datum/supply_pack/ammo/a762_ap + name = "7.62x40mm CLIP Armour Piercing Ammo Box Crate" + desc = "Contains two 60-round 7.62x40mm CLIP Armour Piercing boxes for the SKM rifles." + contains = list(/obj/item/storage/box/ammo/a762_40/ap, + /obj/item/storage/box/ammo/a762_40/ap) + cost = 1000 + +/datum/supply_pack/ammo/a762_hp + name = "7.62x40mm CLIP Hollow Point Ammo Box Crate" + desc = "Contains two 60-round 7.62x40mm CLIP Hollow Point boxes for the SKM rifles." + contains = list(/obj/item/storage/box/ammo/a762_40/hp, + /obj/item/storage/box/ammo/a762_40/hp) + cost = 1000 + /* 5.56 */ /datum/supply_pack/ammo/a556_ammo_box @@ -228,6 +288,20 @@ /obj/item/storage/box/ammo/a556_42) cost = 450 +/datum/supply_pack/ammo/a556_ap + name = "5.56x42mm CLIP Armour Piercing Ammo Box Crate" + desc = "Contains two 60-round 5.56x42mm CLIP Armour Piercing boxes for most newer rifles." + contains = list(/obj/item/storage/box/ammo/a556_42/ap, + /obj/item/storage/box/ammo/a556_42/ap) + cost = 900 + +/datum/supply_pack/ammo/a556_hp + name = "5.56x42mm CLIP Hollow Point Ammo Box Crate" + desc = "Contains two 60-round 5.56x42mm CLIP Hollow Point boxes for most newer rifles." + contains = list(/obj/item/storage/box/ammo/a556_42/hp, + /obj/item/storage/box/ammo/a556_42/hp) + cost = 900 + /* 5.56 caseless */ /datum/supply_pack/ammo/c556mmHITP_ammo_box @@ -267,16 +341,23 @@ /datum/supply_pack/ammo/c8x50mm_boxcrate name = "8x50mm Ammo Box Crate" - desc = "Contains a 30-round 8x50mm ammo box for rifles such as the Illestren." + desc = "Contains a 40-round 8x50mm ammo box for rifles such as the Illestren." contains = list(/obj/item/storage/box/ammo/a8_50r) cost = 250 /datum/supply_pack/ammo/c8x50mm_boxhp_boxcrate name = "8x50mm Hollow Point Crate" - desc = "Contains a 30-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets." - contains = list(/obj/item/storage/box/ammo/a8_50r_hp) + desc = "Contains a 40-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets." + contains = list(/obj/item/storage/box/ammo/a8_50r/hp) + cost = 500 + +/datum/supply_pack/ammo/c8x50mm_tracbox + name = "8x50mm Tracker Crate" + desc = "Contains a 30-round 8x50mm ammo box loaded with tracker ammo, great for sustained hunts." + contains = list(/obj/item/storage/box/ammo/a8_50r/trac) cost = 500 + /* .300 */ /datum/supply_pack/ammo/a300_box @@ -285,6 +366,13 @@ contains = list(/obj/item/storage/box/ammo/a300) cost = 400 +/datum/supply_pack/ammo/a300_trac + name = ".300 Trac Ammo Box Crate" + desc = "Contains a ten-round .300 TRAC ammo box for sniper rifles such as the HP Scout." + contains = list(/obj/item/storage/box/ammo/a300/trac) + cost = 600 + + /* .308 */ /datum/supply_pack/ammo/a308_ammo_box @@ -293,6 +381,18 @@ contains = list(/obj/item/storage/box/ammo/a308) cost = 500 +/datum/supply_pack/ammo/a308_ap + name = "308 Armour Piercing Ammo Box Crate" + desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S." + contains = list(/obj/item/storage/box/ammo/a308/ap) + cost = 500 + +/datum/supply_pack/ammo/a308_hp + name = "308 Hollow Point Ammo Box Crate" + desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S." + contains = list(/obj/item/storage/box/ammo/a308/hp) + cost = 500 + /* 6.5 */ /datum/supply_pack/ammo/a65clip_box @@ -301,6 +401,21 @@ contains = list(/obj/item/storage/box/ammo/a65clip) cost = 400 +/datum/supply_pack/ammo/a65clip_trackers + name = "6.5x57mm CLIP Tracker Shell Crate" + desc = "Contains a 10-round 6.5x57mm CLIP tracker box for various sniper rifles such as the CM-F90 and the Boomslang series." + contains = list(/obj/item/storage/box/ammo/a65clip/trac) + cost = 600 + +/* 8x58 */ + +/datum/supply_pack/ammo/a858 + name = "8x58mm Ammo Box Crate" + desc = "Contains a twenty-round 8x58 ammo box for Solarian-manufactured sniper rifles, such as the SSG-69." + contains = list(/obj/item/storage/box/ammo/a858) + cost = 400 + + /* ferro pellets */ /datum/supply_pack/ammo/ferropelletboxcrate diff --git a/code/modules/cargo/packs/exploration.dm b/code/modules/cargo/packs/exploration.dm index a350fd323146..3a02f59c9b7a 100644 --- a/code/modules/cargo/packs/exploration.dm +++ b/code/modules/cargo/packs/exploration.dm @@ -97,3 +97,11 @@ /obj/item/storage/box/flares, /obj/item/storage/box/flares, ) + +/datum/supply_pack/exploration/nvg + name = "Night Vision Goggles" + desc = "Contains a singular pair of Night Vision Goggles, for all your spelunking and military LARP occasions." + cost = 1000 + contains = list( + /obj/item/clothing/glasses/night + ) diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm index 438d24f9243e..175b9aa9ff06 100644 --- a/code/modules/cargo/packs/magazines.dm +++ b/code/modules/cargo/packs/magazines.dm @@ -158,12 +158,6 @@ cost = 1000 contains = list(/obj/item/ammo_box/magazine/wt550m9/ap) -/datum/supply_pack/magazine/incin_wt550_mag - name = "WT-550 Auto Rifle Incendiary Magazine Crate" - desc = "Contains one magazine of incendiary ammunition for the WT-550 Auto Rifle. Nanotrasen has discontinued the Depleted Uranium magazines as of recently." - cost = 1000 - contains = list(/obj/item/ammo_box/magazine/wt550m9/inc) - /* Solgov */ /datum/supply_pack/magazine/mag_556mm diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm index ffa24a2dd2bd..612f530d4137 100644 --- a/code/modules/cargo/packs/spacesuit_armor.dm +++ b/code/modules/cargo/packs/spacesuit_armor.dm @@ -138,7 +138,7 @@ /datum/supply_pack/spacesuit_armor/marine_armor name = "Tactical Armor Crate" - desc = "One set of well-rounded, tactical body armor. The set includes a helmet and vest." + desc = "One set of well-rounded tactical armor. While it does not protect the limbs, the vest is fairly durable. The set includes a helmet and vest." cost = 1500 contains = list(/obj/item/clothing/suit/armor/vest/marine, /obj/item/clothing/head/helmet/marine) @@ -147,8 +147,8 @@ /datum/supply_pack/spacesuit_armor/medium_marine_armor name = "Medium Tactical Armor Crate" - desc = "One set of well-rounded medium tactical body armor. The set includes a helmet and vest." - cost = 2000 + desc = "One set of well-rounded medium tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece." + cost = 3000 contains = list(/obj/item/clothing/suit/armor/vest/marine/medium, /obj/item/clothing/head/helmet/marine) crate_name = "armor crate" diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm index 0cd01966b245..830746d96fa4 100644 --- a/code/modules/cargo/packs/tools.dm +++ b/code/modules/cargo/packs/tools.dm @@ -74,13 +74,6 @@ contains = list(/obj/item/pickaxe/drill/jackhammer) crate_name = "jackhammer crate" -/datum/supply_pack/tools/plasmacutter - name = "Plasmacutter Crate" - desc = "Contains a plasmacutter, capable of rapidly breaking down hull." - cost = 1250 - contains = list(/obj/item/gun/energy/plasmacutter) - crate_name = "plasmacutter crate" - /datum/supply_pack/tools/metalfoam name = "Metal Foam Grenade Crate" desc = "Seal up those pesky hull breaches with 7 metal foam grenades." @@ -112,10 +105,20 @@ /datum/supply_pack/tools/anglegrinder name = "Angle Grinder" desc = "Contains one angle grinder pack, a tool used for quick structure deconstruction and salvaging" - cost = 2000 - contains = list(/obj/item/gear_pack/anglegrinder) + cost = 1500 + contains = list( + /obj/item/gear_pack/anglegrinder, + /obj/item/radio/headset/alt + ) crate_name = "Angle Grinder" +/datum/supply_pack/tools/plasmacutter + name = "Plasmacutter Crate" + desc = "Contains a plasmacutter, capable of rapidly breaking down hull." + cost = 2500 + contains = list(/obj/item/gun/energy/plasmacutter) + crate_name = "plasmacutter crate" + /* Liquid tanks */ diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm index f660d35f676a..a393ec451c30 100644 --- a/code/modules/client/loadout/loadout_hat.dm +++ b/code/modules/client/loadout/loadout_hat.dm @@ -103,6 +103,23 @@ display_name = "cap, black" path = /obj/item/clothing/head/soft/black +/datum/gear/hat/utility_black + display_name = "utility cover, black" + path = /obj/item/clothing/head/soft/utility_black + +/datum/gear/hat/utility_olive + display_name = "utility cover, olive" + path = /obj/item/clothing/head/soft/utility_olive + +/datum/gear/hat/utility_beige + display_name = "utility cover, beige" + path = /obj/item/clothing/head/soft/utility_beige + +/datum/gear/hat/utility_navy + display_name = "utility cover, navy" + path = /obj/item/clothing/head/soft/utility_navy + + //Beanies /datum/gear/hat/beanie diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm index d6ef375918b3..1c66a077a065 100644 --- a/code/modules/client/verbs/looc.dm +++ b/code/modules/client/verbs/looc.dm @@ -46,8 +46,8 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#6699CC") log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in LOOC: [msg]") return - if(mob.stat == 4) - to_chat(src, span_danger("You cannot use LOOC while dead.")) + if(mob.stat) + to_chat(src, span_danger("You cannot use LOOC while unconscious or dead.")) return if(istype(mob, /mob/dead)) to_chat(src, span_danger("You cannot use LOOC while ghosting.")) diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm index ffa5a5e459ae..83c00e64b89e 100644 --- a/code/modules/clothing/factions/hardliners.dm +++ b/code/modules/clothing/factions/hardliners.dm @@ -126,7 +126,6 @@ icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl - lightweight = 1 jetpack = null /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/hl @@ -148,7 +147,6 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/hl icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' - lightweight = 1 jetpack = null ///////// diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm index cdf1f0bdc96f..366fa3b37cfe 100644 --- a/code/modules/clothing/factions/ngr.dm +++ b/code/modules/clothing/factions/ngr.dm @@ -138,7 +138,6 @@ icon = 'icons/obj/clothing/faction/ngr/suits.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi' helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ngr - lightweight = 1 jetpack = null greyscale_colors = list("#33353a", "#d9ad82", "#8c1a34") diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index c5d7e6ec98f9..85b3af968296 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -57,8 +57,9 @@ new /obj/item/reagent_containers/food/drinks/flask/det(src) /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." + . += "You try to examine [src] closer, but you're too far away." return . += "Alt-click to take a candy corn." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 3e5052cacc92..307106409f18 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -161,3 +161,32 @@ icon_state = "inteqmedsoft" soft_type = "inteqmed" dog_fashion = null + +/obj/item/clothing/head/soft/utility_beige + name = "beige utility cover" + desc = "A flat beige utility cover, unbranded. Just the right color for those sandy planetoids." + icon_state = "patrolbeigesoft" + soft_type = "patrolbeige" + dog_fashion = null + +/obj/item/clothing/head/soft/utility_black + name = "black utility cover" + desc = "A flat black utility cover, unbranded. Night Vision Goggles sold separately." + icon_state = "patrolblacksoft" + soft_type = "patrolblack" + dog_fashion = null + +/obj/item/clothing/head/soft/utility_olive + name = "miskilamao cap" + desc = "An olive utility cover emblazoned with the Miskilamo Shipbreaking logo. The material feels cheap." + icon_state = "patrololivesoft" + soft_type = "patrololive" + dog_fashion = null + +/obj/item/clothing/head/soft/utility_navy + name = "navy utility cover" + desc = "A navy blue utility cover, unbranded. Perfect for Seamen on long voyages." + icon_state = "patrolnavysoft" + soft_type = "patrolnavy" + dog_fashion = null +//recompile icons comment!!!!! diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 8882fbfa8cdf..a1ddb98a3474 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -14,7 +14,7 @@ flags_cover = MASKCOVERSMOUTH visor_flags_cover = MASKCOVERSMOUTH resistance_flags = NONE - supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION /obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index f806beca1e02..00e527a3161a 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -436,7 +436,6 @@ item_state = "hardsuit1-ramzi" hardsuit_type = "ramzi" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi - lightweight = 1 jetpack = null armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) slowdown = 0.7 diff --git a/code/modules/faction/faction_datum.dm b/code/modules/faction/faction_datum.dm index 017c324f5011..993fee1e37f3 100644 --- a/code/modules/faction/faction_datum.dm +++ b/code/modules/faction/faction_datum.dm @@ -24,6 +24,10 @@ name = FACTION_CYBERSUN prefixes = PREFIX_CYBERSUN +/datum/faction/syndicate/hardliners + name = FACTION_HARDLINERS + prefixes = PREFIX_HARDLINERS + /datum/faction/syndicate/suns name = FACTION_SUNS short_name = "SUNS" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 0fcfa5c13940..e79427f2381d 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -909,8 +909,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/examine_more(mob/user) if(!isAdminObserver(user)) return ..() - . = list("You examine [src] closer, and note the following...") - . += list("\t>[ADMIN_FULLMONTY(src)]") + . += "You examine [src] closer, and note the following..." + . += "\t>[ADMIN_FULLMONTY(src)]" /mob/dead/observer/proc/set_invisibility(value) invisibility = value diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 05973b27b3d6..c5f9698682c5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -438,7 +438,7 @@ visible_message("[src] dry heaves!", \ "You try to throw up, but there's nothing in your stomach!") if(stun) - Paralyze(50) + Immobilize(30) return TRUE if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious @@ -454,7 +454,7 @@ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit) if(stun) - Paralyze(20) + Immobilize(10) playsound(get_turf(src), 'sound/effects/splat.ogg', 50, TRUE) var/turf/T = get_turf(src) @@ -476,6 +476,7 @@ T = get_step(T, dir) if (T?.is_blocked_turf()) break + adjust_disgust(-(lost_nutrition*rand(0.5, 2))) return TRUE /mob/living/carbon/proc/spew_organ(power = 5, amt = 1) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 0c95d2502a91..12a40a456f15 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -1,5 +1,7 @@ /mob/living/carbon/attackby(obj/item/W, mob/user, params) var/obj/item/bodypart/BP = get_bodypart(check_zone(user.zone_selected)) + if(!BP) + return ..() var/painless = (HAS_TRAIT(user, TRAIT_ANALGESIA) || HAS_TRAIT(user, TRAIT_PAIN_RESIST)) if(W.tool_behaviour == TOOL_WELDER && IS_ROBOTIC_LIMB(BP) && BP.brute_dam) //prioritize healing if we're synthetic return ..() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index da75efa5265a..f973a2b7a590 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -67,6 +67,8 @@ return pick('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg', 'sound/voice/human/malescream_6.ogg') else if(ismoth(H)) return 'sound/voice/moth/scream_moth.ogg' + else if(isvox(H)) + return 'sound/voice/vox/vox_scream_1.ogg' else if(islizard(H)) return pick('sound/voice/lizard/lizard_scream_1.ogg', 'sound/voice/lizard/lizard_scream_2.ogg', 'sound/voice/lizard/lizard_scream_3.ogg', 'sound/voice/lizard/lizard_scream_4.ogg') diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 295537cfd95b..c462eb294f77 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -430,4 +430,4 @@ if ((wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))) return if(get_age()) - . += list(span_notice("[p_they(TRUE)] appear[p_s()] to be [get_age()].")) + . += span_notice("[p_they(TRUE)] appear[p_s()] to be [get_age()].") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b5e026d4746a..58f726aa508e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -917,7 +917,7 @@ visible_message(span_warning("[src] dry heaves!"), \ span_userdanger("You try to throw up, but there's nothing in your stomach!")) if(stun) - Paralyze(30) + Immobilize(30) return 1 ..() diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 1e40ddf76704..2e0c07be8fd7 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( "÷" = MODE_VOCALCORDS )) -/mob/living/proc/Ellipsis(original_msg, chance = 50, keep_words) +/mob/living/proc/ellipsis(original_msg, chance = 50, keep_words) if(chance <= 0) return "..." if(chance >= 100) @@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return new_msg -/mob/living/say(message, bubble_type,list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) var/ic_blocked = FALSE if(client && !forced && CHAT_FILTER_CHECK(message)) //The filter doesn't act on the sanitized message, but the raw message. @@ -112,8 +112,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list( client?.dsay(message) return - // dead is the only state you can never emote - if(stat != DEAD && check_emote(original_message, forced)) + var/succumbed = FALSE + + if(stat == DEAD) + say_dead(original_message) + return + + if(check_emote(original_message, forced)) return switch(stat) @@ -123,11 +128,19 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN])) return if(HARD_CRIT) - if(!(message_mods[WHISPER_MODE] || message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN])) + if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN])) + // If we cut our message short, abruptly end it with a-.. + var/message_len = length_char(message) + var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health) + message = copytext_char(message, 1, health_diff) + (message_len > health_diff ? "-.." : "...") + message = ellipsis(message, 10, 1) + + //If the player didn't voluntarily whisper, we'll ask them to confirm their dying words + if(!message_mods[WHISPER_MODE] && (tgui_alert(src, "Your dying words will be \"[message]\", continue?", "Succumb", list("Cancel", "Continue"), 15 SECONDS) != "Continue")) + return + message_mods[WHISPER_MODE] = MODE_WHISPER_CRIT - if(DEAD) - say_dead(original_message) - return + succumbed = TRUE if(client && SSlag_switch.measures[SLOWMODE_SAY] && !HAS_TRAIT(src, TRAIT_BYPASS_MEASURES) && !forced && src == usr) if(!COOLDOWN_FINISHED(client, say_slowmode)) @@ -149,33 +162,20 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/message_range = 7 - var/succumbed = FALSE - if(message_mods[MODE_CUSTOM_SAY_EMOTE]) log_message(message_mods[MODE_CUSTOM_SAY_EMOTE], LOG_RADIO_EMOTE) if(!message_mods[MODE_CUSTOM_SAY_ERASE_INPUT]) - if(message_mods[WHISPER_MODE]) + //Final words (MODE_WHISPER_CRIT) are already obfuscated, let them have full range + if(message_mods[WHISPER_MODE] == MODE_WHISPER) if(saymode || message_mods[RADIO_EXTENSION]) //no radio while in crit saymode = null message_mods -= RADIO_EXTENSION message_range = 1 var/logged_message = message - if(stat == HARD_CRIT) //This is cheaper than checking for MODE_WHISPER_CRIT message mod - var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health) - // If we cut our message short, abruptly end it with a-.. - var/message_len = length_char(message) - message = copytext_char(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]" - message = Ellipsis(message, 10, 1) - last_words = message - var/final_warning = alert(usr, "Your dying words will be \"[last_words]\", continue?", "Succumb", "Cancel", "Continue") - if(final_warning == "Cancel" || QDELETED(src)) - return - message_mods[WHISPER_MODE] = MODE_WHISPER_CRIT - succumbed = TRUE - src.log_talk(logged_message, LOG_WHISPER, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE]) + src.log_talk(logged_message, LOG_WHISPER, forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE]) else - src.log_talk(message, LOG_SAY, forced_by=forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE]) + src.log_talk(message, LOG_SAY, forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE]) message = treat_message(message) // unfortunately we still need this var/sigreturn = SEND_SIGNAL(src, COMSIG_MOB_SAY, args) @@ -226,9 +226,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list( send_speech(message, message_range, src, bubble_type, spans, language, message_mods) if(succumbed) - succumb(1) + succumb(TRUE) to_chat(src, compose_message(src, language, message, , spans, message_mods)) - dying_breath(message) return 1 @@ -249,6 +248,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // Create map text prior to modifying message for goonchat if (client?.prefs.chat_on_map && !(stat == UNCONSCIOUS || stat == HARD_CRIT) && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear()) + if(message_mods[MODE_WHISPER] == MODE_WHISPER_CRIT) + play_screen_text("message") if(message_mods[MODE_CUSTOM_SAY_ERASE_INPUT]) create_chat_message(speaker, null, message_mods[MODE_CUSTOM_SAY_EMOTE], spans, EMOTE_MESSAGE) else @@ -419,8 +420,3 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(get_minds && mind) return mind.get_language_holder() . = ..() - -/mob/living/proc/dying_breath(message) - for(var/mob/M in get_hearers_in_view(7, src)) - if(M.can_hear()) - M.play_screen_text("[message]") diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 120bf4825999..c1cb46cb85e4 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -86,7 +86,8 @@ ..() /mob/living/simple_animal/hostile/megafauna/proc/spawn_mob_trophy() - loot += mob_trophy + if(mob_trophy) + loot += mob_trophy /mob/living/simple_animal/hostile/megafauna/gib() if(health > 0) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index fede2e8753ac..3377165ea3ea 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -44,10 +44,8 @@ /mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize() . = ..() - var/i = rand(1,3) - while(i) + for (var/i in 1 to rand(1, 3)) loot += pick(/obj/item/stack/ore/silver, /obj/item/stack/ore/gold, /obj/item/stack/ore/uranium, /obj/item/stack/ore/diamond) - i-- spit = new burrow = new spit.Grant(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 15989be5b3d6..601c87498b61 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -51,7 +51,8 @@ return TRUE /mob/living/simple_animal/hostile/asteroid/hivelord/spawn_mob_trophy() - loot += mob_trophy //we don't butcher + if(mob_trophy) + loot += mob_trophy //we don't butcher /mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed) mouse_opacity = MOUSE_OPACITY_ICON diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d1b28067a804..d56560a5acb5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -502,10 +502,13 @@ handle_eye_contact(examinify) else result = examinify.examine_more(src) + + if(!LAZYLEN(result)) + result = list(span_notice("You examine [examinify] closer, but find nothing of interest...")) else result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? - if(result.len) + if(length(result)) for(var/i in 1 to (length(result) - 1)) result[i] += "\n" diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm index e0567b9954bd..2e7ce89d33b8 100644 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop.dm @@ -115,6 +115,7 @@ /obj/item/modular_computer/laptop/examine_more(mob/user) if(screen_on) interact(user) + return ..() // Laptop frame, starts empty and closed. /obj/item/modular_computer/laptop/buildable diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 27b0809760b7..e8a3b6e18527 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -86,8 +86,8 @@ return ..() /obj/machinery/modular_computer/examine_more(mob/user) - if(cpu?.enabled) - interact(user) + interact(user) + return ..() // Process currently calls handle_power(), may be expanded in future if more things are added. /obj/machinery/modular_computer/process() diff --git a/code/modules/overmap/helm.dm b/code/modules/overmap/helm.dm index 3b825ce39524..efa0bc44c3e9 100644 --- a/code/modules/overmap/helm.dm +++ b/code/modules/overmap/helm.dm @@ -360,7 +360,7 @@ // Unregister map objects if(current_ship) user.client?.clear_map(current_ship.token.map_name) - if(current_ship.burn_direction > BURN_NONE && !length(concurrent_users) && !viewer) // If accelerating with nobody else to stop it + if(current_ship.burn_direction > BURN_NONE && !length(concurrent_users) && !viewer && is_living) // If accelerating with nobody else to stop it say("Pilot absence detected, engaging acceleration safeties.") current_ship.change_heading(BURN_NONE) diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index 90fdeb79af9c..c0b137ca2300 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -34,6 +34,9 @@ /obj/item/paper, /obj/item/photo, /obj/item/holochip, + /obj/item/folder/biscuit, + /obj/item/spacecash, + /obj/item/documents, ) /// List of types which should be allowed to be faxed if hacked var/static/list/exotic_types = list( @@ -47,9 +50,7 @@ /obj/item/reagent_containers/food/snacks/raisincookie, /obj/item/reagent_containers/food/snacks/pancakes, /obj/item/throwing_star, - /obj/item/spacecash, /obj/item/card, - /obj/item/folder/biscuit ) /// Internal radio for announcing over comms var/obj/item/radio/radio diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 3df3820b28f4..48651a3146c4 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -902,6 +902,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25) /obj/machinery/power/apc/examine_more(mob/user) ui_interact(user) + return ..() /obj/machinery/power/apc/ui_data(mob/user) var/list/data = list( diff --git a/code/modules/projectiles/ammunition/ballistic/lmg.dm b/code/modules/projectiles/ammunition/ballistic/lmg.dm index 90030e7b0944..d716618b0d60 100644 --- a/code/modules/projectiles/ammunition/ballistic/lmg.dm +++ b/code/modules/projectiles/ammunition/ballistic/lmg.dm @@ -19,12 +19,6 @@ projectile_type = /obj/projectile/bullet/mm712x82/hp bullet_skin = "hollow" -/obj/item/ammo_casing/mm712x82/inc - name = "7.12x82mm incendiary bullet casing" - desc = "A 7.12x82mm incendiary bullet casing." - projectile_type = /obj/projectile/bullet/incendiary/mm712x82 - bullet_skin = "incen" - /obj/item/ammo_casing/mm712x82/match name = "7.12x82mm match bullet casing" desc = "A 7.12x82mm match bullet casing." diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index 3d378a4020eb..aabc86f3c51e 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -25,12 +25,6 @@ projectile_type = /obj/projectile/bullet/c10mm/hp bullet_skin = "hollow" -/obj/item/ammo_casing/c10mm/inc - name = "10mm incendiary bullet casing" - desc = "A 10mm incendiary bullet casing." - bullet_skin = "incen" - projectile_type = /obj/projectile/bullet/incendiary/c10mm - /obj/item/ammo_casing/c10mm/rubber name = "10mm rubber bullet casing" desc = "A 10mm rubber bullet casing." @@ -65,12 +59,6 @@ bullet_skin = "hollow" projectile_type = /obj/projectile/bullet/c9mm/hp -/obj/item/ammo_casing/c9mm/inc - name = "9mm incendiary bullet casing" - desc = "A 9mm incendiary bullet casing." - bullet_skin = "incen" - projectile_type = /obj/projectile/bullet/incendiary/c9mm - /obj/item/ammo_casing/c9mm/rubber name = "9mm rubber bullet casing" desc = "A 9mm rubber bullet casing." @@ -105,12 +93,6 @@ bullet_skin = "hollow" projectile_type = /obj/projectile/bullet/c45/hp -/obj/item/ammo_casing/c45/inc - name = ".45 incendiary bullet casing" - desc = "A .45 incendiary bullet casing." - bullet_skin = "incen" - projectile_type = /obj/projectile/bullet/incendiary/c45 - /obj/item/ammo_casing/c45/rubber name = ".45 rubber bullet casing" desc = "A .45 rubber bullet casing." @@ -138,3 +120,21 @@ projectile_type = /obj/projectile/bullet/c22lr caliber = "22lr" stack_size = 25 + +/obj/item/ammo_casing/c22lr/hp + name = ".22 LR HP bullet casing" + desc = "A .22 LR bullet HP casing." + projectile_type = /obj/projectile/bullet/c22lr/hp + bullet_skin = "hollow" + +/obj/item/ammo_casing/c22lr/ap + name = ".22 LR AP bullet casing" + desc = "A .22 LR bullet casing." + projectile_type = /obj/projectile/bullet/c22lr/ap + bullet_skin = "ap" + +/obj/item/ammo_casing/c22lr/rubber + name = ".22 LR rubber bullet casing" + desc = "A .22 LR bullet casing." + projectile_type = /obj/projectile/bullet/c22lr/rubber + bullet_skin = "rubber" diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm index 5b6e8b2e0961..60c3722b934a 100644 --- a/code/modules/projectiles/ammunition/ballistic/revolver.dm +++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm @@ -76,7 +76,7 @@ name = ".38 rubber bullet casing" desc = "A .38 rubber bullet casing." bullet_skin = "rubber" - projectile_type = /obj/projectile/bullet/c38/match/bouncy + projectile_type = /obj/projectile/bullet/c38/bouncy /obj/item/ammo_casing/c38/dumdum name = ".38 dum-dum bullet casing" diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 3ab6f7c0668d..8274020c88e5 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -8,13 +8,23 @@ projectile_type = /obj/projectile/bullet/a8_50r stack_size = 10 -/obj/item/ammo_casing/a8_50rhp +/obj/item/ammo_casing/a8_50r/hp name = "8x50mmR hollow point bullet casing" desc = "A 8x50mmR hollow point bullet casing." - icon_state = "rifle-brass-hollow" - caliber = "8x50mmR" - projectile_type = /obj/projectile/bullet/a8_50rhp - stack_size = 10 + bullet_skin = "hollow" + projectile_type = /obj/projectile/bullet/a8_50r/hp + +/obj/item/ammo_casing/a8_50r/match + name = "8x50mmR match bullet casing" + desc = "A 8x50mmR hollow point bullet casing." + bullet_skin = "ap" + projectile_type = /obj/projectile/bullet/a8_50r/match + +/obj/item/ammo_casing/a8_50r/trac + name = "8x50mmR tracker casing" + desc = "A 8x50mmR tracker casing." + bullet_skin = "trac" + projectile_type = /obj/projectile/bullet/a8_50r/trac // 8x58mm Caseless (SSG-669C) @@ -26,15 +36,11 @@ projectile_type = /obj/projectile/bullet/a858 stack_size = 10 -// .300 Magnum (Smile Rifle) +/obj/item/ammo_casing/caseless/a858/trac + name = "8x58mm tracker round" + desc = "A 8x58mm caseless tracker round." + projectile_type = /obj/projectile/bullet/a858/trac -/obj/item/ammo_casing/a300 - name = ".300 Magnum bullet casing" - desc = "A .300 Magnum bullet casing." - icon_state = "rifle-steel" - caliber = "a300" - projectile_type = /obj/projectile/bullet/a300 - stack_size = 15 // 5.56x42mm CLIP (CM82, Hydra variants) @@ -46,6 +52,25 @@ projectile_type = /obj/projectile/bullet/a556_42 stack_size = 15 +/obj/item/ammo_casing/a556_42/hp + name = "5.56x42mm CLIP HP bullet casing" + desc = "A 5.56x42mm CLIP hollow point bullet casing." + bullet_skin = "hollow" + projectile_type = /obj/projectile/bullet/a556_42/hp + +/obj/item/ammo_casing/a556_42/ap + name = "5.56x42mm CLIP bullet casing" + desc = "A 5.56x42mm CLIP bullet casing." + bullet_skin = "ap" + projectile_type = /obj/projectile/bullet/a556_42/ap + +/obj/item/ammo_casing/a556_42/rubber + name = "5.56x42mm CLIP rubber bullet casing" + desc = "A 5.56x42mm CLIP rubber bullet casing." + bullet_skin = "rubber" + projectile_type = /obj/projectile/bullet/a556_42/rubber + stack_size = 15 + // 7.62x40mm CLIP (SKM Rifles) /obj/item/ammo_casing/a762_40 @@ -56,6 +81,24 @@ projectile_type = /obj/projectile/bullet/a762_40 stack_size = 15 +/obj/item/ammo_casing/a762_40/hp + name = "7.62x40mm CLIP HP bullet casing" + desc = "A 7.62x40mm CLIP HP bullet casing." + bullet_skin = "hollow" + projectile_type = /obj/projectile/bullet/a762_40/hp + +/obj/item/ammo_casing/a762_40/ap + name = "7.62x40mm CLIP AP bullet casing" + desc = "A 7.62x40mm CLIP AP bullet casing." + bullet_skin = "ap" + projectile_type = /obj/projectile/bullet/a762_40/ap + +/obj/item/ammo_casing/a762_40/rubber + name = "7.62x40mm CLIP rubber bullet casing" + desc = "A 7.62x40mm CLIP rubber bullet casing." + bullet_skin = "rubber" + projectile_type = /obj/projectile/bullet/a762_40/rubber + //.308 (M514 EBR & CM-GAL-S) /obj/item/ammo_casing/a308 @@ -66,6 +109,20 @@ projectile_type = /obj/projectile/bullet/a308 stack_size = 10 +/obj/item/ammo_casing/a308/ap + name = ".308 AP bullet casing" + desc = "A .308 AP bullet casing." + bullet_skin = "ap" + projectile_type = /obj/projectile/bullet/a308/ap + +/obj/item/ammo_casing/a308/hp + name = ".308 HP bullet casing" + desc = "A .308 HP bullet casing." + bullet_skin = "hollow" + projectile_type = /obj/projectile/bullet/a308/hp + +//.299 + /obj/item/ammo_casing/caseless/c299 name = ".299 Eoehoma caseless bullet casing" desc = "A .299 Eoehoma caseless bullet casing." @@ -73,11 +130,3 @@ caliber = ".299 caseless" projectile_type = /obj/projectile/bullet/c299 stack_size = 15 - -/obj/item/ammo_casing/a65clip - name = "6.5x57mm CLIP bullet casing" - desc = "A 6.5x57mm CLIP bullet casing." - icon_state = "big-brass" - caliber = "6.5CLIP" - projectile_type = /obj/projectile/bullet/a65clip - stack_size = 5 diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm index 3824a0ae384a..e949b475e58c 100644 --- a/code/modules/projectiles/ammunition/ballistic/smg.dm +++ b/code/modules/projectiles/ammunition/ballistic/smg.dm @@ -7,6 +7,24 @@ caliber = "5.7x39mm" projectile_type = /obj/projectile/bullet/c57x39mm +/obj/item/ammo_casing/c57x39mm/ap + name = "5.7x39mm armor piercing bullet casing" + desc = "A 5.7x39mm armour-piercing bullet casing." + bullet_skin = "ap" + projectile_type = /obj/projectile/bullet/c57x39mm/ap + +/obj/item/ammo_casing/c57x39mm/hp + name = "5.7x39mm hollow point bullet casing" + desc = "A 5.7x39mm armour-piercing bullet casing." + bullet_skin = "hollow" + projectile_type = /obj/projectile/bullet/c57x39mm/hp + +/obj/item/ammo_casing/c57x39mm/rubber + name = "5.7x39mm rubber bullet casing" + desc = "A 5.7x39mm rubber bullet casing." + bullet_skin = "rubber" + projectile_type = /obj/projectile/bullet/c57x39mm/rubber + // 4.6x30mm (WT-550 Automatic Rifle & SKM-24v) /obj/item/ammo_casing/c46x30mm @@ -31,11 +49,17 @@ bullet_skin = "ap" projectile_type = /obj/projectile/bullet/c46x30mm/ap -/obj/item/ammo_casing/c46x30mm/inc - name = "4.6x30mm incendiary bullet casing" - desc = "A 4.6x30mm incendiary bullet casing." - bullet_skin = "incen" - projectile_type = /obj/projectile/bullet/incendiary/c46x30mm +/obj/item/ammo_casing/c46x30mm/hp + name = "4.6x30mm HP bullet casing" + desc = "A 4.6x30mm HP bullet casing." + bullet_skin = "hollow" + projectile_type = /obj/projectile/bullet/c46x30mm/hp + +/obj/item/ammo_casing/c46x30mm/rubber + name = "4.6x30mm rubber bullet casing" + desc = "A 4.6x30mm rubber bullet casing." + bullet_skin = "rubber" + projectile_type = /obj/projectile/bullet/c46x30mm/rubber // 4.73x33mm caseless (Solar) diff --git a/code/modules/projectiles/ammunition/ballistic/sniper.dm b/code/modules/projectiles/ammunition/ballistic/sniper.dm index af7369204e6d..d481f4d74d53 100644 --- a/code/modules/projectiles/ammunition/ballistic/sniper.dm +++ b/code/modules/projectiles/ammunition/ballistic/sniper.dm @@ -19,3 +19,35 @@ desc = "A .50 BMG penetrator bullet casing." bullet_skin = "ap" projectile_type = /obj/projectile/bullet/p50/penetrator + +// .300 Magnum (Smile Rifle) + +/obj/item/ammo_casing/a300 + name = ".300 Magnum bullet casing" + desc = "A .300 Magnum bullet casing." + icon_state = "rifle-steel" + caliber = "a300" + projectile_type = /obj/projectile/bullet/a300 + stack_size = 15 + +/obj/item/ammo_casing/a300/trac + name = ".300 Magnum Trac bullet casing" + desc = "A .300 Magnum Tracker casing." + projectile_type = /obj/projectile/bullet/a300/trac + bullet_skin = "trac" + +//6.5 CLIP + +/obj/item/ammo_casing/a65clip + name = "6.5x57mm CLIP bullet casing" + desc = "A 6.5x57mm CLIP bullet casing." + icon_state = "big-brass" + caliber = "6.5CLIP" + projectile_type = /obj/projectile/bullet/a65clip + stack_size = 5 + +/obj/item/ammo_casing/a65clip/trac + name = "6.5x57mm CLIP tracker" + desc = "A 6.5x57mm CLIP tracker." + projectile_type = /obj/projectile/bullet/a65clip/trac + bullet_skin = "trac" diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm index ac82cf6bcebd..a64e075dfa84 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm @@ -7,7 +7,6 @@ icon_state = "ferropelletsbox" /obj/item/storage/box/ammo/ferropellet/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/ferropellet = 4) generate_items_inside(items_inside,src) @@ -21,7 +20,6 @@ icon_state = "ferroslugsbox" /obj/item/storage/box/ammo/ferroslug/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug = 4) generate_items_inside(items_inside,src) @@ -35,7 +33,6 @@ icon_state = "ferrolancesbox" /obj/item/storage/box/ammo/ferrolance/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance = 4) generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm index b98da1f81000..4b50912e5e11 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm @@ -8,8 +8,5 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82/hp ammo_type = /obj/item/ammo_casing/mm712x82/hp -/obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82/incendiary - ammo_type = /obj/item/ammo_casing/mm712x82/inc - /obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82/match ammo_type = /obj/item/ammo_casing/mm712x82/match diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm index a24599138238..871c25d84afd 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm @@ -7,7 +7,6 @@ icon_state = "foambox" /obj/item/storage/box/ammo/foam_darts/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/foam_darts = 4) generate_items_inside(items_inside,src) @@ -20,7 +19,6 @@ icon_state = "foambox_riot" /obj/item/storage/box/ammo/foam_darts/riot/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/foam_darts/riot = 4) generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index 68ae4e2236ba..5a783652a7e3 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -56,20 +56,6 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/hp = 4) generate_items_inside(items_inside,src) -/obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/incendiary - ammo_type = /obj/item/ammo_casing/c10mm/inc - -/obj/item/storage/box/ammo/c10mm_incendiary - name = "box of incendiary 10mm ammo" - desc = "A box of 10mm incendiary ammo, designed to ignite targets at the cost of initial damage." - icon_state = "10mmbox-incendiary" - -/obj/item/storage/box/ammo/c10mm_incendiary/PopulateContents() - ..() - var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/incendiary = 4) - generate_items_inside(items_inside,src) - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/rubber ammo_type = /obj/item/ammo_casing/c10mm/rubber @@ -110,23 +96,22 @@ icon_state = "9mmbox-surplus" /obj/item/storage/box/ammo/c9mm_surplus/PopulateContents() - ..() var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/surplus = 48) + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/surplus = 4) generate_items_inside(items_inside,src) -/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm_ap +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap ammo_type = /obj/item/ammo_casing/c9mm/ap -/obj/item/storage/box/ammo/c9mm/ap +/obj/item/storage/box/ammo/c9mm_ap name = "box of AP 9mm ammo" desc = "A box of 9mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage." icon_state = "9mmbox-ap" -/obj/item/storage/box/ammo/c9mm/ap/PopulateContents() +/obj/item/storage/box/ammo/c9mm_ap/PopulateContents() ..() var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm_ap = 4) + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap = 4) generate_items_inside(items_inside,src) /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/hp @@ -143,20 +128,6 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/hp = 4) generate_items_inside(items_inside,src) -/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/incendiary - ammo_type = /obj/item/ammo_casing/c9mm/inc - -/obj/item/storage/box/ammo/c9mm_incendiary - name = "box of incendiary 9mm ammo" - desc = "A box of 9mm incendiary ammo, designed to ignite targets at the cost of initial damage." - icon_state = "9mmbox-incendiary" - -/obj/item/storage/box/ammo/c9mm_incendiary/PopulateContents() - ..() - var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/incendiary = 4) - generate_items_inside(items_inside,src) - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/rubber ammo_type = /obj/item/ammo_casing/c9mm/rubber @@ -224,25 +195,10 @@ icon_state = "45box-hp" /obj/item/storage/box/ammo/c45_hp/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/hp = 4) generate_items_inside(items_inside,src) -/obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/incendiary - ammo_type = /obj/item/ammo_casing/c45/inc - -/obj/item/storage/box/ammo/c45_incendiary - name = "box of incendiary .45 ammo" - desc = "A box of .45 incendiary ammo, designed to ignite targets at the cost of initial damage." - icon_state = "45box-incendiary" - -/obj/item/storage/box/ammo/c45_incendiary/PopulateContents() - ..() - var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/incendiary = 4) - generate_items_inside(items_inside,src) - /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/rubber ammo_type = /obj/item/ammo_casing/c45/rubber @@ -252,7 +208,6 @@ icon_state = "45box-rubbershot" /obj/item/storage/box/ammo/c45_rubber/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/rubber = 4) generate_items_inside(items_inside,src) @@ -277,11 +232,52 @@ icon_state = "22lrbox" /obj/item/storage/box/ammo/c22lr/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr = 4) generate_items_inside(items_inside,src) +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/ap + ammo_type = /obj/item/ammo_casing/c22lr/ap + max_ammo = 25 + +/obj/item/storage/box/ammo/c22lr/ap + name = "box of .22 LR AP ammo" + desc = "A box of standard .22 LR AP ammo, designed to penetrate through armor at the cost of total damage." + icon_state = "22lrbox" + +/obj/item/storage/box/ammo/c22lr/ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/ap = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/hp + ammo_type = /obj/item/ammo_casing/c22lr/hp + max_ammo = 25 + +/obj/item/storage/box/ammo/c22lr/hp + name = "box of .22 LR HP ammo" + desc = "A box of standard .22 LR HP ammo, designed to cause massive tissue damage at the cost of armor penetration." + icon_state = "22lrbox" + +/obj/item/storage/box/ammo/c22lr/hp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/hp = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/rubber + ammo_type = /obj/item/ammo_casing/c22lr/rubber + max_ammo = 25 + +/obj/item/storage/box/ammo/c22lr/rubber + name = "box of .22 LR rubber ammo" + desc = "A box of standard .22 LR rubber ammo." + icon_state = "22lrbox" + +/obj/item/storage/box/ammo/c22lr/rubber/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/rubber = 4) + generate_items_inside(items_inside,src) + // .357 /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357 @@ -293,7 +289,6 @@ icon_state = "357box" /obj/item/storage/box/ammo/a357/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357 = 4) generate_items_inside(items_inside,src) @@ -307,7 +302,6 @@ icon_state = "357box-match" /obj/item/storage/box/ammo/a357_match/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357/match = 4) generate_items_inside(items_inside,src) @@ -321,7 +315,6 @@ icon_state = "357box-hp" /obj/item/storage/box/ammo/a357_hp/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357/hp = 4) generate_items_inside(items_inside,src) @@ -338,7 +331,6 @@ icon_state = "4570" /obj/item/storage/box/ammo/a4570/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570 = 4) generate_items_inside(items_inside,src) @@ -352,7 +344,6 @@ icon_state = "4570-match" /obj/item/storage/box/ammo/a4570_match/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/match = 4) generate_items_inside(items_inside,src) @@ -366,7 +357,6 @@ icon_state = "4570-hp" /obj/item/storage/box/ammo/a4570_hp/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/hp = 4) generate_items_inside(items_inside,src) @@ -380,7 +370,6 @@ icon_state = "4570-explosive" /obj/item/storage/box/ammo/a4570_explosive/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/explosive = 4) generate_items_inside(items_inside,src) @@ -397,7 +386,6 @@ icon_state = "38box" /obj/item/storage/box/ammo/c38/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38 = 4) generate_items_inside(items_inside,src) @@ -411,7 +399,6 @@ icon_state = "38box-surplus" /obj/item/storage/box/ammo/c38_surplus/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/surplus = 4) generate_items_inside(items_inside,src) @@ -437,7 +424,6 @@ icon_state = "38hotshot" /obj/item/storage/box/ammo/c38_hotshot/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/hotshot = 4) generate_items_inside(items_inside,src) @@ -451,7 +437,6 @@ icon_state = "38iceblox" /obj/item/storage/box/ammo/c38_iceblox/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/iceblox = 4) generate_items_inside(items_inside,src) @@ -467,7 +452,6 @@ icon_state = "a44roum" /obj/item/storage/box/ammo/a44roum/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum = 4) generate_items_inside(items_inside,src) @@ -481,7 +465,6 @@ icon_state = "a44roum-rubber" /obj/item/storage/box/ammo/a44roum_rubber/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum/rubber = 4) generate_items_inside(items_inside,src) @@ -495,7 +478,6 @@ icon_state = "a44roum-hp" /obj/item/storage/box/ammo/a44roum_hp/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum/hp = 4) generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm index efd6cd0716bd..921bbd5c06a1 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm @@ -10,45 +10,49 @@ icon_state = "8x50mmbox" /obj/item/storage/box/ammo/a8_50r/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r = 4) generate_items_inside(items_inside,src) /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/hp - ammo_type = /obj/item/ammo_casing/a8_50rhp + ammo_type = /obj/item/ammo_casing/a8_50r/hp -/obj/item/storage/box/ammo/a8_50r_hp +/obj/item/storage/box/ammo/a8_50r/hp name = "box of HP 8x50mm ammo" desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration." icon_state = "8x50mmbox-hp" /obj/item/storage/box/ammo/a8_50r_hp/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/hp = 4) generate_items_inside(items_inside,src) -// 8x58mm Caseless (SSG-669C) +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/match + ammo_type = /obj/item/ammo_casing/a8_50r/match + max_ammo = 10 -/obj/item/ammo_box/magazine/ammo_stack/prefilled/a858 - ammo_type = /obj/item/ammo_casing/caseless/a858 +/obj/item/storage/box/ammo/a8_50r/match + name = "box of 8x50mm match ammo" + desc = "A box of standard 8x50mm ammo." + icon_state = "8x50mmbox" -// .300 Magnum (Smile Rifle) +/obj/item/storage/box/ammo/a8_50r/match/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/match = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/magazine/ammo_stack/prefilled/a300 - ammo_type = /obj/item/ammo_casing/a300 - max_ammo = 5 +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/trac + ammo_type = /obj/item/ammo_casing/a8_50r/trac + max_ammo = 10 -/obj/item/storage/box/ammo/a300 - name = "box of .300 magnum ammo" - desc = "A box of standard .300 Magnum ammo." - icon_state = "300box" +/obj/item/storage/box/ammo/a8_50r/trac + name = "box of 8x50mm trac ammo" + desc = "A box of 8x50mm trackers." + icon_state = "8x50mmbox" -/obj/item/storage/box/ammo/a300/PopulateContents() - ..() +/obj/item/storage/box/ammo/a8_50r/trac/PopulateContents() var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/a300 = 4) + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/trac = 3) generate_items_inside(items_inside,src) // 5.56x42mm CLIP (CM82, Hydra variants) @@ -63,11 +67,38 @@ icon_state = "a556_42box_big" /obj/item/storage/box/ammo/a556_42/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42 = 4) generate_items_inside(items_inside,src) +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/hp + ammo_type = /obj/item/ammo_casing/a556_42/hp + max_ammo = 15 + +/obj/item/storage/box/ammo/a556_42/hp + name = "box of 5.56x42mm CLIP HP ammo" + desc = "A box of standard 5.56x42mm CLIP HP ammo." + icon_state = "a556_42box_big" + +/obj/item/storage/box/ammo/a556_42/hp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/hp = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/ap + ammo_type = /obj/item/ammo_casing/a556_42/ap + max_ammo = 15 + +/obj/item/storage/box/ammo/a556_42/ap + name = "box of 5.56x42mm CLIP AP ammo" + desc = "A box of standard 5.56x42mm CLIP AP ammo." + icon_state = "a556_42box_big" + +/obj/item/storage/box/ammo/a556_42/ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/ap = 4) + generate_items_inside(items_inside,src) + // 7.62x40mm CLIP (SKM Rifles) /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40 @@ -83,11 +114,52 @@ icon_state = "a762_40box_big_inteq" /obj/item/storage/box/ammo/a762_40/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40 = 4) generate_items_inside(items_inside,src) +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/hp + ammo_type = /obj/item/ammo_casing/a762_40/hp + max_ammo = 15 + +/obj/item/storage/box/ammo/a762_40/hp + name = "box of 7.62x40mm CLIP Hollow Point ammo" + desc = "A box of standard 7.62x40mm CLIP Hollow Point ammo." + icon_state = "a762_40box_big" + +/obj/item/storage/box/ammo/a762_40/hp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/hp = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/ap + ammo_type = /obj/item/ammo_casing/a762_40/ap + max_ammo = 15 + +/obj/item/storage/box/ammo/a762_40/ap + name = "box of 7.62x40mm CLIP Armour Piercing ammo" + desc = "A box of standard 7.62x40mm CLIP Armour Piercing ammo." + icon_state = "a762_40box_big" + +/obj/item/storage/box/ammo/a762_40/ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/ap = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/rubber + ammo_type = /obj/item/ammo_casing/a762_40/rubber + max_ammo = 15 + +/obj/item/storage/box/ammo/a762_40/rubber + name = "box of 7.62x40mm CLIP rubber ammo" + desc = "A box of standard 7.62x40mm CLIP rubber ammo." + icon_state = "a762_40box_big" + +/obj/item/storage/box/ammo/a762_40/rubber/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/rubber = 4) + generate_items_inside(items_inside,src) + //.308 (M514 EBR & CM-GAL-S) /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308 @@ -103,11 +175,38 @@ icon_state = "a308box-HP" /obj/item/storage/box/ammo/a308/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308 = 4) generate_items_inside(items_inside,src) +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/hp + ammo_type = /obj/item/ammo_casing/a308/hp + max_ammo = 10 + +/obj/item/storage/box/ammo/a308/hp + name = "box of .308 HP ammo" + desc = "A box of standard .308 HP ammo." + icon_state = "a308box" + +/obj/item/storage/box/ammo/a308/hp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/hp = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/ap + ammo_type = /obj/item/ammo_casing/a308/ap + max_ammo = 10 + +/obj/item/storage/box/ammo/a308/ap + name = "box of .308 AP ammo" + desc = "A box of standard .308 AP ammo." + icon_state = "a308box" + +/obj/item/storage/box/ammo/a308/ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/ap = 4) + generate_items_inside(items_inside,src) + //.299 Eoehoma Caseless (E-40) /obj/item/ammo_box/magazine/ammo_stack/prefilled/c299 @@ -120,24 +219,6 @@ icon_state = "299box" /obj/item/storage/box/ammo/c299/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c299 = 4) generate_items_inside(items_inside,src) - -//6.5x57mm CLIP - -/obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip - ammo_type = /obj/item/ammo_casing/a65clip - max_ammo = 5 - -/obj/item/storage/box/ammo/a65clip - name = "box of 6.5x57mm CLIP ammo" - desc = "A box of standard 6.5x57mm CLIP ammo." - icon_state = "65box" - -/obj/item/storage/box/ammo/a65clip/PopulateContents() - ..() - var/static/items_inside = list( - /obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip = 4) - generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm index 139abb6de851..ddcf1f8b12e7 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm @@ -11,7 +11,6 @@ icon_state = "12gbox-buckshot" /obj/item/storage/box/ammo/a12g_buckshot/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/buckshot = 4) generate_items_inside(items_inside,src) @@ -25,7 +24,6 @@ icon_state = "12gbox-slug" /obj/item/storage/box/ammo/a12g_slug/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/slug = 4) generate_items_inside(items_inside,src) @@ -39,7 +37,6 @@ icon_state = "12gbox-beanbag" /obj/item/storage/box/ammo/a12g_beanbag/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/beanbag = 4) generate_items_inside(items_inside,src) @@ -53,7 +50,6 @@ icon_state = "12gbox-rubbershot" /obj/item/storage/box/ammo/a12g_rubbershot/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/rubber = 4) generate_items_inside(items_inside,src) @@ -67,7 +63,6 @@ icon_state = "12gbox-slug" //needs icon /obj/item/storage/box/ammo/a12g_blank/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/blank = 4) generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm index d550f5e461ba..e11ed44dceca 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm @@ -1,7 +1,7 @@ // 4.6x30mm (WT-550 Automatic Rifle & SKM-24v) /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm ammo_type = /obj/item/ammo_casing/c46x30mm - max_ammo = 15 + max_ammo = 20 /obj/item/storage/box/ammo/c46x30mm name = "box of 4.6x30mm ammo" @@ -9,16 +9,37 @@ icon_state = "46x30mmbox" /obj/item/storage/box/ammo/c46x30mm/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm = 4) generate_items_inside(items_inside,src) /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/ap ammo_type = /obj/item/ammo_casing/c46x30mm/ap + max_ammo = 20 + +/obj/item/storage/box/ammo/c46x30mm/ap + name = "box of 4.6x30mm AP ammo" + desc = "A box of standard 4.6x30mm AP ammo." + icon_state = "46x30mmbox" + +/obj/item/storage/box/ammo/c46x30mm/ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/ap = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/incendiary - ammo_type = /obj/item/ammo_casing/c46x30mm/inc +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/hp + ammo_type = /obj/item/ammo_casing/c46x30mm/hp + max_ammo = 20 + +/obj/item/storage/box/ammo/c46x30mm/hp + name = "box of 4.6x30mm HP ammo" + desc = "A box of standard 4.6x30mm HP ammo." + icon_state = "46x30mmbox" + +/obj/item/storage/box/ammo/c46x30mm/hp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/hp = 4) + generate_items_inside(items_inside,src) // 4.73x33mm caseless (Solar) /obj/item/ammo_box/magazine/ammo_stack/prefilled/c47x33mm @@ -35,7 +56,6 @@ icon_state = "556mmHITPbox" /obj/item/storage/box/ammo/c556mm/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm = 4) generate_items_inside(items_inside,src) @@ -49,7 +69,6 @@ icon_state = "556mmHITPbox-surplus" /obj/item/storage/box/ammo/c556mm_surplus/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/surplus = 4) generate_items_inside(items_inside,src) @@ -63,7 +82,6 @@ icon_state = "556mmHITPbox-ap" /obj/item/storage/box/ammo/c556mm_ap/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/ap = 4) generate_items_inside(items_inside,src) @@ -77,7 +95,6 @@ icon_state = "556mmHITPbox-hp" /obj/item/storage/box/ammo/c556mm_hp/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/hp = 4) generate_items_inside(items_inside,src) @@ -91,7 +108,6 @@ icon_state = "556mmHITPbox-rubbershot" /obj/item/storage/box/ammo/c556mm_rubber/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/rubbershot = 4) generate_items_inside(items_inside,src) @@ -107,7 +123,45 @@ icon_state = "57x39mmbox" /obj/item/storage/box/ammo/c57x39/PopulateContents() - ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39 = 4) generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/hp + ammo_type = /obj/item/ammo_casing/c57x39mm/hp + +/obj/item/storage/box/ammo/c57x39/hp + name = "box of 5.7x39mm HP ammo" + desc = "A box of standard 5.7x39mm HP ammo." + icon_state = "57x39mmbox" + +/obj/item/storage/box/ammo/c57x39/hp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/hp = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/ap + ammo_type = /obj/item/ammo_casing/c57x39mm/ap + +/obj/item/storage/box/ammo/c57x39/ap + name = "box of 5.7x39mm AP ammo" + desc = "A box of standard 5.7x39mm AP ammo." + icon_state = "57x39mmbox" + +/obj/item/storage/box/ammo/c57x39/ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/ap = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/rubber + ammo_type = /obj/item/ammo_casing/c57x39mm/rubber + +/obj/item/storage/box/ammo/c57x39/rubber + name = "box of 5.7x39mm rubber ammo" + desc = "A box of standard 5.7x39mm rubber ammo." + icon_state = "57x39mmbox" + +/obj/item/storage/box/ammo/c57x39/rubber/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/rubber = 4) + generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm index 8ee54bcd9099..5b9e3218b50f 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm @@ -7,3 +7,78 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/p50/penetrator ammo_type = /obj/item/ammo_casing/p50/penetrator + +// 8x58mm Caseless (SSG-669C) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a858 + ammo_type = /obj/item/ammo_casing/caseless/a858 + max_ammo = 5 + +/obj/item/storage/box/ammo/a858 + name = "box of .300 magnum ammo" + desc = "A box of standard .300 Magnum ammo." + icon_state = "300box" + +/obj/item/storage/box/ammo/a858/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a858 = 4) + generate_items_inside(items_inside,src) + +// .300 Magnum (Smile Rifle) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a300 + ammo_type = /obj/item/ammo_casing/a300 + max_ammo = 5 + +/obj/item/storage/box/ammo/a300 + name = "box of .300 magnum ammo" + desc = "A box of standard .300 Magnum ammo." + icon_state = "300box" + +/obj/item/storage/box/ammo/a300/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a300 = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a300/trac + ammo_type = /obj/item/ammo_casing/a300/trac + max_ammo = 5 + +/obj/item/storage/box/ammo/a300/trac + name = "box of .300 trac ammo" + desc = "A box of standard .300 Magnum ammo." + icon_state = "300box" + +/obj/item/storage/box/ammo/a300/trac/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a300/trac = 2) + generate_items_inside(items_inside,src) + +//6.5x57mm CLIP + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip + ammo_type = /obj/item/ammo_casing/a65clip + max_ammo = 5 + +/obj/item/storage/box/ammo/a65clip + name = "box of 6.5x57mm CLIP ammo" + desc = "A box of standard 6.5x57mm CLIP ammo." + icon_state = "65box" + +/obj/item/storage/box/ammo/a65clip/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip = 4) + generate_items_inside(items_inside,src) + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip/trac + ammo_type = /obj/item/ammo_casing/a65clip/trac + max_ammo = 5 + +/obj/item/storage/box/ammo/a65clip/trac + name = "box of 6.5x57mm CLIP tracker ammo" + desc = "A box of standard 6.5x57mm CLIP tracker ammo." + +/obj/item/storage/box/ammo/a65clip/trac/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip/trac = 2) + generate_items_inside(items_inside,src) diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 0cf2a39beef2..6566f05606eb 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -10,10 +10,6 @@ /obj/item/ammo_box/magazine/m45/empty start_empty = TRUE -/obj/item/ammo_box/magazine/m45/inc - name = "pistol magazine (.45 incendiary)" - desc = "An 8-round single-stack magazine for the Candor pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze." - ammo_type = /obj/item/ammo_casing/c45/inc /obj/item/ammo_box/magazine/m45/hp name = "pistol magazine (.45 HP)" @@ -57,11 +53,6 @@ icon_state = "[base_icon_state]-0" -/obj/item/ammo_box/magazine/co9mm/inc - name = "pistol magazine (9mm incendiary)" - desc = "A 10-round double-stack magazine for standard-issue 9mm pistols. These incendiary rounds deal pitiful damage, but leave flaming trails which set targets ablaze." - ammo_type = /obj/item/ammo_casing/c9mm/inc - /obj/item/ammo_box/magazine/co9mm/hp name = "pistol magazine (9mm HP)" desc= "A 10-round double-stack magazine for standard-issue 9mm pistols. These hollow point rounds do significant damage against soft targets, but are nearly ineffective against armored ones." diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index fdd4ab2d2b45..a8613e4e4903 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -21,13 +21,6 @@ base_icon_state = "46x30mmtA" ammo_type = /obj/item/ammo_casing/c46x30mm/ap -/obj/item/ammo_box/magazine/wt550m9/inc - name = "wt550 magazine (4.6x30mm incendiary)" - desc = "A compact, 30-round top-loading magazine for the WT-550 Automatic Rifle. These incendiary rounds deal pitiful damage, but leave flaming trails which set targets ablaze." - icon_state = "46x30mmtI-30" - base_icon_state = "46x30mmtI" - ammo_type = /obj/item/ammo_casing/c46x30mm/inc - /obj/item/ammo_box/magazine/smgm9mm name = "SMG magazine (9mm)" desc = "A 30-round magazine for 9mm submachine guns. These rounds do okay damage, but struggle against armor." @@ -46,11 +39,6 @@ desc = "A 30-round magazine for 9mm submachine guns. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power." ammo_type = /obj/item/ammo_casing/c9mm/ap -/obj/item/ammo_box/magazine/smgm9mm/inc - name = "SMG Magazine (9mm incendiary)" - desc = "A 30-round magazine for 9mm submachine guns. These incendiary rounds deal pitiful damage, but leave flaming trails which set targets ablaze." - ammo_type = /obj/item/ammo_casing/c9mm/inc - /obj/item/ammo_box/magazine/smgm9mm/rubber name = "SMG Magazine (9mm rubber)" desc = "A 30-round magazine for 9mm submachine guns. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor." diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index c17c1cb8a005..e82ed4d27a21 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -212,10 +212,11 @@ manufacturer = MANUFACTURER_SHARPLITE_NEW /obj/item/gun/energy/laser/hitscanpistol/examine_more(mob/user) + . = ..() if(in_range(src, user) || isobserver(user)) - . = list("You examine [src] closer. Under the grip is a small inscription: \"NT CN SVALINN 462\".") + . += "You examine [src] closer. Under the grip is a small inscription: \"NT CN SVALINN 462\"." else - . = list("You try to examine [src] closer, but you're too far away.") + . += "You try to examine [src] closer, but you're too far away." /obj/item/gun/energy/laser/e10 name = "E-10 laser pistol" diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index ff43fc8cf56c..3731b349cfe0 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -969,6 +969,9 @@ NO_MAG_GUN_HELPER(shotgun/automatic/bulldog) max_ammo = 8 multiple_sprites = AMMO_BOX_FULL_EMPTY +/obj/item/ammo_box/magazine/m12g_bulldog/empty + start_empty = TRUE + /obj/item/ammo_box/magazine/m12g_bulldog/drum name = "shotgun drum magazine (12g buckshot)" desc = "A bulky 12-round drum designed for the Bulldog shotgun and it's derivatives." @@ -980,6 +983,9 @@ NO_MAG_GUN_HELPER(shotgun/automatic/bulldog) w_class = WEIGHT_CLASS_NORMAL multiple_sprites = AMMO_BOX_FULL_EMPTY +/obj/item/ammo_box/magazine/m12g_bulldog/drum/empty + start_empty = TRUE + /obj/item/ammo_box/magazine/m12g_bulldog/drum/stun name = "shotgun drum magazine (12g taser slugs)" ammo_type = /obj/item/ammo_casing/shotgun/stunslug diff --git a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm index ab997c044d01..13820fea264d 100644 --- a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm @@ -169,6 +169,8 @@ EMPTY_GUN_HELPER(automatic/m12_sporter/mod) bolt_type = BOLT_TYPE_LOCKING + slot_flags = ITEM_SLOT_BACK + w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_MEDIUM diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8e3dbf6d91b9..968c3f85ebbc 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -73,7 +73,10 @@ /// number of times we've pierced something. Incremented BEFORE bullet_act and on_hit proc! var/pierces = 0 - var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel + ///Amount of deciseconds it takes for projectile to travel + var/speed = 0.8 + ///plus/minus modifier to projectile speed + var/speed_mod = 0 var/Angle = 0 var/original_angle = 0 //Angle at firing var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle @@ -165,6 +168,7 @@ ///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets var/shrapnel_type + ///If TRUE, hit mobs even if they're on the floor and not our target var/hit_stunned_targets = FALSE /// If true directly targeted turfs can be hit @@ -177,6 +181,7 @@ /obj/projectile/Initialize() . = ..() decayedRange = range + speed = speed + speed_mod AddElement(/datum/element/connect_loc, projectile_connections) /obj/projectile/proc/Range() diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 43106f97deec..277aa5e0404e 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -2,7 +2,7 @@ name = "bullet" icon_state = "gauss" damage = 60 - speed = 0.4 + speed = BULLET_SPEED_RIFLE damage_type = BRUTE nodamage = FALSE flag = "bullet" diff --git a/code/modules/projectiles/projectile/bullets/lmg.dm b/code/modules/projectiles/projectile/bullets/lmg.dm index 71da70475dde..5e246236fc70 100644 --- a/code/modules/projectiles/projectile/bullets/lmg.dm +++ b/code/modules/projectiles/projectile/bullets/lmg.dm @@ -59,28 +59,25 @@ /obj/projectile/bullet/mm712x82 name = "7.12x82mm bullet" damage = 25 - armour_penetration = 4076 + armour_penetration = 40 + speed = BULLET_SPEED_RIFLE /obj/projectile/bullet/mm712x82/ap name = "7.12x82mm armor-piercing bullet" armour_penetration = 75 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/mm712x82/hp name = "7.12x82mm hollow point bullet" damage = 40 armour_penetration = -20 - -/obj/projectile/bullet/incendiary/mm712x82 - name = "7.12x82mm incendiary bullet" - damage = 15 - armour_penetration = 40 - fire_stacks = 3 + speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/mm712x82/match name = "7.12x82mm match bullet" - speed = 0.3 armour_penetration = 50 ricochets_max = 2 ricochet_chance = 60 ricochet_auto_aim_range = 4 ricochet_incidence_leeway = 35 + speed_mod = BULLET_SPEED_HP_MOD diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index 37af59c1de57..73da54ea5819 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -1,98 +1,144 @@ +//.22lr (Himehabu, Micro Target, Pounder (uwu)) + +/obj/projectile/bullet/c22lr + name = ".22LR bullet" + damage = 18 + armour_penetration = -45 + ricochet_incidence_leeway = 20 + ricochet_chance = 65 + speed = BULLET_SPEED_HANDGUN + +/obj/projectile/bullet/c22lr/hp + name = ".22LR bullet" + damage = 24 + armour_penetration = -65 + ricochet_chance = 0 + speed_mod = BULLET_SPEED_HP_MOD + +/obj/projectile/bullet/c22lr/ap + name = ".22LR armor piercing bullet" + damage = 14 + armour_penetration = -25 + ricochet_incidence_leeway = 20 + ricochet_chance = 30 + speed_mod = BULLET_SPEED_AP_MOD + +/obj/projectile/bullet/c22lr/rubber + name = ".22LR rubber bullet" + damage = 4 + stamina = 15 + armour_penetration = -70 + speed_mod = BULLET_SPEED_HV_MOD //do not do this for other rubber bullets. If you do I will come out of the woodwork and bludgeon you to death with this stick i found. + ricochets_max = 8 //ding ding ding ding + ricochet_incidence_leeway = 70 + ricochet_chance = 130 + ricochet_decay_damage = 0.8 + // 9mm (Commander, SABR) /obj/projectile/bullet/c9mm name = "9mm bullet" damage = 20 armour_penetration = -20 + speed = BULLET_SPEED_HANDGUN /obj/projectile/bullet/c9mm/surplus name = "9mm surplus bullet" damage = 15 + speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c9mm/ap name = "9mm armor-piercing bullet" damage = 15 armour_penetration = 20 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c9mm/hp name = "9mm hollow point bullet" damage = 35 armour_penetration = -50 - -/obj/projectile/bullet/incendiary/c9mm - name = "9mm incendiary bullet" - damage = 10 - armour_penetration = -20 - fire_stacks = 2 + speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c9mm/rubber name = "9mm rubber bullet" damage = 5 armour_penetration = -40 stamina = 30 + speed_mod = BULLET_SPEED_RUBBER_MOD -// 10mm (Ringneck & SkM-44(k)) +// 10mm (Ringneck) /obj/projectile/bullet/c10mm name = "10mm bullet" damage = 25 armour_penetration = -20 + speed = BULLET_SPEED_HANDGUN /obj/projectile/bullet/c10mm/surplus name = "10mm surplus bullet" damage = 20 + speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c10mm/ap name = "10mm armor-piercing bullet" damage = 20 armour_penetration = 20 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c10mm/hp name = "10mm hollow point bullet" damage = 40 armour_penetration = -50 - -/obj/projectile/bullet/incendiary/c10mm - name = "10mm incendiary bullet" - damage = 15 - armour_penetration = -20 - fire_stacks = 2 + speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c10mm/rubber name = "10mm rubber bullet" damage = 7 stamina = 38 armour_penetration = -40 + speed_mod = BULLET_SPEED_RUBBER_MOD -// .45 (Candor, C20r, Thompson) +// .45 (Candor, C20r) /obj/projectile/bullet/c45 name = ".45 bullet" damage = 25 armour_penetration = -20 + speed = BULLET_SPEED_HANDGUN /obj/projectile/bullet/c45/surplus name = ".45 surplus bullet" damage = 20 + speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c45/ap name = ".45 armor-piercing bullet" damage = 20 armour_penetration = 20 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c45/hp name = ".45 hollow point bullet" damage = 40 armour_penetration = -50 - -/obj/projectile/bullet/incendiary/c45 - name = ".45 incendiary bullet" - damage = 15 - fire_stacks = 2 - armour_penetration = -20 + speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c45/rubber name = ".45 rubber bullet" damage = 7 stamina = 38 armour_penetration = -40 + speed_mod = BULLET_SPEED_RUBBER_MOD + +// .50 AE (Desert Eagle) + +/obj/projectile/bullet/a50AE + name = ".50 AE bullet" + damage = 40 + speed = BULLET_SPEED_HANDGUN + +/obj/projectile/bullet/a50AE/hp + name = ".50 AE hollow point bullet" + damage = 55 + armour_penetration = -20 + speed_mod = BULLET_SPEED_HP_MOD diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 1c8342616937..47036d5dbda9 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -1,28 +1,19 @@ -// .50 AE (Desert Eagle) - -/obj/projectile/bullet/a50AE - name = ".50 AE bullet" - damage = 40 - -/obj/projectile/bullet/a50AE/hp - name = ".50 AE hollow point bullet" - damage = 55 - armour_penetration = -50 - // .38 (Colt Detective Special & Winchester) /obj/projectile/bullet/c38 name = ".38 bullet" damage = 20 armour_penetration = -20 + speed = BULLET_SPEED_REVOLVER /obj/projectile/bullet/c38/surplus damage = 15 + speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c38/match name = ".38 match bullet" - speed = 0.3 armour_penetration = -10 + speed_mod = BULLET_SPEED_AP_MOD ricochets_max = 4 ricochet_chance = 100 ricochet_auto_aim_angle = 40 @@ -31,17 +22,16 @@ ricochet_decay_chance = 1 ricochet_decay_damage = 1 -/obj/projectile/bullet/c38/match/bouncy // I don't know why this is a subtype of match +/obj/projectile/bullet/c38/bouncy name = ".38 rubber bullet" - speed = 0.4 damage = 7 - stamina = 38 + stamina = 28 armour_penetration = -60 + speed_mod = BULLET_SPEED_RUBBER_MOD ricochets_max = 6 ricochet_incidence_leeway = 70 ricochet_chance = 130 ricochet_decay_damage = 0.8 - shrapnel_type = NONE /obj/projectile/bullet/c38/dumdum name = ".38 dum-dum bullet" @@ -51,22 +41,10 @@ shrapnel_type = /obj/item/shrapnel/bullet/c38/dumdum /obj/projectile/bullet/c38/trac - name = ".38 TRAC bullet" + name = ".38 tracker" damage = 10 ricochets_max = 0 - -/obj/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE) - . = ..() - var/mob/living/carbon/M = target - if(!istype(M)) - return - var/obj/item/implant/tracking/c38/imp - for(var/obj/item/implant/tracking/c38/TI in M.implants) //checks if the target already contains a tracking implant - imp = TI - return - if(!imp) - imp = new /obj/item/implant/tracking/c38(M) - imp.implant(M) + shrapnel_type = /obj/item/shrapnel/bullet/tracker/c38 /obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail name = ".38 hearth bullet" @@ -96,11 +74,12 @@ name = ".357 bullet" damage = 30 -// admin only really, for ocelot memes + speed = BULLET_SPEED_REVOLVER + /obj/projectile/bullet/a357/match name = ".357 match bullet" - speed = 0.3 armour_penetration = 10 + speed_mod = BULLET_SPEED_AP_MOD ricochets_max = 5 ricochet_chance = 140 ricochet_auto_aim_angle = 50 @@ -112,18 +91,21 @@ name = ".357 hollow point bullet" damage = 45 armour_penetration = -20 - ricochet_chance = 0 //mushroom on impact, no bounces + speed_mod = BULLET_SPEED_HP_MOD + ricochet_chance = 0 + // .45-70 Gov't (Hunting Revolver) /obj/projectile/bullet/a4570 name = ".45-70 bullet" damage = 45 //crits in 3-4 taps depending on armor + speed = BULLET_SPEED_REVOLVER /obj/projectile/bullet/a4570/match name = ".45-70 match bullet" - speed = 0.3 armour_penetration = 10 + speed_mod = BULLET_SPEED_AP_MOD ricochets_max = 5 ricochet_chance = 140 ricochet_auto_aim_angle = 50 @@ -133,8 +115,9 @@ /obj/projectile/bullet/a4570/hp name = ".45-70 hollow point bullet" - damage = 55 //it's ALMOST the pre-nerf .357 with less armor pen + damage = 55 armour_penetration = -50 + speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/a4570/explosive //for extra oof name = ".45-70 explosive bullet" @@ -145,27 +128,23 @@ explosion(target, -1, 0, 1) return BULLET_ACT_HIT - -/obj/projectile/bullet/c22lr - name = ".22LR bullet" - damage = 20 - armour_penetration = -45 - ricochet_incidence_leeway = 20 - ricochet_chance = 65 - // 44 Short (Roumain & Shadow) /obj/projectile/bullet/a44roum name = ".44 roumain bullet" damage = 25 + speed = BULLET_SPEED_REVOLVER /obj/projectile/bullet/a44roum/rubber - name = ".44 roumain bullet" + name = ".44 roumain rubber bullet" damage = 7 stamina = 38 armour_penetration = -20 + speed_mod = BULLET_SPEED_RUBBER_MOD /obj/projectile/bullet/a44roum/hp - name = ".44 roumain bullet" + name = ".44 roumain hollow point bullet" damage = 40 armour_penetration = -20 + ricochet_chance = 0 + speed_mod = BULLET_SPEED_HP_MOD diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index e61cd410919a..cc0ecd87c2f6 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -4,74 +4,114 @@ name = "5.56x42mm CLIP bullet" damage = 25 armour_penetration = 20 + speed = BULLET_SPEED_RIFLE + +/obj/projectile/bullet/a556_42/hp + name = "5.56x42mm CLIP hollow point bullet" + damage = 35 + armour_penetration = 0 + speed_mod = BULLET_SPEED_HP_MOD + +/obj/projectile/bullet/a556_42/ap + name = "5.56x42mm CLIP bullet" + damage = 20 + armour_penetration = 40 + speed_mod = BULLET_SPEED_AP_MOD + +/obj/projectile/bullet/a556_42/rubber + name = "5.56x42mm CLIP bullet" + damage = 5 + stamina = 25 + armour_penetration = 0 + speed_mod = BULLET_SPEED_RUBBER_MOD // 8x50mmR (Illestren Rifle) /obj/projectile/bullet/a8_50r name = "8x50mmR bullet" - speed = 0.3 damage = 35 armour_penetration = 40 + speed = BULLET_SPEED_RIFLE -/obj/projectile/bullet/a8_50rhp - name = "8x50mmR bullet" - speed = 0.3 +/obj/projectile/bullet/a8_50r/hp + name = "8x50mmR hollow point bullet" damage = 49 armour_penetration = 0 + speed_mod = BULLET_SPEED_HP_MOD -// .300 Magnum (Smile Rifle) - -/obj/projectile/bullet/a300 - name = ".300 Magnum bullet" - speed = 0.3 - damage = 45 - stamina = 10 - armour_penetration = 40 - -// Bloat evil wizard stupid shit - -/obj/projectile/bullet/a762_enchanted - name = "enchanted 8x50mmR bullet" - damage = 20 - stamina = 80 +/obj/projectile/bullet/a8_50r/match + name = "8x50mmR match bullet" + damage = 40 + armour_penetration = -10 + speed_mod = BULLET_SPEED_AP_MOD + ricochets_max = 4 + ricochet_chance = 80 + ricochet_auto_aim_angle = 40 + ricochet_auto_aim_range = 5 + ricochet_incidence_leeway = 50 + ricochet_decay_chance = 1 + ricochet_decay_damage = 1 + +/obj/projectile/bullet/a8_50r/trac + damage = 10 + armour_penetration = 0 + shrapnel_type = /obj/item/shrapnel/bullet/tracker/a8_50r //7.62x40mm CLIP (SKM Rifles) /obj/projectile/bullet/a762_40 - name = "7.62x40mm CLIP" + name = "7.62x40mm CLIP bullet" damage = 30 armour_penetration = 20 + speed = BULLET_SPEED_RIFLE + +/obj/projectile/bullet/a762_40/hp + name = "7.62x40mm CLIP hollow point bullet" + damage = 40 + armour_penetration = 0 + speed_mod = BULLET_SPEED_HP_MOD + +/obj/projectile/bullet/a762_40/ap + name = "7.62x40mm CLIP armor piercing bullet" + damage = 25 + armour_penetration = 40 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/a762_40/rubber //"rubber" - name = "7.62x40mm CLIP Rubber" + name = "7.62x40mm CLIP rubber bullet" damage = 15 stamina = 40 - armour_penetration = 20 - + armour_penetration = 0 + speed_mod = BULLET_SPEED_RUBBER_MOD //.308 WIN (M514 & GAL DMRs) /obj/projectile/bullet/a308 - name = ".308" + name = ".308 bullet" speed = 0.3 damage = 30 armour_penetration = 40 + speed = BULLET_SPEED_RIFLE + +/obj/projectile/bullet/a308/hp + name = ".308 hollow point bullet" + damage = 40 + armour_penetration = 10 + speed_mod = BULLET_SPEED_HP_MOD + +/obj/projectile/bullet/a308/ap + name = ".308 armor piercing bullet" + damage = 25 + armour_penetration = 60 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/a308/rubber //"rubber" - name = ".308 Rubber" + name = ".308 rubber bullet" speed = 0.3 damage = 25 stamina = 50 armour_penetration = 40 - -// 8x58mm caseless (SG-669) - -/obj/projectile/bullet/a858 - name = "8x58mm caseless bullet" - speed = 0.3 - damage = 35 - armour_penetration = 40 - + speed_mod = BULLET_SPEED_RUBBER_MOD // .299 Eoehoma Caseless (E-40) @@ -79,22 +119,4 @@ name = ".299 Eoehoma caseless bullet" damage = 20 armour_penetration = 10 - -//6.5x57mm CLIP (F90) - -/obj/projectile/bullet/a65clip - name = "6.5x57mm CLIP bullet" - speed = 0.3 - stamina = 10 - damage = 40 - armour_penetration = 50 - - icon_state = "redtrac" - light_system = MOVABLE_LIGHT - light_color = COLOR_SOFT_RED - light_range = 2 - -/obj/projectile/bullet/a65clip/rubber //"rubber" - name = "6.5x57mm CLIP rubber bullet" - damage = 10 - stamina = 40 + speed = BULLET_SPEED_RIFLE diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index a069102a39cc..41a12f7eaf30 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -2,7 +2,7 @@ name = "12g shotgun slug" damage = 40 armour_penetration = -10 - speed = 0.5 + speed = BULLET_SPEED_SHOTGUN /obj/projectile/bullet/slug/beanbag name = "beanbag slug" @@ -14,7 +14,7 @@ name = "incendiary slug" damage = 25 armour_penetration = -10 - speed = 0.5 + speed = BULLET_SPEED_SHOTGUN /obj/projectile/bullet/incendiary/shotgun/dragonsbreath name = "dragonsbreath pellet" @@ -54,7 +54,7 @@ /obj/projectile/bullet/slug/frag12 name = "frag12 slug" damage = 25 - paralyze = 50 + paralyze = 20 /obj/projectile/bullet/slug/frag12/on_hit(atom/target, blocked = FALSE) ..() @@ -69,7 +69,7 @@ icon_state = "pellet" armour_penetration = -35 - speed = 0.5 + speed = BULLET_SPEED_SHOTGUN /obj/projectile/bullet/pellet/buckshot name = "buckshot pellet" diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index e98d48db4ff2..9557f40b1e1c 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -3,30 +3,53 @@ /obj/projectile/bullet/c57x39mm name = "5.7x39mm bullet" damage = 20 + speed = BULLET_SPEED_PDW + +/obj/projectile/bullet/c57x39mm/hp + name = "5.7x39mm hollow point bullet" + damage = 30 + armour_penetration = -20 + speed_mod = BULLET_SPEED_HP_MOD + +/obj/projectile/bullet/c57x39mm/ap + name = "5.7x39mm armor piercing bullet" + damage = 20 + armour_penetration = 20 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c57x39mm/rubber name = "5.7x39mm rubber bullet" damage = 5 stamina = 20 + speed_mod = BULLET_SPEED_RUBBER_MOD // 4.6x30mm (WT-550 Automatic Rifle & NT-SVG) /obj/projectile/bullet/c46x30mm name = "4.6x30mm bullet" damage = 20 + speed = BULLET_SPEED_PDW /obj/projectile/bullet/c46x30mm/recycled damage = 17 + speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c46x30mm/ap name = "4.6x30mm armor-piercing bullet" damage = 15 armour_penetration = 40 + speed_mod = BULLET_SPEED_AP_MOD -/obj/projectile/bullet/incendiary/c46x30mm - name = "4.6x30mm incendiary bullet" - damage = 10 - fire_stacks = 1 +/obj/projectile/bullet/c46x30mm/hp + name = "4.6x30mm bullet" + damage = 25 + speed_mod = BULLET_SPEED_HP_MOD + +/obj/projectile/bullet/c46x30mm/rubber + name = "4.6x30mm bullet" + damage = 4 + stamina = 20 + speed_mod = BULLET_SPEED_RUBBER_MOD // 4.73x33mm caseless (Solar) @@ -44,19 +67,23 @@ /obj/projectile/bullet/c556mm/surplus name = "5.56mm HITP surplus bullet" damage = 15 + speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c556mm/ap name = "5.56mm HITP AP bullet" damage = 15 armour_penetration = 40 + speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c556mm/hp name = "5.56mm HITP hollow point bullet" damage = 30 armour_penetration = -50 + speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c556mm/rubber name = "5.56mm HITP rubber bullet" damage = 5 stamina = 30 armour_penetration = -20 + speed_mod = BULLET_SPEED_RUBBER_MOD diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm index 1f725b8113f2..268d4a9aaf23 100644 --- a/code/modules/projectiles/projectile/bullets/sniper.dm +++ b/code/modules/projectiles/projectile/bullets/sniper.dm @@ -2,7 +2,7 @@ /obj/projectile/bullet/p50 name = ".50 BMG bullet" - speed = 0.3 + speed = BULLET_SPEED_SNIPER damage = 70 knockdown = 100 dismemberment = 50 @@ -39,7 +39,58 @@ knockdown = 0 breakthings = FALSE -/obj/projectile/bullet/p50/penetrator/shuttle //Nukeop Shuttle Variety - icon_state = "gaussstrong" - damage = 25 - range = 16 +//6.5x57mm CLIP (F90) + +/obj/projectile/bullet/a65clip + name = "6.5x57mm CLIP bullet" + stamina = 10 + damage = 40 + armour_penetration = 50 + + speed = BULLET_SPEED_SNIPER + + icon_state = "redtrac" + light_system = MOVABLE_LIGHT + light_color = COLOR_SOFT_RED + light_range = 2 + +/obj/projectile/bullet/a65clip/trac + damage = 10 + armour_penetration = 0 + shrapnel_type = /obj/item/shrapnel/bullet/tracker/a65clip + +//this should only exist on the big ass turrets. don't fucking give players this. +/obj/projectile/bullet/a65clip/rubber //"rubber" + name = "6.5x57mm CLIP rubber bullet" + damage = 10 + stamina = 40 + speed_mod = BULLET_SPEED_RUBBER_MOD + +// 8x58mm caseless (SG-669) + +/obj/projectile/bullet/a858 + name = "8x58mm caseless bullet" + damage = 35 + armour_penetration = 40 + speed = BULLET_SPEED_SNIPER + +/obj/projectile/bullet/a858/trac + name = "8x58mm tracker" + damage = 12 + armour_penetration = 0 + shrapnel_type = /obj/item/shrapnel/bullet/tracker/a858 + +// .300 Magnum + +/obj/projectile/bullet/a300 + name = ".300 Magnum bullet" + damage = 45 + stamina = 10 + armour_penetration = 40 + speed = BULLET_SPEED_RIFLE + +/obj/projectile/bullet/a300/trac + name = ".300 Tracker" + damage = 10 + armour_penetration = 0 + shrapnel_type = /obj/item/shrapnel/bullet/tracker/a308 diff --git a/code/modules/projectiles/projectile/bullets/special.dm b/code/modules/projectiles/projectile/bullets/special.dm deleted file mode 100644 index d3c1b3a72b1a..000000000000 --- a/code/modules/projectiles/projectile/bullets/special.dm +++ /dev/null @@ -1,33 +0,0 @@ -// Honker - -/obj/projectile/bullet/honker - name = "banana" - damage = 0 - movement_type = FLYING - projectile_piercing = ALL - nodamage = TRUE - hitsound = 'sound/items/bikehorn.ogg' - icon = 'icons/obj/hydroponics/harvest.dmi' - icon_state = "banana" - range = 200 - -/obj/projectile/bullet/honker/Initialize() - . = ..() - SpinAnimation() - -/obj/projectile/bullet/honker/on_hit(atom/target, blocked = FALSE) - . = ..() - var/mob/M = target - if(istype(M)) - M.slip(100, M.loc, GALOSHES_DONT_HELP|SLIDE, 0, FALSE) - -// Mime - -/obj/projectile/bullet/mime - damage = 40 - -/obj/projectile/bullet/mime/on_hit(atom/target, blocked = FALSE) - . = ..() - if(iscarbon(target)) - var/mob/living/carbon/M = target - M.silent = max(M.silent, 10) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 123fd24a249d..1e37b9b1ee85 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -581,7 +581,7 @@ /datum/reagent/medicine/anti_rad/on_mob_life(mob/living/carbon/M) M.radiation -= M.radiation - rand(50,150) - M.adjust_disgust(4*REM, 0) + M.adjust_disgust(4*REM) ..() . = 1 diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b45f7eb44a16..b246a81f364e 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1950,8 +1950,7 @@ /datum/reagent/growthserum/on_mob_life(mob/living/carbon/H) var/newsize = current_size - newsize = (1 + (clamp(volume, 0, 30) / 100)) * RESIZE_DEFAULT_SIZE - + newsize = (1 + (clamp(volume, 0, 25) / 100)) * RESIZE_DEFAULT_SIZE H.resize = newsize/current_size current_size = newsize H.update_transform() diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 10713fbf2288..96c2a85c280c 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -6,6 +6,8 @@ explode(holder, created_volume) /datum/chemical_reaction/reagent_explosion/proc/explode(datum/reagents/holder, created_volume) + if(QDELING(holder.my_atom)) + return var/power = modifier + round(created_volume/strengthdiv, 1) if(power > 0) var/turf/T = get_turf(holder.my_atom) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 46dddeb0c586..cc45dd179877 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -670,15 +670,6 @@ construction_time = 300 category = list("Exosuit Equipment") -/datum/design/mech_honker - name = "HoNkER BlAsT 5000" - id = "mech_honker" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker - materials = list(/datum/material/iron=20000,/datum/material/hellstone=10000) - construction_time = 500 - category = list("Exosuit Equipment") - /datum/design/mech_punching_glove name = "Oingo Boingo Punch-face" id = "mech_punching_face" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index a07f9d96dd80..f1b9a8c573c6 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -238,16 +238,6 @@ build_path = /obj/item/ammo_box/magazine/wt550m9/ap departmental_flags = DEPARTMENTAL_FLAG_SECURITY -/datum/design/mag_oldsmg/ic_mag - name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" - desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle" - id = "mag_oldsmg_ic" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000) - build_path = /obj/item/ammo_box/magazine/wt550m9/inc - departmental_flags = DEPARTMENTAL_FLAG_SECURITY - -//WS edit - free lethals - /datum/design/commanderammo name = "Commander magazine (9mm)" desc = "A single stack magazine chambered in 9mm for Commander sidearms." @@ -388,7 +378,7 @@ id = "ap9mm" build_type = PROTOLATHE materials = list(/datum/material/iron = 15000, /datum/material/uranium = 1000) - build_path = /obj/item/storage/box/ammo/c9mm/ap + build_path = /obj/item/storage/box/ammo/c9mm_ap category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -462,36 +452,6 @@ category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY -/datum/design/inc9mm - name = "Incendiary 9mm ammo box" - desc = "A box full of incendiary 9mm ammunition." - id = "inc9mm" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 15000, /datum/material/plasma = 5000) - build_path = /obj/item/storage/box/ammo/c9mm_incendiary - category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY - -/datum/design/inc10mm - name = "Incendiary 10mm ammo box" - desc = "A box full of incendiary 10mm ammunition." - id = "inc10mm" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 15000, /datum/material/plasma = 5000) - build_path = /obj/item/storage/box/ammo/c10mm_incendiary - category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY - -/datum/design/inc45 - name = "Incendiary .45 ammo box" - desc = "A box full of incendiary .45 ammunition." - id = "inc45" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 15000, /datum/material/plasma = 5000) - build_path = /obj/item/storage/box/ammo/c45_incendiary - category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS - /datum/design/rubbershot name = "Rubber Shot" id = "rubber_shot" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 39770fce5c85..799865038b52 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -704,7 +704,7 @@ display_name = "Ballistic Weaponry" description = "This isn't research.. This is reverse-engineering!" prereq_ids = list("weaponry") - design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "shotgun_slug") + design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "shotgun_slug") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 @@ -721,7 +721,7 @@ display_name = "Exotic Ammunition" description = "They won't know what hit em." prereq_ids = list("adv_weaponry", "medical_weapons") - design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox", "inc9mm", "inc10mm", "inc45", "incendiary_slug") + design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox", "incendiary_slug") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm index 0e56c1112488..0cfb0ca04449 100644 --- a/code/modules/spells/spell_types/mime.dm +++ b/code/modules/spells/spell_types/mime.dm @@ -174,55 +174,6 @@ invocation_type ="none" ..() -/obj/effect/proc_holder/spell/aimed/finger_guns - name = "Finger Guns" - desc = "Shoot a mimed bullet from your fingers that stuns and does some damage." - school = "mime" - panel = "Mime" - charge_max = 300 - clothes_req = FALSE - antimagic_allowed = TRUE - invocation_type = INVOCATION_EMOTE - invocation_emote_self = "You fire your finger gun!" - range = 20 - projectile_type = /obj/projectile/bullet/mime - projectile_amount = 3 - sound = null - active_msg = "You draw your fingers!" - deactive_msg = "You put your fingers at ease. Another time." - active = FALSE - - action_icon = 'icons/mob/actions/actions_mime.dmi' - action_icon_state = "finger_guns0" - action_background_icon_state = "bg_mime" - base_icon_state = "finger_guns" - - -/obj/effect/proc_holder/spell/aimed/finger_guns/Click() - var/mob/living/carbon/human/owner = usr - if(owner.incapacitated()) - to_chat(owner, "You can't properly point your fingers while incapacitated.") - return - if(usr && usr.mind) - if(!usr.mind.miming) - to_chat(usr, "You must dedicate yourself to silence first!") - return - invocation = "[usr.real_name] fires [usr.p_their()] finger gun!" - else - invocation_type ="none" - ..() - -/obj/effect/proc_holder/spell/aimed/finger_guns/InterceptClickOn(mob/living/caller, params, atom/target) - if(caller.incapacitated()) - to_chat(caller, "You can't properly point your fingers while incapacitated.") - if(charge_type == "recharge") - var/refund_percent = current_amount/projectile_amount - charge_counter = charge_max * refund_percent - start_recharge() - remove_ranged_ability() - on_deactivation(caller) - ..() - /obj/item/book/granter/spell/mimery_blockade spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime spellname = "Invisible Blockade" @@ -237,18 +188,3 @@ return if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list) user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak) - -/obj/item/book/granter/spell/mimery_guns - spell = /obj/effect/proc_holder/spell/aimed/finger_guns - spellname = "Finger Guns" - name = "Guide to Advanced Mimery Vol 2" - desc = "There aren't any words written..." - icon_state ="bookmime" - remarks = list("...") - -/obj/item/book/granter/spell/mimery_guns/attack_self(mob/user) - . = ..() - if(!.) - return - if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list) - user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index f097cbc59ff6..bf229226e25c 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -78,7 +78,8 @@ if(prob(pukeprob)) H.blur_eyes(3) - H.manual_emote(pick("tears up!", "whimpers!", "chokes!")) + if(prob(25)) + H.manual_emote(pick("tears up!", "whimpers!", "chokes!")) H.vomit(20, 0, 1, 1, 1, 0) H.confused += 2.5 H.stuttering += 1 @@ -87,8 +88,8 @@ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgusted) //profusely vomiting. - H.force_scream() - H.vomit(40, 0, 1, 1, 1, 0) + if(prob(pukeprob)) + H.vomit(40, 0, 1, 1, 1, 0) H.adjust_disgust(-0.5 * disgust_metabolism) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index b10fd114db61..0cf5a1258964 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1130,14 +1130,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) for hit-and-run style attacks. Features an incendiary carbine, flash bang launcher, teleporter, ion thrusters and a Tesla energy array." item = /obj/mecha/combat/gygax/dark/loaded cost = 80 - -/datum/uplink_item/support/honker - name = "Dark H.O.N.K." - desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000." - item = /obj/mecha/combat/honker/dark/loaded - cost = 80 - include_modes = list(/datum/game_mode/nuclear/clown_ops) - /datum/uplink_item/support/touro name = "Touro Exosuit" desc = "A well-armored and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \ diff --git a/dependencies.sh b/dependencies.sh index 6f5a61810a81..82e888062686 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -24,7 +24,7 @@ export SPACEMAN_DMM_VERSION=suite-1.8 export PYTHON_VERSION=3.9.0 #auxmos repository -export AUXMOS_REPO=https://github.com/Putnam3145/auxmos +export AUXMOS_REPO=https://github.com/shiptest-ss13/auxmos #auxmos version -export AUXMOS_VERSION=v2.5.1 +export AUXMOS_VERSION=v2.5.5.1 diff --git a/html/changelogs/AutoChangeLog-pr-3810.yml b/html/changelogs/AutoChangeLog-pr-3810.yml new file mode 100644 index 000000000000..e4e7ad8e4f6c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3810.yml @@ -0,0 +1,5 @@ +author: MarkSuckerberg +changes: + - {bugfix: Examine more should now say the actual object as the subject and not + yourself.} +delete-after: true diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml index 5bb40e26e4eb..aa0a322d130e 100644 --- a/html/changelogs/archive/2024-11.yml +++ b/html/changelogs/archive/2024-11.yml @@ -187,3 +187,58 @@ - balance: Frontiersmen simplemobs count this for their armour values - balance: Frontie armour vest in the blackmarket cost decreased - bugfix: 9mm AP spawns with 9mm AP now +2024-11-17: + fighterslam: + - rscadd: Various minor fixes & QOL adjustments to the Ranger. Major changes include + updating all of the Specialist quarters and a complete re-arrangement of the + Medical and Supply areas. +2024-11-18: + Apogee-dev: + - rscadd: Replaced NGR Hyena with the NGR Derecho-class salvage ship + Erikafox: + - rscadd: girlfailing adjective + - rscadd: vomiting now removes a random amount of disgust. + - balance: vomiting should no longer trigger 12000 times in one minute on that one + person. im so sorry + firebudgy: + - rscadd: Four new hats for your blorbo customization! Find them in loadout. Sponsored + by Miskilamo Shipbreaking. + - bugfix: Vox Frontiersmen Officers finally stitched up their clothing. +2024-11-20: + Erikafox: + - balance: frontiersmen turrets kill everything not in their faction + - balance: medium marine armor now costs 3k at da outpost. + - bugfix: crate shelves now return all metal + - bugfix: crate shelves no longer lead to 0 metal stacks + - bugfix: Cthonian Platforms now have proper dirs + Sadhorizon: + - code_imp: Added a Hardliner faction datum. + SomeguyManperson: + - bugfix: 9mm AP boxes now work right + generalthrax: + - balance: Replaced rubbershot on the Kilo and Scarab with buckshot + - rscadd: Added a soft suit to the Listening Post + - bugfix: Fixed the Listening Post Comms Monitor to be the right type +2024-11-21: + Anticept: + - bugfix: growth serum capped at 25 instead of 30% for sprite scaling reasons. + Erikafox: + - rscadd: rifle calibre and pdw calibre rubbershot/armor piercing/hollow point. + check da outpost + - rscadd: tracker rounds for a few guns. check the black market :3 + - rscdel: most forms of incendiary ammo + - rscdel: A bunch of clown and mime stuff tangentially related to guns + - rscadd: walls on wasteworlds now have a chance to start damaged + - balance: walls on waste worlds are now universally weaker + - rscadd: fax secret documents + - rscadd: and space cash and biscuit folders. without + MarkSuckerberg: + - tweak: Whispering (as in, directly using the verb or typing `#` before your message) + will now skip the succumb confirmation prompt, while normal talking will still + continue to prompt if you want to succumb. + fighterslam: + - bugfix: fixes access on the ranger armory + firebudgy: + - rscadd: Enabled thee screaming audio emote for Vox. + generalthrax: + - bugfix: You can no longer see through Marauder hardsuits diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index d2970f6b9ead..da8e20aef955 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/species/vox/onmob_head_vox.dmi b/icons/mob/species/vox/onmob_head_vox.dmi index f38e8aa28073..515c0ec9f78e 100644 Binary files a/icons/mob/species/vox/onmob_head_vox.dmi and b/icons/mob/species/vox/onmob_head_vox.dmi differ diff --git a/icons/obj/ammunition/ammo_bullets.dmi b/icons/obj/ammunition/ammo_bullets.dmi index 25ea909762aa..6ac65ff5bb66 100644 Binary files a/icons/obj/ammunition/ammo_bullets.dmi and b/icons/obj/ammunition/ammo_bullets.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 52d9036e0211..a3190f2ab872 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 68d030ee383d..79ca6ed0ed87 100644 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/shiptest.dme b/shiptest.dme index dca41d9ba1d5..66f2020bebbe 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1054,7 +1054,6 @@ #include "code\game\mecha\combat\honker.dm" #include "code\game\mecha\combat\marauder.dm" #include "code\game\mecha\combat\phazon.dm" -#include "code\game\mecha\combat\reticence.dm" #include "code\game\mecha\equipment\mecha_equipment.dm" #include "code\game\mecha\equipment\tools\medical_tools.dm" #include "code\game\mecha\equipment\tools\mining_tools.dm" @@ -3123,7 +3122,6 @@ #include "code\modules\projectiles\projectile\bullets\shotgun.dm" #include "code\modules\projectiles\projectile\bullets\smg.dm" #include "code\modules\projectiles\projectile\bullets\sniper.dm" -#include "code\modules\projectiles\projectile\bullets\special.dm" #include "code\modules\projectiles\projectile\bullets\turret.dm" #include "code\modules\projectiles\projectile\energy\_energy.dm" #include "code\modules\projectiles\projectile\energy\ebow.dm" diff --git a/strings/names/adjectives.txt b/strings/names/adjectives.txt index bca89bc5a257..88491827f3f2 100644 --- a/strings/names/adjectives.txt +++ b/strings/names/adjectives.txt @@ -149,6 +149,7 @@ gleaming glorious good gorgeous +girlfailing graceful greasy great diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 0bbf5add1c91..eaeb92321e55 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -3661,13 +3661,13 @@ __metadata: linkType: hard "cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": - version: 7.0.3 - resolution: "cross-spawn@npm:7.0.3" + version: 7.0.6 + resolution: "cross-spawn@npm:7.0.6" dependencies: path-key: ^3.1.0 shebang-command: ^2.0.0 which: ^2.0.1 - checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52 + checksum: 8d306efacaf6f3f60e0224c287664093fa9185680b2d195852ba9a863f85d02dcc737094c6e512175f8ee0161f9b87c73c6826034c2422e39de7d6569cf4503b languageName: node linkType: hard diff --git a/tools/ci/build_auxmos.sh b/tools/ci/build_auxmos.sh index 735b7263761a..061a5dfa6d15 100644 --- a/tools/ci/build_auxmos.sh +++ b/tools/ci/build_auxmos.sh @@ -9,7 +9,7 @@ pushd "$HOME/auxmos" if [ ! -d .git ] then git init - git remote add origin https://github.com/Putnam3145/auxmos.git + git remote add origin $AUXMOS_REPO fi git fetch origin --depth=1 $AUXMOS_VERSION @@ -17,7 +17,7 @@ git reset --hard FETCH_HEAD rustup target add i686-unknown-linux-gnu -env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos" +env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos" mkdir -p ~/.byond/bin cp target/i686-unknown-linux-gnu/release/libauxmos.so ~/.byond/bin/libauxmos.so diff --git a/tools/tgs_scripts/PreCompile.sh b/tools/tgs_scripts/PreCompile.sh index eb45c8bf362b..1003a251e124 100755 --- a/tools/tgs_scripts/PreCompile.sh +++ b/tools/tgs_scripts/PreCompile.sh @@ -53,7 +53,7 @@ cd .. echo "Deploying auxmos..." cd auxmos git checkout "$AUXMOS_VERSION" -env PKG_CONFIG_ALLOW_CROSS=1 RUSTFLAGS="-C target-cpu=native" ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos" +env PKG_CONFIG_ALLOW_CROSS=1 RUSTFLAGS="-C target-cpu=native" ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos" mv target/i686-unknown-linux-gnu/release/libauxmos.so "$1/libauxmos.so" cd ..