diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm index bf4f39c690325..66bbb6f415a0b 100644 --- a/_maps/Prefab/Departments.dmm +++ b/_maps/Prefab/Departments.dmm @@ -360,20 +360,6 @@ "ic" = ( /turf/open/floor/wood, /area/security/detectives_office) -"ir" = ( -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 11; - pixel_y = -5 - }, -/obj/item/mop{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/key/janitor, -/obj/vehicle/ridden/janicart, -/turf/open/floor/iron, -/area/janitor) "iw" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -402,15 +388,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"jF" = ( -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/mob/living/carbon/monkey, -/mob/living/simple_animal/pet/hamster/vector{ - pixel_x = 1; - pixel_y = 10 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "jK" = ( /obj/effect/landmark/start/detective, /turf/open/floor/wood, @@ -434,6 +411,11 @@ /obj/machinery/suit_storage_unit/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) +"ky" = ( +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/dark, +/area/medical/genetics) "kz" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/door/firedoor, @@ -831,6 +813,15 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) +"uB" = ( +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/mob/living/carbon/human/species/monkey, +/mob/living/simple_animal/pet/hamster/vector{ + pixel_x = 1; + pixel_y = 10 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "uF" = ( /obj/effect/turf_decal/edges/techfloor_orange{ dir = 8 @@ -950,6 +941,10 @@ /obj/item/book/manual/hydroponics_pod_people, /turf/open/floor/grass/no_border, /area/hydroponics) +"xP" = ( +/obj/machinery/computer/security/telescreen/entertainment, +/turf/open/floor/iron/dark, +/area/space) "xS" = ( /obj/item/book/manual/wiki/sopengineering, /turf/open/floor/carpet/royalblue, @@ -1197,11 +1192,6 @@ /obj/machinery/light_switch, /turf/open/floor/iron, /area/space) -"Fa" = ( -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/mob/living/carbon/monkey, -/turf/open/floor/iron/dark, -/area/medical/genetics) "Fh" = ( /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -1292,6 +1282,20 @@ /obj/machinery/vendor/exploration, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"ID" = ( +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 11; + pixel_y = -5 + }, +/obj/item/mop{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/key/janitor, +/obj/vehicle/ridden/janicart, +/turf/open/floor/iron, +/area/janitor) "IO" = ( /obj/structure/closet/secure_closet/RD, /turf/open/floor/carpet/purple, @@ -1768,10 +1772,6 @@ /obj/structure/disposalpipe/sorting/mail/destination/threatre, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) -"Tm" = ( -/obj/machinery/computer/security/telescreen/entertainment, -/turf/open/floor/iron/dark, -/area/space) "Tn" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 @@ -2299,7 +2299,7 @@ QG ew To pY -Fa +ky oa qL oa @@ -2359,7 +2359,7 @@ ee cc TS eL -jF +uB Qk ff Qk @@ -2625,7 +2625,7 @@ Qk xh kK bF -Tm +xP EV xB mQ @@ -2651,7 +2651,7 @@ Zj Bo "} (29,1,1) = {" -ir +ID SY PP ZU diff --git a/_maps/RandomRooms/3x5/sk_rdm084_monky.dmm b/_maps/RandomRooms/3x5/sk_rdm084_monky.dmm index ca147424373ba..c771888451f9e 100644 --- a/_maps/RandomRooms/3x5/sk_rdm084_monky.dmm +++ b/_maps/RandomRooms/3x5/sk_rdm084_monky.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/flora/ausbushes/sunnybush, -/mob/living/carbon/monkey, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/template_noop) "b" = ( @@ -14,7 +14,7 @@ /area/template_noop) "d" = ( /obj/structure/flora/ausbushes/ppflowers, -/mob/living/carbon/monkey, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/template_noop) "e" = ( @@ -26,9 +26,7 @@ /obj/machinery/light{ dir = 4 }, -/mob/living/carbon/monkey{ - name = "mankey" - }, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/template_noop) "g" = ( @@ -44,12 +42,12 @@ /area/template_noop) "i" = ( /obj/structure/flora/junglebush/b, -/mob/living/carbon/monkey, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/template_noop) "j" = ( /obj/structure/flora/grass/jungle, -/mob/living/carbon/monkey, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/template_noop) "k" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 440269385c344..20cfe50eef0d7 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -18,10 +18,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"ak" = ( -/obj/machinery/vending/boozeomat/syndicate_access, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) "ap" = ( /obj/machinery/light/small{ dir = 1 @@ -42,12 +38,38 @@ "as" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"aF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"ax" = ( +/obj/effect/turf_decal/box/white/corners{ dir = 8 }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) +/obj/structure/closet/crate, +/obj/item/storage/box/stockparts/deluxe, +/obj/item/storage/box/stockparts/deluxe, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/circuitboard/machine/gibber, +/obj/item/circuitboard/machine/deep_fryer, +/obj/item/circuitboard/machine/cell_charger, +/obj/item/circuitboard/machine/smoke_machine, +/obj/item/storage/part_replacer/cargo, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ay" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/sign/warning/fire{ + pixel_x = 32 + }, +/obj/structure/closet/emcloset/anchored, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/flashlight/seclite, +/obj/item/clothing/mask/gas, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "aL" = ( /turf/closed/wall/mineral/plastitanium/explosive, /area/ruin/unpowered/syndicate_lava_base/testlab) @@ -60,158 +82,158 @@ /obj/machinery/chem_dispenser/fullupgrade, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"aP" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/rag{ - pixel_x = -4; - pixel_y = 9 +"aN" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/science) +"aS" = ( +/obj/effect/spawner/structure/window/plastitanium, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndiwindow"; + name = "Syndicate Research Experimentation Shutters" }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"aU" = ( +/obj/effect/spawner/structure/window/plastitanium, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndiwindow"; + name = "Syndicate Research Experimentation Shutters" }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"bf" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 5; - pixel_y = -2 +/turf/open/floor/iron/white/side{ + dir = 1 }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"bg" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom{ - freerange = 1; - name = "Syndicate Radio Intercom" +/area/ruin/unpowered/syndicate_lava_base/main) +"bh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"bp" = ( +/obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"bs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/medical/syndicate_access, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump/on{ + target_pressure = 4500 }, -/turf/open/floor/iron/white/side, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"bv" = ( -/obj/machinery/air_sensor{ - frequency = 1442; - id_tag = "Syndicate_Construction_o2_sensor" +/obj/machinery/airlock_sensor/incinerator_syndicatelava{ + pixel_x = 22 }, -/turf/open/floor/engine/o2, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/engineering) +"bw" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate, +/obj/item/multitool, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) "bA" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"bD" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"bE" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/firealarm/directional/west, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -30 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"bR" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +"bI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"bS" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" +/area/ruin/unpowered/syndicate_lava_base/engineering) +"bM" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava{ + dir = 4 }, -/turf/open/floor/iron/white/side{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ch" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"bN" = ( +/mob/living/carbon/human/species/monkey, +/obj/merge_conflict_marker{ + name = "---Merge Conflict Marker---"; + + desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ci" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/science) +"bQ" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"cn" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 +/obj/machinery/button/door{ + id = "lavalandsyndi_chemistry"; + name = "Chemistry Blast Door Control"; + pixel_y = 26; + req_access_txt = "150" }, -/obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/l3closet, /obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"cr" = ( -/obj/machinery/door/airlock/hatch{ - name = "Telecommunications"; +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"bT" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/mining/glass{ + name = "Warehouse"; req_access_txt = "150" }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ca" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"cl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/chemistry) "cu" = ( /obj/structure/table/wood, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/sniper_rounds, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"cw" = ( +"cx" = ( +/obj/structure/lattice/catwalk, /obj/structure/railing{ dir = 9 }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) +"cy" = ( +/obj/structure/sign/warning/biohazard, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/science) "cz" = ( /obj/effect/mob_spawn/human/lavaland_syndicate/comms{ @@ -228,6 +250,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) +"cB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) "cG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -244,49 +274,67 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"cI" = ( -/obj/effect/mapping_helpers/no_lava, -/obj/structure/railing{ - dir = 9 +"cP" = ( +/obj/structure/table/wood, +/obj/machinery/light/small, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/syndicate{ + name = "Bar APC"; + pixel_y = -23 }, -/turf/open/floor/plating, -/area/lavaland/surface/outdoors) -"cJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/reagentgrinder{ + pixel_y = 4; + pixel_x = -6 }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"cS" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/mob/living/carbon/monkey{ - faction = list("neutral","Syndicate") +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = 6 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"db" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"cX" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"da" = ( +/obj/machinery/power/apc/syndicate{ + dir = 8; + name = "Chemistry APC"; + pixel_x = -25 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"db" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "dc" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) -"de" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"df" = ( +/obj/effect/mapping_helpers/no_lava, +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/railing/corner{ + dir = 1 }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "di" = ( /obj/machinery/light/small{ dir = 4 @@ -294,15 +342,40 @@ /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) "dj" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"dl" = ( +/obj/machinery/computer/atmos_control/tank{ + dir = 8; + frequency = 1442; + name = "Oxygen Supply Control"; + output_tag = "syndie_lavaland_o2_out"; + sensors = list("syndie_lavaland_o2_sensor"="Tank") + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) +"dm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/modular_fabricator/autolathe/hacked, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/main) +"dt" = ( +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/window/southleft{ + dir = 1; + name = "Chemistry"; + req_access_txt = "150" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/chemistry) "dv" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -444,55 +517,21 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) -"eh" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/science) -"el" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"em" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Science APC"; - pixel_y = 23 - }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 - }, -/obj/item/stack/tile/iron, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) "en" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/vault{ - id_tag = "syndie_lavaland_vault"; - req_access_txt = "150" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "eo" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) +/area/ruin/unpowered/syndicate_lava_base/engineering) "es" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -516,14 +555,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"eA" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) "eD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -539,12 +570,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/cargo) -"eQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) "eS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -604,6 +629,14 @@ }, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) +"eZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/coffee{ + extended_inventory = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "fb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/bin, @@ -629,18 +662,21 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/cargo) "fi" = ( -/obj/effect/mapping_helpers/no_lava, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"fl" = ( -/obj/machinery/light/small{ +/obj/machinery/door/airlock/science{ + req_access_txt = "150"; + name = "Science Lab Interior Airlock" + }, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) "fp" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/effect/decal/cleanable/dirt, @@ -648,31 +684,40 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/chemistry) -"fs" = ( -/obj/machinery/light/small{ - dir = 8 +"fq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/OMinus, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"fr" = ( +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ft" = ( +/obj/effect/turf_decal/box/white/corners, +/obj/structure/closet/crate, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 }, -/turf/open/floor/iron/white/side{ - dir = 8 +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"fu" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/item/reagent_containers/cup/waterbottle/large, +/obj/item/reagent_containers/cup/waterbottle/large, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) "fw" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/firealarm{ @@ -686,49 +731,68 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/cargo) -"fD" = ( -/obj/structure/sign/warning/biohazard, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/science) -"fL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +"fJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"fV" = ( -/obj/structure/table, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"fQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/gloves/combat{ - pixel_y = -6 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 4; - pixel_y = 4 +/obj/effect/turf_decal/tile/red, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"fR" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/clothing/mask/breath{ - pixel_x = -2; - pixel_y = 4 +/obj/machinery/button/door{ + id = "lavalandsyndi"; + name = "Syndicate Experimentation Door Control"; + pixel_y = 25; + req_access_txt = "150"; + pixel_x = -6 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/turf/open/floor/iron/white/side, -/area/ruin/unpowered/syndicate_lava_base/main) -"fW" = ( -/obj/structure/chair, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"fX" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ga" = ( -/obj/structure/table/wood, +/obj/machinery/button/door{ + id = "lavalandsyndiwindow"; + name = "Syndicate Experimentation Window Control"; + pixel_y = 25; + req_access_txt = "150"; + pixel_x = 6 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"fS" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"fT" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"fU" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/structure/chair, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ga" = ( +/obj/structure/table/wood, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/sniper_rounds, /obj/machinery/airalarm/syndicate{ @@ -767,15 +831,6 @@ }, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/cargo) -"ge" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) "gf" = ( /obj/structure/sign/warning/vacuum{ pixel_y = -32 @@ -802,47 +857,23 @@ }, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/cargo) -"gi" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) "gm" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/mob/living/simple_animal/chicken/rabbit{ + faction = list("Syndicate"); + desc = "Just a mildly evil rabbit." }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"gC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"gx" = ( +/obj/machinery/door/airlock/external{ + req_access_txt = "150" }, -/obj/machinery/firealarm/directional/west, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"gN" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/frame/machine, -/obj/machinery/light/small/broken{ - dir = 1 +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "syndi-outpost2" }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/science) +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) "gO" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -887,20 +918,23 @@ "ha" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/main) -"hb" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "syndi-outpost2" - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) "hd" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) +"hh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + name = "Chemistry Lab"; + req_access_txt = "150" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/chemistry) "hi" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -927,21 +961,9 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/cargo) -"hy" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) "hz" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"hA" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/engineering) "hD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -951,21 +973,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/cargo) -"hN" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/ruin/unpowered/syndicate_lava_base/bar) "hO" = ( /turf/closed/wall/mineral/plastitanium/explosive, /area/ruin/unpowered/syndicate_lava_base/dormitories) "hQ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/modular_fabricator/autolathe/hacked, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/main) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "hR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown{ @@ -979,15 +1001,13 @@ }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/main) -"id" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ +"ic" = ( +/obj/structure/chair{ dir = 4 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "if" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -998,6 +1018,15 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) +"im" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "150" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/bar) "ip" = ( /obj/effect/turf_decal/stripes/red/corner, /turf/open/floor/iron, @@ -1007,12 +1036,10 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/main) "ir" = ( -/obj/machinery/door/poddoor{ - id = "lavalandsyndi_cargo" - }, -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) "is" = ( /obj/machinery/light/small{ dir = 1 @@ -1030,28 +1057,29 @@ }, /turf/open/floor/circuit/red, /area/ruin/unpowered/syndicate_lava_base/main) +"iw" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/main) "iz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"iA" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) "iC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"iE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) +"iF" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "syndi-outpost2" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) "iH" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -1073,6 +1101,14 @@ "iN" = ( /turf/closed/wall/mineral/plastitanium/explosive, /area/ruin/unpowered/syndicate_lava_base/main) +"iZ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) "ja" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -1088,56 +1124,32 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"jb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) "jc" = ( /obj/machinery/light/small, /turf/open/floor/circuit/red, /area/ruin/unpowered/syndicate_lava_base/main) +"jd" = ( +/mob/living/carbon/human/species/monkey, +/obj/merge_conflict_marker{ + name = "---Merge Conflict Marker---"; + + desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "jj" = ( /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"jm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) "jn" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "150" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "ju" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/engineering) "jy" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/bar) -"jz" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/deepfryer, -/turf/open/floor/iron/white, -/area/ruin/unpowered/syndicate_lava_base/bar) "jO" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 25 @@ -1178,41 +1190,41 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) +"kq" = ( +/obj/structure/sign/warning/vacuum{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "ks" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"kt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/item/soap/syndie, -/obj/item/mop, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) "kH" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) -"kJ" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -30 - }, -/obj/structure/bookcase/random, -/obj/machinery/light/small, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) "kL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) +/area/ruin/unpowered/syndicate_lava_base/engineering) "kQ" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/medbay) @@ -1242,20 +1254,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/engineering) -"lx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ +"li" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "ly" = ( /obj/structure/chair/stool/bar/directional/east, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) +"lA" = ( +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "lD" = ( /obj/effect/mob_spawn/human/lavaland_syndicate{ dir = 4 @@ -1277,25 +1289,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) -"lP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/main) -"lU" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 +"lL" = ( +/obj/structure/table/wood, +/obj/item/lighter{ + pixel_x = 7; + pixel_y = 6 }, -/obj/structure/chair, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "lX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1319,15 +1320,17 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) "ml" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/toy/cards/deck/cas, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = 6; - pixel_y = 8 +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "mn" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/telecomms) @@ -1342,6 +1345,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) +"my" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "O2 to Incinerator"; + target_pressure = 4500 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "mM" = ( /turf/open/floor/circuit/green, /area/ruin/unpowered/syndicate_lava_base/telecomms) @@ -1356,50 +1368,38 @@ "mT" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"mV" = ( -/obj/structure/table/reinforced, -/obj/effect/decal/cleanable/dirt, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) "nf" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/engineering) -"nj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +"np" = ( +/turf/open/floor/engine/n2, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nt" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 5 }, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"nu" = ( /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"nl" = ( -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi_telecomms" +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"nv" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/plus, +/obj/effect/decal/cleanable/dirt, +/obj/item/pipe_dispenser{ + pixel_y = 12 }, -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"nm" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) -"nr" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) "nE" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1430,14 +1430,36 @@ /obj/item/pickaxe, /turf/open/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"oq" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Bar" +"om" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/item/stack/sheet/wood, +/obj/item/crowbar, +/obj/item/screwdriver, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/bar) +/area/ruin/unpowered/syndicate_lava_base/main) +"on" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"oq" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) "ot" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1525,50 +1547,12 @@ /obj/machinery/door/poddoor/incinerator_syndicatelava_main, /turf/open/floor/engine/vacuum, /area/ruin/unpowered/syndicate_lava_base/engineering) -"oJ" = ( -/obj/effect/spawner/structure/window/plastitanium, -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndiwindow"; - name = "Syndicate Research Experimentation Shutters" - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"oO" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) "oP" = ( /obj/structure/sign/departments/chemistry, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/testlab) -"oR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) "oX" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"oY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) "ph" = ( @@ -1583,253 +1567,290 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) -"pj" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/frame/machine, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/science) -"pl" = ( -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi_bar" +"pn" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 5 }, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"po" = ( /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) -"pn" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"pq" = ( -/turf/open/floor/iron/white, -/area/ruin/unpowered/syndicate_lava_base/bar) -"pw" = ( -/turf/open/floor/iron/stairs/left{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/science) -"pz" = ( -/obj/machinery/door/airlock/maintenance, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"py" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"pD" = ( -/obj/item/storage/box/lights/bulbs, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/clothing/head/utility/welding, -/obj/item/stock_parts/cell/high/plus, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"pK" = ( -/obj/machinery/air_sensor{ +"pA" = ( +/obj/item/book/manual/wiki/xenoarchaeology, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/science) +"pC" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/atmos_control/tank{ + dir = 8; frequency = 1442; - id_tag = "syndie_lavaland_n2_sensor" + name = "Toxins Supply Control"; + output_tag = "syndie_lavaland_tox_out"; + sensors = list("syndie_lavaland_tox_sensor"="Tank") }, -/turf/open/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"pM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/area/ruin/unpowered/syndicate_lava_base/engineering) "pQ" = ( /obj/structure/sign/warning/explosives/alt{ pixel_x = 32 }, /turf/open/floor/circuit/red, /area/ruin/unpowered/syndicate_lava_base/main) -"pR" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, +"pU" = ( +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/food/chocolatebar, +/obj/structure/closet/secure_closet/freezer/fridge/open, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"pT" = ( -/obj/machinery/power/apc/syndicate{ - dir = 8; - name = "Chemistry APC"; - pixel_x = -25 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ql" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/merge_conflict_marker{ + name = "---Merge Conflict Marker---"; + + desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." }, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/mob/living/carbon/monkey{ + faction = list("neutral","Syndicate") }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"pW" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"pY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/no_lava, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"pZ" = ( +/area/ruin/unpowered/syndicate_lava_base/testlab) +"qs" = ( +/obj/machinery/light/small, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"ql" = ( -/obj/effect/mapping_helpers/no_lava, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"qn" = ( +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"qw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"qp" = ( -/turf/open/floor/iron/stairs/right{ - dir = 4 +"qy" = ( +/obj/structure/railing{ + dir = 9 }, -/area/ruin/unpowered/syndicate_lava_base/science) -"qr" = ( -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"qB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"qC" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/frame/machine, +/obj/machinery/light/small/broken{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/science) "qG" = ( /obj/structure/sign/warning/explosives/alt{ pixel_x = -32 }, /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) -"qH" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +"qN" = ( +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_arrivals" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"qO" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"qK" = ( -/obj/structure/closet/radiation, -/obj/structure/extinguisher_cabinet{ - pixel_y = 28 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"qQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) "qR" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) +"qS" = ( +/obj/machinery/door/airlock{ + name = "Cabin 4" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"qV" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "qZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/randomvend/snack{ + hacked = 1 }, -/turf/open/floor/iron/white/side{ - dir = 1 +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"rf" = ( +/obj/machinery/airalarm/syndicate{ + pixel_y = -24 }, -/area/ruin/unpowered/syndicate_lava_base/main) -"rn" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/white/side, -/area/ruin/unpowered/syndicate_lava_base/main) -"rw" = ( -/turf/open/floor/plating, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"rp" = ( +/obj/structure/closet/firecloset/full{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) -"rx" = ( -/obj/structure/table/wood, -/obj/machinery/light/small, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - name = "Bar APC"; - pixel_y = -23 +"ry" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/machinery/reagentgrinder{ - pixel_y = 4; - pixel_x = -6 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"rz" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/item/flashlight{ + pixel_x = -3; + pixel_y = 3 }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = 6 +/obj/item/flashlight, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"rC" = ( +/obj/item/storage/box/lights/bulbs, +/obj/item/stack/rods{ + amount = 50 }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/item/clothing/head/utility/welding, +/obj/item/stock_parts/cell/high/plus, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"rD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/wood, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/item/clothing/head/utility/welding, +/obj/item/weldingtool/largetank, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"rL" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) -"rC" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, +"rQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Engineering APC"; + pixel_y = 23 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "150" +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/obj/effect/turf_decal/stripes/closeup, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"rF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"rS" = ( -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) +/area/ruin/unpowered/syndicate_lava_base/engineering) "rX" = ( /obj/structure/toilet{ pixel_y = 18 @@ -1849,154 +1870,145 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"sd" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 8 +"rY" = ( +/obj/effect/mapping_helpers/no_lava, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"se" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "O2 to Incinerator"; - target_pressure = 4500 +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"rZ" = ( +/obj/machinery/door/airlock/hatch{ + name = "Monkey Pen"; + req_access_txt = "150" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ss" = ( -/obj/machinery/vending/cigarette{ - extended_inventory = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"sB" = ( -/obj/structure/table/reinforced, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/kitchen/rollingpin, -/obj/item/knife/kitchen{ - pixel_x = 6 - }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"sS" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"sY" = ( +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"sa" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 + icon_state = "1-4" }, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"sZ" = ( -/obj/machinery/light/small{ +"sc" = ( +/obj/structure/rack{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"ta" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ +/obj/item/storage/belt/medical, +/obj/effect/decal/cleanable/dirt, +/obj/item/crowbar, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/neck/stethoscope, +/obj/item/defibrillator/loaded, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"tg" = ( +/turf/open/floor/iron/white/side, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"st" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small/broken{ +/obj/item/surgicaldrill, +/obj/item/cautery, +/obj/effect/decal/cleanable/dirt, +/obj/item/blood_filter, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/science) -"tq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/turf/open/floor/iron/white/side, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"su" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/science) -"ts" = ( +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"sw" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"tv" = ( -/obj/machinery/door/poddoor{ - id = "lavalandsyndi_chemistry" - }, -/obj/effect/spawner/structure/window/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"sK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"tz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/chair/stool{ - dir = 8 +/area/ruin/unpowered/syndicate_lava_base/science) +"sL" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"tK" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/dark, +/turf/closed/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"tM" = ( +"sT" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/door/airlock/engineering{ + name = "Engineering"; + req_access_txt = "150" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/closeup, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"sU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/clothing/gloves/artifact_pinchers, +/turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/science) -"tV" = ( -/mob/living/simple_animal/chicken/rabbit{ - faction = list("Syndicate"); - desc = "Just a mildly evil rabbit." +"tk" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/frame/machine, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/science) +"tp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"tr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8; + frequency = 1442; + id_tag = "syndie_lavaland_n2_out"; + name = "nitrogen out" }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ub" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{ - req_access = null +/turf/open/floor/engine/n2, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"tE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/iron/white, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"tF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/chair/stool{ + dir = 8 + }, +/turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) "uc" = ( /obj/effect/mob_spawn/human/lavaland_syndicate{ @@ -2008,72 +2020,39 @@ }, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"ue" = ( -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"ug" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/science, -/obj/item/xenoartifact, -/obj/item/xenoartifact, -/obj/item/xenoartifact, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/science) -"uk" = ( -/obj/structure/closet/emcloset, -/obj/machinery/light/small{ - dir = 4 +"uh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"ul" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"un" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"uq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"uo" = ( -/obj/machinery/airalarm/syndicate{ - pixel_y = -24 - }, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"ur" = ( +/obj/machinery/computer/camera_advanced/syndie, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 5 }, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"uy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"uA" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - dir = 4; - name = "emergency shower"; - desc = "The HS-452. Installed recently by the DonkCo Hygiene Division." - }, -/obj/structure/sign/warning/radiation/rad_area{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/chair{ + dir = 8 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"uz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"uC" = ( /obj/machinery/light/small{ dir = 1 }, @@ -2081,90 +2060,103 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"uD" = ( -/obj/effect/mapping_helpers/no_lava, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/structure/railing/corner{ +/obj/machinery/airalarm/syndicate{ + pixel_y = 24; dir = 1 }, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"uH" = ( +"uE" = ( +/obj/machinery/light/small, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"uJ" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "syndi-outpost1" +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/merge_conflict_marker{ + name = "---Merge Conflict Marker---"; + + desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"uL" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/science) -"uM" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/light/small, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt, +/mob/living/carbon/monkey{ + faction = list("neutral","Syndicate") }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"uH" = ( +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"uN" = ( +/obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"uQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 8; - volume_rate = 200 +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"uP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner{ + dir = 1 }, -/turf/open/floor/plating{ - baseturfs = /turf/open/lava/smooth/lava_land_surface; - initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300" +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) +"uQ" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 }, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"va" = ( -/obj/machinery/door/airlock/hatch{ - name = "Telecommunications Control"; +"uU" = ( +/obj/machinery/button/door{ + id = "lavalandsyndi_bar"; + name = "Bar Blast Door Control"; + pixel_y = 26; req_access_txt = "150" }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"vb" = ( +/area/ruin/unpowered/syndicate_lava_base/bar) +"vf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"ve" = ( +"vg" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/science) +"vh" = ( +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"vm" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"vg" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) "vp" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -2172,38 +2164,45 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "vq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/computer/shuttle_flight{ - dir = 1; - name = "syndicate shuttle dock terminal" +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"vw" = ( +/obj/machinery/light/small, +/obj/structure/extinguisher_cabinet{ + pixel_y = -29 }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"vv" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable/yellow, +/obj/machinery/power/apc/syndicate{ + dir = 4; + name = "Medbay APC"; + pixel_x = 24 }, -/obj/machinery/oven, -/turf/open/floor/iron/white/airless, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) "vA" = ( -/obj/machinery/griddle, -/turf/open/floor/iron/white/airless, -/area/ruin/unpowered/syndicate_lava_base/bar) -"vG" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ - pixel_x = -3 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"vI" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/toy/cards/deck/syndicate{ - pixel_x = 6; - pixel_y = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) "vJ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27; @@ -2223,14 +2222,6 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) -"vK" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) "vT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -2238,47 +2229,32 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"vY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/coffee{ - extended_inventory = 1 +"vW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"wb" = ( /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"we" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/airalarm/syndicate{ + dir = 4; + pixel_x = 24 }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"wn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"wq" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/area/ruin/unpowered/syndicate_lava_base/engineering) +"wk" = ( +/turf/open/floor/engine/o2, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"wu" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) "wB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/red/line{ @@ -2288,72 +2264,80 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/main) "wG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) +/obj/machinery/air_sensor{ + frequency = 1442; + id_tag = "syndie_lavaland_n2_sensor" + }, +/turf/open/floor/engine/n2, +/area/ruin/unpowered/syndicate_lava_base/engineering) "wK" = ( -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndiwindow"; - name = "Syndicate Research Experimentation Shutters" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/obj/item/soap/syndie, +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"wN" = ( +/obj/structure/closet/emcloset, +/obj/machinery/light/small{ + dir = 4 }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"wP" = ( +/obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/spawner/structure/window/plastitanium, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"wL" = ( -/obj/machinery/sleeper/syndie{ +/area/ruin/unpowered/syndicate_lava_base/engineering) +"wV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"wM" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable/yellow, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/airalarm/syndicate{ - pixel_y = -24 +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"wY" = ( +/obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 6 }, -/obj/structure/floodlight_frame, -/turf/open/floor/iron, +/obj/structure/closet/crate/science, +/obj/item/xenoartifact, +/obj/item/xenoartifact, +/obj/item/xenoartifact, +/turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/science) -"wT" = ( +"xa" = ( +/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"xa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch{ - name = "Experimentation Lab"; - req_access_txt = "150" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"xl" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/chair{ +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"xc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) "xn" = ( /obj/machinery/light/small, /obj/structure/filingcabinet/chestdrawer, @@ -2363,109 +2347,46 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) -"xq" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/science{ - pixel_y = 6; - pixel_x = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/science) -"xC" = ( -/obj/effect/spawner/structure/window/plastitanium, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndiwindow"; - name = "Syndicate Research Experimentation Shutters" - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"xH" = ( -/obj/structure/sign/warning/vacuum{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"xR" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) -"xU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet/grimy, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"ya" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"yg" = ( -/obj/machinery/sleeper/syndie{ - dir = 4 +"xs" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) -"yh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +"xA" = ( /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"yr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"xF" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"yx" = ( -/obj/machinery/atmospherics/miner/nitrogen, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/engine/n2, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) -"yA" = ( -/obj/machinery/air_sensor{ +"xH" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -30 + }, +/obj/structure/bookcase/random, +/obj/machinery/light/small, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"xK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 8; frequency = 1442; - id_tag = "syndie_lavaland_tox_sensor" + id_tag = "syndie_lavaland_o2_out"; + name = "oxygen out" }, -/turf/open/floor/engine/plasma, +/turf/open/floor/engine/o2, /area/ruin/unpowered/syndicate_lava_base/engineering) -"yG" = ( -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"yK" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - pixel_y = 24; - dir = 1 - }, -/obj/structure/closet/l3closet, -/obj/machinery/light/small/broken{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"yM" = ( +"xN" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -2481,6 +2402,80 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) +"yb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi"; + name = "Syndicate Research Experimentation Shutters" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/door/airlock/hatch{ + heat_proof = 1; + name = "Experimentation Room"; + req_access_txt = "150" + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"yd" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"yl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"yu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood{ + broken = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"yA" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"yL" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"yM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"yN" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/dormitories) "yR" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -2495,30 +2490,6 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) -"yW" = ( -/obj/effect/turf_decal/box/white/corners, -/obj/structure/closet/crate, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/waterbottle/large, -/obj/item/reagent_containers/cup/waterbottle/large, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) "yY" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -2528,16 +2499,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"za" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +"zc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) "zd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -2545,67 +2514,108 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"ze" = ( -/turf/open/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"zf" = ( -/turf/open/floor/engine/o2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"zn" = ( -/obj/machinery/light/small{ - dir = 4 +"zg" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/components/binary/pump/on{ - target_pressure = 4500 +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"zh" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava{ + pixel_x = -8; + pixel_y = -26 }, -/obj/machinery/airlock_sensor/incinerator_syndicatelava{ - pixel_x = 22 +/obj/machinery/button/ignition/incinerator/syndicatelava{ + pixel_x = 6; + pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"zi" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "syndi-outpost1" + }, +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"zk" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Science APC"; + pixel_y = 23 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"zp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ +/obj/item/stack/tile/iron, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"zm" = ( +/obj/effect/mapping_helpers/no_lava, +/obj/structure/railing{ dir = 9 }, -/turf/open/floor/wood{ - broken = 1 +/turf/open/floor/plating, +/area/lavaland/surface/outdoors) +"zn" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 }, -/area/ruin/unpowered/syndicate_lava_base/bar) -"zs" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-8" }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"zA" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"zs" = ( +/obj/machinery/door/airlock{ + name = "Cabin 3" }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"zD" = ( -/obj/structure/chair{ - dir = 1 +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"zt" = ( +/obj/machinery/door/airlock/hatch{ + name = "Telecommunications"; + req_access_txt = "150" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"zI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"zx" = ( +/obj/machinery/vending/cigarette{ + extended_inventory = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"zA" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/area/ruin/unpowered/syndicate_lava_base/main) "zK" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -2620,96 +2630,79 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"zL" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/obj/effect/decal/cleanable/dirt, -/obj/item/pipe_dispenser{ - pixel_y = 12 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +"zO" = ( +/obj/effect/mapping_helpers/no_lava, +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) "zS" = ( -/obj/structure/closet/emcloset/anchored, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Ac" = ( -/obj/machinery/light/small, -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes/syndicate{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/monkeycubes/syndicate{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Ak" = ( -/obj/effect/turf_decal/stripes/corner{ +/area/ruin/unpowered/syndicate_lava_base/science) +"zW" = ( +/obj/machinery/light/small{ dir = 1 }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Al" = ( -/obj/machinery/door/airlock{ - name = "Cabin 2" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) +/area/ruin/unpowered/syndicate_lava_base/main) +"Am" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/processor, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) "An" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 5 +/obj/machinery/light/small{ + dir = 8 }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood/OMinus, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 }, /turf/open/floor/iron/white/side{ - dir = 5 + dir = 8 }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"Aq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) +/area/ruin/unpowered/syndicate_lava_base/medbay) "Au" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"Ax" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/computer/monitor/secret, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +"Aw" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) "Az" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -2728,28 +2721,22 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) -"AK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +"AJ" = ( +/obj/structure/railing{ dir = 8 }, -/turf/open/floor/iron/white/side, -/area/ruin/unpowered/syndicate_lava_base/main) -"AQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/no_lava, +/turf/open/floor/plating, +/area/lavaland/surface/outdoors) +"AM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/science, +/obj/item/xenoartifact, +/obj/item/xenoartifact, +/obj/item/xenoartifact, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/science) "AR" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -2759,135 +2746,163 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "AU" = ( -/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"Bi" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"Bp" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/science) +"AY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/table, -/obj/item/storage/firstaid/fire, -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 5 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Bt" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Engineering APC"; - pixel_y = 23 +/obj/machinery/power/apc/syndicate{ + dir = 1; + name = "Arrival Hallway APC"; + pixel_y = 23 }, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"BA" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood{ - broken = 1 + icon_state = "0-4" }, -/area/ruin/unpowered/syndicate_lava_base/bar) -"BC" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"BG" = ( +"Ba" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"Bc" = ( +/obj/effect/mapping_helpers/no_lava, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"Be" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"Bj" = ( +/obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"BN" = ( +"Bq" = ( /obj/structure/chair{ - dir = 4 + dir = 1 }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"BS" = ( -/obj/structure/table/wood, -/obj/item/lighter{ - pixel_x = 7; - pixel_y = 6 +/area/ruin/unpowered/syndicate_lava_base/testlab) +"Bw" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24; + dir = 1 + }, +/obj/structure/closet/l3closet, +/obj/machinery/light/small/broken{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"BW" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"BZ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/area/ruin/unpowered/syndicate_lava_base/main) +"Bx" = ( +/obj/structure/closet/secure_closet/medical1{ + req_access = null; + req_access_txt = "150" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"Cc" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 10 +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"By" = ( +/obj/structure/table/reinforced, +/obj/item/scalpel, +/obj/item/circular_saw{ + pixel_y = 9 }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"Cf" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/button/door{ - id = "lavalandsyndi_chemistry"; - name = "Chemistry Blast Door Control"; - pixel_y = 26; - req_access_txt = "150" - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/l3closet, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white/side{ dir = 4 }, -/turf/open/floor/iron/white/side{ - dir = 1 +/area/ruin/unpowered/syndicate_lava_base/medbay) +"Bz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"BB" = ( +/obj/structure/sign/warning/vacuum{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"BC" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"BO" = ( +/turf/open/floor/wood{ + broken = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"BP" = ( +/obj/machinery/griddle, +/turf/open/floor/iron/white/airless, +/area/ruin/unpowered/syndicate_lava_base/bar) +"BS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/chair/stool/bar, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"BU" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/science) +"Ci" = ( +/obj/machinery/door/airlock{ + name = "Cabin 2" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) "Cn" = ( /obj/structure/chair/office{ dir = 4 @@ -2896,136 +2911,145 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) "Co" = ( -/obj/structure/closet/firecloset/full{ - anchored = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"Cp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) +/area/ruin/unpowered/syndicate_lava_base/engineering) "Cq" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"Cr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Arrival Hallway APC"; - pixel_y = 23 - }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "1-8" }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"Cs" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/shower{ + pixel_y = 14; + desc = "The HS-452. Installed recently by the DonkCo Hygiene Division." }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Cx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/turf/open/floor/noslip/standard, +/area/ruin/unpowered/syndicate_lava_base/main) +"Cu" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"CL" = ( -/obj/structure/reagent_dispensers/beerkeg, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"CB" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/turf/open/floor/iron/white/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"CF" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 10 }, -/turf/open/floor/wood{ - broken = 1 +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/science) +"CK" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/machinery/computer/monitor/secret, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "CP" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) +"CQ" = ( +/turf/open/floor/engine/plasma, +/area/ruin/unpowered/syndicate_lava_base/engineering) "CT" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 1 - }, +/obj/structure/closet/crate/bin, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"CU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"CZ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"De" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 +/area/ruin/unpowered/syndicate_lava_base/main) +"CV" = ( +/obj/structure/sign/warning/vacuum{ + pixel_x = -32 }, -/turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors) -"Dh" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Dp" = ( -/obj/item/book/manual/wiki/xenoarchaeology, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/science) -"Dv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"DA" = ( +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"CY" = ( +/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit/radsuit, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) -"DF" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 5 +"CZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Dt" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"DI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"DK" = ( -/obj/machinery/atmospherics/miner/plasma, -/obj/machinery/light/small, -/turf/open/floor/engine/plasma, /area/ruin/unpowered/syndicate_lava_base/engineering) +"DA" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"DD" = ( +/obj/machinery/door/window/southleft{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Bar" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood{ + broken = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/bar) +"DF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) "DL" = ( /obj/structure/sign/warning/explosives/alt{ pixel_x = 32 @@ -3036,36 +3060,107 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) -"DO" = ( -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/chemistry) "DQ" = ( -/obj/structure/table/reinforced, -/obj/item/retractor, -/obj/item/hemostat, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/airalarm/syndicate{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/randomvend/cola{ + hacked = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"DR" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron/white/side{ - dir = 6 + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"DV" = ( +/obj/structure/table, +/obj/item/storage/box/syringes, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/gun/syringe/syndicate, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 9 }, /area/ruin/unpowered/syndicate_lava_base/medbay) -"DS" = ( +"DX" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Ez" = ( -/obj/machinery/door/airlock{ - name = "Cabin 1" +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/firedoor, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) +"En" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + dir = 1; + frequency = 1442; + id_tag = "syndie_lavaland_tox_out"; + name = "toxin out" + }, +/turf/open/floor/engine/plasma, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Eo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/science) +"Eq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Er" = ( +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/stack/sheet/mineral/plastitanium{ + amount = 30 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/circuitboard/machine/thermomachine, +/obj/item/analyzer/ranged, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Et" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) "EA" = ( /obj/machinery/light/small{ dir = 4 @@ -3074,28 +3169,48 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) "EB" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"EE" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/sign/warning/fire{ + pixel_x = 32 }, +/obj/structure/closet/emcloset/anchored, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/flashlight/seclite, +/obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) -"EL" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/sign/barsign{ - pixel_y = -32; - req_access = null - }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"EH" = ( /obj/effect/turf_decal/siding/wood{ - dir = 10 + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 }, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) +"EI" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/structure/frame/computer{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) "EP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3103,10 +3218,24 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) -"ET" = ( +"ER" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"EV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/main) "EZ" = ( /obj/machinery/door/airlock/external{ req_access_txt = "150" @@ -3115,10 +3244,26 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Fr" = ( -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/bar) +"Fi" = ( +/obj/effect/turf_decal/box/white/corners, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Fj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) "Fs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/red/line{ @@ -3129,77 +3274,84 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/main) -"Ft" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" +"Fy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "Experimentation Lab"; + req_access_txt = "150" }, /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/closeup, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/white/side{ - dir = 4 +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"FE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"FC" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/science) +"FK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ - dir = 1 + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = -24 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"FG" = ( -/obj/machinery/button/door{ - id = "lavalandsyndi_bar"; - name = "Bar Blast Door Control"; - req_access_txt = "150"; - pixel_x = -25 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"FK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"FS" = ( -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi_virology" - }, -/obj/effect/spawner/structure/window/plastitanium, -/obj/machinery/door/poddoor{ - id = "lavalandsyndi_science" - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) "FX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/chair/stool/bar/directional/east, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) -"Gh" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +"Gc" = ( +/obj/machinery/computer/atmos_control/tank{ + dir = 8; + frequency = 1442; + name = "Nitrogen Supply Control"; + output_tag = "syndie_lavaland_n2_out"; + sensors = list("syndie_lavaland_n2_sensor"="Tank") + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/toolcloset{ - anchored = 1 +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/item/holosign_creator/atmos, -/obj/item/storage/belt/utility/full, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) +"Gg" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "Gi" = ( /obj/effect/mob_spawn/human/lavaland_syndicate{ dir = 4 }, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) +"Gj" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) "Gk" = ( /obj/machinery/light/small{ dir = 4 @@ -3209,7 +3361,18 @@ }, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"Gp" = ( +"Gq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Gr" = ( /obj/machinery/light/small{ dir = 4 }, @@ -3220,55 +3383,55 @@ /obj/machinery/portable_thermomachine/atmos, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) -"Gt" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"Gs" = ( +/obj/machinery/air_sensor{ + frequency = 1442; + id_tag = "syndie_lavaland_tox_sensor" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, +/turf/open/floor/engine/plasma, /area/ruin/unpowered/syndicate_lava_base/engineering) -"GD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, +"Gu" = ( +/obj/structure/table/reinforced, +/obj/item/retractor, +/obj/item/hemostat, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"GE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Dormitories" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white/side{ + dir = 6 }, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"Gw" = ( +/obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/mining/glass{ + name = "Warehouse"; + req_access_txt = "150" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"GG" = ( -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) +"Gy" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "GH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/door/airlock/hatch{ + name = "Telecommunications Control"; + req_access_txt = "150" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/item/stack/sheet/wood, -/obj/item/crowbar, -/obj/item/screwdriver, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) "GJ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -3276,6 +3439,13 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) +"GO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "GT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -3294,142 +3464,92 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"He" = ( -/obj/effect/turf_decal/box/white/corners, -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/fire{ - pixel_x = 3; - pixel_y = 3 +"Hg" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 }, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/regular{ - pixel_x = -3; - pixel_y = -3 +/obj/item/storage/firstaid/regular, +/obj/structure/table_frame, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"Hj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Hl" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/airalarm/syndicate{ + dir = 8; + pixel_x = -24 }, +/obj/structure/chair/stool, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"Hi" = ( +/area/ruin/unpowered/syndicate_lava_base/bar) +"Hn" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Hj" = ( -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Hk" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +"Hu" = ( +/obj/machinery/door/window/westright{ + name = "Kitchen" }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/ruin/unpowered/syndicate_lava_base/bar) -"Hl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +"Hx" = ( +/obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Hp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/item/reagent_containers/dropper, +/obj/effect/decal/cleanable/dirt, +/obj/item/screwdriver/nuke{ + pixel_y = 18 }, +/obj/machinery/airalarm/syndicate{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"Hz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) "HA" = ( -/obj/effect/turf_decal/box/white/corners{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"HJ" = ( +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/closet/crate/secure/weapon{ - req_access_txt = "150" +/obj/machinery/deepfryer, +/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/bar) +"HO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/item/ammo_box/c10mm{ - pixel_y = 6 - }, -/obj/item/ammo_box/c10mm, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/m10mm{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"HC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"HD" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"HE" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/obj/structure/closet/crate, -/obj/item/storage/box/stockparts/deluxe, -/obj/item/storage/box/stockparts/deluxe, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/circuitboard/machine/gibber, -/obj/item/circuitboard/machine/deep_fryer, -/obj/item/circuitboard/machine/cell_charger, -/obj/item/circuitboard/machine/smoke_machine, -/obj/item/storage/part_replacer/cargo, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) -"HK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Chemistry Lab"; - req_access_txt = "150" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/white, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"HT" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/door/airlock/science{ - req_access_txt = "150"; - name = "Science Lal Exterior Airlock" - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) "HX" = ( /obj/machinery/light/small{ dir = 8 @@ -3437,23 +3557,26 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"If" = ( -/obj/structure/sign/warning/xeno_mining{ - pixel_x = -32 +"HZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/sign/warning/fire{ - pixel_x = 32 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Ig" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +"Ih" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/button/door{ + id = "lavalandsyndi_telecomms"; + name = "Telecomms Blast Door Control"; + pixel_x = 26; + req_access_txt = "150"; + pixel_y = 25 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) "In" = ( /obj/machinery/light/small{ dir = 8 @@ -3482,65 +3605,41 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) -"It" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"IA" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/item/stack/tile/iron, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) -"IE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ +"Iq" = ( +/obj/machinery/light/small{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"IH" = ( -/obj/structure/chair, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"IK" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27; + pixel_y = 1 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"IN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"It" = ( +/obj/structure/closet/secure_closet/medical1{ + req_access = null; + req_access_txt = "150" }, -/obj/machinery/power/terminal{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/beakers/bluespace, +/obj/item/storage/box/beakers/bluespace, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-2" +/turf/open/floor/iron/white/side{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "2-8" +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"IG" = ( +/obj/machinery/atmospherics/miner/nitrogen, +/obj/machinery/light/small{ + dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, -/obj/item/clothing/head/utility/welding, -/obj/item/weldingtool/largetank, -/turf/open/floor/plating, +/turf/open/floor/engine/n2, /area/ruin/unpowered/syndicate_lava_base/engineering) "IO" = ( /obj/structure/chair{ @@ -3555,505 +3654,509 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) "IR" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" +/obj/structure/closet/crate, +/obj/item/vending_refill/snack{ + pixel_x = -3; + pixel_y = 3 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"IV" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 +/obj/item/vending_refill/snack{ + pixel_x = -3; + pixel_y = 3 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"Jm" = ( -/obj/machinery/computer/turbine_computer{ - dir = 1; - id = "syndie_lavaland_incineratorturbine" +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/cola, +/obj/effect/spawner/lootdrop/donkpockets{ + pixel_x = -4; + pixel_y = 6 }, -/obj/machinery/button/door/incinerator_vent_syndicatelava_main{ - pixel_x = 6; - pixel_y = -24 +/obj/effect/spawner/lootdrop/donkpockets{ + pixel_y = 3; + pixel_x = -1 }, -/obj/machinery/button/door/incinerator_vent_syndicatelava_aux{ - pixel_x = -6; - pixel_y = -24 +/obj/effect/spawner/lootdrop/donkpockets{ + pixel_x = 2 }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"IV" = ( +/obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ +/obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Js" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"Ju" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"Jv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8; - frequency = 1442; - id_tag = "syndie_lavaland_n2_out"; - name = "nitrogen out" - }, -/turf/open/floor/engine/n2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Jw" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) -"Jz" = ( -/turf/open/floor/wood{ - broken = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/bar) -"JA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"JI" = ( -/obj/effect/decal/cleanable/dirt, +"IW" = ( +/obj/effect/turf_decal/stripes/corner, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"JM" = ( +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"IX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"JN" = ( -/obj/machinery/telecomms/relay/preset/ruskie{ - use_power = 0 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"JU" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/area/ruin/unpowered/syndicate_lava_base/testlab) +"Jc" = ( +/obj/structure/closet/radiation, +/obj/structure/extinguisher_cabinet{ + pixel_y = 28 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"JW" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"Kc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/science) +"Je" = ( +/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Jp" = ( +/obj/structure/disposaloutlet{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) -"Kd" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "150" - }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "syndi-outpost2" +"Jq" = ( +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndiwindow"; + name = "Syndicate Research Experimentation Shutters" }, +/obj/effect/spawner/structure/window/plastitanium, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"Kh" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/storage/belt/medical, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"Jz" = ( +/obj/structure/table/optable, +/obj/item/surgical_drapes, /obj/effect/decal/cleanable/dirt, -/obj/item/crowbar, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/neck/stethoscope, -/obj/item/defibrillator/loaded, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white/side{ + dir = 4 }, -/turf/open/floor/iron/white/side, /area/ruin/unpowered/syndicate_lava_base/medbay) -"Ku" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"KA" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"KB" = ( -/obj/machinery/button/door{ - id = "lavalandsyndi_bar"; - name = "Bar Blast Door Control"; - pixel_y = 26; - req_access_txt = "150" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"KE" = ( +"JC" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"JL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/firealarm/directional/west, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"KP" = ( -/obj/structure/table, -/obj/machinery/microwave, -/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"JM" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"JN" = ( +/obj/machinery/telecomms/relay/preset/ruskie{ + use_power = 0 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"JP" = ( +/turf/closed/wall/mineral/plastitanium/explosive, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"JU" = ( +/obj/machinery/vending/boozeomat/syndicate_access, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) -"KU" = ( -/obj/machinery/computer/camera_advanced/syndie, +"JW" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"Lc" = ( -/obj/structure/sign/warning/vacuum{ - pixel_x = -32 - }, +"Ki" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Ku" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ dir = 1 }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Lg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/structure/sign/barsign{ + pixel_y = -32; + req_access = null }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Lj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Kx" = ( +/obj/structure/closet/emcloset/anchored, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/main) -"Ll" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/structure/closet/firecloset/full{ - anchored = 1 - }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"Lo" = ( -/obj/structure/closet/crate, -/obj/item/vending_refill/snack{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/vending_refill/snack{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/vending_refill/coffee, -/obj/item/vending_refill/cola, -/obj/effect/spawner/lootdrop/donkpockets{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/effect/spawner/lootdrop/donkpockets{ - pixel_y = 3; - pixel_x = -1 - }, -/obj/effect/spawner/lootdrop/donkpockets{ - pixel_x = 2 +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Kz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/firealarm/directional/west, +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -30 }, -/obj/structure/grille/broken, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"Ls" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"KB" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/closeup, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Lt" = ( -/obj/machinery/porta_turret/syndicate{ +/area/ruin/unpowered/syndicate_lava_base/main) +"KE" = ( +/obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/science) -"LL" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/machinery/power/terminal{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"LV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/item/clothing/gloves/artifact_pinchers, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/science) -"LW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/engineering) -"Mk" = ( -/obj/structure/cable{ +"KF" = ( +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/white/side{ dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"KP" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_y = 9; + pixel_x = 7 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"KS" = ( +/obj/effect/turf_decal/box, +/obj/item/xenoartifact, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/science) +"KV" = ( /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/engineering) -"Mq" = ( +"KX" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 1 }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"Mr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +"KY" = ( +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_cargo" }, +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Lc" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, +/mob/living/carbon/human/species/monkey, +/obj/merge_conflict_marker{ + name = "---Merge Conflict Marker---"; + + desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/science) -"Mu" = ( -/obj/machinery/light/small{ +"Lg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"Lh" = ( +/obj/structure/sign/warning/xeno_mining{ + pixel_x = -32 + }, /obj/structure/sign/warning/fire{ pixel_x = 32 }, -/obj/structure/closet/emcloset/anchored, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/flashlight/seclite, -/obj/item/clothing/mask/gas, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"Mw" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Lj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/main) -"My" = ( -/obj/machinery/door/airlock{ - name = "Cabin 3" +"Lt" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Bar" }, -/obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"MC" = ( +/area/ruin/unpowered/syndicate_lava_base/bar) +"Ly" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"ME" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava{ - pixel_x = -8; - pixel_y = -26 - }, -/obj/machinery/button/ignition/incinerator/syndicatelava{ - pixel_x = 6; - pixel_y = -24 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"MH" = ( +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"LA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ - dir = 8 + dir = 4 }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"ML" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/flashlight{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/flashlight, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"MM" = ( +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"LB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"MN" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access = null; - req_access_txt = "150" +/area/ruin/unpowered/syndicate_lava_base/main) +"LI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/beakers/bluespace, -/obj/item/storage/box/beakers/bluespace, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/shower{ + dir = 4; + name = "emergency shower"; + desc = "The HS-452. Installed recently by the DonkCo Hygiene Division." }, -/turf/open/floor/iron/white/side{ +/obj/structure/sign/warning/radiation/rad_area{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"MS" = ( -/obj/structure/closet/bombcloset, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"LK" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow, +/obj/structure/railing/corner{ dir = 1 }, -/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/syndicate{ + pixel_y = -24 + }, +/obj/structure/floodlight_frame, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) -"MV" = ( +"LL" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"LY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"LZ" = ( +/obj/structure/table/reinforced, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/kitchen/rollingpin, +/obj/item/knife/kitchen{ + pixel_x = 6 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Mb" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"MX" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 +"Mn" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 10 }, -/turf/open/floor/iron/white/side{ +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_lava_base/science) +"Mt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/structure/closet/firecloset/full{ + anchored = 1 + }, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"Nb" = ( +"Mv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"Nh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" +"Mx" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/siding/wood{ + dir = 6 }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"MB" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/area/ruin/unpowered/syndicate_lava_base/main) +"MN" = ( /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Np" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"MP" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -29 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/structure/frame/computer{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"Nv" = ( -/obj/effect/turf_decal/bot, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Nl" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/suit_storage_unit/radsuit, -/obj/machinery/light/small{ - dir = 1 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/main) +"Nm" = ( +/obj/machinery/door/airlock{ + name = "Cabin 1" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"Nq" = ( +/obj/machinery/air_sensor{ + frequency = 1442; + id_tag = "Syndicate_Construction_o2_sensor" + }, +/turf/open/floor/engine/o2, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"NA" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"ND" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/rag{ + pixel_x = -4; + pixel_y = 9 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Nz" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 10 +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) "NF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -4061,184 +4164,142 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"NI" = ( -/obj/structure/sign/warning/vacuum{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +"NJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"NS" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"Ob" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "lavalandsyndi"; - name = "Syndicate Research Experimentation Shutters" - }, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"NQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/door/airlock/hatch{ - heat_proof = 1; - name = "Experimentation Room"; - req_access_txt = "150" +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"Oc" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white/side{ +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Ob" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Op" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Os" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/computer/arcade/orion_trail{ - dir = 4 +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"Oc" = ( +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{ + req_access = null }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Ou" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/chair{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/ruin/unpowered/syndicate_lava_base/bar) -"Oy" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 +"Of" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 9 }, -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"OC" = ( -/obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 6 +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"Og" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/structure/closet/crate/science, -/obj/item/xenoartifact, -/obj/item/xenoartifact, -/obj/item/xenoartifact, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/science) -"OJ" = ( -/obj/machinery/light/small, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/mob/living/carbon/monkey{ - faction = list("neutral","Syndicate") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"OV" = ( -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Pe" = ( -/obj/machinery/light/small, +"Ol" = ( +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Oq" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"Po" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/mining/glass{ - name = "Warehouse"; - req_access_txt = "150" +/area/ruin/unpowered/syndicate_lava_base/main) +"OI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"Pv" = ( -/obj/machinery/computer/atmos_control/tank{ - dir = 8; - frequency = 1442; - name = "Nitrogen Supply Control"; - output_tag = "syndie_lavaland_n2_out"; - sensors = list("syndie_lavaland_n2_sensor"="Tank") +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"OL" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"OP" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Pw" = ( +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"OR" = ( /obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/firstaid/fire, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, -/obj/structure/sign/warning/fire{ - pixel_x = 32 +/turf/open/floor/iron/white/side{ + dir = 5 }, -/obj/structure/closet/emcloset/anchored, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/flashlight/seclite, -/obj/item/clothing/mask/gas, -/obj/effect/turf_decal/stripes/corner{ +/area/ruin/unpowered/syndicate_lava_base/medbay) +"OY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Pj" = ( +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 8 }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Px" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Pn" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/white/side{ - dir = 1 +/turf/open/floor/wood{ + broken = 1 }, -/area/ruin/unpowered/syndicate_lava_base/main) +/area/ruin/unpowered/syndicate_lava_base/bar) +"Pt" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 5 + }, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/testlab) "Py" = ( /obj/machinery/light/small{ dir = 8 @@ -4248,72 +4309,63 @@ }, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"Pz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/randomvend/snack{ - hacked = 1 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"PA" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/science{ - req_access_txt = "150"; - name = "Science Lab Interior Airlock" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) "PC" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/chair/stool/bar/directional/east, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) -"PI" = ( -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"PK" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes, +"PE" = ( +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi_telecomms" + }, +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/telecomms) +"PN" = ( /obj/effect/turf_decal/siding/wood{ - dir = 8 + dir = 4 }, /turf/open/floor/wood, /area/ruin/unpowered/syndicate_lava_base/bar) -"PM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"PO" = ( +/obj/structure/chair, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"PQ" = ( +/turf/open/floor/iron/stairs/left{ + dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"PW" = ( -/obj/machinery/door/window/westright{ - name = "Kitchen" +/area/ruin/unpowered/syndicate_lava_base/science) +"PR" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate{ + pixel_x = -3 }, -/turf/open/floor/iron/white, -/area/ruin/unpowered/syndicate_lava_base/bar) -"PX" = ( -/turf/open/floor/engine/plasma, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"PZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 +/obj/item/toy/cards/deck/syndicate{ + pixel_x = 6; + pixel_y = 6 }, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/bar) +"PS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"PX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) "Qa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -4321,51 +4373,71 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Qf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 1; - frequency = 1442; - id_tag = "syndie_lavaland_tox_out"; - name = "toxin out" - }, -/turf/open/floor/engine/plasma, -/area/ruin/unpowered/syndicate_lava_base/engineering) +"Qc" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/cargo) "Qi" = ( -/obj/effect/turf_decal/delivery, +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Ql" = ( +/obj/structure/closet/bombcloset, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/science) -"Qj" = ( -/obj/machinery/door/poddoor{ - id = "lavalandsyndi_arrivals" +"Qm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Ql" = ( -/obj/machinery/light/small{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"Qq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay" }, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"Qs" = ( -/obj/effect/spawner/structure/window/plastitanium, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"QA" = ( -/obj/machinery/light/small{ +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Qx" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/science) +"Qy" = ( +/obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"QL" = ( +/obj/machinery/light/small, +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes/syndicate{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/monkeycubes/syndicate{ + pixel_x = -2; + pixel_y = -2 + }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) +/area/ruin/unpowered/syndicate_lava_base/testlab) "QM" = ( /obj/machinery/light/small{ dir = 1 @@ -4385,108 +4457,65 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/cargo) -"QO" = ( -/obj/structure/chair/office/light, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"QP" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3 - }, -/obj/item/reagent_containers/dropper, +"QN" = ( +/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/item/screwdriver/nuke{ - pixel_y = 18 - }, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron/white/side{ +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ dir = 4 }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) "QQ" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/fullupgrade{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Ra" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Rf" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"QT" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 + icon_state = "1-4" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Rh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"Rl" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/obj/item/storage/firstaid/regular, -/obj/structure/table_frame, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/science) -"Ru" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - amount = 15; - pixel_y = 2 - }, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"QW" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 1 +/obj/structure/closet/toolcloset{ + anchored = 1 }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"Rw" = ( -/obj/effect/decal/cleanable/dirt, +/obj/item/holosign_creator/atmos, +/obj/item/storage/belt/utility/full, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Rf" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "1-2" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"Rq" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "Ry" = ( -/obj/structure/railing{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"RA" = ( +/obj/machinery/button/door{ + id = "lavalandsyndi_bar"; + name = "Bar Blast Door Control"; + req_access_txt = "150"; + pixel_x = -25 }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/no_lava, -/turf/open/floor/plating, -/area/lavaland/surface/outdoors) +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) "RC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4495,111 +4524,103 @@ /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) "RD" = ( -/obj/effect/mapping_helpers/no_lava, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) +/obj/structure/table/reinforced, +/obj/item/radio/intercom{ + freerange = 1; + name = "Syndicate Radio Intercom" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/telecomms) "RL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 8; + volume_rate = 200 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/turf/open/floor/plating{ + baseturfs = /turf/open/lava/smooth/lava_land_surface; + initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300" }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"RP" = ( +"RS" = ( +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/science) +"RU" = ( +/obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 + icon_state = "1-2" }, -/obj/machinery/firealarm/directional/north, +/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"RU" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/dormitories) "RW" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dormitories" + }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) +/area/ruin/unpowered/syndicate_lava_base/dormitories) "RZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/airalarm/syndicate{ - dir = 4; - pixel_x = 24 +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/randomvend/cola{ - hacked = 1 +/turf/open/floor/wood{ + broken = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Sc" = ( -/obj/item/healthanalyzer, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/science) -"Sd" = ( -/obj/item/reagent_containers/condiment/enzyme, -/obj/item/food/chocolatebar, -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white, /area/ruin/unpowered/syndicate_lava_base/bar) -"Sk" = ( -/obj/effect/turf_decal/box, -/obj/item/xenoartifact, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, +"Sf" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/science{ + pixel_y = 6; + pixel_x = 1 + }, +/turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/science) -"Sl" = ( +"Sh" = ( /obj/machinery/porta_turret/syndicate{ dir = 10 }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ruin/unpowered/syndicate_lava_base/science) -"So" = ( -/obj/structure/chair{ - dir = 4 +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Si" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Sq" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/testlab) +"Sl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" +/obj/item/xenoartifact_labeler, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/science) +"Sp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Sr" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "syndi-outpost1" - }, -/obj/machinery/door/airlock/external{ - req_access_txt = "150" +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Ss" = ( +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_chemistry" }, -/obj/structure/fans/tiny, +/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/area/ruin/unpowered/syndicate_lava_base/chemistry) "St" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ @@ -4610,46 +4631,32 @@ }, /turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Su" = ( -/obj/machinery/light/small{ - dir = 1 +"Sw" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/button/door{ - id = "lavalandsyndi"; - name = "Syndicate Experimentation Door Control"; - pixel_y = 25; - req_access_txt = "150"; - pixel_x = -6 +/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Sy" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "lavalandsyndiwindow"; - name = "Syndicate Experimentation Window Control"; - pixel_y = 25; - req_access_txt = "150"; - pixel_x = 6 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"SB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"SE" = ( -/obj/structure/chair/stool/bar, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Sz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side, +/area/ruin/unpowered/syndicate_lava_base/main) "SF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/red/line{ @@ -4660,104 +4667,130 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/main) -"SI" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"SJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +"SG" = ( +/turf/open/floor/iron/stairs/right{ + dir = 4 + }, +/area/ruin/unpowered/syndicate_lava_base/science) +"SM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitories" }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"SN" = ( -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"SU" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Tc" = ( -/obj/structure/cable{ - icon_state = "1-2" +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"ST" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/barman_recipes, +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava{ +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"SV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/medical/syndicate_access, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"SX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/closet/firecloset/full{ + anchored = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Ta" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Tg" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Ti" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/computer/atmos_control/tank{ - dir = 8; - frequency = 1442; - name = "Toxins Supply Control"; - output_tag = "syndie_lavaland_tox_out"; - sensors = list("syndie_lavaland_tox_sensor"="Tank") +/area/ruin/unpowered/syndicate_lava_base/main) +"Tf" = ( +/obj/structure/chair/office/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/science) +"Tg" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/structure/closet/crate/secure/weapon{ + req_access_txt = "150" + }, +/obj/item/ammo_box/c10mm{ + pixel_y = 6 + }, +/obj/item/ammo_box/c10mm, +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = -5; + pixel_y = 5 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = -2; + pixel_y = 2 }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 1; + pixel_y = -1 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Tk" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/main) -"Tt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/item/ammo_box/magazine/m10mm{ + pixel_x = 4; + pixel_y = -4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Tz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Tv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/area/ruin/unpowered/syndicate_lava_base/main) +"TD" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 5 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"TG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/no_lava, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Tz" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_y = 9; - pixel_x = 7 +"TJ" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) "TK" = ( /obj/machinery/light/small{ dir = 4 @@ -4765,17 +4798,25 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/grimy, /area/ruin/unpowered/syndicate_lava_base/dormitories) -"TN" = ( +"TM" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"TQ" = ( +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "syndi-outpost1" + }, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "TW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -4783,105 +4824,123 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"TX" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/light/small, +"TY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Ua" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Uh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 8; - frequency = 1442; - id_tag = "syndie_lavaland_o2_out"; - name = "oxygen out" +/area/ruin/unpowered/syndicate_lava_base/main) +"Uf" = ( +/obj/machinery/atmospherics/miner/oxygen, +/obj/machinery/light/small{ + dir = 4 }, /turf/open/floor/engine/o2, /area/ruin/unpowered/syndicate_lava_base/engineering) -"Uq" = ( +"Uk" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/iron/white, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Un" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"Ut" = ( -/obj/effect/mapping_helpers/no_lava, -/obj/machinery/light/small{ +/area/ruin/unpowered/syndicate_lava_base/main) +"Up" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Ur" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron/white/side{ dir = 4 }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"Uw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Uv" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/medbay) -"UF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +"UB" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"UL" = ( -/obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"UN" = ( +"UG" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/airalarm/syndicate{ + pixel_y = 24; + dir = 1 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) +/area/ruin/unpowered/syndicate_lava_base/dormitories) "UP" = ( -/turf/closed/wall/mineral/plastitanium/explosive, -/area/ruin/unpowered/syndicate_lava_base/science) -"UT" = ( -/obj/structure/table, -/obj/item/storage/box/syringes, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/gun/syringe/syndicate, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi_virology" }, -/turf/open/floor/iron/white/side{ - dir = 9 +/obj/effect/spawner/structure/window/plastitanium, +/obj/machinery/door/poddoor{ + id = "lavalandsyndi_science" }, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"UW" = ( -/obj/machinery/door/airlock/hatch{ - name = "Monkey Pen"; - req_access_txt = "150" +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/science) +"UQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"UX" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-4" }, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Vc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) "Vf" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ @@ -4892,80 +4951,127 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"Vk" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/white/side{ +"Vn" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Vq" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/computer/arcade/orion_trail{ dir = 4 }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"VC" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"VD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"VE" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"VL" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Vr" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ +"VP" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Vw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/processor, -/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) -"VN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +"VX" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/vault{ + id_tag = "syndie_lavaland_vault"; + req_access_txt = "150" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/main) -"VP" = ( +"VZ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 32 + }, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Wd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/engine, /area/ruin/unpowered/syndicate_lava_base/testlab) -"VS" = ( -/obj/machinery/light/small{ - dir = 8 +"Wf" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/medbay) +"Wg" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"VV" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Wm" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Dormitories" - }, +"Wi" = ( /obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/machinery/door/airlock/science{ + req_access_txt = "150"; + name = "Science Lal Exterior Airlock" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) +/area/ruin/unpowered/syndicate_lava_base/main) "Wn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) +/obj/machinery/oven, +/turf/open/floor/iron/white/airless, +/area/ruin/unpowered/syndicate_lava_base/bar) "Wq" = ( /obj/structure/rack{ dir = 8 @@ -4979,40 +5085,28 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) -"Ww" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"Wy" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/shower{ - pixel_y = 14; - desc = "The HS-452. Installed recently by the DonkCo Hygiene Division." - }, -/turf/open/floor/noslip/standard, -/area/ruin/unpowered/syndicate_lava_base/main) -"Wz" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 +"WA" = ( +/obj/machinery/power/apc/syndicate{ + name = "Dormitories APC"; + pixel_y = -23 }, -/obj/structure/table/reinforced, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"WF" = ( -/obj/structure/disposaloutlet{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"WC" = ( +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/engine, -/area/ruin/unpowered/syndicate_lava_base/testlab) +/obj/machinery/computer/shuttle_flight{ + dir = 1; + name = "syndicate shuttle dock terminal" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/unpowered/syndicate_lava_base/arrivals) "WJ" = ( /obj/machinery/airalarm/syndicate{ dir = 8; @@ -5024,77 +5118,155 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) -"WS" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 5 +"WO" = ( +/obj/machinery/light/small{ + dir = 1 }, -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"WU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/power/terminal{ +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"WP" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution/stand_clear{ dir = 1 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"WU" = ( +/obj/machinery/atmospherics/miner/plasma, +/obj/machinery/light/small, +/turf/open/floor/engine/plasma, /area/ruin/unpowered/syndicate_lava_base/engineering) "WV" = ( -/obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/multitool, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) -"WY" = ( -/obj/structure/table/reinforced, -/obj/item/surgicaldrill, -/obj/item/cautery, -/obj/effect/decal/cleanable/dirt, -/obj/item/blood_filter, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/white/side, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"Xc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/button/door{ - id = "lavalandsyndi_telecomms"; - name = "Telecomms Blast Door Control"; - pixel_x = 26; - req_access_txt = "150"; - pixel_y = 25 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/telecomms) +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) "Xd" = ( /obj/machinery/airalarm/syndicate{ dir = 8; pixel_x = -24 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) +"Xk" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering"; + req_access_txt = "150" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/engineering) +"Xq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"Xr" = ( +/obj/machinery/door/poddoor/preopen{ + id = "lavalandsyndi_bar" + }, +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/ruin/unpowered/syndicate_lava_base/bar) +"Xx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet/grimy, +/area/ruin/unpowered/syndicate_lava_base/dormitories) +"Xy" = ( +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + amount = 15; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"Xz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"XA" = ( +/obj/machinery/vending/toyliberationstation{ + req_access_txt = "150" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"XP" = ( +/obj/machinery/computer/turbine_computer{ + dir = 1; + id = "syndie_lavaland_incineratorturbine" + }, +/obj/machinery/button/door/incinerator_vent_syndicatelava_main{ + pixel_x = 6; + pixel_y = -24 + }, +/obj/machinery/button/door/incinerator_vent_syndicatelava_aux{ + pixel_x = -6; + pixel_y = -24 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/main) -"Xq" = ( +/area/ruin/unpowered/syndicate_lava_base/engineering) +"XQ" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/white/side{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/firealarm/directional/north, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) -"Xr" = ( +"XR" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/syndicate, /obj/item/paper/crumpled{ @@ -5109,136 +5281,70 @@ }, /turf/open/floor/iron/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) -"XA" = ( -/obj/machinery/vending/toyliberationstation{ - req_access_txt = "150" - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, +"XT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"XQ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, +/area/ruin/unpowered/syndicate_lava_base/main) +"XW" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/testlab) -"XV" = ( -/obj/structure/table/reinforced, -/obj/item/scalpel, -/obj/item/circular_saw{ - pixel_y = 9 + icon_state = "1-2" }, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/medbay) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/main) "XY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/structure/closet/firecloset/full{ - anchored = 1 - }, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/cargo) -"Ye" = ( -/obj/machinery/computer/atmos_control/tank{ - dir = 8; - frequency = 1442; - name = "Oxygen Supply Control"; - output_tag = "syndie_lavaland_o2_out"; - sensors = list("syndie_lavaland_o2_sensor"="Tank") +/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Yc" = ( +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Yj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"Yx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/chair/stool/bar, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Yz" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/chair/stool, -/turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"YB" = ( -/obj/machinery/door/airlock{ - name = "Cabin 4" - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"YD" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -29 +"Yd" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/arrivals) -"YK" = ( -/obj/machinery/door/window/southleft{ - base_state = "right"; - dir = 1; - icon_state = "right"; - name = "Bar" +/area/ruin/unpowered/syndicate_lava_base/medbay) +"YC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 }, -/obj/effect/turf_decal/siding/wood{ +/turf/open/floor/iron/white/side{ dir = 1 }, -/turf/open/floor/wood{ - broken = 1 - }, -/area/ruin/unpowered/syndicate_lava_base/bar) -"YQ" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 +/area/ruin/unpowered/syndicate_lava_base/main) +"YF" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron, +/obj/item/stack/tile/iron, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/science) "YU" = ( /obj/structure/chair{ @@ -5254,72 +5360,11 @@ }, /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/main) -"YV" = ( -/obj/machinery/airalarm/syndicate{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/light/small{ - dir = 8 - }, +"Ze" = ( /obj/structure/table, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/stack/sheet/mineral/plastitanium{ - amount = 30 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/circuitboard/machine/thermomachine, -/obj/item/analyzer/ranged, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Zc" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/machinery/door/window/southleft{ - dir = 1; - name = "Chemistry"; - req_access_txt = "150" - }, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/chemistry) -"Zd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/turf/open/floor/wood, -/area/ruin/unpowered/syndicate_lava_base/bar) -"Zf" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, +/obj/machinery/microwave, +/turf/open/floor/iron/white, /area/ruin/unpowered/syndicate_lava_base/bar) -"Zg" = ( -/obj/machinery/power/apc/syndicate{ - name = "Dormitories APC"; - pixel_y = -23 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) "Zi" = ( /obj/structure/table/wood, /obj/item/ammo_box/magazine/m10mm, @@ -5346,71 +5391,77 @@ /turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/arrivals) "Zo" = ( -/obj/machinery/atmospherics/miner/oxygen, -/obj/machinery/light/small{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/syndichem, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white/side{ dir = 4 }, -/turf/open/floor/engine/o2, -/area/ruin/unpowered/syndicate_lava_base/engineering) -"Zr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/item/xenoartifact_labeler, -/turf/open/floor/engine, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"Zx" = ( +/obj/item/healthanalyzer, +/turf/open/floor/plating, /area/ruin/unpowered/syndicate_lava_base/science) -"Zw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"ZA" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/gloves/combat{ + pixel_y = -6 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 4; + pixel_y = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 +/obj/item/clothing/mask/breath{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side, +/area/ruin/unpowered/syndicate_lava_base/main) +"ZK" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/machinery/firealarm/directional/west, /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/turf/open/floor/plating, -/area/ruin/unpowered/syndicate_lava_base/main) -"ZE" = ( -/obj/machinery/light/small{ - dir = 1 +/turf/open/floor/iron, +/area/ruin/unpowered/syndicate_lava_base/chemistry) +"ZL" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/item/toy/cards/deck/cas, +/obj/item/toy/cards/deck/cas/black{ + pixel_x = 6; + pixel_y = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/neutral{ +/turf/open/floor/iron/dark, +/area/ruin/unpowered/syndicate_lava_base/bar) +"ZM" = ( +/obj/structure/chair{ dir = 4 }, -/obj/machinery/firealarm/directional/north, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/dormitories) -"ZT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/area/ruin/unpowered/syndicate_lava_base/cargo) +"ZS" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/small/broken{ + dir = 8 + }, /turf/open/floor/iron/dark, -/area/ruin/unpowered/syndicate_lava_base/bar) -"ZX" = ( -/obj/machinery/light/small, -/obj/structure/extinguisher_cabinet{ - pixel_y = -29 +/area/ruin/unpowered/syndicate_lava_base/science) +"ZY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/syndicate{ - dir = 4; - name = "Medbay APC"; - pixel_x = 24 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /turf/open/floor/iron, -/area/ruin/unpowered/syndicate_lava_base/medbay) -"ZZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/syndichem, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/ruin/unpowered/syndicate_lava_base/chemistry) +/area/ruin/unpowered/syndicate_lava_base/main) (1,1,1) = {" aa @@ -5596,13 +5647,13 @@ ab ab ab ab -Js +Of mn mn mn mn mn -Cc +sL ab ab ab @@ -5726,12 +5777,12 @@ ab ab ab ab -eh -eh -eh -eh -eh -Sl +aN +aN +aN +aN +aN +Mn ab ab ab @@ -5749,7 +5800,7 @@ ac mn mn mN -va +GH mn mn mn @@ -5775,33 +5826,33 @@ ab ab ab ac -eh -eh -Dp -tg -xq -eh -eh +aN +aN +pA +ZS +Sf +aN +aN ab ab ab ab ab ab -Tk -Tk -Tk +iw +iw +iw ab ab ab ab ac ac -nl +PE mP JW WJ -bE +Kz mn mn ab @@ -5825,14 +5876,14 @@ ab ab ab ab -eh -pj -xR -LV -tq -ug -eh -ab +aN +tk +Eo +sU +Og +AM +Lc +jd ab ab ab @@ -5847,10 +5898,10 @@ ab ab ab ac -nl +PE mP -tK -KU +ir +ur Cn ou mn @@ -5875,13 +5926,13 @@ ab ab ab ac -eh -gN -xR -Sk -uL -ug -eh +aN +qC +Eo +KS +Qx +AM +aN ab ab ab @@ -5897,10 +5948,10 @@ ab ab ab ac -nl -WV -Xc -bg +PE +bw +Ih +RD Vf ov mn @@ -5925,14 +5976,14 @@ ab ab ab ac -eh -Qi -Zr -xR -Mr -ug -eh -eh +aN +BU +Sl +Eo +FE +AM +bN +Lc ab ab ab @@ -5944,13 +5995,13 @@ ab ab ab ab -cI -Ry +zm +AJ mT mT mT -QA -wb +vq +Be IO mn mn @@ -5975,14 +6026,14 @@ ab ab ab ab -eh -eh -OC -pw -qp -cw -wM -eh +aN +aN +wY +PQ +SG +qy +LK +aN ab ab ab @@ -5990,17 +6041,17 @@ ab ab ab ab -De -el -el -el -uD -pY -Sr -xH +cx +GO +GO +GO +df +TG +zi +kq mT mo -cr +zt mn mn ab @@ -6026,31 +6077,31 @@ ab ab ab ac -eh -MS -It -IA -NS -Rl -FS +aN +Ql +DF +YF +vI +Hg +UP ab ab ab ab ab ab -De -Cq -pl -pl -pl +cx +uP +Xr +Xr +Xr jy jy mT -Ak +dj mT -JA -bR +XY +qw ol mT ab @@ -6076,31 +6127,31 @@ ab ab ab ac +vg +Jc +Zx +Cu +Tf +EI UP -qK -Sc -MM -QO -Np -FS ab ab ab ab ab -De -Cq -pl -pl -BN -So -FG -kJ +cx +uP +Xr +Xr +yd +ic +RA +xH mT -Hi -uJ -Wn -qn +Hn +TQ +CZ +JC ol mT ab @@ -6126,32 +6177,32 @@ ab ab ab ac -eh -YQ -Aq -EB -rw -yM -FS +aN +yA +sK +AU +RS +xN +UP ab ab ab ab -De -Cq -pl -pl -ss -ml -Tz +cx +uP +Xr +Xr +zx +ZL +KP DM -Os +Vq mT -Pw +ay mT -fu -qn -vq +Qy +JC +WC mT ab ab @@ -6173,34 +6224,34 @@ ab ac ab ac -WS +Pt ae ae ae aL -em -tM -uk -Co -eh -Lt +zk +zS +wN +rp +aN +CF ab ab -De -Cq -pl -pl -vY -CZ +cx +uP +Xr +Xr +eZ +fT kH -Ou +uA lE -tz +tF mT mT mT NF -hy +IW mT mT mT @@ -6225,35 +6276,35 @@ ae ae ae ae -cS -OJ +ql +uE ae -fD -PA -eh -eh -eh -eh -el -el -Cq -pl -pl -IH -vG +cy +fi +aN +aN +aN +aN +GO +GO +uP +Xr +Xr +PO +PR jY db jZ DM jZ -Yz -ZT -Fr +Hl +Ry +rL NF -pM +WP EZ -Lc -If +CV +Lh St ab ab @@ -6273,34 +6324,34 @@ aq aq qG dc -rS +NA dQ -Hj -UW +po +rZ ae -yK -GH -UF +Bw +om +Ta ha -NI -hb -fi -RD +BB +iF +rY +Bj jy jy -KB -fW -BS -xl +uU +Qi +lL +Gy jZ -Hk +Eq jZ DM jZ db -oq +Lt BC -TX +Gg mT mT mT @@ -6320,27 +6371,27 @@ ab ae ap aq -cJ +qQ aq Lg -Dh -Ob +Gj +yb RC -Kc +zc ae -Wy -Yj +Cs +OI gZ -Kd -lx +gx +tE ha -ql -Ut +zO +Bc jy -SI -CZ +CT +fT jZ -FK +TY jZ DM jZ @@ -6348,9 +6399,9 @@ FX ly PC mu -Fr +rL Qa -wT +LA TW mT ab @@ -6370,40 +6421,40 @@ ab ae aq aq -VP +Bz aq -aF -vg +Si +OL ae -Su -uo +fR +rf ae ae -HT +Wi ha ha -Mu +EE ha ha ha ha jy -fl +DA DM jZ DM -SE -zp -PK -aP -Zf -rx +Rq +yu +ST +ND +Vn +cP jy jy -RP -YD +XQ +MP mT -Qj +qN ab ab ab @@ -6420,40 +6471,40 @@ ab ae aq aq -Cx +Wd aq -de -WF -xC -Xr -jm +wV +Jp +aS +XR +IX ph ae -sY -VN +VE +Un ha iN ha Az YU -VS -oq +Yc +Lt DM jZ DM -Hl -Yx -BA -Jz +fq +BS +RZ +BO lX -tV -Zd -EL +gm +Hj +Ku jy -Rf -vb -ta -Qj +TM +OP +VL +qN ab ab ab @@ -6470,40 +6521,40 @@ ab ae ap aq -ET -ET -ET -ET -wK -mV -zD -XQ -xa -JU -Mw -IK -Ql -KE -Dv -HC -pZ -oq +xA +xA +xA +xA +Jq +uN +Bq +zn +Fy +Mb +VD +FK +WV +on +ZY +CU +Oq +Lt jZ -PZ +VZ jO DM jZ -YK -OV +DD +lA lX -UL -iA -QQ +vh +PN +Mx jP -Rf -fL +TM +JL qR -Qj +qN ab ab ab @@ -6524,36 +6575,36 @@ aq DL di aq -oJ +aU AF -Ac +QL ae dQ -uz +zW hd bA bA vT ik if -MH +Ba hz hz hz hz -Pz -RZ -CL -iA -sB -Wz -ak +qZ +DQ +Pn +PN +LZ +EH +JU jy jy -qr +uC nW -lU -Qj +fU +qN ab ab ab @@ -6578,32 +6629,32 @@ ae ae ae oP -qZ -yh +MB +Ua vp hz hz hz hz -Wm -GE +RW +SM hz lD cu hz jy jy -jz -PW -hN -pq -ub +HJ +Hu +Sw +Je +Oc jy -zS -za -SN -BW -Qj +Kx +PS +fr +jn +qN ab ab ab @@ -6620,40 +6671,40 @@ ab ab ab ac -Ju +TD as -MN -pT -gC -CT -SB -HK -Px -Mq +It +da +ZK +Iq +Rf +hh +EV +KB vp hO ga Gi hz iz -BZ -Ez -Nb +Qm +Nm +Mv Gk hz -pD +rC jy -vv -pq -hN -pq -Sd +Wn +Je +Sw +Je +pU jy -Cr -PI +AY +nu oy mT -Qj +qN ab ab ab @@ -6672,36 +6723,36 @@ ab ab as as -Cf +bQ dB -Cp +bh es eS -DO -MX +VC +bf jj GT hz TK -xU -Al -Uq -Pe +Xx +Ci +ry +qs hz hz hz hz -Lo +IR jy -vA -fX -hN -KP +BP +Uk +Sw +Ze jy jy -id -oX -BW +Ly +fQ +jn mT ab ab @@ -6720,37 +6771,37 @@ ab ab ab ab -tv +Ss aM dv dC -eQ +cl et eT -Zc -MX +dt +bf jj AR hz hz hz hz -eo -uM -pz -eA -eA -ve -GD +UG +DX +RU +UB +UB +py +sa jy jy jy -jn +im jy jy Zj -gm -Tv +HZ +vf mT mT ab @@ -6770,37 +6821,37 @@ ab ab ab ab -tv +Ss cA dw dC -Rh +uh eu eU fp -qZ +MB jj vp -hQ +dm hz rX -IR +yN iC -Zg +WA hz hz hz hz -Zw -ve -ve -ve -RL -eA -nr -Xq -Ft -Vk +KX +py +py +py +ca +UB +Nl +KF +Ur +DR mT ab ab @@ -6820,37 +6871,37 @@ ab ab ab ab -tv +Ss cG dx -Ru +Xy dY -yG +MN dC as -lP +YC if vp hz hz hz hz -ZE -nj -My -Nb +WO +PX +zs +Mv Py hz -MC +fS ks -Vw +Am kQ kQ kQ -Ra +JP kT -Sq -jb +xa +xc kQ kQ ab @@ -6873,35 +6924,35 @@ ab as as as -An -QP -ZZ +TJ +Hx +Zo as as as -AU +cX GJ hz HX -xU -YB -wq -IE +Xx +qS +Ob +uq hz uc cu hz -MV -kt +wu +wK kQ kQ -UT -wL -fs -yg -UX +DV +Uv +An +Yd +Wf lI -Kh +sc kQ ab ab @@ -6921,7 +6972,7 @@ ab ab ab ab -Ju +TD as as as @@ -6929,7 +6980,7 @@ as as EP dy -ci +VP vp hz Zi @@ -6941,17 +6992,17 @@ hz hO hz hz -bD +iZ ha kQ -bS +Bx lJ me -pn -rF -UX +vA +tp +Wf lJ -bs +SV kQ ac ab @@ -6974,12 +7025,12 @@ ab ac dy dK -HA -sZ -wG -JM -oO -HD +Tg +Ki +Xz +EB +bT +uQ vp hz hz @@ -6988,19 +7039,19 @@ hz hz hz hz -Ll -Bi +Mt +Vc jR -vK -rn -RW +LB +CB +xs lI lI lI -oR +HA lI -DS -ZX +zg +vw kQ kQ ac @@ -7025,10 +7076,10 @@ ab dy dL eb -Ww +HO eX -HE -GG +ax +Qc zd hi zA @@ -7038,18 +7089,18 @@ Xd LL GY zK -FC -qH -Mw -Mq -AK -Ls +XW +Wg +VD +KB +Sz +JM lI lJ mf -Uw +fJ lI -WY +st kQ kQ ac @@ -7074,10 +7125,10 @@ ab ab dy dM -He -pW +Fi +Hz eY -yW +ft dP cH CP @@ -7089,17 +7140,17 @@ iH ja jj jj -vK +LB if kj -fV +ZA kT -Bp -Oc +OR +Aw kQ -XV -ge -DQ +By +Jz +Gu kQ ac ac @@ -7124,29 +7175,29 @@ ab ab dy dy -ML -iE +rz +Fj Wq dy dy gO -un -wn +Et +Qq dP dy iq -en +VX iq ha EA -zs -kL +Tz +XT ju ju ju ju ju -hA +yL ju ju ju @@ -7154,7 +7205,7 @@ ju ju ju ju -Nz +Sh ab ab ab @@ -7175,8 +7226,8 @@ ab ac dy dy -Po -GG +Gw +Qc dy vJ gP @@ -7189,16 +7240,16 @@ iJ wB ha ju -gi +Xk jU ju -SJ +Gq kV -WU -YV -zL -cn -Jm +KE +Er +nv +ml +XP ju od ju @@ -7224,12 +7275,12 @@ ab ab ac dy -XY -DI +SX +ER fb In gb -ch +Xq hl gQ XA @@ -7238,19 +7289,19 @@ is iK jc ha -Nv -Tt -uy +CY +NJ +LI ju -yr +qB kW -IN -Mk -Tg -SU -Op -dj -Tc +rD +yl +qO +Co +hQ +Up +bM ot oA oE @@ -7275,32 +7326,32 @@ ab ab dy QM -we -ts -ts -ts -we -we -Jw +cB +OY +OY +OY +cB +cB +QT xn dy Fs pQ ar ha -Gh -Hp -AQ -rC -Nh -zI -sS -nm -pR -VV -ME +QW +UQ +vW +sT +kL +yM +li +qV +xF +Pj +zh nE -zn +bp nE oB ju @@ -7331,7 +7382,7 @@ fw gc gS gQ -JI +vm IV dy ha @@ -7339,15 +7390,15 @@ ha ha ha ju -Gt +Ol ju ju -Bt -Ku -ue -DA -se -sd +rQ +sw +KV +oX +my +Sy nf ju ju @@ -7373,34 +7424,34 @@ ab ab ab ab -DF +pn dy eE fe dy gd dy -RU -UN -we -ya -PM -PM -BG -ve -PM -Rw +ZM +NQ +cB +uH +en +en +su +py +en +Cq ju -Ax -TN -LW -ue -ue -Ig -oY -ul -Qf -PX +CK +Sp +bI +KV +KV +eo +Dt +wP +En +CQ ju ab ab @@ -7425,8 +7476,8 @@ ab ab ab dy -ir -ir +KY +KY dy gf dy @@ -7442,15 +7493,15 @@ ha Lj ju ju -Pv -Vr -Gp -Ye -uH -Ti -Qs -yA -DK +Gc +QN +Gr +dl +LY +pC +oq +Gs +WU ju ab ab @@ -7480,23 +7531,23 @@ ab dy gg dy -ir -ir +KY +KY dy -DF +pn ab ab ab ab ab -uQ -KA +RL +nt ju -Qs -Oy +oq +QQ ju -Qs -Oy +oq +QQ ju ju ju @@ -7542,13 +7593,13 @@ ab ab ab ju -pK -Jv +wG +tr ju -bv -Uh +Nq +xK ju -KA +nt ab ab ab @@ -7592,11 +7643,11 @@ ab ab ab ju -yx -ze +IG +np ju -Zo -zf +Uf +wk ju ab ab diff --git a/_maps/arenas/monkey.dmm b/_maps/arenas/monkey.dmm index 6615c6f51a5dc..22e13ab19169a 100644 --- a/_maps/arenas/monkey.dmm +++ b/_maps/arenas/monkey.dmm @@ -44,12 +44,12 @@ /area/tdome/arena) "l" = ( /obj/structure/flora/ausbushes/fernybush, -/mob/living/carbon/monkey, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/tdome/arena) "m" = ( /obj/structure/flora/rock/jungle, -/mob/living/carbon/monkey, +/mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/tdome/arena) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b87ba1499ed4a..724380ad6bfb8 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -251,12 +251,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"adg" = ( -/obj/item/grown/bananapeel, -/obj/structure/flora/ausbushes/fullgrass, -/mob/living/carbon/monkey, -/turf/open/floor/grass/no_border, -/area/medical/genetics) "adt" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -8984,6 +8978,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) +"bSL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/computer/records/medical, +/turf/open/floor/iron/techmaint, +/area/security/brig) "bSM" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -9005,14 +9007,6 @@ /obj/item/storage/box/gloves, /turf/open/floor/iron/white, /area/medical/virology) -"bSU" = ( -/mob/living/carbon/monkey, -/obj/machinery/flasher{ - id = "monkeypen"; - pixel_y = 23 - }, -/turf/open/floor/iron/freezer, -/area/medical/virology) "bTa" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -10382,10 +10376,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bZT" = ( -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/virology) "bZU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -10836,6 +10826,17 @@ }, /turf/open/floor/engine/co2, /area/engine/atmos) +"ccF" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/engine{ + dir = 8; + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/security/checkpoint/engineering) "ccP" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -14719,6 +14720,20 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/engine/engineering) +"cGo" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + pixel_y = -30 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/science) "cGq" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -17001,6 +17016,19 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/security/prison) +"dzr" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/station{ + dir = 8; + pixel_x = 32 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "dzG" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -17495,6 +17523,11 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) +"dIC" = ( +/obj/machinery/computer/records/security, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/carpet/red, +/area/crew_quarters/heads/hos) "dJs" = ( /obj/machinery/light_switch{ pixel_x = -28 @@ -19377,12 +19410,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"evS" = ( -/obj/item/food/grown/banana, -/obj/structure/flora/ausbushes/fullgrass, -/mob/living/carbon/monkey, -/turf/open/floor/grass/no_border, -/area/medical/genetics) "ewc" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -19516,6 +19543,24 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) +"eya" = ( +/obj/machinery/computer/records/security, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + pixel_y = 30 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/checkpoint/auxiliary) "eyf" = ( /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 @@ -20351,13 +20396,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"eNw" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "eNz" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -20492,13 +20530,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) -"eQj" = ( -/obj/machinery/computer/records/security{ - dir = 4; - pixel_y = -3 - }, -/turf/open/floor/iron/dark, -/area/security/main) "eQI" = ( /obj/effect/turf_decal/bot, /obj/machinery/hydroponics/constructable, @@ -21367,14 +21398,6 @@ "fhP" = ( /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"fhY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/computer/records/medical, -/turf/open/floor/iron/techmaint, -/area/security/brig) "fiq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -29754,6 +29777,10 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"izi" = ( +/obj/machinery/light, +/turf/open/floor/iron/white, +/area/medical/virology) "iAe" = ( /obj/structure/table/optable, /obj/item/surgical_drapes{ @@ -30624,11 +30651,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"iTP" = ( -/obj/machinery/computer/records/security, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/carpet/red, -/area/crew_quarters/heads/hos) "iTR" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -31829,6 +31851,17 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) +"jsE" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/airalarm/server{ + pixel_x = -22; + dir = 8 + }, +/turf/open/floor/circuit/telecomms, +/area/tcommsat/server) "jsF" = ( /obj/machinery/firealarm{ dir = 4; @@ -32498,16 +32531,6 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/white, /area/medical/virology) -"jDj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/mob/living/carbon/monkey/punpun, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "jDS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -33265,24 +33288,6 @@ }, /turf/open/floor/plating/rust, /area/maintenance/aft) -"jTo" = ( -/obj/machinery/computer/records/security, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_y = 30 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint/auxiliary) "jTw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -36461,6 +36466,13 @@ broken = 1 }, /area/maintenance/port/fore) +"lcB" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "lcM" = ( /obj/structure/safe, /obj/item/clothing/head/costume/bearpelt, @@ -37157,16 +37169,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/secondary/entry) -"lqk" = ( -/mob/living/carbon/monkey, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron/freezer, -/area/medical/virology) "lqq" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 28 @@ -38501,6 +38503,12 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) +"lYZ" = ( +/obj/item/food/grown/banana, +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass/no_border, +/area/medical/genetics) "lZl" = ( /obj/machinery/camera/directional/north{ c_tag = "Warden's Office" @@ -39268,6 +39276,13 @@ dir = 1 }, /area/hallway/secondary/exit) +"msA" = ( +/obj/machinery/computer/records/security{ + dir = 4; + pixel_y = -3 + }, +/turf/open/floor/iron/dark, +/area/security/main) "msB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -40027,29 +40042,6 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"mKv" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/airalarm/server{ - pixel_x = -22; - dir = 8 - }, -/turf/open/floor/iron/dark/telecomms, -/area/science/server) -"mKG" = ( -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/station{ - dir = 8; - pixel_x = 32 - }, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "mKM" = ( /obj/machinery/firealarm{ dir = 4; @@ -40327,17 +40319,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"mRi" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/engine{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/security/checkpoint/engineering) "mRG" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/white/side{ @@ -44130,6 +44111,16 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"osm" = ( +/mob/living/carbon/human/species/monkey, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron/freezer, +/area/medical/virology) "osw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -44627,6 +44618,11 @@ /obj/machinery/light, /turf/open/floor/plating, /area/engine/engineering) +"oDM" = ( +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/dark_blue, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "oDS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -44858,10 +44854,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"oJY" = ( -/obj/machinery/light, -/turf/open/floor/iron/white, -/area/medical/virology) "oKh" = ( /obj/effect/turf_decal/delivery, /obj/machinery/camera/directional/north, @@ -45482,6 +45474,13 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"oXC" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "oXN" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -45736,6 +45735,16 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) +"pej" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "pet" = ( /obj/structure/window/reinforced{ dir = 4 @@ -45862,37 +45871,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"phr" = ( -/obj/machinery/computer/records/security, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "outerbrig"; - name = "Brig Exterior Doors Control"; - normaldoorcontrol = 1; - pixel_x = 40; - pixel_y = -6; - req_access_txt = "63" - }, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "innerbrig"; - name = "Brig Interior Doors Control"; - normaldoorcontrol = 1; - pixel_x = 40; - pixel_y = 6; - req_access_txt = "63" - }, -/obj/machinery/button/flasher{ - id = "brigentry"; - pixel_x = 24; - pixel_y = 6 - }, -/obj/item/radio/intercom{ - pixel_y = 32 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/security/warden) "phv" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -47558,6 +47536,20 @@ }, /turf/open/floor/wood, /area/medical/break_room) +"pNU" = ( +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 27 + }, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/checkpoint/supply) "pNZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 @@ -48417,11 +48409,6 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/dark, /area/medical/storage) -"qiD" = ( -/obj/machinery/computer/records/medical, -/obj/effect/turf_decal/tile/dark_blue, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/cmo) "qiH" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -50639,11 +50626,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"rcL" = ( -/obj/structure/flora/grass/jungle, -/mob/living/carbon/monkey, -/turf/open/floor/plating/dirt/jungle, -/area/medical/genetics) "rcN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50922,6 +50904,19 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"rft" = ( +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "rfH" = ( /obj/structure/closet/crate/bin, /obj/item/food/donut/chaos, @@ -51605,6 +51600,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) +"rsn" = ( +/obj/machinery/telecomms/processor/preset_exploration, +/obj/machinery/airalarm/server{ + pixel_x = -22; + dir = 8 + }, +/turf/open/floor/circuit/telecomms/server, +/area/quartermaster/exploration_dock) "rsz" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -52006,6 +52009,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) +"rzs" = ( +/mob/living/carbon/human/species/monkey, +/obj/machinery/flasher{ + id = "monkeypen"; + pixel_y = 23 + }, +/turf/open/floor/iron/freezer, +/area/medical/virology) "rzw" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -53108,13 +53119,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"rVA" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "rVB" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -53133,15 +53137,6 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) -"rWC" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - pixel_x = -2; - pixel_y = 3; - dir = 8 - }, -/turf/open/floor/wood, -/area/medical/exam_room) "rWK" = ( /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ @@ -53603,6 +53598,15 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/carpet, /area/hallway/secondary/entry) +"shk" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + pixel_x = -2; + pixel_y = 3; + dir = 8 + }, +/turf/open/floor/wood, +/area/medical/exam_room) "shn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54356,6 +54360,17 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/lawoffice) +"syB" = ( +/obj/machinery/computer/records/security, +/obj/item/storage/secure/safe/caps_spare{ + pixel_x = 6; + pixel_y = 28 + }, +/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "syE" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; @@ -54441,6 +54456,12 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) +"sAF" = ( +/obj/item/grown/bananapeel, +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass/no_border, +/area/medical/genetics) "sBr" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/stripes/line, @@ -54827,14 +54848,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"sGv" = ( -/obj/machinery/telecomms/processor/preset_exploration, -/obj/machinery/airalarm/server{ - pixel_x = -22; - dir = 8 - }, -/turf/open/floor/circuit/telecomms/server, -/area/quartermaster/exploration_dock) "sGB" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -55081,6 +55094,16 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/port) +"sKF" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/airalarm/server{ + pixel_x = -22; + dir = 8 + }, +/turf/open/floor/iron/dark/telecomms, +/area/science/server) "sKX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56631,6 +56654,37 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"tqr" = ( +/obj/machinery/computer/records/security, +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "outerbrig"; + name = "Brig Exterior Doors Control"; + normaldoorcontrol = 1; + pixel_x = 40; + pixel_y = -6; + req_access_txt = "63" + }, +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "innerbrig"; + name = "Brig Interior Doors Control"; + normaldoorcontrol = 1; + pixel_x = 40; + pixel_y = 6; + req_access_txt = "63" + }, +/obj/machinery/button/flasher{ + id = "brigentry"; + pixel_x = 24; + pixel_y = 6 + }, +/obj/item/radio/intercom{ + pixel_y = 32 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/security/warden) "tqF" = ( /turf/closed/wall/r_wall, /area/maintenance/fore/secondary) @@ -57856,17 +57910,6 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"tKV" = ( -/obj/machinery/telecomms/broadcaster/preset_left, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/airalarm/server{ - pixel_x = -22; - dir = 8 - }, -/turf/open/floor/circuit/telecomms, -/area/tcommsat/server) "tLg" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 @@ -58530,6 +58573,11 @@ /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/iron/white/side, /area/crew_quarters/bar/atrium) +"tYs" = ( +/obj/structure/flora/grass/jungle, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/plating/dirt/jungle, +/area/medical/genetics) "tYC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -60141,19 +60189,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron/white, /area/science/research) -"uIt" = ( -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "uJd" = ( /obj/machinery/light/small, /obj/machinery/airalarm/directional/south{ @@ -61567,16 +61602,6 @@ /obj/structure/disposalpipe/segment, /turf/open/space, /area/space/nearstation) -"vnR" = ( -/obj/machinery/computer/records/medical, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/bridge) "voa" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -63545,17 +63570,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"wbI" = ( -/obj/machinery/computer/records/security, -/obj/item/storage/secure/safe/caps_spare{ - pixel_x = 6; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "wbO" = ( /obj/effect/turf_decal/box, /obj/machinery/plumbing/bottle_dispenser{ @@ -63891,20 +63905,6 @@ }, /turf/open/floor/iron/tech, /area/crew_quarters/fitness) -"whi" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_y = -30 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/science) "whp" = ( /obj/effect/turf_decal/tile/dark_blue{ dir = 4 @@ -63991,6 +63991,16 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"wjt" = ( +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/bridge) "wka" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -64786,6 +64796,10 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/dark, /area/medical/surgery) +"wBW" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/virology) "wCo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -68356,20 +68370,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"ybK" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 27 - }, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint/supply) "ycx" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -83090,7 +83090,7 @@ amC alU iGZ aBI -jTo +eya wgM ihV aHy @@ -92892,7 +92892,7 @@ bty qJM bwd bzA -ybK +pNU rjl bwe eRh @@ -93685,7 +93685,7 @@ bVI bWD bXA bYB -tKV +jsE uwI wnw ccg @@ -96209,7 +96209,7 @@ qsK aPR aPR aPR -wbI +syB wPR nmS jvp @@ -96940,7 +96940,7 @@ tcd vHu aNo agn -phr +tqr mtv tXy nIx @@ -98718,7 +98718,7 @@ aaa afp aaa rfQ -iTP +dIC vNM rRp mnn @@ -98777,7 +98777,7 @@ sET aJq aOE vFY -vnR +wjt qOi vpS hce @@ -98986,7 +98986,7 @@ aEU aEU aEU aEU -eQj +msA xTq qFV aaP @@ -99510,7 +99510,7 @@ aiX aiX tFh aiX -fhY +bSL fDt ulD kYS @@ -100367,7 +100367,7 @@ wvY bWQ lqv aqd -mRi +ccF qLc caA nCY @@ -101059,8 +101059,8 @@ iQx tqF yfF llb -rVA -mKG +oXC +dzr tdz tzx pdQ @@ -103419,7 +103419,7 @@ voa spa jLH nDi -eNw +lcB btZ ojH pmc @@ -105220,7 +105220,7 @@ rXD vIR vSY mnG -uIt +rft wai uwZ jpg @@ -105459,7 +105459,7 @@ aHJ idb jEK fLh -jDj +pej unQ nez fkY @@ -107544,7 +107544,7 @@ xyU cpm lWM hhG -rWC +shk tGD hfh gvm @@ -108085,7 +108085,7 @@ uzz eZP nYQ hqh -oJY +izi bNd vJz bzs @@ -109083,8 +109083,8 @@ jLS hOd bye edA -adg -evS +sAF +lYZ tVm cUp lnB @@ -109341,7 +109341,7 @@ but bye mqa tlH -rcL +tYs uFr xQG wFy @@ -109361,9 +109361,9 @@ xhK bOt lwA bNd -bZT +wBW ggx -bZT +wBW cnc chN dLc @@ -109609,7 +109609,7 @@ wWC sNL iQJ bOt -qiD +oDM iEs kNz wrV @@ -109619,7 +109619,7 @@ bOt lwA bNd isE -lqk +osm jLx pps mZL @@ -109875,7 +109875,7 @@ jVz bOt lwA bNd -bSU +rzs tnx iLi wEQ @@ -110133,7 +110133,7 @@ bOt lwA bNd iLi -bZT +wBW iLi cbO kEX @@ -111396,7 +111396,7 @@ eek eao byf bzu -mKv +sKF bzu bDb bEm @@ -113967,7 +113967,7 @@ lCl byk vFx por -whi +cGo bDc bEo fUV @@ -120642,7 +120642,7 @@ aaa xkR sDn uqc -sGv +rsn gQd xcE ict diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index 1023d7e472dc3..161defacdc083 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -31,15 +31,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/bar) -"aak" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/genetics) "aal" = ( /obj/structure/transit_tube/curved{ dir = 1 @@ -56,16 +47,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/aft) -"aan" = ( -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/genetics) -"aao" = ( -/obj/machinery/light/small, -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/genetics) "aap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -3859,29 +3840,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/iron/dark, /area/engine/engine_room) -"aWc" = ( -/obj/machinery/computer/records/security, -/obj/machinery/requests_console{ - pixel_x = -32 - }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = 28 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/security/checkpoint/engineering) "aWi" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -5496,6 +5454,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"bzI" = ( +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/main) "bzS" = ( /obj/effect/landmark/start/station_engineer, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -7079,6 +7044,13 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) +"bXV" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/warden) "bXX" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/yellow{ @@ -7778,15 +7750,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"clk" = ( -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = 28 - }, -/mob/living/carbon/monkey/punpun, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "clI" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -9473,18 +9436,6 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"cSX" = ( -/obj/structure/window/reinforced/spawner{ - dir = 4 - }, -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/security/main) "cTD" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -9763,6 +9714,19 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) +"cXC" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/dark, +/area/security/checkpoint/supply) "cXE" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -10990,6 +10954,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"dtx" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/turf/open/floor/wood, +/area/security/detectives_office) "dtD" = ( /obj/machinery/portable_thermomachine, /obj/machinery/requests_console{ @@ -13722,6 +13692,17 @@ }, /turf/open/space/basic, /area/space/nearstation) +"enj" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/main) "enp" = ( /obj/effect/decal/cleanable/glass, /turf/closed/wall, @@ -14744,14 +14725,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main/monastery) -"eGm" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/genetics) "eGC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ @@ -14843,6 +14816,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"eJj" = ( +/obj/machinery/camera/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/computer/records/security, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/checkpoint/medical) "eJz" = ( /obj/effect/landmark/start/paramedic, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -16354,6 +16340,29 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) +"fkG" = ( +/obj/machinery/computer/records/security, +/obj/machinery/requests_console{ + pixel_x = -32 + }, +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/security/checkpoint/engineering) "fkI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16957,17 +16966,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/quartermaster/office) -"ftP" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/camera/directional/west, -/obj/machinery/light_switch{ - pixel_x = 1; - pixel_y = 28 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "fuh" = ( /turf/closed/wall, /area/hallway/secondary/service) @@ -20095,14 +20093,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/security/brig/dock) -"gwg" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - dir = 1; - pixel_y = 5 - }, -/turf/open/floor/carpet/cyan, -/area/crew_quarters/heads/cmo) "gwl" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -20264,6 +20254,51 @@ }, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) +"gyl" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/table/reinforced, +/obj/item/circuitboard/computer/crew{ + pixel_x = -12; + pixel_y = 7 + }, +/obj/item/circuitboard/computer/records/medical{ + pixel_x = -13; + pixel_y = 5 + }, +/obj/item/circuitboard/computer/operating{ + pixel_x = -14; + pixel_y = 3 + }, +/obj/item/circuitboard/computer/pandemic{ + pixel_x = -15; + pixel_y = 1 + }, +/obj/item/circuitboard/computer/scan_consolenew{ + pixel_x = -16; + pixel_y = -1 + }, +/obj/item/circuitboard/machine/chem_dispenser{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/circuitboard/machine/chem_dispenser/botany{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/circuitboard/machine/chem_heater{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/circuitboard/machine/chem_master{ + pixel_x = 5 + }, +/obj/item/circuitboard/machine/cryo_tube{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/engine/storage) "gyr" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer/fullupgrade, @@ -20573,6 +20608,11 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"gCr" = ( +/obj/machinery/light/small, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "gCB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -21546,6 +21586,15 @@ /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) +"gRA" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "gRD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21877,6 +21926,11 @@ /obj/machinery/vending/medical, /turf/open/floor/iron, /area/medical/virology) +"gYL" = ( +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron, +/area/bridge) "gYM" = ( /obj/structure/table/optable{ name = "Robotics Operating Table" @@ -26947,14 +27001,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) -"iBi" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/bridge) "iBp" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, @@ -27897,12 +27943,6 @@ }, /turf/open/floor/engine/air, /area/engine/atmos) -"iSM" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/turf/open/floor/wood, -/area/security/detectives_office) "iTa" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ @@ -28356,6 +28396,16 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"jad" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/security/checkpoint/science) "jal" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28971,6 +29021,18 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) +"jjw" = ( +/obj/structure/window/reinforced/spawner{ + dir = 4 + }, +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/security/main) "jjx" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30432,10 +30494,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"jLw" = ( -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/virology) "jLA" = ( /obj/structure/sign/warning/docking{ pixel_x = 32 @@ -30929,51 +30987,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) -"jUh" = ( -/obj/structure/cable/yellow, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/table/reinforced, -/obj/item/circuitboard/computer/crew{ - pixel_x = -12; - pixel_y = 7 - }, -/obj/item/circuitboard/computer/records/medical{ - pixel_x = -13; - pixel_y = 5 - }, -/obj/item/circuitboard/computer/operating{ - pixel_x = -14; - pixel_y = 3 - }, -/obj/item/circuitboard/computer/pandemic{ - pixel_x = -15; - pixel_y = 1 - }, -/obj/item/circuitboard/computer/scan_consolenew{ - pixel_x = -16; - pixel_y = -1 - }, -/obj/item/circuitboard/machine/chem_dispenser{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/circuitboard/machine/chem_dispenser/botany{ - pixel_x = 7; - pixel_y = 5 - }, -/obj/item/circuitboard/machine/chem_heater{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/circuitboard/machine/chem_master{ - pixel_x = 5 - }, -/obj/item/circuitboard/machine/cryo_tube{ - pixel_x = 4; - pixel_y = -2 - }, -/turf/open/floor/iron/dark, -/area/engine/storage) "jUi" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line, @@ -36388,6 +36401,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/aft) +"lJy" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/obj/machinery/light_switch{ + pixel_x = 1; + pixel_y = 28 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "lJD" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -38525,6 +38549,15 @@ }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) +"mpB" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/security/detectives_office) "mpF" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -40768,17 +40801,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/asteroid, /area/maintenance/starboard/secondary) -"mWY" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/security/laptop{ - pixel_y = 2 - }, -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/lawoffice) "mXv" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -41104,6 +41126,11 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"neb" = ( +/obj/structure/bed/roller, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "nek" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -41216,23 +41243,6 @@ }, /turf/open/floor/iron/dark, /area/engine/storage) -"nfU" = ( -/obj/item/radio/intercom{ - pixel_x = -29; - pixel_y = -29 - }, -/obj/machinery/requests_console{ - department = "Security Outpost - Medical"; - pixel_x = -32 - }, -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/security/checkpoint/medical) "nfV" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -41646,6 +41656,14 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) +"npk" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/bridge) "npo" = ( /obj/structure/chair/fancy/bench/right{ dir = 8 @@ -42106,6 +42124,16 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"nxS" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/security/checkpoint/customs) "nya" = ( /obj/machinery/computer/turbine_computer{ dir = 8; @@ -46609,6 +46637,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/port/central) +"oWM" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/virology) "oWN" = ( /obj/machinery/camera/directional/north, /obj/machinery/telecomms/relay/preset/telecomms, @@ -48570,13 +48602,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/foyer) -"pHj" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/crew_quarters/heads/hos) "pHz" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49583,19 +49608,6 @@ }, /turf/open/floor/plating, /area/tcommsat/computer) -"pYt" = ( -/obj/machinery/camera/directional/north, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/computer/records/security, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/checkpoint/medical) "pYz" = ( /obj/machinery/door/airlock/science{ name = "Toxins Lab"; @@ -50125,6 +50137,15 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"qiy" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/obj/structure/bed/roller, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "qiD" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, @@ -54714,13 +54735,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"rIH" = ( -/obj/effect/turf_decal/tile/red/diagonal_edge, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/main) "rJj" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -55407,6 +55421,14 @@ }, /turf/open/floor/iron/dark, /area/engine/storage) +"rVj" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "rVB" = ( /obj/structure/chair/fancy/bench/pew/right{ dir = 8 @@ -57191,15 +57213,6 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/department/science/central) -"sys" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "syt" = ( /obj/structure/window/reinforced/spawner{ dir = 4 @@ -57280,6 +57293,15 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) +"szz" = ( +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = 28 + }, +/mob/living/carbon/human/species/monkey/punpun, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "szC" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -57889,16 +57911,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/science/robotics/lab) -"sJX" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/security/checkpoint/science) "sKa" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -60723,11 +60735,6 @@ /obj/machinery/computer/security/security, /turf/open/floor/iron/dark, /area/security/warden) -"tGj" = ( -/obj/machinery/computer/records/medical, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron, -/area/bridge) "tGC" = ( /obj/structure/transit_tube, /obj/structure/lattice, @@ -62300,6 +62307,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engine/engineering) +"uhS" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_y = 5 + }, +/turf/open/floor/carpet/cyan, +/area/crew_quarters/heads/cmo) "uhX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62668,13 +62683,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"umx" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/warden) "umy" = ( /obj/machinery/smartfridge, /turf/open/floor/iron, @@ -65133,6 +65141,17 @@ }, /turf/open/space/basic, /area/space) +"vce" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/security/laptop{ + pixel_y = 2 + }, +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/lawoffice) "vci" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment, @@ -66291,6 +66310,23 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) +"vva" = ( +/obj/item/radio/intercom{ + pixel_x = -29; + pixel_y = -29 + }, +/obj/machinery/requests_console{ + department = "Security Outpost - Medical"; + pixel_x = -32 + }, +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/security/checkpoint/medical) "vvb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -68663,6 +68699,13 @@ /obj/item/stack/medical/gauze, /turf/open/floor/iron/dark, /area/security/brig/medbay) +"whR" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/crew_quarters/heads/hos) "whY" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -69081,15 +69124,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"woh" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/wood, -/area/security/detectives_office) "won" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -69577,16 +69611,6 @@ /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) -"wxT" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/security/checkpoint/customs) "wxY" = ( /obj/machinery/power/terminal{ dir = 8 @@ -72450,17 +72474,6 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/checkpoint/supply) -"xxd" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/main) "xxg" = ( /obj/item/radio/intercom{ pixel_y = 24 @@ -73456,19 +73469,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"xNc" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/dark, -/area/security/checkpoint/supply) "xNl" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Command Maintenance Hatch"; @@ -93795,7 +93795,7 @@ lKj amI lCB klF -jUh +gyl kxH aMT aMT @@ -98008,7 +98008,7 @@ sSj xjD rjR lwz -mWY +vce fjM bjA nGh @@ -98661,7 +98661,7 @@ cWH cWH lPX sJS -aWc +fkG cuL dBV idp @@ -106668,7 +106668,7 @@ nHS cHz tvN pMq -sJX +jad vux fKx fKx @@ -106875,7 +106875,7 @@ anT anT anT alZ -iBi +npk aPv adI aOM @@ -107903,7 +107903,7 @@ anT aMT anT alZ -tGj +gYL qFQ skY aPd @@ -108972,7 +108972,7 @@ qnk mlk cIL sJK -wxT +nxS nUe nUe lFz @@ -109723,7 +109723,7 @@ uGg uGg eNC vtM -sys +gRA lln ePr nEf @@ -109789,7 +109789,7 @@ gNF dam aYT nTo -clk +szz mEv fhO cjX @@ -112277,7 +112277,7 @@ fSe xzx tzh ttg -cSX +jjw hHj ntR fwX @@ -112546,14 +112546,14 @@ hzq nXe wdn aKD -woh -iSM +mpB +dtx fdo tTo xCb juS sim -umx +bXV thk tTo uqH @@ -113102,7 +113102,7 @@ ewh iaQ koh iDL -ftP +lJy jSX iDL tYf @@ -113819,7 +113819,7 @@ fSe fSe jhz kCo -xxd +enj hHj pwU fft @@ -114071,7 +114071,7 @@ aMT aMT oRA hMG -rIH +bzI wYy fSe jhz @@ -116680,7 +116680,7 @@ xmB vnF fQk onl -xNc +cXC ftE jZr ikJ @@ -117163,7 +117163,7 @@ fsb fSN gPG aPP -pHj +whR iRh mJQ unX @@ -118511,8 +118511,8 @@ gpT gqY uYV syo -aak -aan +qiy +neb vBf qSI eCC @@ -118769,7 +118769,7 @@ rQd rQd uOa xef -aao +gCr vBf kBi bjq @@ -119025,7 +119025,7 @@ rDF vdX gUv qeJ -eGm +rVj dsx vBf jaq @@ -120296,7 +120296,7 @@ iIy bDd dcF miq -nfU +vva vQz twH xKw @@ -120566,7 +120566,7 @@ tij tij aZG rTm -gwg +uhS tij ppd rBf @@ -120808,7 +120808,7 @@ qHm gfS tyI vQz -pYt +eJj wrv nKR fjJ @@ -130091,11 +130091,11 @@ aMT aMT lvw lYS -jLw -jLw -jLw -jLw -jLw +oWM +oWM +oWM +oWM +oWM lYS lvw aMT diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 04e68fe7c0881..c4fe578f27a79 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -907,6 +907,22 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/construction/mining/aux_base) +"ahw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/engine, +/area/maintenance/disposal/incinerator) "ahM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -1197,6 +1213,19 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"ajw" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/security/detectives_office) "ajJ" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -1572,6 +1601,18 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/hallway/secondary/entry) +"alz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/engineering) "alI" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -2708,18 +2749,6 @@ "ats" = ( /turf/closed/wall, /area/medical/medbay/lobby) -"att" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/engineering) "atu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -6166,20 +6195,6 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"aMw" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/maintenance/disposal/incinerator) "aMy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter/flipped{ @@ -6366,18 +6381,6 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) -"aNS" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/engine, -/area/maintenance/disposal/incinerator) "aNT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -6459,14 +6462,6 @@ /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) -"aPz" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/maintenance/disposal/incinerator) "aPA" = ( /obj/machinery/button/ignition/incinerator/atmos{ pixel_x = 8; @@ -13481,6 +13476,16 @@ "bPM" = ( /turf/closed/wall, /area/engine/transit_tube) +"bPS" = ( +/obj/machinery/computer/records/medical, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "bPW" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -18292,6 +18297,18 @@ }, /turf/open/floor/iron, /area/hallway/secondary/command) +"csH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "csI" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -18548,17 +18565,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) -"cuy" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - pixel_y = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/wood, -/area/medical/exam_room) "cuB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -24164,6 +24170,16 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"dbq" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/security/main) "dbu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -24385,18 +24401,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"dcy" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/status_display/ai{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint) "dcE" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -23 @@ -24598,6 +24602,20 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/xenobiology) +"ddX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/mapping_helpers/atmos_auto_connect, +/obj/machinery/airalarm/server{ + dir = 8; + pixel_x = -22 + }, +/turf/open/floor/iron, +/area/tcommsat/server) "ddY" = ( /obj/item/radio/intercom{ pixel_y = -32 @@ -24860,6 +24878,14 @@ }, /turf/open/floor/iron/white, /area/science/research) +"dgC" = ( +/obj/machinery/computer/records/medical/laptop, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "dgJ" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -26118,14 +26144,6 @@ }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) -"dsR" = ( -/obj/machinery/computer/records/medical/laptop, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "dsZ" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/ai{ @@ -26442,13 +26460,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"dvE" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "dvO" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -29371,19 +29382,6 @@ }, /turf/open/floor/iron, /area/maintenance/port/aft) -"dRF" = ( -/obj/machinery/computer/records/medical/laptop{ - dir = 1; - pixel_y = 4 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/item/toy/figure/cmo{ - pixel_x = -9; - pixel_y = 11 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "dRI" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/filingcabinet/chestdrawer, @@ -29793,6 +29791,20 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"dVM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/machinery/computer/records/security, +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron, +/area/crew_quarters/heads/hos) "dVW" = ( /obj/machinery/door/airlock/grunge{ name = "Chapel Hall" @@ -31062,6 +31074,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/port/fore) +"egM" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/engine, +/area/maintenance/disposal/incinerator) "egQ" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, @@ -34123,20 +34147,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) -"eZO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/machinery/computer/records/security, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron, -/area/crew_quarters/heads/hos) "fab" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34660,6 +34670,14 @@ /obj/item/flashlight, /turf/open/floor/iron, /area/maintenance/aft) +"fiX" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/engine, +/area/maintenance/disposal/incinerator) "fjc" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -35444,6 +35462,14 @@ /obj/machinery/light/small, /turf/open/floor/iron, /area/medical/break_room) +"fwL" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/security/brig/medbay) "fwR" = ( /obj/machinery/conveyor_switch{ id = "SciLoad" @@ -36160,19 +36186,6 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/medical/virology) -"fHN" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/security/detectives_office) "fHO" = ( /obj/machinery/camera/directional/north{ c_tag = "Departures - Fore"; @@ -37514,18 +37527,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"gbh" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 1 - }, -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark/smooth_half, -/area/crew_quarters/heads/hos) "gbj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -37583,18 +37584,6 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/security/main) -"gbV" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, -/obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "gbW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42609,6 +42598,23 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/tcommsat/server) +"hEU" = ( +/obj/machinery/computer/records/medical{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/camera{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "hFh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ @@ -44632,18 +44638,6 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/kitchen) -"ijv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "ijz" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -45334,22 +45328,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/security/brig) -"ivC" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/cmo{ - dir = 1; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "ivH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -45552,13 +45530,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"iyr" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron, -/area/security/checkpoint/supply) "iyt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/east, @@ -45961,10 +45932,6 @@ /obj/structure/sign/departments/minsky/supply/janitorial, /turf/closed/wall, /area/janitor/custodian) -"iGk" = ( -/mob/living/carbon/monkey, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "iGD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -48163,18 +48130,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/dorms) -"juT" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/customs/auxiliary) "juV" = ( /obj/structure/fireplace, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -48543,6 +48498,19 @@ }, /turf/open/floor/iron, /area/medical/medbay/lobby) +"jBr" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/security/detectives_office) "jBG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -48867,13 +48835,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"jGA" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/turf/open/floor/iron, -/area/security/checkpoint/escape) "jGC" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -49093,16 +49054,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) -"jME" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hop) "jMF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -49234,6 +49185,22 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"jOg" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/cmo{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "jOu" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/light{ @@ -52253,6 +52220,13 @@ }, /turf/open/floor/iron, /area/crew_quarters/heads/hor) +"kLq" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/warden) "kLu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -52471,6 +52445,13 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) +"kQC" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "kQG" = ( /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -52851,20 +52832,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"kZj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/effect/mapping_helpers/atmos_auto_connect, -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -22 - }, -/turf/open/floor/iron, -/area/tcommsat/server) "kZP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53941,6 +53908,16 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) +"lsp" = ( +/obj/machinery/atmospherics/components/binary/pump, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "lsH" = ( /obj/structure/railing{ dir = 1 @@ -54005,23 +53982,6 @@ dir = 1 }, /area/hallway/secondary/entry) -"ltq" = ( -/obj/machinery/computer/records/medical{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ltv" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 22 @@ -54742,6 +54702,10 @@ }, /turf/open/floor/iron, /area/security/checkpoint/escape) +"lEU" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "lEW" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -56366,6 +56330,17 @@ }, /turf/open/floor/iron, /area/hallway/secondary/command) +"meJ" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + pixel_y = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/wood, +/area/medical/exam_room) "meM" = ( /obj/structure/window/reinforced, /obj/machinery/firealarm{ @@ -56540,6 +56515,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/quartermaster/warehouse) +"mhN" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 + }, +/obj/machinery/airlock_sensor/incinerator_toxmix{ + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "mhZ" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -57468,6 +57455,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"mwT" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/security/checkpoint/supply) "mxx" = ( /obj/structure/table/wood, /obj/item/folder, @@ -57577,13 +57571,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/science/xenobiology) -"mAd" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron, -/area/security/checkpoint/science/research) "mAe" = ( /obj/structure/table, /obj/item/paper_bin, @@ -58145,6 +58132,18 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/aft) +"mIw" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/status_display/ai{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/checkpoint) "mIA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -58843,16 +58842,6 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron, /area/quartermaster/exploration_prep) -"mVm" = ( -/obj/machinery/keycard_auth{ - pixel_x = 26; - pixel_y = 26 - }, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/turf/open/floor/carpet/red, -/area/crew_quarters/heads/hos) "mVn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -58960,16 +58949,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"mWZ" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "mXa" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -60740,47 +60719,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/research) -"nwF" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Personnel's Desk"; - departmentType = 5; - name = "Head of Personnel RC"; - pixel_x = 32; - pixel_y = 32 - }, -/obj/machinery/light_switch{ - pixel_x = -38; - pixel_y = 7 - }, -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/obj/machinery/button/door{ - id = "hopline"; - name = "Queue Shutters Control"; - pixel_x = -26; - pixel_y = -7; - req_access_txt = "57" - }, -/obj/machinery/button/door{ - id = "hopblast"; - name = "Lockdown Blast doors"; - pixel_x = -26; - pixel_y = 7; - req_access_txt = "57" - }, -/obj/machinery/button/flasher{ - id = "hopflash"; - pixel_x = -38; - pixel_y = -7; - req_access_txt = "28" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hop) "nwT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62035,6 +61973,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmospherics_engine) +"nQE" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/checkpoint/customs) "nQH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62272,6 +62222,19 @@ }, /turf/open/floor/iron, /area/engine/gravity_generator) +"nTQ" = ( +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/item/toy/figure/cmo{ + pixel_x = -9; + pixel_y = 11 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "nTW" = ( /obj/machinery/vending/cigarette, /obj/machinery/firealarm/directional/north, @@ -64546,11 +64509,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/bar) -"oIE" = ( -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/engine, -/area/science/mixing/chamber) "oIF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, @@ -69045,6 +69003,11 @@ dir = 1 }, /area/hallway/secondary/entry) +"qiz" = ( +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/engine, +/area/science/mixing/chamber) "qiC" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ @@ -70161,6 +70124,20 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"qys" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airlock_sensor/incinerator_atmos{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/engine, +/area/maintenance/disposal/incinerator) "qyC" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -70701,11 +70678,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"qIO" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/mob/living/carbon/monkey/punpun, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "qIZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -72411,6 +72383,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"rju" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron, +/area/medical/genetics) "rjx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -74179,21 +74168,21 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"rLs" = ( -/obj/machinery/computer/records/medical, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "rLG" = ( /obj/structure/chair/office, /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark/smooth_large, /area/security/main) +"rLL" = ( +/obj/machinery/keycard_auth{ + pixel_x = 26; + pixel_y = 26 + }, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/crew_quarters/heads/hos) "rLP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -76092,16 +76081,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/patients_rooms) -"spm" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/security/main) "spM" = ( /obj/machinery/vending/autodrobe, /obj/structure/cable/yellow{ @@ -77902,6 +77881,13 @@ /obj/item/kirbyplants/random, /turf/open/floor/carpet/grimy, /area/tcommsat/computer) +"sQP" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/turf/open/floor/iron, +/area/security/checkpoint/escape) "sQX" = ( /obj/machinery/computer/security/mining{ dir = 4 @@ -78290,6 +78276,18 @@ }, /turf/open/floor/iron/white, /area/security/brig/medbay) +"sXt" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 1 + }, +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark/smooth_half, +/area/crew_quarters/heads/hos) "sXx" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -80081,18 +80079,6 @@ /obj/machinery/photocopier, /turf/open/floor/carpet/red, /area/security/detectives_office) -"tAd" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/checkpoint/customs) "tAe" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -84041,6 +84027,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/science/robotics/mechbay) +"uPO" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/customs/auxiliary) "uQd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_thermomachine, @@ -85049,19 +85047,6 @@ /obj/structure/sign/departments/minsky/medical/medical2, /turf/closed/wall, /area/security/brig/medbay) -"vgB" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end, -/mob/living/carbon/monkey, -/turf/open/floor/iron, -/area/medical/genetics) "vgQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -85386,6 +85371,13 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"vmj" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/security/checkpoint/science/research) "vmt" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, @@ -86887,22 +86879,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"vKl" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/engine, -/area/maintenance/disposal/incinerator) "vKB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -87442,6 +87418,19 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"vTU" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/end, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron, +/area/medical/genetics) "vUc" = ( /obj/structure/chair/office{ dir = 8 @@ -88532,6 +88521,22 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/maintenance/department/science) +"wjR" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/westright{ + dir = 4; + name = "'Monkey Pen"; + req_access_txt = "9" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron, +/area/medical/genetics) "wkh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -88577,14 +88582,6 @@ "wkM" = ( /turf/open/floor/holofloor/plating, /area/holodeck/prison) -"wkS" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/white, -/area/security/brig/medbay) "wkV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -88990,22 +88987,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"wqx" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/westright{ - dir = 4; - name = "'Monkey Pen"; - req_access_txt = "9" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron, -/area/medical/genetics) "wqz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, @@ -89036,6 +89017,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/atmos) +"wqU" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/hop) "wrj" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/directional/east{ @@ -89665,19 +89656,6 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/security/detectives_office) -"wyY" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/security/detectives_office) "wzr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -89817,6 +89795,11 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"wCt" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "wCx" = ( /obj/machinery/light/small{ dir = 1 @@ -90868,6 +90851,47 @@ /obj/item/hand_labeler, /turf/open/floor/iron/dark, /area/medical/morgue) +"wQl" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Personnel's Desk"; + departmentType = 5; + name = "Head of Personnel RC"; + pixel_x = 32; + pixel_y = 32 + }, +/obj/machinery/light_switch{ + pixel_x = -38; + pixel_y = 7 + }, +/obj/item/radio/intercom{ + pixel_y = 26 + }, +/obj/machinery/button/door{ + id = "hopline"; + name = "Queue Shutters Control"; + pixel_x = -26; + pixel_y = -7; + req_access_txt = "57" + }, +/obj/machinery/button/door{ + id = "hopblast"; + name = "Lockdown Blast doors"; + pixel_x = -26; + pixel_y = 7; + req_access_txt = "57" + }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = -38; + pixel_y = -7; + req_access_txt = "28" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/hop) "wQo" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -91354,23 +91378,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) -"wZR" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron, -/area/medical/genetics) "xad" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -92305,13 +92312,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/dorms) -"xqG" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/warden) "xqH" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage"; @@ -116030,7 +116030,7 @@ xOv eSj gXZ aPy -aNS +egM aPy gXZ afB @@ -116286,9 +116286,9 @@ aGO uWt slo gXZ -aMw -vKl -aPz +qys +ahw +fiX gXZ hFo aRF @@ -122748,7 +122748,7 @@ iji oRw siF nBM -att +alz pij cch gAd @@ -128192,7 +128192,7 @@ svv sfo qnx eJc -gbV +mhN eJc fsz sfL @@ -128448,8 +128448,8 @@ qYo svv oYI exE -oIE -ijv +qiz +csH mEg nJc wso @@ -128706,7 +128706,7 @@ svv ixL xXn eJc -mWZ +lsp eJc pIq sHj @@ -129973,7 +129973,7 @@ lTs cNn cOV jKw -mAd +vmj tpm rLi oeV @@ -130971,10 +130971,10 @@ bOy bQz bSz bUB -nwF +wQl uxf iKH -jME +wqU lIr nVe sQX @@ -132200,7 +132200,7 @@ lAp pOL lMx cWU -tAd +nQE qzF akE rZH @@ -132577,7 +132577,7 @@ dOd vSn dNL ssN -juT +uPO pNW nRw eWx @@ -132730,7 +132730,7 @@ ieu aDL bVe mFN -qIO +wCt oIn sVh qKU @@ -133114,7 +133114,7 @@ sOR eec jBn xPa -jGA +sQP egG aad aad @@ -133528,7 +133528,7 @@ bsH buq aaa bwT -rLs +bPS lOI vOY mPB @@ -133809,7 +133809,7 @@ dzh eWL cmE cof -kZj +ddX cqY csw dpO @@ -134556,7 +134556,7 @@ bsL buq aaa bwX -dvE +kQC hHG vHa trF @@ -135120,7 +135120,7 @@ fyg cRd cnz ews -ivC +jOg cRd pKl uDp @@ -135129,10 +135129,10 @@ cRd dbu pIp dvc -wZR +rju hIW -wqx -vgB +wjR +vTU dvc ybx isk @@ -136312,7 +136312,7 @@ cId fWh eZf nyr -dcy +mIw vNN akP arU @@ -136662,7 +136662,7 @@ kYX bUx ulF tuF -ltq +hEU cPy msj mHY @@ -136842,7 +136842,7 @@ aCV mDy aFi bXF -iyr +mwT nYb cnt jTK @@ -139717,8 +139717,8 @@ kJx jDr lHS bMW -fHN -wyY +ajw +jBr bHr eeo ksd @@ -139765,7 +139765,7 @@ jMM mKL mKL dPq -iGk +lEU bkC wLH din @@ -140022,8 +140022,8 @@ vau lII aqa dPq -iGk -iGk +lEU +lEU oQr rjR hFD @@ -140280,7 +140280,7 @@ icT mKL dPq uyH -iGk +lEU pQj kqr jky @@ -141797,7 +141797,7 @@ fmt fmt eoC gEX -cuy +meJ anj eMu nIF @@ -142578,7 +142578,7 @@ yld rjo oxf jTq -dRF +nTQ rYI usa dtK @@ -144381,7 +144381,7 @@ dFe pMM nxN dtK -dsR +dgC iWC roU dxp @@ -146387,7 +146387,7 @@ dSV fWk aoI nbM -xqG +kLq qYS bFL qpD @@ -148958,7 +148958,7 @@ liY mZr nqU lKh -wkS +fwL tNF gbU utw @@ -150251,7 +150251,7 @@ aZx luQ iHY biP -eZO +dVM nmV oBk tZZ @@ -150760,7 +150760,7 @@ rYk aZx bxF weL -spm +dbq jEE fcx fkX @@ -152309,7 +152309,7 @@ oAg jCO erl tzf -gbh +sXt dXm abj aad @@ -152564,7 +152564,7 @@ xbD roT wIv xWq -mVm +rLL wrX aPW biP diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 78b5571115541..e5a4c9a80a536 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -1,17 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aaj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "aam" = ( /obj/structure/lattice, /obj/item/shard, @@ -303,13 +290,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"adz" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "adF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -347,6 +327,11 @@ /obj/structure/lattice, /turf/open/space, /area/asteroid/nearstation) +"aeq" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/wood, +/area/medical/exam_room) "aer" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/storage/box/lights/mixed, @@ -500,19 +485,16 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/maintenance/port/central) -"ahi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/machinery/power/smes{ - charge = 5e+006 +"ahf" = ( +/obj/machinery/power/shieldwallgen, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/structure/cable/yellow, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" +/obj/effect/turf_decal/bot{ + dir = 1 }, -/area/bridge) +/turf/open/floor/iron/dark, +/area/teleporter) "ahj" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -671,17 +653,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/science/lobby) -"ajg" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech/grid, -/area/science/xenobiology) "aji" = ( /obj/machinery/door/window/brigdoor/westleft{ name = "Captain's Bedroom"; @@ -689,14 +660,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) -"ajn" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint, -/area/science/storage) "ajo" = ( /obj/structure/cable{ icon_state = "0-2" @@ -739,22 +702,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"ajF" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Filter to Gas" - }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "ajH" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -831,11 +778,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/science/breakroom) -"akk" = ( -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/gateway) "aks" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -845,6 +787,17 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/central) +"akE" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/engine, +/area/science/storage) "akG" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -1034,6 +987,17 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/aft) +"anj" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Chamber" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "anq" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -1082,6 +1046,24 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"anU" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/research{ + name = "Research Division Access"; + req_access_txt = "47" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/techmaint, +/area/science/lobby) "aob" = ( /turf/open/floor/plating/rust, /area/space/nearstation) @@ -1189,6 +1171,14 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) +"aqb" = ( +/obj/machinery/button/shieldwallgen/directional/south{ + name = "Arrivals" + }, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "aqg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1198,6 +1188,23 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"aqq" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/machinery/status_display/door_timer{ + id = "arrdoor"; + name = "Arrival Cell"; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/security/checkpoint) "aqA" = ( /obj/machinery/light/small, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -1213,19 +1220,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqL" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/iron/ameridiner, +/turf/open/floor/iron/dark, /area/engine/engine_room) "aqM" = ( /obj/machinery/door/airlock{ @@ -1341,15 +1340,6 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/port/central) -"ass" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/dock/drydock, -/area/drydock) "asu" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 1 @@ -1614,6 +1604,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"auY" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "avb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_spawn, @@ -1650,23 +1644,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"avJ" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/machinery/status_display/door_timer{ - id = "arrdoor"; - name = "Arrival Cell"; - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/security/checkpoint) "avK" = ( /obj/machinery/door/airlock/vault{ name = "Vault Door"; @@ -1686,15 +1663,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/security/nuke_storage) -"avS" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/tech/grid, -/area/science/xenobiology) "avU" = ( /obj/machinery/airalarm/directional/east{ pixel_x = 22 @@ -1721,12 +1689,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"awf" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/nanite_program_hub, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "awl" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -1802,6 +1764,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/central) +"awX" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/lobby) "axc" = ( /obj/effect/turf_decal/bot/left, /obj/machinery/light_switch{ @@ -1819,12 +1791,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/asteroid/nearstation) -"axE" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/dock/drydock, -/area/drydock/security) "axI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1896,50 +1862,6 @@ }, /turf/open/floor/iron/dark/side, /area/hallway/secondary/exit/departure_lounge) -"ayQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/hallway/primary/starboard) -"ayX" = ( -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 2; - name = "landing marker"; - picked_color = "Burgundy" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "aze" = ( /obj/machinery/camera/directional/south{ c_tag = "Medbay - Cloning Lab"; @@ -2300,17 +2222,6 @@ }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) -"aDB" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint, -/area/science/storage) "aDF" = ( /turf/open/floor/plating/rust, /area/asteroid/nearstation) @@ -2519,16 +2430,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"aGg" = ( -/mob/living/carbon/monkey, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark_green/corner{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "aGh" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -2655,6 +2556,10 @@ /obj/structure/chair/fancy/plastic, /turf/open/floor/iron/dark, /area/engine/atmos) +"aHd" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "aHf" = ( /turf/closed/wall/r_wall, /area/science/test_area) @@ -2954,6 +2859,13 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"aJE" = ( +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "aJK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3095,6 +3007,13 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) +"aLv" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "aLF" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -3137,18 +3056,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/central) -"aMf" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/catwalk_floor, -/area/drydock) "aMs" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -3250,35 +3157,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/vacant_room/office) -"aNJ" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/white/end{ - dir = 8 - }, -/obj/machinery/airalarm/mixingchamber{ - dir = 4; - pixel_x = 22 - }, -/turf/open/floor/iron/techmaint, -/area/science/mixing/chamber) "aNW" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/medical) -"aNY" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/maintenance{ - name = "Genetics Lab Maintenance"; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "aOa" = ( /obj/item/storage/bag/bio, /obj/structure/table/reinforced, @@ -3596,6 +3478,15 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/port/central) +"aQy" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 1; + filter_type = "n2"; + name = "nitrogen filter" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "aQH" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 10 @@ -3794,14 +3685,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/port) -"aSJ" = ( -/obj/effect/turf_decal/bot_white/right, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/gateway) "aSR" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -3892,6 +3775,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) +"aTH" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "aTN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -3986,6 +3875,14 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/aft) +"aUH" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/conveyor{ + dir = 8; + id = "canister_conveyor" + }, +/turf/open/floor/plating, +/area/science/storage) "aUJ" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/firedoor, @@ -4240,6 +4137,27 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"aWP" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "aWR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -4551,22 +4469,17 @@ "bbZ" = ( /turf/closed/wall, /area/space/nearstation) -"bcd" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bcg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/techmaint, /area/security/prison) -"bci" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" +"bcq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, +/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) @@ -4679,20 +4592,6 @@ "bdu" = ( /turf/closed/wall, /area/maintenance/department/medical) -"bdJ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Conference Room Maintenance"; - req_access_txt = "19" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridgedoors"; - name = "Bridge Access Blast Door" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/central) "bdP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -4891,6 +4790,18 @@ broken = 1 }, /area/asteroid/nearstation) +"bhj" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port) "bhp" = ( /turf/open/floor/plating/rust, /area/maintenance/department/medical) @@ -5453,6 +5364,21 @@ dir = 1 }, /area/hallway/primary/fore) +"bnD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "bnT" = ( /obj/structure/table/wood, /obj/item/flashlight/seclite, @@ -5512,37 +5438,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) -"boV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/plaques/kiddie/library{ - pixel_x = -32 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood, -/area/library) "bpq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/janitor) -"bps" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/bridge) "bpv" = ( /obj/machinery/light/small{ dir = 4 @@ -5789,25 +5690,6 @@ }, /turf/open/floor/wood, /area/quartermaster/qm) -"bsy" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Cargo Maintenance"; - req_one_access_txt = "31;48;12" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/aft/secondary) "bsH" = ( /obj/machinery/computer/prisoner/management{ dir = 1 @@ -5819,19 +5701,6 @@ /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron, /area/security/checkpoint) -"bsI" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "bsL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/airalarm/directional/north{ @@ -5850,22 +5719,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"btg" = ( -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Surgery Maintenance"; - req_access_txt = "45" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "bti" = ( /turf/open/floor/circuit/green{ luminosity = 2 @@ -6135,6 +5988,12 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"bwS" = ( +/obj/machinery/button/shieldwallgen/directional/south{ + id = 2 + }, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "bwY" = ( /obj/machinery/modular_computer/console/preset/curator{ dir = 8 @@ -6327,15 +6186,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"bAF" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "bAS" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -6423,16 +6273,6 @@ /obj/machinery/camera/directional/east, /turf/open/floor/noslip/standard, /area/crew_quarters/fitness/recreation) -"bCW" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/toxins, -/obj/item/storage/firstaid/toxin{ - pixel_x = -4; - pixel_y = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "bCZ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -6566,12 +6406,6 @@ }, /turf/open/floor/iron/dark, /area/medical/storage) -"bFd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "bFm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -6589,21 +6423,6 @@ dir = 10 }, /area/medical/surgery) -"bFv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/command/glass{ - name = "Control Room"; - req_access_txt = "19" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/iron/techmaint, -/area/tcommsat/computer) "bFI" = ( /obj/machinery/door/airlock{ id_tag = "commissarydoor2"; @@ -6845,6 +6664,20 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"bJP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/beacon, +/turf/open/floor/iron/dark, +/area/hallway/primary/starboard) "bJS" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/conveyor{ @@ -6975,6 +6808,25 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"bMA" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = -5 + }, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 + }, +/obj/item/geiger_counter, +/obj/item/geiger_counter, +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch{ + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "bMR" = ( /obj/structure/table/optable, /obj/item/surgical_drapes, @@ -7014,11 +6866,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) -"bNs" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/gateway) "bNx" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7148,6 +6995,17 @@ }, /turf/open/floor/iron/grid/steel, /area/science/research) +"bOX" = ( +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/bridge) "bOZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -7239,19 +7097,6 @@ /obj/machinery/light, /turf/open/floor/iron/sepia, /area/maintenance/disposal/incinerator) -"bPN" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "bPP" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/advanced_airlock_controller{ @@ -7320,15 +7165,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"bQx" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "bQy" = ( /obj/structure/sign/map/right{ desc = "A framed outdated, yet detailed picture of the station. there's even the permanent prison wing in the bottom left!"; @@ -7521,6 +7357,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/port) +"bTh" = ( +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ + pixel_x = 24 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/machinery/airlock_sensor/incinerator_toxmix{ + pixel_y = 24 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "bTk" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/research{ @@ -7778,15 +7629,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/sepia, /area/maintenance/disposal/incinerator) -"bVw" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "bVy" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/item/kirbyplants/random, @@ -7800,15 +7642,6 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"bVI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/iron/ameridiner, -/area/medical/genetics) "bVJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -7885,6 +7718,14 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"bXu" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/nanite_programmer, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "bXv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -8457,21 +8298,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"cgS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "chb" = ( /obj/machinery/door/airlock/medical/glass{ name = "Recovery Room" @@ -8651,15 +8477,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"cjd" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/engine, -/area/science/storage) "cje" = ( /obj/item/kirbyplants/random, /turf/open/floor/plating, @@ -8670,14 +8487,6 @@ }, /turf/open/floor/iron/sepia, /area/science/shuttle) -"cjO" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/power/shieldwallgen, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/engine, -/area/maintenance/department/engine) "cjS" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal/bin, @@ -9166,12 +8975,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/aft) -"crl" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "crw" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -9297,15 +9100,6 @@ }, /turf/open/floor/iron/techmaint, /area/ai_monitored/security/armory) -"csE" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "csJ" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -9327,6 +9121,12 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"ctk" = ( +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/open/floor/dock/drydock, +/area/drydock) "ctv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -9370,6 +9170,18 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"ctM" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "ctN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -9467,6 +9279,15 @@ }, /turf/open/floor/prison, /area/security/prison) +"cvj" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/engine, +/area/science/storage) "cvq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -9543,6 +9364,14 @@ }, /turf/open/floor/iron, /area/medical/break_room) +"cvZ" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance{ + name = "Psychologist Maintenance"; + req_access_txt = "12" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "cwc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -9681,13 +9510,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/bridge) -"cyd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron/ameridiner, -/area/medical/genetics) "cyf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -9754,6 +9576,15 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/port) +"czq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/plating, +/area/medical/cryo) "czs" = ( /obj/structure/closet/radiation, /obj/effect/turf_decal/bot, @@ -9901,14 +9732,19 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"cBs" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor/inverted{ - id = "plasma_conveyor"; - dir = 9 +"cBq" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/science/storage) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/camera/directional/west, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "cBt" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -10030,6 +9866,21 @@ /obj/machinery/light, /turf/open/floor/plating, /area/engine/storage) +"cDo" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/button/shieldwallgen/directional/east{ + name = "Arrivals" + }, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "cDE" = ( /obj/machinery/light{ dir = 4 @@ -10147,10 +9998,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/research) -"cGf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "cGp" = ( /turf/closed/wall, /area/maintenance/disposal) @@ -10202,19 +10049,6 @@ }, /turf/open/floor/iron, /area/medical/break_room) -"cHs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/shieldwallgen, -/obj/effect/turf_decal/bot, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/engine, -/area/maintenance/department/engine) "cHt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -10419,6 +10253,14 @@ /obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating, /area/hallway/primary/central) +"cJB" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/gateway) "cJN" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, @@ -10597,26 +10439,6 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/tech, /area/bridge) -"cLU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Exploration Preparation Room"; - req_access_txt = "49" - }, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "cMw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10772,31 +10594,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/fore) -"cOM" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/wood, -/area/medical/exam_room) -"cOO" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "cOP" = ( /obj/machinery/button/door{ id = "telelab"; @@ -10810,18 +10607,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/vacant_room/commissary/commissaryRandom) -"cPk" = ( -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "cPl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10886,6 +10671,15 @@ dir = 8 }, /area/quartermaster/storage) +"cPQ" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "cPR" = ( /obj/machinery/holopad{ pixel_x = -16 @@ -11027,14 +10821,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"cRu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "cRz" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 8 @@ -11066,18 +10852,6 @@ /obj/item/survivalcapsule/capsule_checkpoint, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"cRD" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - dir = 1; - id = 1 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/turf/open/floor/plating/airless, -/area/docking/arrival) "cRG" = ( /obj/machinery/mass_driver{ id = "toxinsdriver" @@ -11209,6 +10983,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/maintenance/central/secondary) +"cSK" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Detective's Office Maintenance"; + req_access_txt = "4" + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/security/brig) "cSN" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -11296,16 +11078,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"cTE" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "cTG" = ( /turf/open/floor/iron/sepia, /area/science/shuttle) @@ -11460,30 +11232,16 @@ }, /turf/open/floor/iron/techmaint, /area/science/research) -"cVj" = ( -/obj/machinery/door/poddoor/preopen{ - id = "rdxeno"; - name = "Xenobiology Containment Door" - }, -/obj/machinery/door/airlock/research{ - name = "Science Shuttle Dock"; - req_access_txt = "47" - }, -/obj/machinery/door/firedoor, +"cVo" = ( +/obj/effect/turf_decal/stripes/closeup, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Desk Maintenance"; + req_access_txt = "5" }, -/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, -/area/science/shuttledock) -"cVt" = ( -/obj/machinery/button/shieldwallgen/directional/east{ - id = 3 - }, -/turf/open/floor/catwalk_floor, -/area/drydock) +/area/maintenance/department/medical) "cVu" = ( /obj/machinery/teleport/hub, /turf/open/floor/iron/tech/grid, @@ -11563,6 +11321,26 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/bridge) +"cWq" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Science - Toxins Mixing Lab Burn Chamber"; + name = "science camera" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "cWr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -11571,6 +11349,19 @@ }, /turf/open/floor/plating, /area/medical/virology) +"cWC" = ( +/obj/structure/sign/warning/radiation{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/corner, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "cWF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -11610,20 +11401,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"cWY" = ( -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison Blast Door" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/hallway/primary/central) "cXc" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment{ @@ -11645,6 +11422,26 @@ "cXA" = ( /turf/closed/wall, /area/hydroponics/garden) +"cXE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Exploration Preparation Room"; + req_access_txt = "49" + }, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "cXO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -11784,6 +11581,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) +"dae" = ( +/obj/structure/bookcase/random/adult, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/turf/open/floor/iron/dark, +/area/library) "dal" = ( /obj/structure/closet/secure_closet/exile, /obj/effect/turf_decal/bot{ @@ -11875,6 +11679,20 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) +"dbc" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/structure/noticeboard{ + dir = 8; + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "dbs" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -11965,14 +11783,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"ddm" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor/inverted{ - id = "plasma_conveyor"; - dir = 5 - }, -/turf/open/floor/plating, -/area/science/storage) "ddo" = ( /obj/machinery/light/small{ dir = 4 @@ -12000,6 +11810,22 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) +"ddN" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "12" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "ddP" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -12022,6 +11848,19 @@ /obj/structure/table/reinforced, /turf/open/floor/plating, /area/engine/storage) +"def" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk/over, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "dek" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -12107,11 +11946,6 @@ }, /turf/open/floor/plating/airless, /area/solar/port/aft) -"deV" = ( -/obj/structure/bookcase/random/adult, -/obj/machinery/light, -/turf/open/floor/iron/dark, -/area/library) "deW" = ( /obj/item/kirbyplants/random, /obj/structure/window/reinforced{ @@ -12184,14 +12018,6 @@ /obj/structure/window/reinforced, /turf/open/floor/grass/no_border, /area/hallway/secondary/exit/departure_lounge) -"dfX" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "dgw" = ( /obj/machinery/light/small{ dir = 8 @@ -12338,14 +12164,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"dix" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/binary/valve/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "diI" = ( /obj/machinery/newscaster{ pixel_y = 31 @@ -12444,6 +12262,21 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/aft) +"djQ" = ( +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/reagent_containers/chem_bag/triamed, +/turf/open/floor/iron/grid/steel, +/area/medical/apothecary) "djY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -12591,16 +12424,6 @@ /obj/machinery/portable_atmospherics/canister/bz, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"dlL" = ( -/mob/living/carbon/monkey, -/obj/effect/turf_decal/siding/dark_green{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "dlP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -12765,14 +12588,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"dpl" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/science/storage) "dpq" = ( /obj/machinery/cryopod{ dir = 4 @@ -12793,6 +12608,14 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"dpC" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor{ + id = "plasma_conveyor"; + dir = 6 + }, +/turf/open/floor/plating, +/area/science/storage) "dpE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, @@ -12917,18 +12740,6 @@ dir = 1 }, /area/quartermaster/office) -"drv" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/science/research) "drw" = ( /obj/machinery/light/small{ dir = 4 @@ -13082,6 +12893,16 @@ }, /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) +"dtx" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Robotics Maintenance"; + req_access_txt = "29" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/aft/secondary) "dtE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -13199,6 +13020,12 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) +"duE" = ( +/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/box/corners, +/turf/open/floor/iron/dark, +/area/gateway) "duI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -13224,6 +13051,16 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) +"dvq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Desk"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/grid, +/area/medical/medbay/central) "dvD" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 4 @@ -13287,6 +13124,15 @@ }, /turf/open/floor/iron, /area/medical/medbay/lobby) +"dwq" = ( +/obj/structure/plasticflaps/opaque, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor{ + dir = 8; + id = "plasma_conveyor" + }, +/turf/open/floor/engine, +/area/science/storage) "dws" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ dir = 4 @@ -13345,19 +13191,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical) -"dxM" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/conveyor_switch/oneway{ - id = "o2_conveyor"; - name = "O2 Conveyor"; - pixel_x = -12 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/techmaint, -/area/science/storage) "dxQ" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -13453,6 +13286,17 @@ dir = 4 }, /area/hallway/primary/port) +"dzk" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint, +/area/science/storage) "dzt" = ( /obj/structure/sign/departments/minsky/research/robotics, /turf/closed/wall/r_wall, @@ -13498,21 +13342,6 @@ }, /turf/open/floor/iron/techmaint, /area/medical/virology) -"dAE" = ( -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/reagent_containers/chem_bag/triamed, -/turf/open/floor/iron/grid/steel, -/area/medical/apothecary) "dAM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13627,25 +13456,6 @@ dir = 1 }, /area/hallway/primary/central) -"dDr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Central Maintenance"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "dDv" = ( /obj/structure/lattice/catwalk/over, /obj/item/stack/marker_beacon{ @@ -13751,16 +13561,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/port/fore) -"dFD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "dFG" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ @@ -13831,17 +13631,7 @@ /obj/structure/altar_of_gods, /turf/open/floor/carpet/grimy, /area/chapel/main) -"dGu" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"dGG" = ( +"dGs" = ( /obj/machinery/camera/directional/east{ c_tag = "Science - Exploration Preparation"; name = "science camera" @@ -14377,16 +14167,6 @@ }, /turf/open/floor/iron/techmaint, /area/engine/break_room) -"dLD" = ( -/obj/machinery/power/shieldwallgen, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/teleporter) "dLO" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -14417,6 +14197,18 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hydroponics) +"dMm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/button/door{ + id = "Skynet_launch"; + name = "Mech Bay Door Control"; + pixel_y = 24; + req_access_txt = "29" + }, +/turf/open/floor/iron/techmaint, +/area/science/robotics/mechbay) "dMq" = ( /obj/machinery/door/window/brigdoor/southright{ base_state = "leftsecure"; @@ -14465,18 +14257,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) -"dMI" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port) "dMR" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow{ @@ -14864,17 +14644,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/storage/primary) -"dSy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/obj/machinery/nanite_chamber, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "dSC" = ( /obj/structure/table/wood/fancy/black, /obj/item/disk/nuclear/fake/obvious, @@ -14958,6 +14727,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, /area/bridge) +"dTy" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "dTQ" = ( /obj/structure/rack, /obj/item/crowbar, @@ -15007,6 +14786,35 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) +"dUp" = ( +/obj/machinery/button/door/incinerator_vent_toxmix{ + pixel_x = 40; + pixel_y = 4 + }, +/obj/machinery/button/door{ + id = "mixwindows"; + name = "Toxin Chamber Shutters Control"; + pixel_x = 24; + pixel_y = 4 + }, +/obj/machinery/button/ignition/incinerator/toxmix{ + pixel_x = 24; + pixel_y = -6 + }, +/obj/machinery/computer/atmos_control/tank/toxins_mixing_tank{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/turf/open/floor/iron/techmaint, +/area/science/mixing/chamber) "dUG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15046,6 +14854,15 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"dVl" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/security/checkpoint/escape) "dVo" = ( /obj/item/target/syndicate, /obj/effect/decal/cleanable/dirt, @@ -15254,12 +15071,6 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) -"dYD" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/turf/open/space/basic, -/area/space) "dYE" = ( /turf/closed/mineral/random/low_chance, /area/asteroid/nearstation) @@ -15301,13 +15112,6 @@ }, /turf/closed/wall/r_wall, /area/engine/supermatter) -"dZA" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "dZG" = ( /obj/structure/chair/foldable{ dir = 4 @@ -15327,6 +15131,19 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/aft) +"ead" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/conveyor_switch/oneway{ + id = "canister_conveyor"; + name = "Canister Conveyor"; + pixel_x = -12 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/techmaint, +/area/science/storage) "eag" = ( /obj/effect/turf_decal/siding/wideplating_new/corner, /turf/open/floor/iron, @@ -15524,23 +15341,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/central) -"ecs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/central) "ecw" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -15554,6 +15354,15 @@ dir = 8 }, /area/science/robotics/lab) +"ecB" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 5 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ecM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15726,6 +15535,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/library/lounge) +"efy" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "efM" = ( /obj/effect/turf_decal/trimline/red/filled/warning, /obj/effect/turf_decal/trimline/red/warning{ @@ -15748,11 +15564,6 @@ burnt = 1 }, /area/maintenance/starboard/central) -"egw" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/plating/airless, -/area/docking/arrival) "egK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -15853,6 +15664,14 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/wood, /area/bridge/showroom/corporate) +"eiq" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor/inverted{ + id = "plasma_conveyor"; + dir = 5 + }, +/turf/open/floor/plating, +/area/science/storage) "eit" = ( /obj/structure/table, /obj/item/computer_hardware/hard_drive/role/medical{ @@ -15997,12 +15816,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/maintenance/port/central) -"ekh" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "ekl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -16179,13 +15992,6 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/brig) -"elN" = ( -/mob/living/carbon/monkey, -/obj/effect/turf_decal/siding/dark_green{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "elQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -16233,16 +16039,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) -"emQ" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/port) "emV" = ( /obj/machinery/light{ dir = 1 @@ -16402,6 +16198,19 @@ /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/vault, /area/science/server) +"eoY" = ( +/obj/structure/lattice/catwalk/over, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "epc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/requests_console{ @@ -16494,19 +16303,6 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark, /area/chapel/main) -"eqY" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "ere" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -16594,6 +16390,17 @@ }, /turf/open/floor/carpet/grimy, /area/chapel/main) +"esf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/door/window/westleft{ + dir = 1; + name = "Monkey Pen"; + req_access_txt = "9" + }, +/turf/open/floor/iron/ameridiner, +/area/medical/genetics) "esg" = ( /obj/structure/chair/fancy/sofa/old/left{ color = "#596479"; @@ -16784,15 +16591,19 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/vault, /area/crew_quarters/heads/hor) -"evg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 +"evc" = ( +/obj/effect/turf_decal/caution{ + dir = 8 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/machinery/light_switch{ + pixel_x = -20; + pixel_y = 22 }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "evu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16960,6 +16771,26 @@ }, /turf/open/floor/iron, /area/vacant_room/commissary/commissary1) +"exO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/hallway/primary/starboard) "exP" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "ceprivate"; @@ -17060,16 +16891,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"eAe" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +"ezS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) @@ -17191,6 +17016,18 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"eBs" = ( +/obj/effect/turf_decal/guideline/guideline_in/red{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "Skynet_launch"; + name = "Mech Bay Door Control"; + pixel_x = 24; + req_access_txt = "29" + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/port) "eBy" = ( /obj/structure/noticeboard{ dir = 8; @@ -17245,13 +17082,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/hydroponics) -"eCA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron/ameridiner, -/area/medical/genetics) "eCD" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 @@ -17368,20 +17198,6 @@ /obj/effect/landmark/start/randommaint/psychiatrist, /turf/open/floor/wood, /area/medical/exam_room) -"eDw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/beacon, -/turf/open/floor/iron/dark, -/area/hallway/primary/starboard) "eDN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -17393,6 +17209,28 @@ }, /turf/open/floor/plating, /area/bridge) +"eDO" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/lattice/catwalk/over, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "eDW" = ( /obj/machinery/door/window/northleft{ dir = 2; @@ -17412,10 +17250,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload_foyer) -"eEJ" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "eEO" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -17767,11 +17601,6 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/library/lounge) -"eIv" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/computer/objective, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "eIC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -17972,38 +17801,12 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"eJP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "eJT" = ( /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, /turf/open/floor/iron, /area/vacant_room/commissary/commissary1) -"eJY" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/door/airlock/research{ - name = "Xenobiology"; - req_access_txt = "55" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "eKf" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -18440,6 +18243,19 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"eOA" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Desk Maintenance"; + req_access_txt = "9" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "eON" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -18470,13 +18286,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"ePt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "ePI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -18673,12 +18482,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/library) -"eRF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "eRJ" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -18758,6 +18561,16 @@ }, /turf/open/floor/iron/dark, /area/library/lounge) +"eSm" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Loop" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "eSp" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -19153,18 +18966,6 @@ dir = 1 }, /area/hallway/primary/central) -"eWj" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/lobby) "eWG" = ( /obj/machinery/light/small{ dir = 4 @@ -19343,6 +19144,12 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) +"eYx" = ( +/obj/item/toy/beach_ball, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/siding/dark_green, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "eYA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -19503,14 +19310,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"faT" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/maintenance{ - name = "Psychologist Maintenance"; - req_access_txt = "12" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "faV" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -19521,16 +19320,6 @@ /obj/structure/sign/departments/minsky/research/xenobiology, /turf/closed/wall/r_wall, /area/science/misc_lab) -"fbe" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Teleporter Maintenance"; - req_access_txt = "17" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/central/secondary) "fbt" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -19570,6 +19359,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, /area/science/lobby) +"fbC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Thermoelectric Generator Input" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fbF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ @@ -19577,18 +19380,19 @@ }, /turf/open/floor/iron/dark, /area/medical/surgery) -"fcb" = ( -/obj/machinery/computer/records/medical{ - dir = 8 +"fbM" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Engineering Maintenance"; + req_access_txt = "10" }, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/security/checkpoint/customs) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/aft) "fce" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19976,16 +19780,6 @@ }, /turf/open/floor/iron/dark/side, /area/crew_quarters/fitness/recreation) -"fhQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Supermatter Engine - Backup Starboard"; - name = "engineering camera" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "fhY" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, @@ -20112,6 +19906,14 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"fjC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fjQ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -20149,17 +19951,6 @@ "fkx" = ( /turf/open/floor/carpet/royalblue, /area/bridge/meeting_room/council) -"fkF" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/drydock) "fkH" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -20298,6 +20089,14 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/engine/atmos) +"flV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/grid/steel, +/area/library) "fmn" = ( /obj/machinery/biogenerator, /obj/item/reagent_containers/cup/bucket{ @@ -20632,6 +20431,19 @@ /obj/item/taperecorder, /turf/open/floor/wood, /area/library) +"fpO" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/over, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "fpS" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -20718,15 +20530,6 @@ }, /turf/open/floor/iron, /area/security/main) -"fri" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "frp" = ( /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -20804,6 +20607,23 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"fsn" = ( +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_one_access_txt = "10;24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "fsx" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 1 @@ -20926,11 +20746,6 @@ }, /turf/open/floor/iron/techmaint, /area/bridge/meeting_room/council) -"fth" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/power/shieldwallgen, -/turf/open/floor/engine, -/area/maintenance/department/engine) "fti" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -21180,6 +20995,14 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/engine, /area/security/nuke_storage) +"fvL" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/power/shieldwallgen, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/engine, +/area/maintenance/department/engine) "fvN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -21285,6 +21108,13 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/aft/secondary) +"fxq" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fxw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -21338,6 +21168,13 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) +"fyl" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/techmaint, +/area/science/mixing) "fys" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -21455,6 +21292,19 @@ burnt = 1 }, /area/maintenance/disposal) +"fAa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) +"fAh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fAj" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -21601,30 +21451,6 @@ dir = 8 }, /area/quartermaster/warehouse) -"fBU" = ( -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 2; - name = "landing marker"; - picked_color = "Burgundy" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/machinery/button/shieldwallgen/directional/north{ - id = 4 - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/bridge) "fCd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -21634,6 +21460,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"fCl" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/airlock/research{ + name = "Toxins Launch Site"; + req_one_access_txt = "8;47" + }, +/turf/open/floor/iron/techmaint, +/area/science/misc_lab) "fCp" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -21801,6 +21641,21 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) +"fDQ" = ( +/obj/structure/sign/warning/radiation{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fDS" = ( /obj/structure/window/reinforced, /obj/structure/flora/ausbushes/genericbush, @@ -21866,6 +21721,15 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"fEn" = ( +/obj/structure/lattice/catwalk/over, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "fEp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -21876,6 +21740,19 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, /area/library) +"fEs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Theatre Backstage"; + req_access_txt = "46" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port) "fEu" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -21962,18 +21839,6 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) -"fFV" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "fGa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22209,6 +22074,22 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/dark, /area/bridge) +"fIB" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_x = -30 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "fIN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22288,6 +22169,19 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) +"fJm" = ( +/obj/structure/sign/warning/enginesafety{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Gas to Cooling Loop" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fJx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -22356,6 +22250,15 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"fKh" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fKk" = ( /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/delivery, @@ -22383,12 +22286,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) -"fKU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "fLe" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/conveyor{ @@ -22428,17 +22325,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) -"fLp" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/fore) "fLr" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, @@ -22633,13 +22519,6 @@ dir = 10 }, /area/quartermaster/office) -"fMT" = ( -/obj/machinery/light/small, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/catwalk_floor, -/area/drydock) "fNc" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -22767,6 +22646,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/science/robotics/mechbay) +"fOv" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 4 + }, +/obj/structure/cable/orange{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/drydock/security) "fOz" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -22853,6 +22744,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/department/medical) +"fPC" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fPK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -22930,6 +22832,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"fQx" = ( +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay RC"; + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "fQy" = ( /obj/machinery/conveyor{ dir = 1; @@ -22964,6 +22881,19 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"fRb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fRu" = ( /turf/closed/wall/r_wall, /area/science/misc_lab) @@ -22990,6 +22920,14 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"fRE" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/gateway) "fRG" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -23098,6 +23036,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) +"fTw" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/machinery/computer/records/security, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/security/checkpoint/supply) "fTA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -23173,13 +23122,6 @@ /obj/item/toy/plush/moth/lovers, /turf/open/floor/grass/no_border, /area/ai_monitored/security/armory) -"fUw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "fUA" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -23288,6 +23230,10 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"fVO" = ( +/obj/machinery/atmospherics/pipe/manifold/orange/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fVT" = ( /obj/machinery/light, /obj/machinery/requests_console{ @@ -23302,6 +23248,28 @@ }, /turf/open/floor/wood, /area/bridge/meeting_room/council) +"fVU" = ( +/obj/effect/turf_decal/trimline/purple/corner, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/grid/steel, +/area/science/research) +"fVW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ + pixel_y = 26 + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "fWa" = ( /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 4 @@ -23314,6 +23282,13 @@ }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) +"fWt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fWv" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -23541,15 +23516,6 @@ }, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) -"fYR" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/security/checkpoint/escape) "fYU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -23622,28 +23588,42 @@ }, /turf/open/floor/engine, /area/security/nuke_storage) +"fZG" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "fZJ" = ( /obj/effect/landmark/start/station_engineer, /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) -"fZL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +"fZW" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/turf_decal/stripes/closeup{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech/grid, -/area/science/mixing/chamber) +/area/science/xenobiology) "gab" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -23694,6 +23674,13 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"gai" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "gam" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, @@ -24017,6 +24004,18 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"gff" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/security/checkpoint/customs) "gfk" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box/corners, @@ -24410,6 +24409,12 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/cafeteria) +"gkb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "gkd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -24533,21 +24538,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"glF" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "gmj" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /obj/effect/turf_decal/guideline/guideline_mid/darkblue, @@ -24641,6 +24631,19 @@ }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) +"gnx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/aft) "gnA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -24801,16 +24804,6 @@ }, /turf/open/floor/wood, /area/library) -"gpC" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/machinery/computer/records/security, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/security/checkpoint/science/research) "gpF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24957,19 +24950,6 @@ /obj/item/book/manual/wiki/sopsupply, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"grR" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/camera/directional/west, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "grU" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/closet/secure_closet/medical1, @@ -25176,15 +25156,6 @@ "gud" = ( /turf/closed/mineral/random/labormineral, /area/asteroid/nearstation/bomb_site) -"guh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "guj" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 @@ -25297,19 +25268,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/bridge) -"gvM" = ( -/obj/structure/lattice/catwalk/over, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "gvS" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -25406,6 +25364,21 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"gxj" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/medical{ + anchored = 1 + }, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/obj/item/storage/firstaid/o2, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "gxl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -25524,20 +25497,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) -"gzd" = ( -/obj/effect/turf_decal/trimline/purple/line, -/obj/effect/landmark/start/scientist, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/science/research) "gzl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25557,6 +25516,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library/lounge) +"gzn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/central) "gzo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -25714,10 +25690,34 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port) +"gAC" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/closet/crate, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "gAI" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/central) +"gAJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/conveyor{ + dir = 8; + id = "o2_conveyor" + }, +/turf/open/floor/plating, +/area/science/storage) "gAK" = ( /obj/machinery/porta_turret/ai, /obj/effect/turf_decal/box/red, @@ -25821,6 +25821,16 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) +"gCd" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "gCn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26026,6 +26036,13 @@ }, /turf/open/floor/engine, /area/security/nuke_storage) +"gEn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/ameridiner, +/area/medical/genetics) "gEs" = ( /turf/closed/wall/r_wall, /area/science/lab) @@ -26106,22 +26123,18 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"gFs" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "12" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"gFz" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) +/area/medical/medbay/central) "gFZ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -26332,6 +26345,17 @@ burnt = 1 }, /area/maintenance/central) +"gJd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/conveyor{ + dir = 8; + id = "canister_conveyor" + }, +/turf/open/floor/plating, +/area/science/storage) "gJo" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26372,6 +26396,22 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"gJB" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom{ + pixel_x = -28 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "gJJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -26472,16 +26512,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"gKK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "gKT" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 4 @@ -26541,19 +26571,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical) -"gLB" = ( -/obj/structure/sign/warning/radiation{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/corner, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "gLC" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 1 @@ -26614,6 +26631,16 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/tech, /area/bridge) +"gMa" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/computer/records/security, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/security/checkpoint/science/research) "gMG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26780,6 +26807,16 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"gOg" = ( +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/siding/dark_green{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "gOi" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -26804,6 +26841,15 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) +"gOo" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/open/floor/dock/drydock, +/area/drydock/security) "gOA" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -26931,13 +26977,6 @@ /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"gQm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "gQn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -27200,6 +27239,11 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"gTB" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "gTD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27239,6 +27283,12 @@ dir = 4 }, /area/engine/atmos) +"gTT" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/techmaint, +/area/science/mixing) "gUc" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 @@ -27262,14 +27312,6 @@ /obj/structure/flora/ausbushes/fernybush, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) -"gUs" = ( -/obj/structure/window/reinforced, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hop) "gUt" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -27297,28 +27339,6 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/secondary/exit/departure_lounge) -"gVa" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 4; - icon_state = "leftsecure"; - name = "Secure Creature Pen Shield Holder"; - atom_integrity = 300; - req_access_txt = "47" - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gVe" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible, /obj/structure/cable/yellow{ @@ -27338,14 +27358,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/techmaint, /area/maintenance/disposal/incinerator) -"gVf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/grid/steel, -/area/library) "gVp" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -27418,13 +27430,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/engine/engine_room) -"gWz" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "gWE" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/light/small{ @@ -27435,6 +27440,10 @@ }, /turf/open/floor/engine, /area/engine/gravity_generator) +"gWN" = ( +/obj/machinery/vendor/exploration, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "gWS" = ( /obj/machinery/light{ dir = 8 @@ -27562,19 +27571,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/bridge) -"gYf" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/closet/crate, -/obj/item/storage/toolbox/mechanical, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "gYr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27809,6 +27805,17 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"hbx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor{ + id = "plasma_conveyor"; + dir = 1 + }, +/turf/open/floor/plating, +/area/science/storage) "hbD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -28005,30 +28012,11 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) -"heP" = ( -/obj/structure/sign/warning/enginesafety{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Gas to Cooling Loop" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "heS" = ( /turf/open/floor/iron/dark/side{ dir = 8 }, /area/hallway/primary/central) -"hfo" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/tech/grid, -/area/science/mixing/chamber) "hfx" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/firecloset, @@ -28183,6 +28171,12 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"hig" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "hij" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -28513,15 +28507,6 @@ /obj/effect/turf_decal/guideline/guideline_out/yellow, /turf/open/floor/iron/dark/corner, /area/hallway/primary/port) -"hlP" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hlX" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 4 @@ -28543,25 +28528,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"hlY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "72" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port) "hlZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -28692,18 +28658,6 @@ }, /turf/open/floor/iron/sepia, /area/maintenance/disposal/incinerator) -"hoI" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hoV" = ( /obj/machinery/vending/clothing, /turf/open/floor/carpet, @@ -28952,6 +28906,10 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/hallway/primary/aft) +"htl" = ( +/obj/machinery/gateway/station, +/turf/open/floor/iron/dark, +/area/gateway) "htv" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 9 @@ -29101,6 +29059,22 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/hallway/primary/starboard) +"hvR" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayAuxFoyer"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/grid, +/area/medical/medbay/central) "hvT" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -29160,16 +29134,6 @@ }, /turf/open/floor/iron/sepia, /area/engine/break_room) -"hwK" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "63" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/security/brig) "hwL" = ( /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, @@ -29309,6 +29273,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"hyU" = ( +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/dock/drydock, +/area/drydock) "hyZ" = ( /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -29418,6 +29391,16 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/engine/light, /area/science/xenobiology) +"hAi" = ( +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "hAt" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -29439,6 +29422,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/port/central) +"hAZ" = ( +/obj/structure/chair/fancy/bench/corporate/right, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore) "hBa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -29457,27 +29445,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grid/steel, /area/science/shuttle) -"hBh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, +"hBj" = ( /obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/holopad, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/tcommsat/computer) "hBv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -29565,14 +29542,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"hCH" = ( +"hCg" = ( /obj/structure/table/reinforced, -/obj/item/tank/internals/plasma, -/obj/item/tank/internals/plasma, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +/obj/item/pen, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/turf/open/floor/iron/techmaint, +/area/medical/medbay/central) "hCP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ @@ -29614,6 +29595,23 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"hDf" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/hand_tele, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Handled Teleporter Storage"; + req_one_access_txt = "17;19" + }, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced, +/turf/open/floor/iron/dark, +/area/teleporter) "hDl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29672,16 +29670,6 @@ /obj/machinery/light/small, /turf/open/floor/iron, /area/hallway/secondary/entry) -"hEb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Desk"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/grid, -/area/medical/medbay/central) "hEc" = ( /obj/machinery/announcement_system, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -29714,6 +29702,32 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, /area/bridge) +"hEr" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/item/storage/secure/safe{ + pixel_x = 6; + pixel_y = 39 + }, +/obj/machinery/button/door{ + id = "Prisongate"; + name = "Prison Wing Lockdown"; + pixel_x = 6; + pixel_y = 24; + req_access_txt = "3" + }, +/obj/machinery/computer/security/telescreen/prison{ + dir = 8; + pixel_x = 31; + pixel_y = 1 + }, +/turf/open/floor/iron/dark, +/area/security/warden) "hEL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, @@ -29737,20 +29751,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) -"hEW" = ( -/obj/machinery/door/airlock{ - name = "Bar Backroom"; - req_access_txt = "25" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/techmaint, -/area/crew_quarters/bar) "hFb" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 22 @@ -29928,24 +29928,6 @@ "hHe" = ( /turf/closed/wall/mineral/plastitanium, /area/science/shuttle) -"hHg" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/stripes/closeup, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/techmaint, -/area/science/lobby) "hHi" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 @@ -29962,28 +29944,6 @@ /obj/machinery/camera/directional/east, /turf/open/floor/iron/dark, /area/security/prison/shielded) -"hHr" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock{ - name = "Service Hall"; - req_access_txt = "35" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/techmaint, -/area/hydroponics) -"hHy" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/red/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hHX" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -30187,12 +30147,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/bridge) -"hKg" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hKD" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall, @@ -30495,19 +30449,6 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/engine/light, /area/medical/cryo) -"hMF" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hMI" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark, @@ -30548,19 +30489,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/grid/steel, /area/science/nanite) -"hMQ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "hNb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -30666,26 +30594,6 @@ dir = 8 }, /area/hallway/primary/aft) -"hPe" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Science - Toxins Mixing Lab Burn Chamber"; - name = "science camera" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "hPh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -30711,6 +30619,13 @@ /obj/machinery/rnd/production/techfab/department/security, /turf/open/floor/iron/dark, /area/security/warden) +"hPK" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "hPW" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/line, @@ -30967,15 +30882,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"hUo" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hUv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -31092,15 +30998,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"hVJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/plating, -/area/medical/cryo) "hVK" = ( /obj/effect/turf_decal/delivery, /obj/machinery/vending/cigarette, @@ -31233,17 +31130,6 @@ "hXF" = ( /turf/open/floor/iron/dark, /area/engine/storage) -"hXT" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/red/line, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hXZ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -31268,25 +31154,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"hYA" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"hYM" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/trinary/filter/critical{ - dir = 1; - filter_type = "n2"; - name = "nitrogen filter" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "hYU" = ( /obj/structure/table/wood/fancy, /obj/item/flashlight/lantern, @@ -31855,6 +31722,16 @@ burnt = 1 }, /area/maintenance/starboard/aft) +"ieP" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ieR" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -31981,6 +31858,33 @@ }, /turf/open/floor/iron/checker, /area/quartermaster/storage) +"igH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/obj/machinery/nanite_chamber, +/turf/open/floor/iron/techmaint, +/area/science/nanite) +"igJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/research{ + name = "Research Division Access"; + req_access_txt = "47" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/techmaint, +/area/science/lobby) "igW" = ( /obj/effect/turf_decal/bot, /obj/machinery/pipedispenser/disposal/transit_tube, @@ -32020,13 +31924,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"iid" = ( -/obj/machinery/power/shieldwallgen, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/teleporter) "iin" = ( /obj/structure/sign/warning/fire, /turf/closed/wall, @@ -32185,20 +32082,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"ilm" = ( -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Sleepers"; - name = "medbay camera" - }, -/mob/living/simple_animal/bot/medbot/filled{ - desc = "A little medical robot, officially part of the Nanotrasen medical inspectorate. He looks somewhat underwhelmed."; - name = "Inspector Johnson" - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "ilA" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 @@ -32223,6 +32106,10 @@ }, /turf/open/floor/carpet/red, /area/library) +"ilH" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/turf/open/floor/plating, +/area/science/mixing/chamber) "ilR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red{ @@ -32370,6 +32257,20 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"inr" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/landmark/blobstart, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "inv" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -32518,17 +32419,6 @@ /obj/machinery/light, /turf/open/floor/iron/dark/airless, /area/medical/surgery) -"ipl" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Chamber" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter) "ipn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -32621,19 +32511,6 @@ "iqy" = ( /turf/open/floor/engine/co2/light, /area/engine/atmos) -"iqB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/structure/table/reinforced, -/obj/item/storage/box/disks_nanite{ - pixel_x = -4; - pixel_y = 4 - }, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "iqP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -32691,20 +32568,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"iro" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/red/line, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "irr" = ( /obj/machinery/camera/directional/south{ c_tag = "Atmospherics - Plasma Cell" @@ -32734,18 +32597,6 @@ dir = 8 }, /area/hallway/primary/central) -"irQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "irV" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -32843,13 +32694,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) -"itf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "ito" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -32944,6 +32788,16 @@ }, /turf/open/floor/iron/grid/steel, /area/bridge) +"iuh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/techmaint, +/area/science/storage) "ius" = ( /obj/machinery/atmospherics/components/trinary/filter{ dir = 8 @@ -33257,6 +33111,17 @@ }, /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) +"ixj" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Thermoelectric Generator Input" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ixm" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -33510,16 +33375,6 @@ /obj/structure/curtain/bounty, /turf/open/floor/wood, /area/hallway/primary/aft) -"izK" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "izL" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -33549,14 +33404,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/science/mixing) -"iAy" = ( -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/gateway) "iAS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -33699,6 +33546,12 @@ "iCD" = ( /turf/open/floor/iron/sepia, /area/construction/mining/aux_base) +"iDd" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/tech/grid, +/area/science/mixing/chamber) "iDi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -33821,6 +33674,18 @@ }, /turf/open/floor/plating, /area/quartermaster/sorting) +"iEm" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/item/beacon, +/turf/open/floor/iron/sepia, +/area/science/shuttle) "iEq" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 22 @@ -33942,6 +33807,12 @@ broken = 1 }, /area/maintenance/department/security/brig) +"iFU" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "iFY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -34110,12 +33981,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"iHM" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "iHP" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -34269,6 +34134,16 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) +"iJv" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/sign/plaques/kiddie/library{ + pixel_x = -32 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/library) "iJx" = ( /obj/machinery/light{ dir = 1 @@ -34329,6 +34204,12 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) +"iKc" = ( +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/open/floor/dock/drydock, +/area/drydock/security) "iKl" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced, @@ -34389,12 +34270,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/lab) -"iKM" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "iKN" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ @@ -34468,12 +34343,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"iMt" = ( -/obj/machinery/button/shieldwallgen/directional/south{ - id = 2 - }, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "iMO" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 @@ -34559,6 +34428,23 @@ /obj/structure/ore_box, /turf/open/floor/plating, /area/maintenance/port/aft) +"iNO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/tech/grid, +/area/science/mixing/chamber) "iNR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -34626,17 +34512,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) -"iOM" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/station{ - dir = 8; - pixel_x = 32 - }, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "iON" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -34870,14 +34745,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) -"iQY" = ( -/obj/effect/turf_decal/bot_white, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/gateway) "iRo" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, @@ -35050,15 +34917,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science/research) -"iTF" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "iTY" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -35138,18 +34996,6 @@ }, /turf/open/floor/iron/techmaint, /area/bridge) -"iUE" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "iUO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -35513,6 +35359,10 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"jbh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "jbn" = ( /obj/effect/turf_decal/bot, /obj/structure/table/reinforced, @@ -35741,6 +35591,18 @@ broken = 1 }, /area/maintenance/department/engine) +"jez" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 4; + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating/airless, +/area/docking/bridge) "jeD" = ( /obj/machinery/light{ dir = 8 @@ -35756,6 +35618,14 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"jeP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/binary/valve/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "jeQ" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /obj/effect/turf_decal/trimline/red/line{ @@ -36009,6 +35879,16 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) +"jiT" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "jjd" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/light/small{ @@ -36087,15 +35967,6 @@ dir = 8 }, /area/hallway/primary/starboard) -"jjA" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/medical/surgery) "jjB" = ( /mob/living/basic/cockroach, /turf/open/floor/plating, @@ -36340,17 +36211,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/storage/primary) -"jml" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor{ - id = "plasma_conveyor"; - dir = 1 - }, -/turf/open/floor/plating, -/area/science/storage) "jmr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -36359,14 +36219,29 @@ broken = 1 }, /area/maintenance/starboard/aft) -"jmu" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor{ - id = "plasma_conveyor"; - dir = 6 +"jmP" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Secure Creature Pen Shield Holder"; + atom_integrity = 300 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, /turf/open/floor/plating, -/area/science/storage) +/area/science/xenobiology) "jmQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -36779,19 +36654,6 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/science/shuttle) -"jtK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/storage) "juz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -37068,6 +36930,19 @@ }, /turf/open/floor/iron/dark, /area/bridge/showroom/corporate) +"jyI" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/security/laptop{ + pixel_y = 2 + }, +/obj/item/paper/fluff{ + default_raw_text = "Been here before - Love is when I freeze - Somebody's bloodShot down on his knees - Take whatcha learn and whatcha need."; + name = "Lawyer's poem"; + pixel_x = 9; + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/lawoffice) "jyO" = ( /turf/open/floor/plating/asteroid/airless, /area/space) @@ -37245,17 +37120,6 @@ dir = 4 }, /area/hallway/primary/aft) -"jAX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/aft) "jBo" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -37339,6 +37203,19 @@ }, /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) +"jCa" = ( +/obj/machinery/light{ + dir = 4 + }, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/siding/dark_green/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "jCi" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -37359,19 +37236,6 @@ }, /turf/open/floor/iron, /area/science/breakroom) -"jCt" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/aft) "jCR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37485,6 +37349,13 @@ dir = 1 }, /area/engine/atmos) +"jEb" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "jEh" = ( /obj/item/shovel/spade, /obj/item/crowbar, @@ -37689,18 +37560,6 @@ dir = 8 }, /area/hallway/primary/fore) -"jHg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable/yellow, -/turf/open/floor/engine{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "jHk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -37713,21 +37572,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"jHo" = ( -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "jHq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -37937,35 +37781,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port) -"jJy" = ( -/obj/machinery/button/door/incinerator_vent_toxmix{ - pixel_x = 40; - pixel_y = 4 - }, -/obj/machinery/button/door{ - id = "mixwindows"; - name = "Toxin Chamber Shutters Control"; - pixel_x = 24; - pixel_y = 4 - }, -/obj/machinery/button/ignition/incinerator/toxmix{ - pixel_x = 24; - pixel_y = -6 - }, -/obj/machinery/computer/atmos_control/tank/toxins_mixing_tank{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/end{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/turf/open/floor/iron/techmaint, -/area/science/mixing/chamber) "jJI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -38170,17 +37985,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/medical/break_room) -"jMW" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/drydock/security) "jNa" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 @@ -38198,6 +38002,12 @@ }, /turf/open/floor/iron/dark, /area/hydroponics) +"jNz" = ( +/obj/machinery/button/shieldwallgen/directional/east{ + id = 3 + }, +/turf/open/floor/catwalk_floor, +/area/drydock) "jNA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood, @@ -38631,16 +38441,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"jRe" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "jRk" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, @@ -38749,15 +38549,6 @@ name = "mainframe floor" }, /area/tcommsat/server) -"jSD" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/end, -/obj/effect/turf_decal/stripes/red/end, -/obj/structure/lattice/catwalk, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "jTf" = ( /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ @@ -39010,6 +38801,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) +"jWB" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/lobby) "jWE" = ( /obj/structure/table/reinforced, /obj/item/stack/package_wrap, @@ -39260,19 +39063,6 @@ dir = 1 }, /area/hallway/primary/central) -"jYQ" = ( -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/engine, -/area/science/storage) "jYW" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/stool/bar/directional/west, @@ -39294,20 +39084,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"jZn" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/obj/machinery/computer/nanite_cloud_controller, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "jZt" = ( /obj/machinery/advanced_airlock_controller{ pixel_y = 26 @@ -39580,6 +39356,18 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"kcQ" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "kcS" = ( /turf/closed/wall/r_wall, /area/science/explab) @@ -39628,21 +39416,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) -"kdD" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/science/mixing) "kdI" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -40219,6 +39992,24 @@ /obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) +"kkB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/storage) "kkV" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -40295,6 +40086,11 @@ }, /turf/open/floor/grass/no_border, /area/medical/medbay/lobby) +"klZ" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "kmm" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /obj/effect/turf_decal/guideline/guideline_mid/purple, @@ -40320,6 +40116,19 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) +"kmz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable/yellow, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/bridge) "kmD" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/soda_cans/dr_gibb, @@ -40332,6 +40141,22 @@ /obj/item/target/clown, /turf/open/floor/plating/airless, /area/science/test_area) +"kmR" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Surgery Maintenance"; + req_access_txt = "45" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "kmZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40731,14 +40556,6 @@ /obj/structure/tank_dispenser, /turf/open/floor/engine, /area/maintenance/department/engine) -"ksc" = ( -/obj/machinery/atmospherics/components/unary/tank/plasma{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "kss" = ( /obj/effect/landmark/event_spawn, /obj/structure/lattice/catwalk, @@ -40774,6 +40591,19 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) +"ksQ" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + dir = 4; + pixel_x = 3; + pixel_y = 2 + }, +/obj/machinery/newscaster{ + pixel_x = -28; + pixel_y = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "ksU" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/sepia, @@ -40785,15 +40615,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) -"kta" = ( -/obj/structure/plasticflaps/opaque, -/obj/machinery/conveyor{ - dir = 8; - id = "o2_conveyor" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/engine, -/area/science/storage) "ktg" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Laser Room"; @@ -40921,6 +40742,15 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/engine/light, /area/medical/cryo) +"kuF" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/obj/structure/cable/yellow, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/hallway/primary/central) "kuH" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/westleft{ @@ -41271,26 +41101,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"kxV" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/airlock/glass{ - name = "Kitchen Cold Room"; - req_access_txt = "28" - }, -/turf/open/floor/iron/techmaint, -/area/crew_quarters/kitchen/coldroom) "kyc" = ( /obj/item/reagent_containers/cup/bucket, /obj/effect/turf_decal/bot, @@ -41370,14 +41180,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"kzA" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "1;4" - }, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/techmaint, -/area/maintenance/central) "kzC" = ( /obj/structure/sink{ dir = 8; @@ -41410,6 +41212,12 @@ }, /turf/open/floor/iron, /area/security/courtroom) +"kzP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "kzU" = ( /obj/machinery/door/window/westleft{ dir = 1 @@ -41492,6 +41300,24 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/central) +"kAW" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Virology Maintenance"; + req_access_txt = "39" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/central) "kBb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -41559,13 +41385,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) -"kBJ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "kBX" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -41662,6 +41481,12 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) +"kDc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/power/shieldwallgen, +/turf/open/floor/engine, +/area/maintenance/department/engine) "kDg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -41688,6 +41513,9 @@ }, /turf/open/floor/iron, /area/science/breakroom) +"kDt" = ( +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "kDv" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/rust, @@ -41755,18 +41583,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) -"kEn" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/turf/open/floor/iron/techmaint, -/area/medical/medbay/central) "kEr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -41886,6 +41702,11 @@ }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/exit/departure_lounge) +"kFV" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/power/shieldwallgen, +/turf/open/floor/engine, +/area/maintenance/department/engine) "kFY" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -41907,11 +41728,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"kGz" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "kGA" = ( /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -41986,15 +41802,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) -"kHO" = ( -/obj/structure/plasticflaps/opaque, -/obj/machinery/conveyor{ - dir = 8; - id = "canister_conveyor" - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/engine, -/area/science/storage) "kHU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/end{ @@ -42024,13 +41831,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"kIn" = ( -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4; - name = "mix to port" - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "kIo" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -42152,14 +41952,11 @@ }, /turf/open/floor/iron/dark, /area/maintenance/department/science) -"kJH" = ( -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +"kJw" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/camera/directional/south, /turf/open/floor/iron/ameridiner, /area/engine/engine_room) "kJN" = ( @@ -42208,16 +42005,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/storage/tools) -"kKG" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/main) "kKL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42315,13 +42102,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"kMH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "kMI" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -42412,6 +42192,15 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/auxiliary) +"kNI" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Lab Maintenance"; + req_access_txt = "9" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "kNM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42455,18 +42244,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/maintenance/department/science) -"kOt" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - id = 2; - dir = 4 - }, -/obj/structure/cable/orange{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/drydock/security) "kOu" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) @@ -42865,6 +42642,11 @@ /obj/item/book/manual/wiki/sopengineering, /turf/open/floor/iron/dark, /area/engine/storage_shared) +"kUi" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/turf/open/floor/plating/airless, +/area/drydock/security) "kUm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -43116,6 +42898,22 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"kWh" = ( +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/computer/nanite_chamber_control{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "kWn" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -43356,12 +43154,6 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"kXP" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "kXS" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -43542,15 +43334,6 @@ dir = 4 }, /area/janitor) -"kZv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/engine, -/area/science/storage) "kZw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -43585,6 +43368,26 @@ /obj/machinery/atmospherics/components/binary/pump, /turf/open/floor/iron/dark, /area/engine/engine_room) +"kZP" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/glass{ + name = "Kitchen Cold Room"; + req_access_txt = "28" + }, +/turf/open/floor/iron/techmaint, +/area/crew_quarters/kitchen/coldroom) "kZX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -43661,19 +43464,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"laM" = ( -/obj/effect/spawner/randomvend/snack, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/aft) "laN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44025,6 +43815,12 @@ dir = 8 }, /area/quartermaster/warehouse) +"lfz" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lfJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -44147,6 +43943,16 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) +"lgR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Custodial Closet"; + req_access_txt = "26" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/security/brig) "lgU" = ( /turf/open/floor/iron/dark, /area/engine/atmos) @@ -44180,6 +43986,12 @@ dir = 1 }, /area/quartermaster/storage) +"lhk" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/nanite_program_hub, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "lhm" = ( /obj/machinery/door/airlock/security/glass{ name = "Fore Brig Desk"; @@ -44400,12 +44212,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"ljb" = ( -/obj/effect/turf_decal/bot_white/right, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/box/corners, -/turf/open/floor/iron/dark, -/area/gateway) "ljg" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/structure/railing{ @@ -44860,16 +44666,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) -"lol" = ( -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/genetics) "lor" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, @@ -44889,6 +44685,16 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"loX" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "loY" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -44961,6 +44767,23 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/wood, /area/crew_quarters/heads/hos) +"lpD" = ( +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Construction Area"; + req_access_txt = "32" + }, +/turf/open/floor/iron/techmaint, +/area/construction) "lpH" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/camera/motion{ @@ -45375,6 +45198,19 @@ }, /turf/open/floor/engine, /area/medical/cryo) +"luE" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "luL" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -45434,19 +45270,6 @@ }, /turf/open/floor/wood, /area/library) -"lvm" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/security/laptop{ - pixel_y = 2 - }, -/obj/item/paper/fluff{ - default_raw_text = "Been here before - Love is when I freeze - Somebody's bloodShot down on his knees - Take whatcha learn and whatcha need."; - name = "Lawyer's poem"; - pixel_x = 9; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/lawoffice) "lvn" = ( /obj/effect/turf_decal/trimline/blue/line, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -45473,6 +45296,42 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"lvJ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/corner, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/light/small, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) +"lvK" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 6 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) +"lvL" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lvR" = ( /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 @@ -45572,6 +45431,18 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"lwU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/tank_dispenser, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lwW" = ( /obj/effect/turf_decal/guideline/guideline_in/bar{ dir = 8 @@ -45589,21 +45460,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/hallway/primary/port) -"lxd" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/button/shieldwallgen/directional/east{ - name = "Arrivals" - }, -/turf/open/floor/engine{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "lxn" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/cardboard, @@ -45878,6 +45734,25 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side, /area/hallway/primary/port) +"lBj" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Atmos to Gas" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lBm" = ( /obj/machinery/computer/communications, /obj/structure/cable/yellow{ @@ -45885,6 +45760,18 @@ }, /turf/open/floor/iron/grid/steel, /area/bridge) +"lBs" = ( +/obj/structure/cable/orange{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lBt" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -46095,6 +45982,14 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"lEO" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/conveyor{ + dir = 8; + id = "o2_conveyor" + }, +/turf/open/floor/plating, +/area/science/storage) "lET" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -46125,16 +46020,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"lFr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/turf/open/floor/iron/techmaint, -/area/science/storage) "lFs" = ( /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/white/box, @@ -46180,6 +46065,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"lFV" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor{ + dir = 10; + id = "plasma_conveyor" + }, +/turf/open/floor/plating, +/area/science/storage) "lGe" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 1 @@ -46207,6 +46100,15 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/engine, /area/science/mixing/chamber) +"lGz" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/box, +/obj/effect/turf_decal/stripes/red/box, +/obj/structure/lattice/catwalk, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "lGD" = ( /obj/structure/table, /obj/item/book/manual/wiki/security_space_law{ @@ -46239,6 +46141,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/shuttledock) +"lGU" = ( +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "lHa" = ( /obj/machinery/light/small, /obj/structure/sign/poster/official/obey{ @@ -46260,6 +46168,16 @@ /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark, /area/security/courtroom) +"lHl" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lHw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -46358,19 +46276,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) -"lIE" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/conveyor/inverted{ - id = "plasma_conveyor"; - dir = 6 - }, -/turf/open/floor/plating, -/area/science/storage) "lIM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46486,16 +46391,6 @@ dir = 4 }, /area/hallway/primary/aft) -"lKD" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "lKG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46611,27 +46506,6 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) -"lMA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"lMO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "lMS" = ( /obj/machinery/newscaster{ pixel_y = 31 @@ -46692,14 +46566,6 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/engine/atmos) -"lNG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Thermoelectric Generator output" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "lNH" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -46773,6 +46639,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"lOx" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/central) "lOy" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -46820,15 +46698,6 @@ }, /turf/open/floor/iron, /area/storage/primary) -"lOM" = ( -/obj/machinery/computer/shuttle_flight/labor{ - dir = 8 - }, -/obj/machinery/button/shieldwallgen/directional/north{ - id = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "lOW" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -46862,18 +46731,6 @@ }, /turf/open/floor/carpet/grimy, /area/hallway/primary/port) -"lPv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/button/door{ - id = "Skynet_launch"; - name = "Mech Bay Door Control"; - pixel_y = 24; - req_access_txt = "29" - }, -/turf/open/floor/iron/techmaint, -/area/science/robotics/mechbay) "lPB" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/cable/yellow{ @@ -46881,6 +46738,21 @@ }, /turf/open/floor/grass, /area/hydroponics/garden) +"lPD" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Science - Toxins Secure Storage"; + name = "science camera" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/engine, +/area/science/storage) "lPL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -46910,6 +46782,15 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/medical/apothecary) +"lQf" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lQB" = ( /obj/structure/bookcase, /obj/structure/disposalpipe/segment{ @@ -46917,6 +46798,20 @@ }, /turf/open/floor/plating, /area/construction) +"lQF" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Conference Room Maintenance"; + req_access_txt = "19" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridgedoors"; + name = "Bridge Access Blast Door" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/central) "lQM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -46955,14 +46850,6 @@ dir = 8 }, /area/ai_monitored/storage/eva) -"lRm" = ( -/obj/machinery/suit_storage_unit/exploration, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "lRo" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -46970,6 +46857,18 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/science/lobby) +"lRw" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/science/research) "lRy" = ( /obj/effect/turf_decal/guideline/guideline_in_alt/red{ dir = 4 @@ -47039,17 +46938,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"lSw" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/engine, -/area/science/storage) "lSH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -47150,6 +47038,33 @@ }, /turf/open/floor/carpet/grimy, /area/vacant_room/office) +"lUE" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint, +/area/science/storage) +"lUM" = ( +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/target, +/obj/item/target/syndicate, +/obj/item/target/alien, +/obj/item/target/clown, +/obj/structure/closet/crate/secure{ + desc = "A secure crate containing various materials for building a customised test-site."; + name = "Test Site Materials Crate"; + req_access_txt = "8" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "lUT" = ( /obj/structure/chair/fancy/comfy{ color = "#596479"; @@ -47205,19 +47120,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/auxiliary) -"lVc" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - dir = 4; - pixel_x = 3; - pixel_y = 2 - }, -/obj/machinery/newscaster{ - pixel_x = -28; - pixel_y = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) "lVh" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 8 @@ -47288,6 +47190,15 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) +"lVQ" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "lVW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -47806,6 +47717,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"mcN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "mcR" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 @@ -47873,6 +47791,19 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/medbay/central) +"mdV" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/aft) "mdX" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -47900,6 +47831,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) +"mez" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "meC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -47914,19 +47855,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"meQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/structure/lattice/catwalk/over, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "meU" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/closeup{ @@ -47949,21 +47877,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"mfv" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Science - Toxins Secure Storage"; - name = "science camera" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/engine, -/area/science/storage) "mfN" = ( /obj/machinery/reagentgrinder{ desc = "Used to grind things up into raw materials and liquids."; @@ -48199,6 +48112,20 @@ }, /turf/open/floor/iron/ridged, /area/crew_quarters/toilet/auxiliary) +"miF" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/head/utility/radiation, +/obj/effect/turf_decal/bot, +/obj/item/pipe_dispenser, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "miP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -48260,12 +48187,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hydroponics) -"mjL" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/open/floor/dock/drydock, -/area/drydock) "mjN" = ( /obj/structure/sign/departments/security, /turf/closed/wall/r_wall, @@ -48365,6 +48286,16 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/auxiliary) +"mlg" = ( +/obj/machinery/power/shieldwallgen, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/teleporter) "mlt" = ( /obj/structure/closet/secure_closet/brig{ id = "medcell"; @@ -48459,6 +48390,14 @@ }, /turf/open/floor/iron/techmaint, /area/engine/engine_room) +"mno" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor/inverted{ + id = "plasma_conveyor"; + dir = 9 + }, +/turf/open/floor/plating, +/area/science/storage) "mnr" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -48556,18 +48495,6 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"moJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/storage) "moM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48794,12 +48721,6 @@ /obj/structure/closet, /turf/open/floor/plating, /area/maintenance/department/medical) -"mss" = ( -/obj/machinery/atmospherics/components/trinary/mixer{ - dir = 4 - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "msy" = ( /obj/effect/turf_decal/guideline/guideline_out_arrow_con/blue{ dir = 1 @@ -48848,6 +48769,21 @@ dir = 8 }, /area/hallway/primary/central) +"mtn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/command/glass{ + name = "Control Room"; + req_access_txt = "19" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint, +/area/tcommsat/computer) "mtx" = ( /obj/structure/window/reinforced, /obj/structure/flora/ausbushes/brflowers, @@ -48929,6 +48865,17 @@ "muq" = ( /turf/open/floor/carpet/orange, /area/quartermaster/qm) +"mut" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security/telescreen/station{ + dir = 8; + pixel_x = 32 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "muu" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow, @@ -49240,13 +49187,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) -"myi" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "myk" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/brown/opposingcorners{ @@ -49798,6 +49738,17 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) +"mES" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/aft) "mEU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -49817,6 +49768,25 @@ "mFf" = ( /turf/open/floor/iron/tech/grid, /area/engine/engine_room) +"mFg" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Cargo Maintenance"; + req_one_access_txt = "31;48;12" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/aft/secondary) "mFj" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -50006,15 +49976,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/medical/break_room) -"mIo" = ( -/obj/machinery/camera/directional/south, -/obj/structure/chair/fancy/comfy{ - buildstackamount = 0; - color = "#742925"; - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/library) "mIp" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, @@ -50212,13 +50173,6 @@ dir = 10 }, /area/ai_monitored/storage/eva) -"mKQ" = ( -/obj/effect/turf_decal/trimline/purple/corner, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/grid/steel, -/area/science/research) "mKU" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, @@ -50343,6 +50297,20 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/bridge/meeting_room/council) +"mMW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/line, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "mMX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -50588,11 +50556,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"mPV" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "mPX" = ( /obj/structure/noticeboard{ pixel_y = 26 @@ -50677,6 +50640,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/central) +"mQx" = ( +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/storage) "mQF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -50818,6 +50794,18 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) +"mTu" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "mTv" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box/corners, @@ -51029,13 +51017,14 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"mVs" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/cable/orange{ - icon_state = "1-2" +"mVu" = ( +/obj/structure/cable/yellow, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +/turf/open/floor/plating, +/area/bridge) "mVB" = ( /obj/machinery/requests_console{ department = "Virology"; @@ -51095,19 +51084,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft/secondary) -"mXd" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/maintenance{ - name = "Genetics Desk Maintenance"; - req_access_txt = "9" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "mXq" = ( /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -51198,6 +51174,13 @@ /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, /area/security/execution/transfer) +"mYR" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "mYS" = ( /obj/structure/sign/warning/electricshock{ pixel_x = 32 @@ -51273,12 +51256,6 @@ burnt = 1 }, /area/maintenance/port/central) -"mZO" = ( -/obj/item/toy/beach_ball, -/mob/living/carbon/monkey, -/obj/effect/turf_decal/siding/dark_green, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "mZR" = ( /obj/structure/window/reinforced, /obj/structure/flora/ausbushes/ppflowers, @@ -51312,17 +51289,6 @@ }, /turf/open/floor/iron/sepia, /area/construction/mining/aux_base) -"naT" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - id = 1 - }, -/obj/structure/cable/orange{ - icon_state = "0-4" - }, -/turf/open/floor/plating/airless, -/area/docking/arrival) "naZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -51436,12 +51402,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/grid, /area/medical/virology) -"nbP" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "nbR" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, @@ -51450,6 +51410,22 @@ /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"nca" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, +/obj/machinery/airalarm/mixingchamber{ + dir = 4; + pixel_x = 22 + }, +/turf/open/floor/iron/techmaint, +/area/science/mixing/chamber) "nch" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -51501,6 +51477,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) +"ncB" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "ncC" = ( /obj/item/folder/yellow, /obj/item/pen, @@ -51560,18 +51551,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"nek" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Morgue Maintenance"; - req_access_txt = "6" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/central) "nel" = ( /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 @@ -51593,6 +51572,15 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) +"net" = ( +/obj/machinery/camera/directional/south, +/obj/structure/chair/fancy/comfy{ + buildstackamount = 0; + color = "#742925"; + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/library) "nev" = ( /obj/structure/chair/office{ dir = 8 @@ -51612,6 +51600,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/gateway) +"neL" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "neP" = ( /obj/machinery/door/poddoor/preopen{ id = "telelab"; @@ -51747,25 +51744,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/department/security/brig) -"ngn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/corner{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "ngo" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -51845,6 +51823,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/science/shuttledock) +"nht" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/bridge) "nhu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/light{ @@ -51920,6 +51906,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"niq" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/turf/open/floor/plating/airless, +/area/docking/arrival) "nit" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -52010,20 +52001,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood, /area/library) -"njq" = ( -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 32 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "njr" = ( /obj/structure/chair/fancy/bench{ dir = 8 @@ -52048,14 +52025,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"njL" = ( -/obj/machinery/suit_storage_unit/exploration, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "nkl" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -52096,16 +52065,6 @@ /obj/item/clothing/head/soft/red, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"nkX" = ( -/obj/machinery/power/shieldwallgen, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/teleporter) "nkY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -52241,13 +52200,6 @@ "nnm" = ( /turf/open/floor/wood, /area/vacant_room/office) -"nno" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "nnq" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/red/filled/line, @@ -52266,6 +52218,17 @@ }, /turf/open/floor/prison, /area/security/prison) +"nns" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/line, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "nnw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -52441,12 +52404,23 @@ /obj/structure/table/reinforced, /turf/open/floor/engine/light, /area/science/xenobiology) +"npM" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 9 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "npW" = ( /obj/item/radio/intercom{ pixel_x = 28 }, /turf/open/floor/iron/sepia, /area/science/shuttle) +"npX" = ( +/obj/structure/chair/stool, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/carpet, +/area/crew_quarters/bar/atrium) "npY" = ( /obj/structure/chair/fancy/bench/corporate/right{ dir = 4 @@ -52455,6 +52429,16 @@ dir = 8 }, /area/hallway/primary/central) +"npZ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "nqh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -52509,6 +52493,14 @@ }, /turf/open/floor/iron/ridged/steel, /area/science/explab) +"nqL" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/pump{ + name = "Lil Pump" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "nrb" = ( /obj/machinery/newscaster{ pixel_y = 31 @@ -52517,12 +52509,6 @@ /obj/structure/table/wood, /turf/open/floor/cult, /area/library) -"nrk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/power/shieldwallgen, -/turf/open/floor/engine, -/area/maintenance/department/engine) "nrL" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -52777,24 +52763,6 @@ }, /turf/open/floor/iron/grid, /area/crew_quarters/toilet/restrooms) -"nue" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/engine, -/area/science/storage) "nuj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -52874,6 +52842,19 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/aft) +"nvz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/general/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "nvA" = ( /obj/machinery/newscaster{ pixel_x = 28; @@ -52923,6 +52904,12 @@ }, /turf/open/floor/iron/techmaint, /area/quartermaster/storage) +"nwo" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/dock/drydock, +/area/drydock) "nwy" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark/side, @@ -53010,6 +52997,14 @@ }, /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) +"nyg" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "mixwindows"; + name = "Toxin Mix Chamber Blast Door" + }, +/turf/open/floor/plating, +/area/science/mixing/chamber) "nyo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/guideline/guideline_in/red, @@ -53050,6 +53045,12 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"nyN" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "nyW" = ( /obj/effect/turf_decal/trimline/red/line{ dir = 6 @@ -53099,6 +53100,12 @@ }, /turf/open/floor/wood, /area/bridge/meeting_room/council) +"nzg" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/science/mixing) "nzw" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -53230,6 +53237,18 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"nAP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/storage) "nBb" = ( /obj/machinery/airalarm/directional/east{ pixel_x = 22 @@ -53814,6 +53833,18 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"nHF" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "nHJ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -53883,6 +53914,13 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness/recreation) +"nIg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/ameridiner, +/area/medical/genetics) "nIj" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, @@ -53952,13 +53990,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/dorms) -"nJd" = ( -/obj/machinery/atmospherics/components/trinary/filter/critical{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "nJm" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/unary/thermomachine/heater, @@ -53983,6 +54014,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/atmos) +"nJL" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "nJU" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron/techmaint, @@ -54033,19 +54070,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"nKw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "engsm"; - name = "Radiation Shutters Control"; - pixel_x = 24; - req_one_access_txt = "10;24" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/supermatter) "nKL" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -54144,6 +54168,20 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/grid/steel, /area/hydroponics) +"nMt" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/north, +/obj/machinery/conveyor_switch/oneway{ + id = "plasma_conveyor"; + name = "Plasma Conveyor"; + pixel_x = -12 + }, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/turf/open/floor/iron/techmaint, +/area/science/storage) "nMw" = ( /turf/closed/wall, /area/crew_quarters/toilet/auxiliary) @@ -54234,18 +54272,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/disposal) -"nOv" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - id = 4; - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating/airless, -/area/docking/bridge) "nOV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -54366,6 +54392,17 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"nQY" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/drydock/security) "nRh" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/turf_decal/bot, @@ -54416,6 +54453,16 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) +"nSi" = ( +/obj/machinery/light/small, +/obj/machinery/firealarm/directional/south, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/science/storage) "nSy" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -54652,21 +54699,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"nWR" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/red/corner, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "nWS" = ( /obj/structure/sign/departments/restroom, /turf/closed/wall, @@ -54735,6 +54767,14 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/department/security/brig) +"nXI" = ( +/obj/effect/turf_decal/bot_white, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/gateway) "nXK" = ( /obj/machinery/camera/directional/east, /turf/open/floor/engine/light, @@ -54745,21 +54785,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/storage/primary) -"nXO" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "nYc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54803,6 +54828,15 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/auxiliary) +"nYE" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "nYG" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/machinery/door/poddoor/preopen{ @@ -54811,6 +54845,21 @@ }, /turf/open/floor/plating, /area/crew_quarters/toilet/restrooms) +"nYU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/bridge) "nZa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55232,6 +55281,15 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) +"ocY" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/techmaint, +/area/science/mixing) "odj" = ( /obj/effect/turf_decal/guideline/guideline_out/blue{ dir = 1 @@ -55482,6 +55540,27 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/port) +"ohF" = ( +/obj/structure/table/reinforced, +/obj/item/nanite_scanner{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/nanite_remote{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Experimentor"; + name = "science camera" + }, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "ohR" = ( /obj/structure/table/wood, /obj/item/folder/yellow, @@ -55516,12 +55595,6 @@ }, /turf/open/floor/wood, /area/hallway/primary/aft) -"ohZ" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "oih" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -55546,28 +55619,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/disposal) -"oiN" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/turf/open/floor/catwalk_floor, -/area/drydock) -"oiW" = ( -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -30 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "oje" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -55750,15 +55801,6 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/engine/storage) -"olO" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/box, -/obj/effect/turf_decal/stripes/red/box, -/obj/structure/lattice/catwalk, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "olW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -55922,6 +55964,30 @@ }, /turf/open/floor/iron/techmaint, /area/tcommsat/computer) +"onr" = ( +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/machinery/button/shieldwallgen/directional/north{ + id = 4 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/bridge) "onz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56136,19 +56202,6 @@ dir = 8 }, /area/crew_quarters/fitness/recreation) -"opL" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "opR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56290,16 +56343,6 @@ "oqW" = ( /turf/closed/wall/r_wall, /area/science/storage) -"orh" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/button/shieldwallgen/directional/west, -/turf/open/floor/engine{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "orz" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -56322,29 +56365,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/starboard) -"orO" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Secure Creature Pen Shield Holder"; - atom_integrity = 300 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "orP" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/advanced_airlock_controller{ @@ -56401,6 +56421,18 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"osB" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 3 + }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/drydock) "osF" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 @@ -56620,6 +56652,13 @@ }, /turf/open/floor/iron/grid, /area/medical/virology) +"ovR" = ( +/obj/machinery/light/small, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/catwalk_floor, +/area/drydock) "ovU" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -56711,6 +56750,22 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"owO" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Filter to Gas" + }, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "owV" = ( /obj/effect/turf_decal/guideline/guideline_out_arrow_con/blue{ dir = 9 @@ -56767,23 +56822,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"oxQ" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/item/hand_tele, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Handled Teleporter Storage"; - req_one_access_txt = "17;19" - }, -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/turf/open/floor/iron/dark, -/area/teleporter) "oxU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -56833,12 +56871,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"oyX" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/science/mixing) "ozc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -56906,6 +56938,14 @@ }, /turf/open/floor/iron/white, /area/medical/genetics) +"oBa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/hallway/primary/aft) "oBh" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 4 @@ -57267,27 +57307,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) -"oFV" = ( -/obj/structure/lattice/catwalk/over, -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 2; - name = "landing marker"; - picked_color = "Burgundy" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/bridge) "oFX" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/structure/sign/warning/nosmoking{ @@ -57370,6 +57389,19 @@ name = "mainframe floor" }, /area/tcommsat/server) +"oGV" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/conveyor_switch/oneway{ + id = "o2_conveyor"; + name = "O2 Conveyor"; + pixel_x = -12 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/techmaint, +/area/science/storage) "oHd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -57408,15 +57440,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"oHz" = ( -/obj/structure/plasticflaps/opaque, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor{ - dir = 8; - id = "plasma_conveyor" - }, -/turf/open/floor/engine, -/area/science/storage) "oHE" = ( /obj/machinery/telecomms/broadcaster/preset_right, /obj/effect/turf_decal/stripes/closeup{ @@ -57759,18 +57782,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"oLQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/item/beacon, -/turf/open/floor/iron/sepia, -/area/science/shuttle) "oLS" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -57838,25 +57849,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) -"oOj" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = -5 +"oNW" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/obj/item/geiger_counter, -/obj/item/geiger_counter, -/obj/effect/turf_decal/bot, -/obj/machinery/light_switch{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +/turf/open/floor/catwalk_floor/iron_smooth, +/area/science/mixing) "oOp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -57901,6 +57908,18 @@ }, /turf/open/floor/iron/dark, /area/lawoffice) +"oOX" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + dir = 1; + id = 1 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/turf/open/floor/plating/airless, +/area/docking/arrival) "oPf" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -57971,6 +57990,12 @@ }, /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) +"oQC" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "oQR" = ( /obj/effect/landmark/blobstart, /turf/open/floor/grass, @@ -58189,19 +58214,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, /area/security/nuke_storage) -"oTx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/aft) "oTB" = ( /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/maintenance_hatch{ @@ -58405,17 +58417,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/visible, /turf/open/floor/iron/dark, /area/engine/atmos) -"oWl" = ( -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/computer/records/medical, -/obj/machinery/button/door{ - id = "emmd"; - name = "Emergency Medical Lockdown"; - pixel_y = 24; - req_access_txt = "40" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/heads/cmo) "oWE" = ( /obj/structure/sign/poster/official/report_crimes{ pixel_y = -32 @@ -58511,19 +58512,6 @@ }, /turf/open/floor/iron/grid/steel, /area/bridge) -"oYa" = ( -/obj/effect/spawner/randomvend/cola, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/aft) "oYg" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -58682,13 +58670,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/aft) -"oZZ" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank{ - pixel_x = 25 - }, -/obj/machinery/igniter/incinerator_toxmix, -/turf/open/floor/engine/vacuum, -/area/science/mixing/chamber) "pam" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 @@ -58822,28 +58803,6 @@ dir = 4 }, /area/teleporter) -"pbB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/structure/lattice/catwalk/over, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 2; - name = "landing marker"; - picked_color = "Burgundy" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "pbU" = ( /obj/machinery/light{ dir = 1 @@ -58856,15 +58815,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"pcp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "pcC" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -58884,17 +58834,6 @@ /obj/structure/sign/departments/minsky/supply/janitorial, /turf/closed/wall, /area/janitor) -"pcV" = ( -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/bridge) "pcW" = ( /mob/living/simple_animal/sloth/citrus, /obj/structure/disposalpipe/segment{ @@ -59181,25 +59120,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"pgj" = ( -/obj/item/stack/rods/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/target, -/obj/item/target/syndicate, -/obj/item/target/alien, -/obj/item/target/clown, -/obj/structure/closet/crate/secure{ - desc = "A secure crate containing various materials for building a customised test-site."; - name = "Test Site Materials Crate"; - req_access_txt = "8" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "pgn" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -59233,9 +59153,6 @@ /obj/item/borg/upgrade/rename, /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) -"pgs" = ( -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "pgx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/siding/wood{ @@ -59253,6 +59170,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"pgH" = ( +/obj/machinery/door/airlock{ + name = "Bar Backroom"; + req_access_txt = "25" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/techmaint, +/area/crew_quarters/bar) "pgP" = ( /obj/effect/turf_decal/guideline/guideline_mid_arrow_con/purple{ dir = 10 @@ -59570,20 +59501,6 @@ }, /turf/open/floor/iron/techmaint, /area/science/storage) -"plW" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/utility/radiation, -/obj/item/clothing/head/utility/radiation, -/obj/effect/turf_decal/bot, -/obj/item/pipe_dispenser, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "plZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59784,6 +59701,19 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/cafeteria, /area/storage/art) +"ppc" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "ppi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -59814,6 +59744,21 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/iron/techmaint, /area/quartermaster/warehouse) +"ppE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/volume_pump{ + name = "Gas to Filter" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ppG" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -59982,10 +59927,6 @@ }, /turf/open/floor/plating, /area/security/checkpoint/escape) -"psq" = ( -/obj/machinery/vendor/exploration, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "ptb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60121,18 +60062,14 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"puC" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 +"puA" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Thermoelectric Generator output" }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/turf/open/floor/iron/techmaint, -/area/medical/medbay/central) +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "puI" = ( /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/iron/fifty{ @@ -60161,14 +60098,6 @@ "puV" = ( /turf/closed/wall, /area/medical/genetics) -"puZ" = ( -/obj/machinery/button/shieldwallgen/directional/south{ - name = "Arrivals" - }, -/turf/open/floor/engine{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "pvc" = ( /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/red/box, @@ -60265,6 +60194,13 @@ dir = 4 }, /area/hallway/primary/port) +"pwa" = ( +/obj/machinery/air_sensor/atmos/toxins_mixing_tank{ + pixel_x = 25 + }, +/obj/machinery/igniter/incinerator_toxmix, +/turf/open/floor/engine/vacuum, +/area/science/mixing/chamber) "pwm" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /obj/machinery/light/small{ @@ -60296,25 +60232,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/maintenance/disposal) -"pwI" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Atmos to Gas" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "pwZ" = ( /obj/structure/closet/crate, /obj/item/coin/silver, @@ -60322,6 +60239,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"pxf" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "pxh" = ( /obj/structure/sign/departments/minsky/engineering/engineering, /turf/closed/wall/r_wall, @@ -60459,24 +60391,6 @@ "pyK" = ( /turf/open/floor/carpet, /area/medical/exam_room) -"pyQ" = ( -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/item/bodypart/r_arm/robot{ - pixel_x = 3 - }, -/obj/item/bodypart/l_arm/robot{ - pixel_x = -3 - }, -/obj/item/stack/cable_coil/white, -/obj/item/assembly/flash/handheld/weak, -/obj/item/assembly/flash/handheld/weak, -/obj/item/assembly/flash/handheld/weak, -/obj/item/assembly/flash/handheld/weak, -/obj/item/assembly/flash/handheld/weak, -/obj/item/assembly/flash/handheld/weak, -/turf/open/floor/iron/grid/steel, -/area/science/robotics/lab) "pyX" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 1 @@ -60496,13 +60410,6 @@ }, /turf/open/floor/engine/light, /area/science/explab) -"pzg" = ( -/obj/structure/table/reinforced, -/obj/item/pipe_dispenser, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "pzr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -60644,6 +60551,17 @@ dir = 6 }, /area/engine/atmos) +"pAR" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 3 + }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/drydock) "pBe" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -60789,14 +60707,6 @@ }, /turf/open/floor/iron/dark, /area/library/lounge) -"pCw" = ( -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/gateway) "pCz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60997,6 +60907,16 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"pFC" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port) "pFH" = ( /obj/structure/table/reinforced, /obj/item/food/chips, @@ -61422,12 +61342,6 @@ broken = 1 }, /area/maintenance/starboard/fore) -"pKL" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/dock/drydock, -/area/drydock) "pKS" = ( /obj/structure/railing/corner{ dir = 4 @@ -61800,21 +61714,6 @@ /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark, /area/lawoffice) -"pQr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/lobby) "pQv" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -61980,6 +61879,10 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/starboard/central) +"pTP" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "pTX" = ( /obj/structure/tank_dispenser, /turf/open/floor/iron/dark, @@ -62106,6 +62009,20 @@ /obj/effect/turf_decal/tile/green/opposingcorners, /turf/open/floor/iron, /area/hallway/secondary/service) +"pVJ" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/machinery/computer/nanite_cloud_controller, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "pVL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -62129,6 +62046,16 @@ }, /turf/open/floor/iron/sepia, /area/science/shuttle) +"pVN" = ( +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "pVT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -62155,6 +62082,15 @@ name = "mainframe floor" }, /area/tcommsat/server) +"pWy" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "pWB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62185,16 +62121,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"pWZ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "pXd" = ( /turf/open/floor/iron/grid/steel, /area/crew_quarters/dorms) @@ -62258,14 +62184,16 @@ dir = 1 }, /area/janitor) -"pXT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 +"pYa" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron, -/area/hallway/primary/aft) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "pYk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -62435,6 +62363,19 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) +"pZX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/storage) "qac" = ( /obj/effect/turf_decal/guideline/guideline_out/yellow{ dir = 4 @@ -62478,12 +62419,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissaryFood) -"qaJ" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qaM" = ( /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/stripes/line, @@ -62611,19 +62546,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"qbK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "qbV" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -62894,14 +62816,6 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) -"qfj" = ( -/obj/structure/cable/yellow, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/bridge) "qfq" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/engine, @@ -62935,15 +62849,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/asteroid/nearstation) -"qfY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "qgh" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -63054,10 +62959,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"qhQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qhY" = ( /obj/machinery/light, /obj/structure/table, @@ -63086,25 +62987,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"qim" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Service Hall"; - req_one_access_txt = "25;26;35;28;22;37;46;38" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port) "qit" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -63122,6 +63004,15 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/construction/mining/aux_base) +"qix" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/engine, +/area/science/storage) "qiB" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -63165,15 +63056,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) -"qiU" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qiV" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/bot, @@ -63539,15 +63421,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"qnm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qnw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -63588,28 +63461,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"qnW" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/bridge) -"qnY" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/end{ - dir = 1 - }, -/obj/structure/lattice/catwalk, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "qnZ" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -63734,6 +63585,15 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"qqm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/iron/ameridiner, +/area/medical/genetics) "qqr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -63894,21 +63754,6 @@ }, /turf/open/floor/iron/techmaint, /area/lawoffice) -"qso" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/lattice/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "qsq" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/misc/assistantformal, @@ -63979,6 +63824,19 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"qsZ" = ( +/obj/effect/spawner/randomvend/cola, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/aft) "qte" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/light/small{ @@ -64055,12 +63913,6 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"qtN" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/techmaint, -/area/science/mixing) "qtS" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 8 @@ -64101,6 +63953,15 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"quc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "que" = ( /obj/structure/sign/map/right{ desc = "A framed outdated, yet detailed picture of the station. there's even the permanent prison wing in the bottom left!"; @@ -64448,12 +64309,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison/shielded) -"qyQ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qyT" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/components/binary/pump{ @@ -64568,17 +64423,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"qBf" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qBn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64716,19 +64560,6 @@ }, /turf/open/floor/iron/sepia, /area/construction/mining/aux_base) -"qCQ" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "qCS" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -64808,6 +64639,13 @@ dir = 4 }, /area/storage/primary) +"qEe" = ( +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/turf/open/floor/grass, +/area/medical/genetics) "qEf" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -64815,6 +64653,15 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"qEg" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "qEh" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/techmaint, @@ -65239,6 +65086,21 @@ /obj/structure/table/wood/poker, /turf/open/floor/carpet/red, /area/crew_quarters/bar/atrium) +"qIz" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "qIB" = ( /obj/effect/turf_decal/plaque{ icon_state = "L1" @@ -65519,14 +65381,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) -"qLW" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/conveyor{ - dir = 8; - id = "canister_conveyor" - }, -/turf/open/floor/plating, -/area/science/storage) "qMc" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -65534,6 +65388,20 @@ }, /turf/open/floor/iron, /area/science/lab) +"qMd" = ( +/obj/effect/turf_decal/trimline/purple/line, +/obj/effect/landmark/start/scientist, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/science/research) "qMq" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -65635,19 +65503,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/engine_room) -"qOd" = ( -/obj/effect/turf_decal/caution{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = -20; - pixel_y = 22 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/engine, -/area/engine/supermatter) "qOC" = ( /obj/structure/table/wood, /obj/machinery/airalarm/directional/west{ @@ -65689,16 +65544,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/primary/starboard) -"qOZ" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Desk Maintenance"; - req_access_txt = "5" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "qPc" = ( /turf/open/floor/iron/dark/side{ dir = 6 @@ -65812,6 +65657,15 @@ }, /turf/open/floor/iron/tech, /area/medical/virology) +"qQi" = ( +/obj/machinery/computer/shuttle_flight/labor{ + dir = 8 + }, +/obj/machinery/button/shieldwallgen/directional/north{ + id = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "qQj" = ( /turf/closed/wall, /area/maintenance/department/security/brig) @@ -65902,17 +65756,6 @@ }, /turf/open/floor/iron, /area/maintenance/central) -"qRj" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/engine{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/supermatter) "qRl" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -66057,6 +65900,23 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"qSz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/obj/structure/table/reinforced, +/obj/item/nanite_remote{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/nanite_scanner{ + pixel_x = 4; + pixel_y = -4 + }, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "qSI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -66119,26 +65979,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/courtroom) -"qSU" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"qSX" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/conveyor{ - dir = 8; - id = "o2_conveyor" - }, -/turf/open/floor/plating, -/area/science/storage) "qTa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -66340,13 +66180,14 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) -"qWx" = ( -/obj/machinery/computer/records/medical, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +"qWE" = ( +/obj/structure/window/reinforced, +/obj/machinery/computer/records/security{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, -/area/bridge) +/area/crew_quarters/heads/hop) "qWL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -66411,18 +66252,6 @@ }, /turf/open/floor/carpet/grimy, /area/crew_quarters/bar) -"qXC" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/central) "qXO" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, @@ -66442,6 +66271,11 @@ /obj/item/clothing/head/soft/blue, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"qYj" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/gateway) "qYs" = ( /obj/machinery/light/small{ dir = 4 @@ -66451,6 +66285,19 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/bar/atrium) +"qYy" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "qYA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -66768,22 +66615,6 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/disposal) -"rdI" = ( -/obj/machinery/door/airlock/maintenance{ - name = "cargo Maintenance"; - req_one_access_txt = "31;48" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/aft) "rdR" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 @@ -66836,11 +66667,30 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) +"reI" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "S.V.A. Storage Maintenance"; + req_one_access_txt = "1" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/security/brig) "reM" = ( /obj/machinery/light/small, /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/disposal) +"reY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "rfa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -67099,6 +66949,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/storage/tools) +"rif" = ( +/obj/machinery/power/apc/auto_name/directional/west{ + pixel_x = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "rih" = ( /obj/docking_port/stationary{ dir = 8; @@ -67177,6 +67042,26 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room/council) +"riS" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Service Foyer"; + req_one_access_txt = "22;25;26;28;35;37;38;46" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/hallway/secondary/service) "rjD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -67259,10 +67144,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) -"rjZ" = ( -/obj/machinery/gateway/station, -/turf/open/floor/iron/dark, -/area/gateway) "rkv" = ( /obj/structure/table/wood, /turf/open/floor/carpet, @@ -67294,12 +67175,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/iron, /area/engine/atmos) -"rlv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "rlO" = ( /obj/machinery/light{ dir = 8 @@ -67463,18 +67338,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"rnI" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "rnX" = ( /turf/open/floor/iron/dark/side{ dir = 1 @@ -67502,16 +67365,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) -"rom" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Custodial Closet"; - req_access_txt = "26" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/security/brig) "rop" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/window/reinforced/tinted{ @@ -67579,25 +67432,6 @@ }, /turf/open/floor/iron/techmaint, /area/security/main) -"rpo" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/machinery/light, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) -"rpq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "rpu" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -67820,6 +67654,19 @@ /obj/item/wirecutters, /turf/open/floor/plating, /area/maintenance/aft) +"rsl" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "rso" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -67871,6 +67718,14 @@ }, /turf/open/floor/iron, /area/medical/medbay/lobby) +"rtm" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Storage Room"; + req_access_txt = "12" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "rtu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68084,6 +67939,23 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"rwi" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology"; + req_access_txt = "55" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "rwr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -68170,6 +68042,20 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) +"rwQ" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/hallway/primary/central) "rxc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -68409,6 +68295,17 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"rzG" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/fore) "rzV" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain/private) @@ -68471,6 +68368,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central/secondary) +"rAz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/gateway) "rAC" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -68480,19 +68382,6 @@ /obj/structure/railing, /turf/open/floor/plating, /area/hallway/primary/aft) -"rBk" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/conveyor_switch/oneway{ - id = "canister_conveyor"; - name = "Canister Conveyor"; - pixel_x = -12 - }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/techmaint, -/area/science/storage) "rBl" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -68737,19 +68626,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) -"rEf" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Medbay - Auxiliary Fore Entrance"; - name = "medbay camera" - }, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "rEA" = ( /obj/effect/turf_decal/stripes/end, /turf/open/floor/circuit/green{ @@ -68872,16 +68748,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"rGg" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "72" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port) "rGl" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/closet/secure_closet/personal, @@ -68973,18 +68839,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/engine/engine_room) -"rHf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "rHh" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -69252,9 +69106,21 @@ /turf/open/floor/iron, /area/hallway/primary/central) "rKB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +/obj/machinery/door/airlock/maintenance{ + name = "cargo Maintenance"; + req_one_access_txt = "31;48" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/aft) "rKC" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -69291,6 +69157,16 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"rLb" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "rLd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -69344,22 +69220,6 @@ broken = 1 }, /area/maintenance/port/central) -"rMa" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "rMc" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -69783,21 +69643,6 @@ /obj/effect/turf_decal/siding/wideplating_new/dark, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"rPC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/red/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 24 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "rPG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -69859,6 +69704,11 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/maintenance/starboard/central) +"rQn" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/turf/open/floor/plating, +/area/drydock) "rQq" = ( /obj/structure/lattice/catwalk, /obj/item/stack/marker_beacon{ @@ -70169,16 +70019,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"rUQ" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Loop" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "rVe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -70235,14 +70075,15 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/iron/grid/steel, /area/science/robotics/lab) -"rVE" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "mixwindows"; - name = "Toxin Mix Chamber Blast Door" +"rVN" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 }, -/turf/open/floor/plating, -/area/science/mixing/chamber) +/obj/effect/turf_decal/stripes/end, +/obj/effect/turf_decal/stripes/red/end, +/obj/structure/lattice/catwalk, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "rVS" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -70469,14 +70310,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"rYX" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor{ - dir = 10; - id = "plasma_conveyor" - }, -/turf/open/floor/plating, -/area/science/storage) "rZb" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -70664,6 +70497,18 @@ }, /turf/open/space/basic, /area/solar/starboard/fore) +"sbg" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "sbj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -70711,12 +70556,6 @@ }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) -"sbJ" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/iron/dark, -/area/library) "sbR" = ( /obj/structure/chair{ dir = 1 @@ -71307,22 +71146,6 @@ "siW" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) -"sjl" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/research{ - name = "Research Division Access"; - req_access_txt = "47" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/stripes/closeup, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/techmaint, -/area/science/lobby) "sjs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -71425,6 +71248,12 @@ dir = 4 }, /area/engine/atmos) +"skx" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/open/floor/dock/drydock, +/area/drydock/security) "skP" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; @@ -71725,6 +71554,15 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"soG" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/tech/grid, +/area/science/xenobiology) "soH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -71847,6 +71685,14 @@ broken = 1 }, /area/space/nearstation) +"srh" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor{ + id = "plasma_conveyor"; + dir = 8 + }, +/turf/open/floor/plating, +/area/science/storage) "srw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -71951,6 +71797,16 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron, /area/hallway/primary/aft) +"ssS" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/toxins, +/obj/item/storage/firstaid/toxin{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "ssT" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -71960,14 +71816,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"stb" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Detective's Office Maintenance"; - req_access_txt = "4" - }, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/security/brig) "sth" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/sec/surgery{ @@ -72508,7 +72356,7 @@ }, /turf/open/floor/iron, /area/security/main) -"szM" = ( +"szH" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -72731,6 +72579,15 @@ }, /turf/open/floor/iron/grid/steel, /area/science/research) +"sCA" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_access_txt = "35" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/techmaint, +/area/hydroponics) "sCC" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -72755,19 +72612,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"sCF" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/camera/directional/north{ - c_tag = "Supermatter Engine - Fore"; - name = "engineering camera" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "sCI" = ( /turf/open/floor/iron/dark, /area/hallway/primary/central) @@ -72904,26 +72748,6 @@ }, /turf/open/floor/noslip/standard, /area/crew_quarters/fitness/recreation) -"sEn" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"sEp" = ( -/obj/machinery/light{ - dir = 4 - }, -/mob/living/carbon/monkey, -/obj/effect/turf_decal/siding/dark_green/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "sEu" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -72967,6 +72791,16 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"sFq" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "72" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port) "sFv" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /turf/open/floor/iron, @@ -73056,13 +72890,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"sGa" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "sGf" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -73161,16 +72988,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"sHQ" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/power/terminal, -/turf/open/floor/catwalk_floor, -/area/drydock/security) "sHR" = ( /obj/machinery/conveyor{ dir = 8; @@ -73200,15 +73017,19 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/r_wall, /area/hallway/secondary/entry) -"sIF" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" +"sIG" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/camera/directional/north{ + c_tag = "Supermatter Engine - Fore"; + name = "engineering camera" }, -/obj/structure/cable/orange{ - icon_state = "2-4" +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/dock/drydock, -/area/drydock/security) +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "sIS" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/delivery, @@ -73295,6 +73116,13 @@ dir = 4 }, /area/engine/atmos) +"sKd" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "sKK" = ( /obj/machinery/shieldgen, /obj/machinery/light/small{ @@ -73344,20 +73172,6 @@ }, /turf/open/floor/plating/airless, /area/asteroid/nearstation) -"sLw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/door/airlock/research{ - name = "Toxins Launch Site"; - req_one_access_txt = "8;47" - }, -/turf/open/floor/iron/techmaint, -/area/science/misc_lab) "sLy" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/medical, @@ -73474,18 +73288,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"sNr" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - dir = 1; - id = 3 - }, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/drydock) "sNs" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, @@ -73622,17 +73424,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine, /area/science/storage) -"sOP" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/carpet/red, -/area/crew_quarters/heads/hos) "sOQ" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/fancy/sofa/old/right{ @@ -73651,16 +73442,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/customs) -"sOX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "sOZ" = ( /obj/effect/spawner/room/tenxfive, /turf/open/floor/plating, @@ -73678,36 +73459,7 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"sPx" = ( -/obj/structure/sign/warning/radiation{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/corner{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"sPK" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/healthanalyzer, -/turf/open/floor/plating, -/area/maintenance/aft) -"sPZ" = ( -/obj/structure/lattice/catwalk/over, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +"sPj" = ( /obj/item/stack/marker_beacon{ anchored = 1; icon_state = "markerburgundy-on"; @@ -73717,17 +73469,29 @@ name = "landing marker"; picked_color = "Burgundy" }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 8 + }, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) -"sQi" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +"sPK" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/healthanalyzer, +/turf/open/floor/plating, +/area/maintenance/aft) "sQn" = ( /obj/effect/turf_decal/delivery, /obj/machinery/rnd/production/circuit_imprinter, @@ -74372,6 +74136,18 @@ }, /turf/open/floor/iron/dark, /area/maintenance/department/science) +"sXJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_y = 31 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "sXL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -74460,21 +74236,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"sYT" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "sYV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -74500,18 +74261,6 @@ }, /turf/open/floor/iron/grid/steel, /area/engine/atmos) -"sZv" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/turf/open/floor/iron, -/area/security/checkpoint/engineering) "sZy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -74601,6 +74350,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/grid/steel, /area/hydroponics/garden) +"tag" = ( +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/open/floor/catwalk_floor, +/area/drydock) "taq" = ( /obj/structure/chair/fancy/bench/corporate/left{ dir = 4 @@ -74986,14 +74741,28 @@ dir = 4 }, /area/engine/atmos) -"tgx" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/plating/airless, -/area/drydock/security) +"tgs" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tgQ" = ( /turf/open/floor/iron/dark, /area/storage/tech) +"thd" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/turf/open/floor/iron, +/area/security/checkpoint/engineering) "thk" = ( /turf/closed/wall, /area/hallway/primary/fore) @@ -75256,6 +75025,12 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) +"tkx" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tky" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -75422,6 +75197,15 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"tmh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tmq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75469,11 +75253,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"tnU" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/plating/airless, -/area/docking/bridge) "tok" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -75542,11 +75321,16 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/techmaint, /area/crew_quarters/locker) -"toR" = ( -/obj/structure/chair/stool, -/mob/living/carbon/monkey/punpun, -/turf/open/floor/carpet, -/area/crew_quarters/bar/atrium) +"toU" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/genetics) "toW" = ( /obj/machinery/power/smes{ charge = 1e+006 @@ -75633,12 +75417,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"tpM" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "tpO" = ( /obj/machinery/button/door{ desc = "A remote control switch for the Auxiliary medbay foyer."; @@ -75776,6 +75554,15 @@ /obj/item/reagent_containers/pill/patch/silver_sulf, /turf/open/floor/iron/grid/steel, /area/engine/engineering) +"trl" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "trp" = ( /turf/open/floor/iron/grid/steel, /area/quartermaster/exploration_prep) @@ -75821,6 +75608,15 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"trU" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/medical/surgery) "tsb" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -75955,6 +75751,18 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) +"ttI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "ttK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -76134,12 +75942,6 @@ /obj/structure/chair/fancy/sofa/old/right, /turf/open/floor/carpet/grimy, /area/hallway/primary/port) -"tvP" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "tvU" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/delivery, @@ -76155,17 +75957,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) -"twn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/conveyor{ - dir = 8; - id = "o2_conveyor" - }, -/turf/open/floor/plating, -/area/science/storage) "twu" = ( /obj/structure/cable{ icon_state = "2-8" @@ -76324,6 +76115,22 @@ }, /turf/open/floor/iron/grid/steel, /area/science/research) +"tyM" = ( +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Telecomms Storage"; + req_one_access_txt = "61" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "tyS" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -76404,6 +76211,16 @@ /obj/structure/closet/wardrobe/green, /turf/open/floor/iron, /area/maintenance/starboard/central) +"tAg" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/button/shieldwallgen/directional/west, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "tAi" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -76555,21 +76372,6 @@ }, /turf/open/floor/iron, /area/quartermaster/warehouse) -"tBI" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/medical{ - anchored = 1 - }, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/storage/firstaid/o2, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/engine{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "tBN" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos{ dir = 1 @@ -76725,6 +76527,16 @@ }, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/entry) +"tDo" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tDI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -76803,6 +76615,18 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port) +"tER" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 2; + dir = 8 + }, +/obj/structure/cable/orange{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/drydock/security) "tFc" = ( /obj/structure/railing{ dir = 8 @@ -76849,15 +76673,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) -"tFZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +"tFY" = ( +/obj/structure/bookcase/random/adult, +/obj/machinery/light, +/turf/open/floor/iron/dark, +/area/library) "tGa" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 4 @@ -76896,6 +76716,17 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison) +"tGQ" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/drydock) "tGU" = ( /obj/structure/tank_dispenser/oxygen, /obj/machinery/firealarm/directional/north, @@ -76911,27 +76742,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/medical/break_room) -"tHw" = ( -/obj/structure/table/reinforced, -/obj/item/nanite_scanner{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/nanite_remote{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Experimentor"; - name = "science camera" - }, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "tHE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet{ @@ -77018,17 +76828,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"tIE" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "tIF" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -77096,21 +76895,6 @@ burnt = 1 }, /area/maintenance/port) -"tIV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/volume_pump{ - name = "Gas to Filter" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "tIZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -77120,6 +76904,31 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) +"tJh" = ( +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 8 + }, +/obj/structure/lattice/catwalk/over, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "tJu" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/trimline/red/filled/line, @@ -77384,11 +77193,6 @@ }, /turf/open/floor/engine/n2o/light, /area/engine/atmos) -"tMR" = ( -/obj/structure/chair/fancy/bench/corporate/right, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore) "tNd" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -77589,16 +77393,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"tPm" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/lobby) "tPn" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, @@ -77744,6 +77538,15 @@ }, /turf/open/floor/iron/white, /area/science/research) +"tRe" = ( +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Auxiliary Tool Storage Maintenance"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/aft) "tRh" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, @@ -77758,21 +77561,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"tRq" = ( -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Medbay RC"; - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "tRv" = ( /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics"; @@ -77793,6 +77581,25 @@ }, /turf/open/floor/iron/techmaint, /area/engine/atmos) +"tRx" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) +"tRL" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tRP" = ( /obj/structure/table, /obj/item/storage/box/donkpockets/donkpocketpizza, @@ -77847,6 +77654,18 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"tSJ" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tSL" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /obj/effect/turf_decal/guideline/guideline_mid/purple, @@ -78048,6 +77867,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) +"tUL" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/gateway) "tUM" = ( /obj/structure/dresser, /turf/open/floor/carpet/blue, @@ -78079,6 +77906,18 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"tVu" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable/yellow, +/turf/open/floor/engine{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "tVx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -78114,6 +77953,12 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) +"tVV" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "tVX" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -78291,14 +78136,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"tXJ" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/nanite_programmer, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "tXM" = ( /turf/closed/wall, /area/engine/engineering) @@ -78313,15 +78150,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"tYd" = ( -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison Blast Door" - }, -/obj/structure/cable/yellow, -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/hallway/primary/central) "tYl" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -78365,31 +78193,6 @@ }, /turf/open/floor/wood, /area/library/lounge) -"tZq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Thermoelectric Generator Input" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) -"tZC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/conveyor{ - dir = 8; - id = "canister_conveyor" - }, -/turf/open/floor/plating, -/area/science/storage) "tZF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/north{ @@ -78564,6 +78367,14 @@ }, /turf/open/floor/engine/o2/light, /area/engine/atmos) +"uce" = ( +/obj/machinery/suit_storage_unit/exploration, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "ucl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -78591,19 +78402,20 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"ucx" = ( -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; - name = "Head of Security RC"; - pixel_x = -1; - pixel_y = 29 +"ucD" = ( +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 }, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/records/security, -/turf/open/floor/wood, -/area/crew_quarters/heads/hos) +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Sleepers"; + name = "medbay camera" + }, +/mob/living/simple_animal/bot/medbot/filled{ + desc = "A little medical robot, officially part of the Nanotrasen medical inspectorate. He looks somewhat underwhelmed."; + name = "Inspector Johnson" + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "ucJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -78614,21 +78426,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"ucM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Break Room Maintenance"; - req_access_txt = "5" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/medical) "ucO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -78739,6 +78536,17 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"ued" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/machinery/light, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "ueh" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/light{ @@ -78851,6 +78659,11 @@ "ufF" = ( /turf/closed/wall, /area/engine/atmos) +"ufH" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/objective, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "ufT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -79013,6 +78826,25 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"uig" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Central Maintenance"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) "uir" = ( /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/delivery, @@ -79247,6 +79079,13 @@ /obj/structure/sign/departments/minsky/engineering/telecommmunications, /turf/closed/wall/r_wall, /area/tcommsat/computer) +"ulz" = ( +/obj/machinery/power/shieldwallgen, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/teleporter) "ulA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder/displaced, @@ -79568,6 +79407,12 @@ }, /turf/open/floor/iron/grid/steel, /area/crew_quarters/bar/atrium) +"upA" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "upB" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -79685,6 +79530,15 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/maintenance/disposal) +"uro" = ( +/obj/structure/plasticflaps/opaque, +/obj/machinery/conveyor{ + dir = 8; + id = "o2_conveyor" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/engine, +/area/science/storage) "urv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/stripes/closeup{ @@ -79713,6 +79567,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/grid, /area/crew_quarters/toilet/restrooms) +"usd" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "usf" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -79726,44 +79587,11 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"usp" = ( -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Telecomms Storage"; - req_one_access_txt = "61" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/starboard/fore) "usv" = ( /obj/machinery/bluespace_beacon, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/side, /area/teleporter) -"usz" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/obj/structure/table/reinforced, -/obj/item/nanite_remote{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/nanite_scanner{ - pixel_x = 4; - pixel_y = -4 - }, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "usA" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/misc/assistantformal, @@ -79935,6 +79763,13 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron, /area/maintenance/aft) +"uuw" = ( +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/machinery/pipedispenser, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "uux" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -80021,13 +79856,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"uvk" = ( -/obj/structure/bookcase/random/adult, -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/turf/open/floor/iron/dark, -/area/library) "uvm" = ( /obj/structure/bed, /obj/item/bedsheet/ce, @@ -80083,13 +79911,6 @@ }, /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) -"uvS" = ( -/mob/living/carbon/monkey, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/turf/open/floor/grass, -/area/medical/genetics) "uvU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -80264,6 +80085,14 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/customs) +"uxo" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/conveyor{ + dir = 8; + id = "plasma_conveyor" + }, +/turf/open/floor/plating, +/area/science/storage) "uxt" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -80546,18 +80375,6 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"uAR" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - id = 2; - dir = 8 - }, -/obj/structure/cable/orange{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/drydock/security) "uAZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -80730,6 +80547,25 @@ }, /turf/open/floor/iron/cafeteria, /area/vacant_room/commissary/commissaryFood) +"uDw" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Service Hall"; + req_one_access_txt = "25;26;35;28;22;37;46;38" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port) "uDx" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -80758,12 +80594,6 @@ /obj/machinery/light, /turf/open/floor/iron/sepia, /area/engine/break_room) -"uDO" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/open/floor/dock/drydock, -/area/drydock/security) "uDP" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -81005,32 +80835,6 @@ }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/aft) -"uGP" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/item/storage/secure/safe{ - pixel_x = 6; - pixel_y = 39 - }, -/obj/machinery/button/door{ - id = "Prisongate"; - name = "Prison Wing Lockdown"; - pixel_x = 6; - pixel_y = 24; - req_access_txt = "3" - }, -/obj/machinery/computer/security/telescreen/prison{ - dir = 8; - pixel_x = 31; - pixel_y = 1 - }, -/turf/open/floor/iron/dark, -/area/security/warden) "uGR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -81106,6 +80910,13 @@ /obj/item/stack/medical/bruise_pack, /turf/open/floor/plating, /area/maintenance/aft) +"uHY" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "mix to port" + }, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "uIa" = ( /obj/effect/spawner/randomvend/snack, /obj/effect/turf_decal/delivery, @@ -81148,6 +80959,12 @@ /obj/item/pen, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"uIB" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "uIE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -81259,6 +81076,15 @@ }, /turf/open/floor/iron, /area/quartermaster/warehouse) +"uJY" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "uKb" = ( /obj/effect/turf_decal{ dir = 1 @@ -81305,22 +81131,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) -"uKz" = ( -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/computer/nanite_chamber_control{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/science/nanite) "uKW" = ( /obj/vehicle/ridden/wheelchair, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -81419,6 +81229,28 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/dorms) +"uME" = ( +/obj/structure/lattice/catwalk/over, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "uMM" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/lootdrop/maintenance/four, @@ -81475,23 +81307,6 @@ /obj/effect/spawner/lootdrop/glowstick, /turf/open/floor/plating/rust, /area/maintenance/aft) -"uNy" = ( -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Construction Area"; - req_access_txt = "32" - }, -/turf/open/floor/iron/techmaint, -/area/construction) "uNC" = ( /obj/machinery/status_display/evac, /turf/closed/wall, @@ -81813,6 +81628,13 @@ }, /turf/open/floor/iron/sepia, /area/science/shuttle) +"uRC" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "uRF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external, @@ -81920,6 +81742,25 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"uTI" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = -28 + }, +/obj/machinery/light_switch{ + pixel_x = -24; + pixel_y = -8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "uTL" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ @@ -82510,17 +82351,6 @@ /obj/item/reagent_containers/pill/patch/silver_sulf, /turf/open/floor/iron/grid/steel, /area/engine/engineering) -"vaG" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - id = 3 - }, -/obj/structure/cable/orange{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/drydock) "vaQ" = ( /obj/effect/turf_decal/guideline/guideline_in/blue{ dir = 4 @@ -82620,14 +82450,6 @@ }, /turf/open/floor/iron/techmaint, /area/medical/morgue) -"vbQ" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor{ - dir = 8; - id = "plasma_conveyor" - }, -/turf/open/floor/plating, -/area/science/storage) "vcf" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -82810,19 +82632,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"vem" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Theatre Backstage"; - req_access_txt = "46" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port) "veo" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck{ @@ -82912,6 +82721,12 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/science/lobby) +"vfp" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "vfD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -82991,13 +82806,6 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/teleporter) -"vgv" = ( -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/machinery/pipedispenser, -/turf/open/floor/iron/techmaint, -/area/quartermaster/exploration_prep) "vgC" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -83042,13 +82850,6 @@ dir = 8 }, /area/engine/atmos) -"vhl" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "vhm" = ( /obj/machinery/power/rad_collector/anchored, /obj/effect/turf_decal/stripes/line{ @@ -83078,15 +82879,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"vhC" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "vhU" = ( /turf/closed/wall, /area/medical/apothecary) @@ -83397,26 +83189,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"vkT" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Service Foyer"; - req_one_access_txt = "22;25;26;28;35;37;38;46" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/hallway/secondary/service) "vkW" = ( /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ @@ -83489,6 +83261,19 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"vlC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "vlF" = ( /obj/structure/table/reinforced, /obj/structure/disposalpipe/segment, @@ -83498,6 +83283,19 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) +"vlG" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/conveyor/inverted{ + id = "plasma_conveyor"; + dir = 6 + }, +/turf/open/floor/plating, +/area/science/storage) "vlS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -83729,6 +83527,25 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/grid/steel, /area/engine/storage_shared) +"voL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "72" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port) "voQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -83924,16 +83741,6 @@ }, /turf/open/floor/iron/techmaint, /area/engine/gravity_generator) -"vqA" = ( -/obj/item/kirbyplants/random, -/obj/machinery/button/door{ - id = "gateshutter"; - name = "Gateway Access Shutters Control"; - pixel_y = -24; - req_access_txt = "62" - }, -/turf/open/floor/iron/dark, -/area/gateway) "vqF" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 22 @@ -84029,18 +83836,6 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) -"vqZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = 31 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) "vro" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, @@ -84083,6 +83878,13 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) +"vsa" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/catwalk_floor, +/area/drydock/security) "vsd" = ( /obj/structure/table/wood/fancy, /obj/item/soulstone/anybody/chaplain, @@ -84604,22 +84406,6 @@ dir = 4 }, /area/hallway/primary/port) -"vwc" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayAuxFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/grid, -/area/medical/medbay/central) "vwf" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/holopad, @@ -84945,6 +84731,16 @@ }, /turf/open/floor/iron/techmaint, /area/science/explab) +"vyV" = ( +/mob/living/carbon/human/species/monkey, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark_green/corner{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "vyZ" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, @@ -85116,20 +84912,6 @@ }, /turf/open/floor/plating, /area/storage/tech) -"vAQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "plasma_conveyor"; - dir = 9 - }, -/turf/open/floor/plating, -/area/science/storage) "vAS" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -85475,6 +85257,20 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"vFO" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/end{ + dir = 1 + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "vFP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -85495,18 +85291,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"vGm" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ - id = 4; - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating/airless, -/area/docking/bridge) "vGr" = ( /turf/open/floor/iron/dark/side, /area/quartermaster/storage) @@ -85664,6 +85448,14 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"vIC" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/science/storage) "vIG" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -85744,24 +85536,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"vJs" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Virology Maintenance"; - req_access_txt = "39" - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/central) "vJt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -85780,22 +85554,25 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"vJw" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "vJz" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, /turf/open/floor/iron, /area/engine/atmos) -"vJC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/tcommsat/computer) "vJE" = ( /obj/item/circuitboard/machine/telecomms/bus{ pixel_x = 4; @@ -85832,25 +85609,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) -"vKb" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_x = -28 - }, -/obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = -8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "vKc" = ( /obj/structure/sign/warning/explosives/alt, /turf/closed/wall/r_wall, @@ -85876,6 +85634,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"vKw" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "1;4" + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/techmaint, +/area/maintenance/central) "vKy" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -86536,6 +86302,17 @@ }, /turf/open/floor/iron/techmaint, /area/science/robotics/lab) +"vRf" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 1 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/turf/open/floor/plating/airless, +/area/docking/arrival) "vRg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden/crude, @@ -86549,6 +86326,40 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/port/fore) +"vRm" = ( +/obj/machinery/door/poddoor/preopen{ + id = "rdxeno"; + name = "Xenobiology Containment Door" + }, +/obj/machinery/door/airlock/research{ + name = "Science Shuttle Dock"; + req_access_txt = "47" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) +"vRo" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "vRu" = ( /obj/machinery/camera/directional/east{ c_tag = "Atmospherics - Carbon Dioxide Cell"; @@ -86707,6 +86518,13 @@ /obj/item/electronics/airalarm, /turf/open/floor/plating, /area/maintenance/port) +"vSO" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "vSP" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -86765,6 +86583,19 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"vTD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/shieldwallgen, +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/engine, +/area/maintenance/department/engine) "vTE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -87017,6 +86848,15 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) +"vWX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 5 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "vXA" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -87076,6 +86916,21 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"vYb" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "vYc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -87273,6 +87128,13 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"wbj" = ( +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "wbm" = ( /obj/item/wrench, /obj/structure/lattice/catwalk, @@ -87499,6 +87361,12 @@ }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/fore) +"weg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "wej" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/atmospherics{ @@ -87520,16 +87388,18 @@ dir = 1 }, /area/quartermaster/storage) -"weo" = ( -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +"wes" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "S.V.A. Storage Maintenance"; - req_one_access_txt = "1" +/obj/machinery/power/terminal{ + dir = 4 }, -/turf/open/floor/iron/techmaint, -/area/maintenance/department/security/brig) +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/catwalk_floor, +/area/drydock) "weu" = ( /obj/structure/railing{ dir = 1 @@ -87622,6 +87492,14 @@ "wfA" = ( /turf/closed/wall, /area/crew_quarters/heads/captain/private) +"wfD" = ( +/obj/machinery/suit_storage_unit/exploration, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/techmaint, +/area/quartermaster/exploration_prep) "wfJ" = ( /obj/structure/closet/secure_closet/medical1, /obj/item/storage/pill_bottle/epinephrine, @@ -87634,6 +87512,16 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) +"wfL" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "wge" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -87648,6 +87536,25 @@ }, /turf/open/floor/iron/grid, /area/medical/virology) +"wgh" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/plasma, +/obj/item/tank/internals/plasma, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) +"wgj" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/carpet/red, +/area/crew_quarters/heads/hos) "wgl" = ( /obj/machinery/light, /turf/open/floor/iron, @@ -87749,15 +87656,6 @@ /obj/machinery/power/tesla_coil, /turf/open/floor/iron/dark, /area/engine/engine_room) -"whQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "whR" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 9 @@ -87993,6 +87891,19 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) +"wlt" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "wlz" = ( /turf/open/floor/carpet/red, /area/crew_quarters/bar/atrium) @@ -88054,20 +87965,6 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) -"wmz" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/north, -/obj/machinery/conveyor_switch/oneway{ - id = "plasma_conveyor"; - name = "Plasma Conveyor"; - pixel_x = -12 - }, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/turf/open/floor/iron/techmaint, -/area/science/storage) "wmC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -88185,6 +88082,19 @@ }, /turf/open/floor/iron/stairs/right, /area/maintenance/department/engine) +"wnJ" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "engsm"; + name = "Radiation Shutters Control"; + pixel_x = 24; + req_one_access_txt = "10;24" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/supermatter) "wnQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -88274,6 +88184,12 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/engine/atmos) +"woS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "woY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -88387,6 +88303,25 @@ }, /turf/open/floor/plating, /area/maintenance/central/secondary) +"wqj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "wqF" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -88466,13 +88401,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"wrz" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "wrE" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/stripes/closeup{ @@ -88555,6 +88483,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/maintenance/department/science) +"wsx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Supermatter Engine - Backup Starboard"; + name = "engineering camera" + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "wsD" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -88597,6 +88535,17 @@ "wsQ" = ( /turf/closed/mineral, /area/quartermaster/office) +"wsT" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "wsZ" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -88800,6 +88749,20 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/primary/central) +"wvv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "plasma_conveyor"; + dir = 9 + }, +/turf/open/floor/plating, +/area/science/storage) "wvB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/vault, @@ -89110,6 +89073,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/secondary/entry) +"wzJ" = ( +/obj/structure/plasticflaps/opaque, +/obj/machinery/conveyor{ + dir = 8; + id = "canister_conveyor" + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/engine, +/area/science/storage) "wzL" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -89209,6 +89181,16 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"wAy" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "63" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/security/brig) "wAI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -89254,18 +89236,6 @@ /obj/machinery/field/generator, /turf/open/floor/iron/dark, /area/engine/engine_room) -"wBs" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/engine{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "wBt" = ( /turf/closed/wall, /area/security/main) @@ -89335,17 +89305,6 @@ burnt = 1 }, /area/maintenance/starboard/fore) -"wCB" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/obj/machinery/computer/records/security, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, -/area/security/checkpoint/supply) "wCN" = ( /turf/closed/wall, /area/crew_quarters/toilet/restrooms) @@ -89431,6 +89390,14 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron, /area/hallway/secondary/entry) +"wFf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/grid/steel, +/area/science/mixing) "wFi" = ( /obj/structure/cable{ icon_state = "0-2" @@ -90121,6 +90088,16 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"wNL" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "wNX" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -90198,6 +90175,18 @@ /obj/item/camera, /turf/open/floor/wood, /area/crew_quarters/theatre) +"wON" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/power/shieldwallgen/atmos/strong/roundstart{ + id = 4; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating/airless, +/area/docking/bridge) "wOO" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -90284,10 +90273,6 @@ }, /turf/open/floor/vault, /area/ai_monitored/security/armory) -"wPG" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/science/mixing/chamber) "wPJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -90329,12 +90314,6 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) -"wQs" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "wQu" = ( /turf/closed/wall, /area/science/lobby) @@ -90364,6 +90343,27 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"wRq" = ( +/obj/structure/lattice/catwalk/over, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/bridge) "wRr" = ( /obj/structure/sign/poster/official/nanotrasen_logo, /turf/closed/wall, @@ -90402,6 +90402,24 @@ }, /turf/open/floor/plating, /area/crew_quarters/bar/atrium) +"wRI" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/item/bodypart/r_arm/robot{ + pixel_x = 3 + }, +/obj/item/bodypart/l_arm/robot{ + pixel_x = -3 + }, +/obj/item/stack/cable_coil/white, +/obj/item/assembly/flash/handheld/weak, +/obj/item/assembly/flash/handheld/weak, +/obj/item/assembly/flash/handheld/weak, +/obj/item/assembly/flash/handheld/weak, +/obj/item/assembly/flash/handheld/weak, +/obj/item/assembly/flash/handheld/weak, +/turf/open/floor/iron/grid/steel, +/area/science/robotics/lab) "wRJ" = ( /obj/effect/landmark/event_spawn, /obj/effect/landmark/xeno_spawn, @@ -90573,19 +90591,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"wTv" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "wTJ" = ( /obj/machinery/light/small{ dir = 8 @@ -90630,6 +90635,18 @@ }, /turf/open/floor/iron/techmaint, /area/science/robotics/mechbay) +"wTO" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Morgue Maintenance"; + req_access_txt = "6" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/port/central) "wTY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -90653,16 +90670,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"wUh" = ( -/obj/item/extinguisher, -/obj/item/extinguisher, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "wUj" = ( /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness/recreation) @@ -90942,15 +90949,6 @@ "wWu" = ( /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) -"wWD" = ( -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Auxiliary Tool Storage Maintenance"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/techmaint, -/area/maintenance/port/aft) "wWH" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; @@ -90997,18 +90995,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/lab) -"wXa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/tank_dispenser, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "wXc" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, @@ -91016,14 +91002,6 @@ "wXd" = ( /turf/open/floor/plating/rust, /area/maintenance/port) -"wXf" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/pump{ - name = "Lil Pump" - }, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "wXp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -91112,6 +91090,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"wYr" = ( +/obj/effect/spawner/randomvend/snack, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/aft) "wYu" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating{ @@ -91161,6 +91152,21 @@ }, /turf/open/floor/engine, /area/engine/engine_room) +"wYJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/lobby) "wYL" = ( /obj/structure/sign/warning/securearea{ name = "WARNING: Station Limits" @@ -91232,6 +91238,19 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/crew_quarters/locker) +"wZw" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/lattice/catwalk/over, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "wZy" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/light{ @@ -91376,17 +91395,6 @@ /obj/effect/spawner/lootdrop/techstorage/security, /turf/open/floor/iron/dark, /area/storage/tech) -"xaG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/door/window/westleft{ - dir = 1; - name = "Monkey Pen"; - req_access_txt = "9" - }, -/turf/open/floor/iron/ameridiner, -/area/medical/genetics) "xaP" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, @@ -91467,11 +91475,6 @@ dir = 8 }, /area/crew_quarters/fitness/recreation) -"xcc" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/plating, -/area/drydock) "xcg" = ( /obj/machinery/cryopod, /obj/effect/turf_decal/stripes/line, @@ -91490,6 +91493,31 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"xcp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 24 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) +"xcr" = ( +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson/engine, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "xcw" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -91515,6 +91543,19 @@ }, /turf/open/floor/iron/dark, /area/engine/storage_shared) +"xcE" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/structure/table/reinforced, +/obj/item/storage/box/disks_nanite{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/iron/techmaint, +/area/science/nanite) "xcJ" = ( /obj/item/storage/secure/briefcase{ pixel_x = -2; @@ -91673,6 +91714,15 @@ }, /turf/open/floor/wood, /area/hallway/primary/port) +"xdY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "xed" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -91815,22 +91865,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"xfn" = ( -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom{ - pixel_x = -28 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "xfp" = ( /obj/item/trash/syndi_cakes, /obj/machinery/light/small{ @@ -91842,16 +91876,6 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/disposal) -"xfs" = ( -/obj/machinery/light/small, -/obj/machinery/firealarm/directional/south, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/engine, -/area/science/storage) "xfu" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -92382,19 +92406,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"xkm" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Engineering Maintenance"; - req_access_txt = "10" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/techmaint, -/area/maintenance/starboard/aft) "xkx" = ( /turf/open/floor/wood, /area/library) @@ -92631,17 +92642,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/medical/break_room) -"xmW" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Thermoelectric Generator Input" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "xnb" = ( /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ @@ -92689,6 +92689,12 @@ dir = 5 }, /area/quartermaster/storage) +"xnE" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/library) "xnF" = ( /obj/effect/turf_decal/guideline/guideline_in_arrow_con/red{ dir = 9 @@ -93129,13 +93135,6 @@ }, /turf/open/floor/iron/grid/steel, /area/engine/storage_shared) -"xsT" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "xsW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ @@ -93195,6 +93194,19 @@ }, /turf/open/floor/iron/dark, /area/medical/surgery) +"xtl" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Medbay - Auxiliary Fore Entrance"; + name = "medbay camera" + }, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xtr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -93216,18 +93228,6 @@ "xtu" = ( /turf/closed/wall/r_wall, /area/engine/gravity_generator) -"xtv" = ( -/obj/effect/turf_decal/guideline/guideline_in/red{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "Skynet_launch"; - name = "Mech Bay Door Control"; - pixel_x = 24; - req_access_txt = "29" - }, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/port) "xtw" = ( /obj/effect/landmark/start/janitor, /obj/structure/disposalpipe/segment{ @@ -93275,23 +93275,6 @@ "xub" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/entry) -"xuj" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/engine, -/area/engine/supermatter) "xuq" = ( /obj/machinery/newscaster{ pixel_x = -28; @@ -93308,13 +93291,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) -"xuL" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engine_room) "xuO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -93384,21 +93360,25 @@ "xvj" = ( /turf/closed/wall, /area/medical/cryo) -"xvk" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "xvp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/dark, /area/bridge) +"xvq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "xvx" = ( /obj/item/pool/pool_noodle, /obj/item/pool/pool_noodle, @@ -93420,16 +93400,6 @@ /obj/item/reagent_containers/cup/bucket, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xvC" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "xvL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -93835,21 +93805,6 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/crew_quarters/locker) -"xzW" = ( -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "xzY" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 @@ -94057,6 +94012,16 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"xCh" = ( +/obj/item/kirbyplants/random, +/obj/machinery/button/door{ + id = "gateshutter"; + name = "Gateway Access Shutters Control"; + pixel_y = -24; + req_access_txt = "62" + }, +/turf/open/floor/iron/dark, +/area/gateway) "xCu" = ( /obj/structure/table/reinforced, /obj/item/storage/box/flashes{ @@ -94121,15 +94086,6 @@ }, /turf/open/floor/iron, /area/medical/medbay/lobby) -"xCA" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/techmaint, -/area/science/mixing) "xCD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -94370,6 +94326,11 @@ }, /turf/open/floor/plating, /area/security/main) +"xEq" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/turf/open/floor/plating/airless, +/area/docking/bridge) "xEG" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 8 @@ -94598,6 +94559,17 @@ }, /turf/open/floor/iron/techmaint, /area/hallway/primary/central) +"xGN" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/computer/records/medical, +/obj/machinery/button/door{ + id = "emmd"; + name = "Emergency Medical Lockdown"; + pixel_y = 24; + req_access_txt = "40" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/heads/cmo) "xGW" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/delivery, @@ -94651,6 +94623,43 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) +"xHq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Break Room Maintenance"; + req_access_txt = "5" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/department/medical) +"xHw" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 4; + icon_state = "leftsecure"; + name = "Secure Creature Pen Shield Holder"; + atom_integrity = 300; + req_access_txt = "47" + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/science/xenobiology) "xHD" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ dir = 8 @@ -94701,16 +94710,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"xHS" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Robotics Maintenance"; - req_access_txt = "29" - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/maintenance/aft/secondary) "xHX" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -94801,6 +94800,16 @@ }, /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/mechbay) +"xJh" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Teleporter Maintenance"; + req_access_txt = "17" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/central/secondary) "xJk" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 @@ -94872,16 +94881,6 @@ dir = 8 }, /area/hallway/primary/fore) -"xJy" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "xJB" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 @@ -95046,6 +95045,21 @@ }, /turf/open/floor/iron/grid/steel, /area/science/research) +"xKI" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "xKJ" = ( /obj/structure/chair, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -95369,21 +95383,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/misc_lab/range) -"xNK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ - pixel_y = 26 - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "xNL" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -95577,19 +95576,6 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/security/checkpoint/escape) -"xPU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/techmaint, -/area/science/xenobiology) "xQc" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -95646,12 +95632,6 @@ "xQF" = ( /turf/closed/wall, /area/engine/engine_room) -"xQG" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/turf/open/floor/iron/grid/steel, -/area/science/mixing) "xRi" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, @@ -95736,16 +95716,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/quartermaster/office) -"xSp" = ( -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson/engine, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) "xSr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -95931,6 +95901,12 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/wood, /area/quartermaster/qm) +"xUG" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "xUL" = ( /turf/open/floor/iron, /area/hallway/primary/port) @@ -96028,31 +96004,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) -"xWw" = ( -/obj/item/stack/marker_beacon{ - anchored = 1; - icon_state = "markerburgundy-on"; - light_color = "#FA644B"; - light_power = 3; - light_range = 2; - name = "landing marker"; - picked_color = "Burgundy" - }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 8 - }, -/obj/structure/lattice/catwalk/over, -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/docking/arrival) "xWz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ @@ -96102,10 +96053,13 @@ "xWY" = ( /turf/closed/mineral, /area/maintenance/aft) -"xXd" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/iron/ameridiner, -/area/engine/engine_room) +"xXb" = ( +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/siding/dark_green{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "xXj" = ( /turf/closed/mineral, /area/hallway/primary/central) @@ -96396,6 +96350,17 @@ dir = 1 }, /area/hallway/primary/fore) +"yam" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/airalarm/engine{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/supermatter) "yaq" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/three, @@ -96471,6 +96436,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/engine/atmos) +"yaU" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ybi" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/loading_area{ @@ -96678,13 +96649,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"ydO" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/techmaint, -/area/science/mixing) "ydP" = ( /obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/delivery, @@ -96804,6 +96768,19 @@ "yfq" = ( /turf/closed/wall/r_wall, /area/science/robotics/lab) +"yfG" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/lattice/catwalk/over, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless{ + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/docking/arrival) "yfI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -96830,6 +96807,12 @@ "yfU" = ( /turf/closed/wall, /area/library) +"yfY" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/space/basic, +/area/space) "ygc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -96886,6 +96869,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"ygO" = ( +/obj/machinery/atmospherics/components/unary/tank/plasma{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ygU" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 22 @@ -96903,6 +96894,19 @@ }, /turf/open/floor/plating/asteroid, /area/maintenance/department/science) +"yhe" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security RC"; + pixel_x = -1; + pixel_y = 29 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/records/security, +/turf/open/floor/wood, +/area/crew_quarters/heads/hos) "yhh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/yellow{ @@ -96951,6 +96955,15 @@ }, /turf/open/floor/carpet, /area/vacant_room/office) +"yhY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/science/xenobiology) "yic" = ( /obj/effect/landmark/start/assistant, /obj/machinery/light_switch{ @@ -97216,6 +97229,15 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) +"yke" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/ameridiner, +/area/engine/engine_room) "ykq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -97230,14 +97252,6 @@ burnt = 1 }, /area/space/nearstation) -"ykA" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/conveyor{ - id = "plasma_conveyor"; - dir = 8 - }, -/turf/open/floor/plating, -/area/science/storage) "ykE" = ( /obj/item/radio/intercom{ pixel_x = 28 @@ -97323,20 +97337,6 @@ "ylJ" = ( /turf/open/floor/plating, /area/maintenance/aft) -"ylR" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/landmark/blobstart, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "ylU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -110100,17 +110100,17 @@ tAB tAB tAB tAB -naT -egw -egw -egw -egw -egw -egw -egw -egw -egw -cRD +vRf +niq +niq +niq +niq +niq +niq +niq +niq +niq +oOX tAB tAB tAB @@ -110356,8 +110356,8 @@ aLs kqK xOI vYB -orh -fri +tAg +fEn wQm wQm wQm @@ -110367,7 +110367,7 @@ wQm wQm wQm wQm -fri +fEn fzy wov tAB @@ -110614,17 +110614,17 @@ tKV big rOn aoe -xWw -opL -meQ -pbB -meQ -qso -gvM -sPZ -gvM -gvM -ayX +tJh +wZw +yfG +eDO +yfG +bnD +eoY +uME +eoY +eoY +sPj vWx xDa tlB @@ -110871,7 +110871,7 @@ xDa tSk xDa xrR -qbK +qYy bbm bbm bbm @@ -110883,7 +110883,7 @@ bbm bbm xhP gpP -puZ +aqb tAB csJ csJ @@ -111128,7 +111128,7 @@ xDa tSk xDa xrR -bsI +fpO bbm bbm bbm @@ -111382,10 +111382,10 @@ mAW hcs tAW rbg -jHg +tVu xDa xrR -bsI +fpO bbm bbm bbm @@ -111639,10 +111639,10 @@ xTE xTE mKj xDa -wBs -tBI -lxd -hMQ +ctM +gxj +cDo +def bbm bbm bbm @@ -111701,7 +111701,7 @@ cyp cyp cyp mpX -iMt +bwS fei wJt csJ @@ -111940,7 +111940,7 @@ vMO hBg rxE nti -oLQ +iEm rxE rxE oJM @@ -111958,8 +111958,8 @@ sOx sOx sOx sOx -uDO -kOt +iKc +fOv uvA nnx nnx @@ -112215,8 +112215,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -112355,7 +112355,7 @@ gda ofq nza hDl -fYR +dVl gIR oqJ xTl @@ -112472,8 +112472,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -112729,8 +112729,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -112986,8 +112986,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -113243,8 +113243,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -113371,7 +113371,7 @@ pGA pGA pGA pGA -fLp +rzG pOg fUi cHU @@ -113432,7 +113432,7 @@ lqK lqK lqK lqK -hlY +voL lqK taP pVe @@ -113500,8 +113500,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -113732,7 +113732,7 @@ szO ole vDW sYV -vqA +xCh vDW ggr bkO @@ -113757,8 +113757,8 @@ tzj sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -113984,9 +113984,9 @@ nnx nnx csJ vDW -aSJ -akk -pCw +cJB +qYj +fRE aKC sYV aJa @@ -114014,8 +114014,8 @@ sOx sOx sOx sOx -axE -tgx +skx +kUi lWc nnx nnx @@ -114172,7 +114172,7 @@ dfP bSV lJQ olY -dMI +bhj dMy dMy dMy @@ -114241,9 +114241,9 @@ nnx nnx csJ vDW -iQY -rjZ -bNs +nXI +htl +rAz aKC sYV aTQ @@ -114265,14 +114265,14 @@ uPJ jtC aCf uzV -bQx +nYE cyp sOx sOx sOx sOx -sIF -uAR +gOo +tER sYK nnx nnx @@ -114498,9 +114498,9 @@ nnx nnx csJ vDW -iAy -akk -ljb +tUL +qYj +duE aKC qfK fsQ @@ -114516,19 +114516,19 @@ cRQ aHo cRQ cRQ -aMf +wes scs kwm fJy aCf cyp -sHQ -jMW -ohZ -gWz -ohZ -csE -iHM +npZ +nQY +uIB +vsa +uIB +reY +lGU wUr wJt csJ @@ -114773,7 +114773,7 @@ cRQ cRQ cRQ cRQ -fkF +tGQ aCf aCf aCf @@ -115030,7 +115030,7 @@ cRQ cRQ cRQ cRQ -fMT +ovR aCf kHH kHH @@ -115279,15 +115279,15 @@ kHH kHH kHH aCf -cVt -mjL -pKL -pKL -pKL -pKL -pKL -ass -oiN +jNz +ctk +nwo +nwo +nwo +nwo +nwo +hyU +tag aCf kHH kHH @@ -115440,7 +115440,7 @@ asa gsK gTm aKc -pXT +oBa pVz wZn dCU @@ -115537,13 +115537,13 @@ kHH kHH aCf rfN -vaG -xcc -xcc -xcc -xcc -xcc -sNr +pAR +rQn +rQn +rQn +rQn +rQn +osB rfN aCf kHH @@ -116002,7 +116002,7 @@ lqK lqK lqK lqK -rGg +sFq lqK taP eTn @@ -116208,7 +116208,7 @@ ssm jnL jnL jnL -boV +iJv pIn qgS wZn @@ -116466,7 +116466,7 @@ bhz bhz upZ xkx -sbJ +xnE yfU cPl gFf @@ -116723,7 +116723,7 @@ fEr fEr fEr xkx -deV +tFY yfU nxF tmb @@ -116733,7 +116733,7 @@ cXA cXA cXA cXA -emQ +pFC cXA cXA cXA @@ -116981,7 +116981,7 @@ xkx xkx xkx odk -gVf +flV wZn cIW xkO @@ -117298,7 +117298,7 @@ coQ ctC eFU nhf -wWD +tRe fFv xqO xqO @@ -117494,9 +117494,9 @@ xkx xkx xkx xkx -mIo +net yfU -vqZ +sXJ gFf aWs xGW @@ -117510,7 +117510,7 @@ arZ wxd wxd wxd -qim +uDw rxd kuH fTE @@ -117751,7 +117751,7 @@ fEK fpV fpV xkx -uvk +dae yfU qFL bdj @@ -118020,7 +118020,7 @@ xVQ nzD tce mbp -hHr +sCA vgT vgT vgT @@ -118039,7 +118039,7 @@ mRd tuj mRd mRd -toR +npX uJh lru vAS @@ -118306,7 +118306,7 @@ wwM xeh xkk qbf -vem +fEs ojm uXL gSS @@ -119055,7 +119055,7 @@ arZ oaT rxd rxd -hEW +pgH rxd vqH kob @@ -119095,7 +119095,7 @@ tSL sXF iIf bRc -avJ +aqq qIc vcy uId @@ -119364,7 +119364,7 @@ abm abm abm abm -uNy +lpD abm hZp oIU @@ -119855,7 +119855,7 @@ wxd vTm atj omN -fcb +gff hOX uBD vTm @@ -120084,7 +120084,7 @@ kZd ipn xNi pBe -kxV +kZP xNi xNi xNi @@ -121161,7 +121161,7 @@ fvq tDV wtF wtF -rdI +rKB wtF ygo oDB @@ -121334,18 +121334,18 @@ weA utM ttC weA -nXO -glF -sYT +ncB +pxf +xKI weA dkc aOT aOT weA -jAX -jCt -oYa -laM +mES +mdV +qsZ +wYr puV uFZ puV @@ -121365,7 +121365,7 @@ tdp aQp xFQ arZ -vkT +riS lrB xNi xNi @@ -121595,9 +121595,9 @@ nRP rxu tke pmI -hEb +dvq ksL -bcd +vfp weA ehn bdu @@ -121844,7 +121844,7 @@ jID lHA dlt lLM -qXC +lOx aUk fTX aUk @@ -121852,15 +121852,15 @@ jQk gKb mCc aUk -puC +hCg bgM cxI -qOZ +cVo bGU bed rrS sqU -mXd +eOA kGN wQQ vty @@ -122109,9 +122109,9 @@ qqk pik dKx nOV -kEn +gFz tpO -rEf +xtl weA bjE mJM @@ -122362,9 +122362,9 @@ weA atk cUp dkc -vwc +hvR aHr -vwc +hvR dkc weA weA @@ -122388,7 +122388,7 @@ xvj xvj xvj xvj -hVJ +czq xvj xvj vtm @@ -122623,7 +122623,7 @@ fcj yid aQH aUY -cOM +aeq ebk osZ uPe @@ -122637,9 +122637,9 @@ pgb tNV uqM gms -bVI -cyd -uvS +qqm +nIg +qEe ygM cxE hMo @@ -122888,14 +122888,14 @@ fut xLS lZy sqU -aNY +kNI usf oAX mCy wQQ ndk -xaG -eCA +esf +gEn dop ygM kuB @@ -122904,7 +122904,7 @@ eRm pri uRq iwu -hVJ +czq wqJ sDy ocC @@ -123142,7 +123142,7 @@ fXC xOq ulg qKj -faT +cvZ rZN mJM ygM @@ -123381,7 +123381,7 @@ lLM lLM lLM dlt -nek +wTO ijh vRQ vRQ @@ -123406,7 +123406,7 @@ ygM tZK oAX wQQ -lol +toU ygM gDT hSO @@ -123657,7 +123657,7 @@ ceV ceV ceV ceV -btg +kmR ceV ygM bkH @@ -123675,7 +123675,7 @@ nBD lsC vrS wHS -hVJ +czq wqJ sDy jHV @@ -123698,7 +123698,7 @@ eMc rFq xNh xNh -rom +lgR xNh kZp eMc @@ -123909,7 +123909,7 @@ uuW cRI lzk nGx -jjA +trU vcf ceV hRQ @@ -124152,9 +124152,9 @@ cNt ask aeJ aJt -elN +xXb aRn -aGg +vyV cWr bIL ddX @@ -124408,7 +124408,7 @@ lLM cNt atw aeJ -mZO +eYx vgi oQR gld @@ -124666,9 +124666,9 @@ cNt bDD aeJ cVH -dlL +gOg mHL -sEp +jCa cWr cpH atK @@ -124960,7 +124960,7 @@ ctv now ctv now -eWj +jWB nxC mwy jIA @@ -125004,7 +125004,7 @@ gTL cpS fEf wFZ -wCB +fTw sTv qeK buy @@ -125203,7 +125203,7 @@ nKj nKj ceV ceV -ilm +ucD xtj xLt uiJ @@ -125217,7 +125217,7 @@ lkI izL lkI ppz -tPm +awX eYP esZ wrM @@ -125474,7 +125474,7 @@ vsi jsQ wTs jsQ -pQr +wYJ nyo fAu jIA @@ -126473,7 +126473,7 @@ wrS xEG eFz aeJ -oWl +xGN wRQ fAQ aRh @@ -126485,8 +126485,8 @@ oBh rrs cHt ofJ -xfn -oiW +gJB +fIB rrs mPj ofJ @@ -126720,7 +126720,7 @@ jID lLM jAw vZU -vJs +kAW dgw aOU dAz @@ -126753,7 +126753,7 @@ aHF vUP fVb jVi -tRq +fQx sPi vhU fxA @@ -127330,7 +127330,7 @@ sNI wMZ qfG qfG -bsy +mFg qfG qfG vzm @@ -127511,7 +127511,7 @@ jcy ljz vuI ayc -dDr +uig vHr hjt pFo @@ -127786,7 +127786,7 @@ ocm lil uho lMx -dAE +djQ maD wqJ xCx @@ -128052,7 +128052,7 @@ owW xIt xIt xIt -kzA +vKw sUb lpl lpl @@ -128073,7 +128073,7 @@ ccX jcv bJC hUT -stb +cSK ijJ lFy khr @@ -128134,7 +128134,7 @@ xxf ofr vNy eRv -cVj +vRm xhb lGL mFm @@ -128355,7 +128355,7 @@ cZi iJQ bUa dWg -xtv +eBs kjk dyV xxY @@ -128546,7 +128546,7 @@ dIl vHr dUJ hGh -bAF +trl vHr aBZ uvt @@ -128619,7 +128619,7 @@ sJa sJa sJa sJa -xHS +dtx sJa atN sJa @@ -128643,7 +128643,7 @@ lIP lIP cwd lIP -cLU +cXE lIP lIP lIP @@ -128846,8 +128846,8 @@ wyg hUT iSJ xgk -iOM -njq +mut +dbc irV hhg iSJ @@ -128870,7 +128870,7 @@ vqF qbd kyO sJa -lPv +dMm dou cml xjL @@ -128902,7 +128902,7 @@ oZg cKl eUd oQx -njL +wfD lIP itx lIP @@ -129159,7 +129159,7 @@ vQk trp dls oZg -lRm +uce lIP lIP lIP @@ -129411,12 +129411,12 @@ eUi ktD lIP fDS -eIv +ufH trp ojp lVK oZg -lRm +uce lIP rGp bnZ @@ -129562,7 +129562,7 @@ rme ayc dUk ayc -ecs +gzn ayc ayc ayc @@ -129627,9 +129627,9 @@ elA jQF cnM vgt -nkX -iid -oxQ +ahf +ulz +hDf ruv fve cnM @@ -129668,7 +129668,7 @@ eUi dWP lIP vYt -psq +gWN trp wrU eMQ @@ -129830,7 +129830,7 @@ ivu mJM yio yio -ucM +xHq yio yio yio @@ -129842,7 +129842,7 @@ yio gXq fPz qdj -gFs +ddN fFG oJd lPk @@ -129884,10 +129884,10 @@ lFO gHF cnM cnM -iid -dLD +ulz +mlg cnM -fbe +xJh cnM cnM oVz @@ -129928,7 +129928,7 @@ lAW lWR vQk dcd -gYf +gAC lIP wTh wTh @@ -130100,7 +130100,7 @@ gLs gLs iOW thk -tMR +hAZ dPC uvh uwd @@ -130439,8 +130439,8 @@ eUi xEK lIP mZR -vgv -dGG +uuw +dGs wHY vWb sHw @@ -130847,7 +130847,7 @@ mJM mJM mJM xLB -dfX +rtm mJM fKo bhp @@ -130877,7 +130877,7 @@ sDy wrM vUR mhV -kKG +wNL lgf wdt scg @@ -131216,13 +131216,13 @@ eNp ozc oYg dlC -orO +jmP rxv lis tCO lis ide -gVa +xHw siW qTo bmB @@ -131669,7 +131669,7 @@ uJD vBV tbP pXI -uGP +hEr nHb gjj pXI @@ -131703,7 +131703,7 @@ bGo xJW cfB wza -mKQ +fVU jBQ wyB wEL @@ -131913,7 +131913,7 @@ sMk khk fLt xIV -hwK +wAy vUR ycI fOi @@ -131960,7 +131960,7 @@ mhe fLK gZr iBF -gzd +qMd aZL bLq kpU @@ -132213,7 +132213,7 @@ vBG yfq rVu pgr -pyQ +wRI trH kYH wAn @@ -132422,7 +132422,7 @@ mCt aVK lfQ xIV -ucx +yhe vcv sgF qFX @@ -132474,7 +132474,7 @@ wtm wtm wtm wtm -drv +lRw hBE jBo kQd @@ -132735,7 +132735,7 @@ fQl odo dpI kQd -usz +qSz ggz cQD kcS @@ -132756,7 +132756,7 @@ siW siW siW siW -eJY +rwi siW siW neP @@ -132983,7 +132983,7 @@ rdC vBG nkY dFQ -gpC +gMa jrR ePb kNm @@ -132992,9 +132992,9 @@ fQl odo bmp kQd -iqB +xcE hMO -dSy +igH kcS lsO mBP @@ -133012,9 +133012,9 @@ bNA ktD iHz siW -kGz -xPU -avS +gTB +xvq +soG siW npK vUc @@ -133195,7 +133195,7 @@ inF geq lpA rzi -sOP +wgj cnW xIV imQ @@ -133249,9 +133249,9 @@ rBE vHb bmp vEX -awf +lhk kqu -uKz +kWh kcS sch vyQ @@ -133269,9 +133269,9 @@ dez nsc ikr skP -dix -eqY -ajg +jeP +nvz +fZW siW hAf wRJ @@ -133506,9 +133506,9 @@ tyI odo qPt kQd -jZn +pVJ wyr -tXJ +bXu kcS bmD jhn @@ -133526,9 +133526,9 @@ dnu eUi xEK siW -pgj -qfY -wUh +lUM +yhY +pVN siW cOP lFI @@ -133754,18 +133754,18 @@ svz qRv mRk wWr -sjl +igJ hqQ mpf bzv -hHg +anU jAS wxv dpI kQd jqc kIQ -tHw +ohF kcS rpX hzp @@ -133784,7 +133784,7 @@ eUi xni fRu fRu -sLw +fCl fRu fRu fRu @@ -134732,7 +134732,7 @@ hiG uzK lcA lcA -weo +reI lcA lcA iNR @@ -135784,8 +135784,8 @@ xXj xXj ulQ ulQ -cWY -tYd +rwQ +kuF ulQ row row @@ -136331,12 +136331,12 @@ cTl pCA xSV wgV -myi +efy qMM wgV wgV wgV -qtN +gTT qBX tNd oYh @@ -136344,8 +136344,8 @@ vpQ bZw loZ plQ -ajn -aDB +lUE +dzk oqW bOb oqW @@ -136587,14 +136587,14 @@ abA wiV oCl xSV -hPe -rpq +cWq +wFf acB izY izY izY izY -kdD +oNW aiW aiW nch @@ -136761,7 +136761,7 @@ xWV xWV xWV xWV -bdJ +lQF xWV fha fsU @@ -136772,7 +136772,7 @@ wFC iuI oRt gnK -lVc +ksQ wVe wFC kbr @@ -136844,21 +136844,21 @@ wgM oZY wgM xSV -rHf +ttI wgV -olO +lGz wgV -qnY -jSD +vFO +rVN wgV wgV -bCW -rpo +ssS +ued oqW -wmz -rBk -dxM -lFr +nMt +ead +oGV +iuh vZW oqW cSS @@ -137101,20 +137101,20 @@ pnp ydi eZy xSV -rHf +ttI wgV -xQG +oQC wgV -mss -nno -ydO -xCA +upA +hPK +fyl +ocY oqW oqW oqW -oHz -kHO -kta +dwq +wzJ +uro oqW sOH oqW @@ -137282,7 +137282,7 @@ fuu wPQ wRD wJl -gUs +qWE ink ixw iZE @@ -137358,21 +137358,21 @@ ylJ ydi ylJ xSV -xNK -jJy +fVW +dUp oSF wgV -kIn -aNJ +uHY +nca ape -oyX +nzg oqW -ddm -cBs -vbQ -qLW -qSX -cjd +eiq +mno +uxo +aUH +lEO +cvj uxw kHV oqW @@ -137549,7 +137549,7 @@ wnR noO oyC tqT -hBh +aWP smC muu qQl @@ -137615,21 +137615,21 @@ pnp ydi lyl vKD -fZL +iNO vKD -szM -rVE -szM +szH +nyg +szH vKD mho mho oqW -ykA -jmu -rYX -qLW -qSX -kZv +srh +dpC +lFV +aUH +lEO +qix uxw kHV oqW @@ -137872,8 +137872,8 @@ uUs ydi gNA vKD -ylR -hfo +inr +iDd rdZ lhz rVe @@ -137881,14 +137881,14 @@ cYE wQe ccQ oqW -lIE -jml -vAQ -tZC -twn -lSw -moJ -xfs +vlG +hbx +wvv +gJd +gAJ +akE +nAP +nSi oqW vXB glg @@ -138129,23 +138129,23 @@ uUs iue vzI vKD -xzW -wPG +bTh +ilH lhz -oZZ +pwa hCb cYE wQe xQq oqW -jYQ -nue -jtK +mQx +kkB +pZX aPK bls -mfv +lPD qgh -dpl +vIC oqW ioZ waQ @@ -138659,7 +138659,7 @@ bPZ jPw jPw jPw -oTx +gnx jPw jPw jPw @@ -140104,10 +140104,10 @@ emd aJD iuy dxQ -dZA +usd ewH fEC -qWx +wbj knt dxQ vJa @@ -140382,7 +140382,7 @@ mrt cwc iPN nBV -lvm +jyI dTb oXq xYC @@ -140938,7 +140938,7 @@ hXF hXF nUj xQx -sZv +thd qLr rJF qNK @@ -143497,7 +143497,7 @@ rTh hpj riJ bHB -xkm +fbM pON oKr mYS @@ -144493,10 +144493,10 @@ taC jHq mUa lNZ -vJC +hBj jpD omS -bFv +mtn ofU sNs xTa @@ -144795,9 +144795,9 @@ cug wWM wWM wWM -plW -tFZ -vhl +miF +uJY +sKd sDI sVQ nZD @@ -145041,20 +145041,20 @@ yhx wWM xUO xQF -xSp -wXa -pWZ -jHo -vKb -cgS -grR -irQ -bPN -cRu -itf -qhQ -ePt -dFD +xcr +lwU +bcq +rif +uTI +vYb +cBq +mTu +fRb +fjC +ezS +jbh +aLv +mez tNW eJG veJ @@ -145298,20 +145298,20 @@ yhB wWM xUO xQF -aqL -mVs -sOX -xsT -sQi -gKK -sGa -sQi -sQi -sQi -sQi -sQi -hKg -kXP +qIz +tgs +ieP +fxq +pTP +pYa +kJw +pTP +pTP +pTP +pTP +pTP +npM +nJL wWM wWM wWM @@ -145555,20 +145555,20 @@ mUX wWM xUO xQF -pwI -hUo -whQ -kBJ -kBJ -iUE -cOO -eRF -eRF -eRF -eRF -eRF -nbP -kXP +lBj +neL +fKh +mcN +mcN +lvL +fZG +weg +weg +weg +weg +weg +hig +nJL rHd wtD ptR @@ -145812,20 +145812,20 @@ yhB wWM wWM xQF -hMF -tIE -iTF -cTE -qRj -gLB -tIV -sPx -nKw -dGu -kMH -xvk -qyQ -kXP +vJw +wsT +yke +jiT +yam +cWC +ppE +fDQ +wnJ +wfL +jEb +ecB +iFU +nJL vro mFf wBq @@ -145999,7 +145999,7 @@ hiQ yeb yeb yeb -lOM +qQi drK ubJ yeb @@ -146068,21 +146068,21 @@ wCr kCh pSb wWM -sEn -lMA -hYA +gai +sbg +dTy tIN sVM yes dZx -xuj +fsn mYb yes xoU -adz -lMO -qyQ -kXP +mYR +tmh +iFU +nJL vro mFf wBq @@ -146248,7 +146248,7 @@ nnx nnx nnx nnx -dYD +yfY nnx nnx nnx @@ -146258,7 +146258,7 @@ nnx yeb cIg dse -qfj +mVu yeb lWG cIg @@ -146325,21 +146325,21 @@ wCr yhB wIh wWM -ksc -lMA -hYA +ygO +sbg +dTy byn sVZ yes -ipl -qOd +anj +evc tMn yes -wTv -xuL -lMO -qyQ -kXP +ppc +aqL +tmh +iFU +nJL vro mFf coR @@ -146513,9 +146513,9 @@ csJ csJ csJ yeb -fBU -ahi -bps +onr +kmz +nYU yeb lKQ yeb @@ -146582,9 +146582,9 @@ wCr yhB rxn wWM -pzg -lMA -hYA +tRx +sbg +dTy sug chP yes @@ -146594,9 +146594,9 @@ onl yes unR qmx -lMO -qyQ -oOj +tmh +iFU +bMA wWM mCw xzr @@ -146769,8 +146769,8 @@ nnx nnx nnx nnx -vGm -pcV +jez +bOX uJQ uJQ uJQ @@ -146801,7 +146801,7 @@ cZZ cZZ jVH cZZ -ayQ +exO taC xTa xsq @@ -146839,9 +146839,9 @@ aTa sCc wGC wWM -hCH -lMA -nWR +wgh +sbg +lvJ yes yes kMI @@ -146851,9 +146851,9 @@ ebC pYt yes yes -ngn -guh -kJH +wqj +vWX +hAi wWM wWM wWM @@ -147026,8 +147026,8 @@ nnx nnx nnx nnx -tnU -qnW +xEq +nht uJQ uJQ uJQ @@ -147096,9 +147096,9 @@ wCr wHw jIo wWM -sCF -xvC -iro +sIG +lHl +mMW uxj vMJ vqc @@ -147109,9 +147109,9 @@ vhm edg uxj ekl -tZq -wrz -wrz +fbC +vSO +vSO mik caF scj @@ -147283,8 +147283,8 @@ nnx nnx nnx nnx -tnU -qnW +xEq +nht uJQ uJQ uJQ @@ -147353,9 +147353,9 @@ wCr sCc yhx wWM -wXf -xvC -iro +nqL +lHl +mMW uxj vMJ nwa @@ -147366,9 +147366,9 @@ vhm edg uxj rJD -hoI -pgs -kXP +tSJ +kDt +nJL qNM lAv wjb @@ -147540,8 +147540,8 @@ nnx nnx nnx nnx -tnU -qnW +xEq +nht uJQ uJQ uJQ @@ -147610,9 +147610,9 @@ wCr sCc ryd wWM -tvP -lMA -hXT +yaU +sbg +nns uxj xht rOa @@ -147623,9 +147623,9 @@ uhu jlC uxj ekA -fFV -xXd -vhC +tRL +aHd +lQf qNM lAv wjb @@ -147797,8 +147797,8 @@ nnx nnx nnx nnx -tnU -qnW +xEq +nht uJQ uJQ uJQ @@ -147829,11 +147829,11 @@ enL hyZ vNw hZG -eDw +bJP lSU xTa mUP -usp +tyM nGX aTX jUs @@ -147867,9 +147867,9 @@ wCr wHw rzd wWM -qaJ -lMA -hHy +lfz +sbg +rsl yes yes yes @@ -147879,10 +147879,10 @@ yes yes yes yes -rPC -xmW -xXd -jRe +xcp +ixj +aHd +loX aQK eBM wjs @@ -148054,8 +148054,8 @@ nnx nnx nnx nnx -tnU -qnW +xEq +nht uJQ uJQ uJQ @@ -148124,22 +148124,22 @@ wCr sCc wIh wWM -bFd -eAe -bVw -rlv -eJP -rlv -rlv +gkb +wlt +quc +woS +fAh +woS +woS ksx -fhQ -rlv -eJP -rlv -rUQ -qnm -pgs -heP +wsx +woS +fAh +woS +eSm +xdY +kDt +fJm wWM wWM fvg @@ -148311,8 +148311,8 @@ nnx nnx nnx nnx -nOv -oFV +wON +wRq bKE dvX bKE @@ -148382,21 +148382,21 @@ sCc wWM wWM xQF -ajF -pgs -fKU -nJd -cGf -nJd +owO +kDt +kzP +aJE +fAa +aJE thS -nJd -cGf -hYM -sQi -eEJ -qnm -iKM -qiU +aJE +fAa +aQy +pTP +fVO +xdY +aTH +cPQ kWV vNA nkF @@ -148639,21 +148639,21 @@ sCc wWM xUO xQF -rMa -rKB -gQm -tpM -mPV -tpM +vRo +auY +fWt +tVV +klZ +tVV kss -tpM -rKB -wQs -pgs -crl -izK -lNG -xJy +tVV +auY +xUG +kDt +nyN +rLb +puA +tDo mdb vNM scz @@ -148896,21 +148896,21 @@ yhB wWM xUO xQF -rnI -bci -qSU -qCQ -lKD -cPk +kcQ +pWy +nHF +luE +gCd +lBs ksx -hlP -ekh -evg -fUw -fUw -aaj -pcp -qBf +qEg +tkx +lvK +uRC +uRC +vlC +lVQ +fPC wWM nBY wjC @@ -149942,7 +149942,7 @@ vuU wWM vOC jDH -cjO +fvL rXm xCJ rFB @@ -150199,7 +150199,7 @@ kzJ wWM gIH dcZ -nrk +kDc rXm vjj bGF @@ -150456,7 +150456,7 @@ vuX wWM rZp wkz -nrk +kDc rXm nBz sbA @@ -150713,7 +150713,7 @@ odz wWM gen kbM -fth +kFV rXm jKb utQ @@ -150970,7 +150970,7 @@ xDA wWM biQ kbM -nrk +kDc rXm xCJ rPI @@ -151227,7 +151227,7 @@ xQF wWM ksb vKW -cHs +vTD rXm xCJ bGF diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 0fa19ccdd5f49..b1ee4595e9402 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2144,19 +2144,6 @@ "auE" = ( /turf/closed/wall, /area/storage/primary) -"auG" = ( -/obj/machinery/atmospherics/components/binary/valve{ - dir = 8 - }, -/obj/effect/landmark/start/scientist, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) "auI" = ( /obj/structure/table/wood, /obj/item/gavelblock, @@ -5138,28 +5125,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing/chamber) -"bbC" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, -/obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) -"bbD" = ( -/obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "bbE" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -5170,16 +5135,6 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) -"bbF" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "bbI" = ( /obj/machinery/doppler_array/research/science{ dir = 4 @@ -7564,6 +7519,15 @@ /obj/structure/sign/poster/contraband/random, /turf/closed/wall/rust, /area/maintenance/central) +"byD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "byI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7785,29 +7749,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) -"bAJ" = ( -/obj/machinery/computer/records/security, -/obj/machinery/requests_console{ - department = "Detective's office"; - name = "Detective RC"; - pixel_y = 30 - }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -6 - }, -/obj/machinery/button/door{ - id = "detective_shutters"; - name = "Detective's Privacy Toggle"; - pixel_x = 24; - pixel_y = 6; - req_access_txt = "4" - }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 4 - }, -/turf/open/floor/wood, -/area/security/detectives_office) "bAM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -9320,6 +9261,18 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/central) +"bRw" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/hos) "bRy" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, @@ -9807,6 +9760,15 @@ /obj/structure/sign/departments/evac, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) +"bXE" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/warden) "bYD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10080,19 +10042,6 @@ }, /turf/closed/wall/r_wall, /area/science/test_area) -"ccr" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/records/medical/laptop, -/obj/structure/table, -/turf/open/floor/iron/dark, -/area/medical/morgue) "ccx" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -10481,6 +10430,28 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cfJ" = ( +/obj/machinery/atmospherics/components/binary/valve, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ + pixel_y = 26 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing/chamber) "cfL" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 @@ -10516,17 +10487,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/port) -"cgt" = ( -/obj/machinery/computer/records/medical, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/security/detectives_office) "cgu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -14817,6 +14777,14 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/medical/chemistry) +"cVH" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/security/checkpoint/engineering) "cVK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -16191,6 +16159,22 @@ }, /turf/open/floor/plating/airless, /area/engine/engineering) +"dsH" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/bridge) "dsJ" = ( /obj/structure/closet{ name = "security locker" @@ -17490,6 +17474,25 @@ burnt = 1 }, /area/maintenance/starboard/aft) +"dMR" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = -20; + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing/chamber) "dNk" = ( /obj/structure/toilet{ pixel_y = 13 @@ -17571,6 +17574,13 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"dPl" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/checkpoint/supply) "dPy" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/table, @@ -18447,17 +18457,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron, /area/quartermaster/storage) -"ebR" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/medical/medbay/central) "ebZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, @@ -18472,6 +18471,29 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"ecj" = ( +/obj/machinery/computer/records/security, +/obj/machinery/requests_console{ + department = "Detective's office"; + name = "Detective RC"; + pixel_y = 30 + }, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = -6 + }, +/obj/machinery/button/door{ + id = "detective_shutters"; + name = "Detective's Privacy Toggle"; + pixel_x = 24; + pixel_y = 6; + req_access_txt = "4" + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 4 + }, +/turf/open/floor/wood, +/area/security/detectives_office) "ecB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/freezer, @@ -19543,6 +19565,16 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/maintenance/fore) +"erH" = ( +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "erU" = ( /obj/machinery/power/solar{ id = "foreport"; @@ -21061,23 +21093,6 @@ }, /turf/open/floor/iron, /area/science/robotics/mechbay) -"eSG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "eTx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -21306,6 +21321,14 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/locker) +"eWF" = ( +/mob/living/carbon/human/species/monkey, +/mob/living/carbon/human/species/monkey, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/virology) "eWH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22533,6 +22556,14 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"foc" = ( +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/engine, +/area/science/mixing/chamber) "fod" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -23194,16 +23225,6 @@ dir = 1 }, /area/maintenance/aft) -"fzX" = ( -/obj/effect/landmark/start/scientist, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "fAm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -23606,16 +23627,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"fHt" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = -26 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/brig) "fHv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -24418,6 +24429,27 @@ }, /turf/open/floor/iron/dark, /area/tcommsat/computer) +"fTZ" = ( +/obj/item/kirbyplants{ + icon_state = "plant-17"; + pixel_x = 8; + pixel_y = 3 + }, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = 40 + }, +/obj/machinery/button/door{ + id = "bar_1"; + name = "Bar Shutters Toggle"; + pixel_x = 24; + pixel_y = 24; + req_access_txt = "25" + }, +/mob/living/carbon/human/species/monkey/punpun, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "fUa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -24510,6 +24542,18 @@ }, /turf/open/space/basic, /area/solar/starboard/fore) +"fVr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "fVA" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -24910,6 +24954,13 @@ burnt = 1 }, /area/maintenance/port) +"gdd" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/hallway/secondary/exit/departure_lounge) "gdf" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -25070,6 +25121,17 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) +"geT" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/showroomfloor, +/area/medical/medbay/central) "geV" = ( /obj/machinery/power/apc{ areastring = "/area/chapel/office"; @@ -25628,6 +25690,13 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"goS" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "goX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/xeno_mining{ @@ -26478,6 +26547,24 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) +"gFq" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Chief Medical Officer's Office"; + name = "medical camera" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4; + color = "#486091" + }, +/obj/machinery/computer/records/medical, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/heads/cmo) "gFB" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -26991,21 +27078,6 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/engineering) -"gNu" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "gNQ" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -28233,6 +28305,22 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) +"hhX" = ( +/obj/machinery/door/firedoor/heavy, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/closeup{ + 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/iron/dark, +/area/science/mixing/chamber) "hhY" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/light{ @@ -29110,6 +29198,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"hvq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "hvt" = ( /obj/structure/table/glass, /obj/item/book/manual/hydroponics_pod_people{ @@ -31357,6 +31460,20 @@ }, /turf/open/floor/iron, /area/security/execution/transfer) +"igM" = ( +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_x = -30 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Traffic Control"; + name = "shuttle camera" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/hallway/secondary/exit/departure_lounge) "ihJ" = ( /obj/structure/sign/departments/security{ pixel_x = -32 @@ -32404,18 +32521,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"izG" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/medbay/central) "izO" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -32810,15 +32915,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmos) -"iFj" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "iFq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -32929,25 +33025,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/security/brig/aft) -"iGw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_x = -20; - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) "iGM" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 @@ -34089,6 +34166,18 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"iYh" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/medbay/central) "iYC" = ( /obj/machinery/power/solar{ id = "foreport"; @@ -34489,6 +34578,22 @@ broken = 1 }, /area/maintenance/starboard/fore) +"jho" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Science Checkpoint RC"; + pixel_y = -30 + }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/checkpoint/science/research) "jhq" = ( /obj/machinery/door/airlock/maintenance{ name = "crematorium Maintenance"; @@ -36128,18 +36233,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/prison, /area/security/prison) -"jHa" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "jHj" = ( /obj/machinery/computer/communications{ dir = 1 @@ -37421,22 +37514,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) -"kez" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "keS" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, @@ -39317,15 +39394,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) -"kKm" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/warden) "kLd" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -39900,18 +39968,6 @@ }, /turf/open/floor/iron/dark, /area/science/xenobiology) -"kVf" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hos) "kVh" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -43489,6 +43545,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"mdb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/mob/living/carbon/human/species/monkey, +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/dark, +/area/medical/virology) "mdn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -43707,13 +43774,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"mgE" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "mgF" = ( /obj/machinery/light/small, /obj/structure/cable{ @@ -43768,6 +43828,19 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) +"mhs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/door/window/westleft{ + name = "Monkey Pen"; + pixel_y = 1; + req_access_txt = "9"; + dir = 1 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/dark, +/area/medical/virology) "mhu" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -47261,20 +47334,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"nrf" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = -30 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Traffic Control"; - name = "shuttle camera" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/hallway/secondary/exit/departure_lounge) "nsk" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -47980,6 +48039,22 @@ broken = 1 }, /area/security/execution/education) +"nFh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "nFK" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -49727,6 +49802,22 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ofe" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "off" = ( /obj/structure/sign/warning/securearea{ pixel_y = -32 @@ -49840,6 +49931,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/showroomfloor, /area/medical/virology) +"ohH" = ( +/obj/effect/landmark/start/scientist, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "ohV" = ( /obj/item/storage/box/firingpins, /obj/structure/table, @@ -50055,6 +50156,19 @@ broken = 1 }, /area/maintenance/starboard/aft) +"olL" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/records/medical/laptop, +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/medical/morgue) "olP" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -50275,16 +50389,6 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"opi" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/computer/records/security, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "opn" = ( /obj/machinery/light{ bulb_colour = "#22bfa2"; @@ -50530,6 +50634,14 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"oto" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/brig) "otp" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -51350,6 +51462,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"oEZ" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/hallway/secondary/exit/departure_lounge) "oFf" = ( /obj/machinery/button/door{ id = "Biohazard"; @@ -52153,12 +52272,6 @@ /obj/structure/flora/rock/pile, /turf/closed/mineral/random/labormineral, /area/space/nearstation) -"oRZ" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/obj/item/book/manual/wiki/sopsecurity, -/turf/open/floor/carpet/red, -/area/crew_quarters/heads/hos) "oSk" = ( /obj/effect/decal/cleanable/food/flour, /obj/structure/cable/yellow{ @@ -52356,13 +52469,6 @@ /obj/structure/flora/junglebush/large, /turf/open/floor/grass, /area/medical/medbay/central) -"oVE" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/hallway/secondary/exit/departure_lounge) "oVL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -52526,22 +52632,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"oYU" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/bridge) "oZd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, @@ -53506,13 +53596,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/maintenance/port) -"ppO" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/security/checkpoint/supply) "ppQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -53773,14 +53856,6 @@ broken = 1 }, /area/maintenance/fore) -"ptt" = ( -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/engine, -/area/science/mixing/chamber) "ptG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -55144,19 +55219,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/shuttledock) -"pPN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - pixel_y = 1; - req_access_txt = "9"; - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron/dark, -/area/medical/virology) "pPO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55698,6 +55760,23 @@ }, /turf/open/floor/iron/dark/telecomms, /area/science/server) +"pZg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "pZk" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -55827,17 +55906,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/starboard) -"qbG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/mob/living/carbon/monkey, -/obj/structure/window/reinforced{ - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron/dark, -/area/medical/virology) "qbM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -58588,14 +58656,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/quartermaster/warehouse) -"qVt" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/brig) "qVy" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8; @@ -60628,6 +60688,23 @@ broken = 1 }, /area/maintenance/central) +"rFl" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/bridge) "rFr" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -61027,6 +61104,16 @@ }, /turf/open/floor/iron, /area/security/brig) +"rLl" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_x = -26 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/brig) "rLn" = ( /obj/machinery/status_display/ai{ pixel_x = -32; @@ -63582,6 +63669,21 @@ }, /turf/open/floor/iron/dark, /area/science/robotics/lab) +"sAt" = ( +/obj/machinery/door/window/westleft{ + name = "Monkey Pen"; + pixel_y = 1; + req_access_txt = "9"; + dir = 1 + }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/mob/living/carbon/human/species/monkey, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/showroomfloor, +/area/medical/genetics) "sAB" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -64230,6 +64332,19 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/quartermaster/warehouse) +"sMx" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 8 + }, +/obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing/chamber) "sMA" = ( /obj/structure/closet/emcloset/anchored, /obj/machinery/light/small{ @@ -64528,6 +64643,17 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"sPS" = ( +/obj/machinery/computer/records/medical, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/security/detectives_office) "sQA" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ @@ -65298,14 +65424,6 @@ broken = 1 }, /area/maintenance/solars/port/fore) -"tbT" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/security/checkpoint/engineering) "tbU" = ( /obj/structure/tank_dispenser/oxygen{ pixel_x = -1; @@ -68960,13 +69078,6 @@ /obj/item/book/manual/wiki/sopcommand, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hor) -"upB" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/hallway/secondary/exit/departure_lounge) "upE" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -70570,6 +70681,16 @@ }, /turf/open/floor/prison, /area/security/prison) +"uPf" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/computer/records/security, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "uPr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood{ @@ -70902,6 +71023,16 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"uVd" = ( +/obj/machinery/atmospherics/components/binary/pump, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "uVf" = ( /obj/structure/window/reinforced{ dir = 1 @@ -71043,6 +71174,12 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"uWV" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/obj/item/book/manual/wiki/sopsecurity, +/turf/open/floor/carpet/red, +/area/crew_quarters/heads/hos) "uXn" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -71148,22 +71285,6 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) -"uYG" = ( -/obj/machinery/door/firedoor/heavy, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/closeup{ - 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/iron/dark, -/area/science/mixing/chamber) "uYK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -71672,6 +71793,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/maintenance/disposal) +"vgE" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 + }, +/obj/machinery/airlock_sensor/incinerator_toxmix{ + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "vgQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -73824,28 +73957,6 @@ }, /turf/open/floor/iron/dark, /area/janitor) -"vOC" = ( -/obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ - pixel_y = 26 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing/chamber) "vOG" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /obj/structure/cable/yellow{ @@ -76912,24 +77023,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"wNH" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Chief Medical Officer's Office"; - name = "medical camera" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4; - color = "#486091" - }, -/obj/machinery/computer/records/medical, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/heads/cmo) "wOn" = ( /obj/effect/turf_decal/tile/black/fourcorners, /obj/structure/weightmachine/weightlifter, @@ -77272,22 +77365,6 @@ burnt = 1 }, /area/maintenance/starboard/aft) -"wRP" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - name = "Science Checkpoint RC"; - pixel_y = -30 - }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/checkpoint/science/research) "wRS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -77470,14 +77547,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) -"wTN" = ( -/mob/living/carbon/monkey, -/mob/living/carbon/monkey, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/virology) "wTZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -80161,21 +80230,6 @@ /obj/item/storage/bag/trash, /turf/open/floor/plating, /area/maintenance/disposal) -"xEQ" = ( -/obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - pixel_y = 1; - req_access_txt = "9"; - dir = 1 - }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/mob/living/carbon/monkey, -/mob/living/carbon/monkey, -/turf/open/floor/iron/showroomfloor, -/area/medical/genetics) "xFd" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -80941,23 +80995,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/science/xenobiology) -"xTB" = ( -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/bridge) "xTM" = ( /obj/structure/closet/crate/silvercrate, /obj/machinery/light/small{ @@ -81738,22 +81775,6 @@ burnt = 1 }, /area/security/checkpoint/medical) -"ygq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/mixing) "ygD" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -81975,27 +81996,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"yio" = ( -/obj/item/kirbyplants{ - icon_state = "plant-17"; - pixel_x = 8; - pixel_y = 3 - }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 40 - }, -/obj/machinery/button/door{ - id = "bar_1"; - name = "Bar Shutters Toggle"; - pixel_x = 24; - pixel_y = 24; - req_access_txt = "25" - }, -/mob/living/carbon/monkey/punpun, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "yiy" = ( /obj/machinery/conveyor{ dir = 1; @@ -100170,7 +100170,7 @@ fqB iPc tPE cVZ -fHt +rLl teN njG mJy @@ -100364,7 +100364,7 @@ smb uol ybK aPA -wNH +gFq rhW krs vap @@ -101193,7 +101193,7 @@ dku doD uKZ mln -qVt +oto mfd bue dcp @@ -101390,7 +101390,7 @@ aNG gzI gHb imK -xEQ +sAt aNG wDi fes @@ -101404,7 +101404,7 @@ oEu uvp gEs gFI -opi +uPf eyq lHe aQL @@ -101715,7 +101715,7 @@ gMe wVu eLN dbO -oRZ +uWV rYb hNh dPP @@ -101924,7 +101924,7 @@ kja mHC iTq leb -izG +iYh inY krT aNn @@ -101974,7 +101974,7 @@ vql vre rqw czQ -kVf +bRw wOP aeU aeU @@ -102730,7 +102730,7 @@ upL rbD mqm aVY -kKm +bXE fQt eHC iiL @@ -102959,7 +102959,7 @@ bAN qLW lvi ukd -wTN +eWF afe dzB bJi @@ -103216,7 +103216,7 @@ vlT kvt cnx lbk -pPN +mhs atK twN bJi @@ -103473,7 +103473,7 @@ vlT rJv eIV jXV -qbG +mdb afe xCs bJi @@ -104475,10 +104475,10 @@ paH fLk vJk pXK -ccr +olL aNu wKX -ebR +geT tXy kla wkP @@ -107862,7 +107862,7 @@ bOU dtt oph aaY -cgt +sPS bTm pYb acl @@ -108119,7 +108119,7 @@ bOU aaY mkB aaY -bAJ +ecj xFp hcX fPh @@ -108403,7 +108403,7 @@ aHb aHc aIG aDk -eSG +pZg aDk aFI aFI @@ -108855,7 +108855,7 @@ huO kLH btI rJe -yio +fTZ ppl mgS omi @@ -111439,7 +111439,7 @@ kny vWv sWE qKm -oYU +dsH gdn fpV wfh @@ -112469,7 +112469,7 @@ brL pNQ iQa oxu -xTB +rFl dtB sCp jsj @@ -115074,7 +115074,7 @@ pBA hYs awH nVG -tbT +cVH yiV gNr awH @@ -119666,7 +119666,7 @@ gld sGa eam blg -ppO +dPl mMR nqf blg @@ -121451,7 +121451,7 @@ vWF gdi aRI oIt -wRP +jho baV hnf gha @@ -121745,7 +121745,7 @@ rfy fjD sWe wZD -nrf +igM rZh bWO nLW @@ -121993,7 +121993,7 @@ uds woh fod emm -oVE +gdd bPe xTR yfq @@ -122727,8 +122727,8 @@ awi lBs xNj ums -jHa -fzX +fVr +ohH fZJ uXn hGt @@ -122984,9 +122984,9 @@ awi eIL iqw gVD -iFj -mgE -kez +byD +goS +ofe woO stm bbN @@ -123243,7 +123243,7 @@ vbQ xLt pcM bce -gNu +hvq qcA lwZ bbN @@ -123500,7 +123500,7 @@ sWn gvx why bbE -ygq +nFh hRf hKg bcD @@ -123757,7 +123757,7 @@ bbu bbi bbi bbi -uYG +hhX rwa bcf bbN @@ -123793,7 +123793,7 @@ acm bPe weC xYY -upB +oEZ bPe iyq krV @@ -124012,9 +124012,9 @@ aXs aXK baX bbX -bbC +vgE bby -vOC +cfJ gaQ qze oSR @@ -124269,10 +124269,10 @@ aXs aXN bbt uhu -bbD -ptt -iGw -auG +erH +foc +dMR +sMx uej xvW vyn @@ -124526,7 +124526,7 @@ aXs baq bbw bbX -bbF +uVd bby iQx uwT diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7c2811765f642..d201dfe5f9b0a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -561,13 +561,6 @@ /obj/machinery/computer/security/hos, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) -"aew" = ( -/obj/machinery/computer/records/security, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hos) "aeA" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -3036,15 +3029,6 @@ "aCw" = ( /turf/open/floor/carpet/red, /area/security/detectives_office) -"aCx" = ( -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/machinery/newscaster{ - pixel_x = 28 - }, -/turf/open/floor/carpet/red, -/area/security/detectives_office) "aCz" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -4207,16 +4191,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"aJY" = ( -/obj/structure/window/reinforced, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) "aKb" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6315,19 +6289,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"aVF" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/engine{ - dir = 8; - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/red/half, -/turf/open/floor/iron/dark/smooth_half{ - dir = 1 - }, -/area/security/checkpoint/engineering) "aVG" = ( /obj/machinery/status_display/supply, /turf/closed/wall, @@ -6670,16 +6631,6 @@ /obj/item/aiModule/reset, /turf/open/floor/iron/dark, /area/storage/tech) -"aYo" = ( -/obj/machinery/computer/records/security, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/security/checkpoint/customs) "aYs" = ( /obj/structure/sign/warning/securearea{ pixel_y = 32 @@ -7288,14 +7239,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/quartermaster/sorting) -"bbQ" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/mob/living/carbon/monkey, -/turf/open/floor/iron, -/area/maintenance/aft) "bbT" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -8287,6 +8230,17 @@ }, /turf/open/space, /area/space/nearstation) +"bil" = ( +/obj/structure/table, +/obj/machinery/airalarm/directional/north{ + pixel_y = 28 + }, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_half, +/area/security/brig) "bim" = ( /obj/structure/table/reinforced, /obj/item/folder/blue{ @@ -12322,6 +12276,13 @@ }, /turf/open/floor/plating, /area/maintenance/central) +"bIr" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/window/reinforced{ + pixel_y = 1 + }, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "bIN" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -13157,6 +13118,21 @@ dir = 1 }, /area/gateway) +"bNp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/computer/records/security{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/security/warden) "bNs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18591,14 +18567,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"cHd" = ( -/obj/machinery/computer/records/security, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/security/main) "cHk" = ( /obj/structure/cable, /obj/machinery/power/tracker, @@ -21812,15 +21780,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/sorting) -"dmL" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/anticorner, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 1 - }, -/area/security/checkpoint/supply) "dmT" = ( /turf/open/floor/iron, /area/quartermaster/sorting) @@ -22962,10 +22921,6 @@ }, /turf/open/floor/iron/dark, /area/science/shuttledock) -"dFf" = ( -/mob/living/carbon/monkey/punpun, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "dFo" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, @@ -24310,6 +24265,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) +"efo" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/machinery/airalarm/server{ + dir = 8; + pixel_x = -28 + }, +/turf/open/floor/iron/dark, +/area/science/server) "efu" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -24525,16 +24493,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/brig) -"emC" = ( -/obj/machinery/atmospherics/components/binary/pump/on, -/obj/structure/sign/warning/fire{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "emH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24740,6 +24698,23 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) +"eqy" = ( +/obj/structure/sign/poster/official/suit_sensors{ + pixel_x = -32; + pixel_y = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "eqG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -26028,6 +26003,10 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"eRL" = ( +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "eSd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26634,6 +26613,21 @@ /obj/item/reagent_containers/cup/glass/shaker, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) +"feI" = ( +/obj/structure/table/wood, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/computer/records/medical/laptop{ + dir = 8; + pixel_y = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood, +/area/medical/exam_room) "feW" = ( /turf/open/floor/iron, /area/maintenance/department/medical/central) @@ -27847,6 +27841,21 @@ }, /turf/open/floor/iron/dark, /area/aisat) +"fAv" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/item/book/manual/wiki/security_space_law, +/obj/machinery/computer/security/telescreen/rd{ + dir = 8; + pixel_x = 28; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/security/checkpoint/science/research) "fAG" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -31114,6 +31123,13 @@ }, /turf/open/floor/iron/dark, /area/science/explab) +"gOM" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/security/detectives_office) "gPd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32747,6 +32763,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"htj" = ( +/obj/machinery/computer/records/medical/laptop{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/mirror{ + pixel_y = 29 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "htt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34444,6 +34473,19 @@ }, /turf/open/floor/iron, /area/hydroponics/garden) +"hWU" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/engine{ + dir = 8; + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/security/checkpoint/engineering) "hXn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34612,6 +34654,25 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) +"ibr" = ( +/obj/structure/table/wood, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security RC"; + pixel_y = 30 + }, +/obj/machinery/computer/records/medical/laptop, +/obj/item/storage/secure/safe/HoS{ + pixel_x = 36; + pixel_y = 28 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Head of Security's Office" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/hos) "ibw" = ( /obj/structure/closet/secure_closet/miner, /obj/machinery/airalarm/directional/east, @@ -35740,18 +35801,6 @@ }, /turf/open/floor/iron/dark/smooth_half, /area/security/checkpoint/science/research) -"iwf" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "iwl" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -36572,6 +36621,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"iLJ" = ( +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "iLR" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -40329,23 +40385,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/bridge) -"kkt" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/machinery/light_switch{ - pixel_x = -27; - pixel_y = 6 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/red/anticorner{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_corner, -/area/security/checkpoint/science/research) "kky" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -45247,21 +45286,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark, /area/tcommsat/server) -"mcB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/computer/records/security{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/security/warden) "mcV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -48495,6 +48519,16 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/carpet/grimy, /area/chapel/office) +"nkh" = ( +/obj/machinery/computer/records/security, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/security/checkpoint/customs) "nll" = ( /obj/structure/table/reinforced, /obj/item/folder/white{ @@ -49521,25 +49555,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"nGh" = ( -/obj/structure/table/wood, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; - name = "Head of Security RC"; - pixel_y = 30 - }, -/obj/machinery/computer/records/medical/laptop, -/obj/item/storage/secure/safe/HoS{ - pixel_x = 36; - pixel_y = 28 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Head of Security's Office" - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hos) "nGk" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 @@ -49725,28 +49740,6 @@ }, /turf/open/floor/wood, /area/library) -"nJL" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, -/obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -28 - }, -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "nJM" = ( /mob/living/simple_animal/pet/dog/bullterrier/walter, /obj/structure/bed/dogbed/walter, @@ -49786,6 +49779,18 @@ /obj/machinery/fax/service, /turf/open/floor/iron, /area/hallway/secondary/service) +"nKn" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "nKu" = ( /obj/machinery/camera/directional/west{ c_tag = "Chapel - Port" @@ -50390,18 +50395,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) -"nVt" = ( -/obj/machinery/computer/records/security, -/obj/machinery/computer/security/telescreen/cmo{ - dir = 4; - pixel_x = 1; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/security/checkpoint/medical) "nVu" = ( /obj/machinery/power/solar_control{ dir = 8; @@ -51946,13 +51939,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"owo" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/turf/open/floor/carpet/red, -/area/security/detectives_office) "owq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -52618,6 +52604,20 @@ /obj/effect/spawner/lootdrop/maintenance/eight, /turf/open/floor/plating, /area/maintenance/aft) +"oGq" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "oHa" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/stool/bar/directional/south, @@ -53151,6 +53151,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) +"oQY" = ( +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/structure/sign/warning/fire{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "oRr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53707,6 +53717,20 @@ }, /turf/open/floor/iron/dark/smooth_half, /area/hallway/secondary/exit/departure_lounge) +"pcX" = ( +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/item/toy/figure/cmo{ + pixel_x = -9; + pixel_y = 11 + }, +/obj/item/book/manual/wiki/sopmedical, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "pda" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/iron, @@ -56037,21 +56061,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"pXt" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/item/book/manual/wiki/security_space_law, -/obj/machinery/computer/security/telescreen/rd{ - dir = 8; - pixel_x = 28; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/red/half, -/turf/open/floor/iron/dark/smooth_half{ - dir = 1 - }, -/area/security/checkpoint/science/research) "pXu" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/pump, @@ -56158,6 +56167,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) +"pZh" = ( +/obj/machinery/computer/records/security, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/hos) "pZw" = ( /obj/machinery/light/small{ dir = 1 @@ -57251,6 +57267,14 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/starboard) +"qub" = ( +/obj/machinery/computer/records/security, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/security/main) "quh" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -58476,19 +58500,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/department/science/xenobiology) -"qRE" = ( -/obj/machinery/door/window/westleft{ - dir = 2; - name = "Monkey Pen"; - pixel_y = 1; - req_access_txt = "9" - }, -/mob/living/carbon/monkey, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/freezer, -/area/medical/genetics) "qRL" = ( /obj/effect/landmark/start/bartender, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -59318,23 +59329,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"rgC" = ( -/obj/structure/sign/poster/official/suit_sensors{ - pixel_x = -32; - pixel_y = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/west, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "rgM" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance"; @@ -59691,6 +59685,15 @@ dir = 1 }, /area/hallway/primary/starboard) +"rpR" = ( +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/engine, +/area/science/mixing/chamber) "rqt" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -60209,6 +60212,15 @@ /obj/structure/closet/crate, /turf/open/floor/iron, /area/maintenance/starboard/secondary) +"rAB" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/security/checkpoint/supply) "rAK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60440,13 +60452,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"rEJ" = ( -/mob/living/carbon/monkey, -/obj/structure/window/reinforced{ - pixel_y = 1 - }, -/turf/open/floor/iron/freezer, -/area/medical/genetics) "rEK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60885,10 +60890,6 @@ }, /turf/open/floor/iron, /area/maintenance/aft) -"rNQ" = ( -/mob/living/carbon/monkey, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "rOa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -61975,6 +61976,19 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) +"seM" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Telecomms - Server Room - Aft-Port" + }, +/obj/machinery/airalarm/server{ + dir = 8; + pixel_x = -28 + }, +/turf/open/floor/iron/dark/telecomms, +/area/tcommsat/server) "seX" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -61998,6 +62012,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/maintenance/port) +"sfn" = ( +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/machinery/newscaster{ + pixel_x = 28 + }, +/turf/open/floor/carpet/red, +/area/security/detectives_office) "sfq" = ( /obj/machinery/holopad, /obj/effect/landmark/start/cyborg, @@ -62415,17 +62438,6 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"sop" = ( -/obj/structure/table, -/obj/machinery/airalarm/directional/north{ - pixel_y = 28 - }, -/obj/machinery/computer/records/medical/laptop, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/white/smooth_half, -/area/security/brig) "soM" = ( /obj/machinery/light/small{ dir = 8 @@ -62859,19 +62871,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"svQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 8 - }, -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -28 - }, -/turf/open/floor/iron/dark, -/area/science/server) "svU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -63048,20 +63047,6 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) -"syT" = ( -/obj/machinery/computer/records/medical/laptop{ - dir = 1; - pixel_y = 4 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/item/toy/figure/cmo{ - pixel_x = -9; - pixel_y = 11 - }, -/obj/item/book/manual/wiki/sopmedical, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "szo" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -65729,6 +65714,23 @@ }, /turf/open/space, /area/space/nearstation) +"txH" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/light_switch{ + pixel_x = -27; + pixel_y = 6 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/red/anticorner{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner, +/area/security/checkpoint/science/research) "txI" = ( /obj/structure/girder, /obj/structure/grille, @@ -65876,13 +65878,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"tAW" = ( -/obj/structure/window/reinforced{ - pixel_y = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/iron/freezer, -/area/medical/genetics) "tAZ" = ( /obj/machinery/firealarm{ pixel_y = 29 @@ -67071,19 +67066,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"tWN" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Telecomms - Server Room - Aft-Port" - }, -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -28 - }, -/turf/open/floor/iron/dark/telecomms, -/area/tcommsat/server) "tXE" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -67291,6 +67273,28 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"ubS" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 + }, +/obj/machinery/airlock_sensor/incinerator_toxmix{ + pixel_y = 24 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_x = -28 + }, +/obj/machinery/light_switch{ + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "ubZ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -67658,13 +67662,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"ugN" = ( -/obj/machinery/computer/records/medical, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "ugS" = ( /obj/machinery/firealarm{ dir = 4; @@ -68282,6 +68279,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"utr" = ( +/obj/machinery/door/window/westleft{ + dir = 2; + name = "Monkey Pen"; + pixel_y = 1; + req_access_txt = "9" + }, +/mob/living/carbon/human/species/monkey, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "utH" = ( /obj/machinery/telecomms/processor/preset_exploration, /turf/open/floor/circuit/telecomms/mainframe, @@ -68441,20 +68451,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"uvP" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_half{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "uwh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -69049,6 +69045,13 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"uIf" = ( +/obj/structure/window/reinforced{ + pixel_y = 1 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/freezer, +/area/medical/genetics) "uIp" = ( /obj/structure/closet, /obj/item/storage/box/donkpockets, @@ -69361,6 +69364,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/aft) +"uNP" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge) "uNT" = ( /obj/machinery/firealarm{ pixel_y = -24 @@ -69461,15 +69471,6 @@ dir = 8 }, /area/hallway/primary/aft) -"uOQ" = ( -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/engine, -/area/science/mixing/chamber) "uPm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -69792,13 +69793,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"uWe" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "uWj" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/stripes/end{ @@ -71276,6 +71270,14 @@ }, /turf/open/floor/iron, /area/engine/gravity_generator) +"vwR" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron, +/area/maintenance/aft) "vwX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/disposal/bin, @@ -72394,6 +72396,16 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) +"vPJ" = ( +/obj/structure/window/reinforced, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "vQr" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -75229,21 +75241,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/port) -"wVp" = ( -/obj/structure/table/wood, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/computer/records/medical/laptop{ - dir = 8; - pixel_y = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/turf/open/floor/wood, -/area/medical/exam_room) "wVw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75459,19 +75456,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/bridge) -"wZm" = ( -/obj/machinery/computer/records/medical/laptop{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/mirror{ - pixel_y = 29 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "wZB" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -77086,6 +77070,10 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"xzY" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "xAf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/circuit/green, @@ -79284,6 +79272,18 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) +"yjs" = ( +/obj/machinery/computer/records/security, +/obj/machinery/computer/security/telescreen/cmo{ + dir = 4; + pixel_x = 1; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/security/checkpoint/medical) "yjy" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -94788,7 +94788,7 @@ aaa aip dWF bbK -aYo +nkh kWQ qWb biz @@ -95857,7 +95857,7 @@ avr bTs wLx cia -wZm +htj hMK gaE tMw @@ -97408,7 +97408,7 @@ xRh ecO lCt cDL -rNQ +xzY lzI mDQ vOg @@ -97665,8 +97665,8 @@ iBM fnM cOQ cDL -rNQ -rNQ +xzY +xzY xRy sth dUR @@ -97923,7 +97923,7 @@ crm bpW cDL dLv -rNQ +xzY yls roJ rwn @@ -100181,7 +100181,7 @@ eUh aSX rbu jNh -dmL +rAB aYS baz bbW @@ -100225,7 +100225,7 @@ nyD oCJ sXs dnJ -wVp +feI ocx eYl ovI @@ -102762,7 +102762,7 @@ bdA bkz fBa gTi -aJY +vPJ bsM rFa vUN @@ -103044,7 +103044,7 @@ mdP bSS bSS cdw -rgC +eqy tuo fWe fWX @@ -103064,7 +103064,7 @@ qdC tCy xTR mLe -syT +pcX uHS cmu klZ @@ -103331,7 +103331,7 @@ bnS avr hzz hik -bbQ +vwR vaQ oBe cMI @@ -105371,7 +105371,7 @@ vUr cNt fue rdQ -nVt +yjs bLM lQB sWe @@ -105633,7 +105633,7 @@ eGp lQB hIc rdQ -tAW +uIf efl uVp igd @@ -105800,7 +105800,7 @@ aaa aaa lMJ ajm -sop +bil uYl ljd vDB @@ -105841,7 +105841,7 @@ bqA bci aaf bft -ugN +iLJ bja bjc bmz @@ -105890,7 +105890,7 @@ qxo lbd gzm rdQ -qRE +utr oCH oOa vti @@ -106147,7 +106147,7 @@ bYs xph rdQ rdQ -rEJ +bIr mYS ydT ctB @@ -107617,7 +107617,7 @@ mxH fpC mxb cQU -mcB +bNp dkO sbU aET @@ -107705,7 +107705,7 @@ cCq jAk cPb edQ -uvP +oGq baf cPb aaf @@ -107897,7 +107897,7 @@ bcl bci aaf bft -uWe +uNP bje bjc pvm @@ -108631,7 +108631,7 @@ aaf aaf aaf aiD -cHd +qub iDw qSK ley @@ -110167,7 +110167,7 @@ aaa aaf aaa aec -aew +pZh lBy gxU ssi @@ -110238,7 +110238,7 @@ aYX vrl hqx bZo -kkt +txH jCA xNA hEX @@ -110424,7 +110424,7 @@ lMJ lMJ aaa adZ -nGh +ibr wFY rDV tqF @@ -110753,7 +110753,7 @@ aYT jAJ bZo jMY -pXt +fAv hZt qNL lWP @@ -111215,8 +111215,8 @@ dEQ ajm ayF azV -owo -aCx +gOM +sfn xsb ayJ eDi @@ -111316,7 +111316,7 @@ oqj plM qJb qGT -nJL +ubS qGT tMC ssv @@ -111573,8 +111573,8 @@ hIx kFS geE rtv -iwf -uOQ +nKn +rpR wLZ ssv opp @@ -111830,7 +111830,7 @@ hOu fws mpE qGT -emC +oQY qGT poA ssv @@ -112825,7 +112825,7 @@ thn faw ctW vfX -svQ +efo trY thn cyG @@ -113303,7 +113303,7 @@ bmO bmO buN ltZ -dFf +eRL wiR gFs wmZ @@ -121770,7 +121770,7 @@ wzX cXA rQT pXg -aVF +hWU xur bfX iTF @@ -133616,7 +133616,7 @@ bJm bNX bGd yih -tWN +seM bOc aRy aaa diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index 5a7db27c721dc..dee000ae322e0 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -287,21 +287,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"acB" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/engine, -/area/engine/atmospherics_engine) "acJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ @@ -322,6 +307,11 @@ }, /turf/open/floor/wood, /area/library) +"acO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "acW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -3783,41 +3773,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"bhP" = ( -/obj/structure/rack, -/obj/item/computer_hardware/hard_drive/role/lawyer{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/folder/red{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/folder/blue{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/folder/yellow{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/briefcase, -/obj/item/clothing/glasses/sunglasses/advanced/big{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/clothing/glasses/sunglasses/advanced{ - pixel_x = 3; - pixel_y = 8 - }, -/obj/item/laser_pointer{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/wood, -/area/lawoffice) "bia" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/trunk{ @@ -4931,6 +4886,18 @@ "bAo" = ( /turf/closed/wall, /area/security/brig/medbay) +"bAu" = ( +/obj/structure/table/optable, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/surgical_drapes, +/obj/item/radio/intercom{ + pixel_x = 1; + pixel_y = 29 + }, +/turf/open/floor/iron/white/side, +/area/medical/surgery) "bAI" = ( /obj/effect/turf_decal/tile/white/half/contrasted, /turf/open/floor/iron, @@ -8669,15 +8636,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"cLH" = ( -/obj/machinery/door/window/westleft{ - dir = 4; - name = "Monkey Pen"; - req_access_txt = "9" - }, -/mob/living/carbon/monkey, -/turf/open/floor/vault, -/area/medical/genetics) "cLT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9963,6 +9921,19 @@ /obj/effect/turf_decal/box, /turf/open/floor/engine/o2, /area/ai_monitored/turret_protected/ai) +"dil" = ( +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 25 + }, +/obj/machinery/computer/records/security{ + pixel_y = -3 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/security/detectives_office) "diq" = ( /obj/machinery/camera/directional/east, /obj/effect/turf_decal/guideline/guideline_edge/blue{ @@ -12434,6 +12405,13 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/iron, /area/maintenance/central) +"dVM" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/vault, +/area/medical/genetics) "dVW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13948,6 +13926,18 @@ }, /turf/open/floor/iron, /area/science/lab) +"evh" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/engine, +/area/science/mixing/chamber) "evp" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -14084,6 +14074,17 @@ /obj/machinery/camera/directional/north, /turf/open/floor/engine/plasma, /area/engine/atmos) +"exh" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + alpha = 180; + dir = 4 + }, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/security/checkpoint/auxiliary) "exi" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -14702,6 +14703,21 @@ /obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/hallway/primary/aft) +"eHm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/engine, +/area/engine/atmospherics_engine) "eHp" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, @@ -15317,6 +15333,11 @@ }, /turf/open/floor/carpet/green, /area/security/main) +"eQJ" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, +/turf/open/floor/engine, +/area/science/mixing/chamber) "eQN" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -16440,6 +16461,41 @@ }, /turf/open/floor/carpet/red, /area/security/detectives_office) +"fhR" = ( +/obj/structure/rack, +/obj/item/computer_hardware/hard_drive/role/lawyer{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/folder/red{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/folder/blue{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/folder/yellow{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/briefcase, +/obj/item/clothing/glasses/sunglasses/advanced/big{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/clothing/glasses/sunglasses/advanced{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/laser_pointer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/wood, +/area/lawoffice) "fhV" = ( /obj/machinery/dna_scannernew, /turf/open/floor/iron/white, @@ -16605,6 +16661,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/noslip/standard, /area/crew_quarters/toilet) +"fjv" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "fjB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -17001,6 +17061,15 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron, /area/vacant_room/commissary/commissary1) +"fpo" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/engine, +/area/engine/atmospherics_engine) "fpB" = ( /obj/effect/turf_decal/guideline/guideline_out/brown{ dir = 1 @@ -17888,20 +17957,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/medical/surgery) -"fDt" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airlock_sensor/incinerator_atmos{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/engine/atmospherics_engine) "fDQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -18566,16 +18621,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/engine/break_room) -"fOw" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - alpha = 180 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/security/checkpoint/escape) "fOG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19239,6 +19284,17 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) +"gag" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/security/main) "gau" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional{ @@ -20523,6 +20579,15 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"guz" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood, +/area/medical/exam_room) "guB" = ( /obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/segment{ @@ -20692,6 +20757,17 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/office) +"gxl" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/computer/records/security, +/obj/machinery/computer/security/telescreen/medical{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "gxo" = ( /obj/machinery/newscaster{ pixel_x = 1; @@ -20796,28 +20872,6 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"gAB" = ( -/obj/machinery/camera/directional/west, -/obj/effect/turf_decal/bot, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 2 - }, -/obj/machinery/light_switch{ - pixel_x = -20 - }, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/turf/open/floor/iron/dark, -/area/bridge) "gAE" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -22719,6 +22773,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/sepia, /area/maintenance/port/central) +"heZ" = ( +/obj/machinery/door/window/westleft{ + dir = 4; + name = "Monkey Pen"; + req_access_txt = "9" + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/vault, +/area/medical/genetics) "hff" = ( /obj/item/kirbyplants/random, /obj/structure/disposalpipe/segment{ @@ -23398,15 +23461,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"hqx" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/engine/atmospherics_engine) "hqy" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/effect/decal/cleanable/dirt, @@ -24257,6 +24311,16 @@ "hFn" = ( /turf/open/floor/iron/dark, /area/security/prison) +"hFw" = ( +/obj/machinery/light, +/obj/machinery/computer/records/medical{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/brig/medbay) "hFC" = ( /obj/effect/landmark/start/station_engineer, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -28924,14 +28988,6 @@ /obj/structure/marker_beacon, /turf/open/space/basic, /area/solar/starboard/fore) -"jjt" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/turf/open/floor/engine, -/area/engine/atmospherics_engine) "jjB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29428,18 +29484,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"jsN" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/engine, -/area/science/mixing/chamber) "jsT" = ( /obj/effect/turf_decal/guideline/guideline_in/brown, /obj/structure/cable/yellow{ @@ -30620,16 +30664,6 @@ /obj/structure/closet/crate/miningcar, /turf/open/floor/iron/sepia, /area/maintenance/port/central) -"jNG" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/records/medical/laptop{ - dir = 1; - pixel_y = 6; - req_one_access = null; - req_one_access_txt = "5" - }, -/turf/open/floor/iron/white, -/area/medical/office) "jNH" = ( /obj/structure/lattice/catwalk, /obj/machinery/porta_turret/ai{ @@ -32545,10 +32579,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/engine/engine_room) -"ktc" = ( -/mob/living/carbon/monkey, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "ktu" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -33040,19 +33070,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/central) -"kCg" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airlock_sensor/incinerator_toxmix{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/science/mixing/chamber) "kCk" = ( /obj/structure/table/reinforced, /obj/machinery/keycard_auth{ @@ -34272,19 +34289,6 @@ }, /turf/open/floor/engine, /area/engine/atmos) -"kWP" = ( -/obj/machinery/computer/security/telescreen/prison{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/security/warden) "kWV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34358,19 +34362,6 @@ dir = 9 }, /area/medical/sleeper) -"kYf" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 - }, -/obj/machinery/computer/records/security{ - pixel_y = -3 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/carpet/red, -/area/security/detectives_office) "kYk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -34814,6 +34805,24 @@ dir = 1 }, /area/hallway/primary/central) +"les" = ( +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security RC"; + pixel_x = 31; + pixel_y = -2 + }, +/turf/open/floor/iron/ridged/steel, +/area/crew_quarters/heads/hos) "leu" = ( /obj/machinery/conveyor{ dir = 8; @@ -35029,6 +35038,16 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"liS" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/closet/crate/silvercrate, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "ljt" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -36575,6 +36594,20 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/tech, /area/engine/atmos) +"lIO" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airlock_sensor/incinerator_atmos{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/engine, +/area/engine/atmospherics_engine) "lJj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -36662,6 +36695,17 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/tech, /area/engine/atmos) +"lKE" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/security/checkpoint/science) "lKP" = ( /obj/machinery/camera/directional/north, /turf/open/floor/engine/n2o, @@ -37408,28 +37452,6 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) -"lZU" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop{ - dir = 1; - pixel_y = 5 - }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; - pixel_x = 32; - pixel_y = -2 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "lZY" = ( /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 4 @@ -37755,24 +37777,6 @@ }, /turf/open/floor/iron/dark, /area/medical/virology) -"mev" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; - name = "Head of Security RC"; - pixel_x = 31; - pixel_y = -2 - }, -/turf/open/floor/iron/ridged/steel, -/area/crew_quarters/heads/hos) "meG" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -38115,25 +38119,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/security/brig) -"mkH" = ( -/obj/machinery/camera/directional/east, -/obj/effect/turf_decal/bot, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 8; - freerange = 1; - name = "Station Intercom (Captain)"; - pixel_x = 32; - pixel_y = -2 - }, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/bridge) "mkS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38543,6 +38528,28 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"mqk" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_y = 5 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer RC"; + pixel_x = 32; + pixel_y = -2 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "mqz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/disposal/bin, @@ -42306,17 +42313,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/science/storage) -"nvc" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/security/main) "nvg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/blood/footprints, @@ -44012,6 +44008,15 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) +"nXP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/tech, +/area/ai_monitored/storage/eva) "nXR" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/turf_decal/bot, @@ -45594,6 +45599,27 @@ dir = 1 }, /area/medical/surgery) +"oyC" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/clipboard{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/photo_album{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/carpet/royalblack, +/area/library) "oyS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -49305,11 +49331,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"pFF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/mob/living/carbon/monkey, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "pGg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -51500,15 +51521,6 @@ /obj/item/clothing/gloves/color/yellow, /turf/open/floor/iron/dark, /area/engine/storage) -"qoI" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/wood, -/area/medical/exam_room) "qoQ" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ alpha = 180; @@ -53437,6 +53449,28 @@ /obj/structure/sign/departments/minsky/engineering/engineering, /turf/closed/wall, /area/engine/engineering) +"qWp" = ( +/obj/machinery/camera/directional/west, +/obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/newscaster{ + pixel_x = -32; + pixel_y = 2 + }, +/obj/machinery/light_switch{ + pixel_x = -20 + }, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/turf/open/floor/iron/dark, +/area/bridge) "qWt" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/cable/yellow{ @@ -54322,17 +54356,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig/dock) -"rjl" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180; - dir = 4 - }, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/security/checkpoint/auxiliary) "rjH" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55453,6 +55476,16 @@ }, /turf/open/floor/wood, /area/security/detectives_office) +"rBk" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/records/medical/laptop{ + dir = 1; + pixel_y = 6; + req_one_access = null; + req_one_access_txt = "5" + }, +/turf/open/floor/iron/white, +/area/medical/office) "rBm" = ( /obj/structure/table/wood, /obj/item/folder/blue{ @@ -55823,26 +55856,6 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) -"rGf" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/light{ - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/vault, -/area/medical/genetics) -"rGp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/tech, -/area/ai_monitored/storage/eva) "rGC" = ( /obj/machinery/camera/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -56089,16 +56102,6 @@ /obj/structure/bookcase/manuals/medical, /turf/open/floor/carpet/blue, /area/medical/exam_room) -"rKH" = ( -/obj/machinery/light, -/obj/machinery/computer/records/medical{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/brig/medbay) "rKZ" = ( /obj/structure/railing{ dir = 4 @@ -56305,6 +56308,19 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/engine/engine_room) +"rPi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airlock_sensor/incinerator_toxmix{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/engine, +/area/science/mixing/chamber) "rPp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -57955,17 +57971,6 @@ /obj/machinery/power/port_gen, /turf/open/floor/iron, /area/maintenance/department/security) -"ssr" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/computer/records/security, -/obj/machinery/computer/security/telescreen/medical{ - pixel_y = 32 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "sss" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -58062,17 +58067,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/security/brig) -"suI" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/security/checkpoint/science) "suJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -58539,18 +58533,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"sFd" = ( -/obj/structure/table/optable, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/surgical_drapes, -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = 29 - }, -/turf/open/floor/iron/white/side, -/area/medical/surgery) "sFf" = ( /obj/machinery/light{ dir = 8 @@ -58924,14 +58906,6 @@ }, /turf/open/floor/iron, /area/medical/storage) -"sLe" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8 - }, -/obj/machinery/camera/directional/east, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/engine, -/area/science/mixing/chamber) "sLf" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8; @@ -59210,27 +59184,6 @@ }, /turf/open/floor/plating, /area/engine/atmospherics_engine) -"sPf" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/clipboard{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/photo_album{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/carpet/royalblack, -/area/library) "sPZ" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -59539,6 +59492,28 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/security/prison) +"sUF" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_x = 25 + }, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 40 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/machinery/computer/records/medical/laptop{ + dir = 8; + pixel_x = 2 + }, +/turf/open/floor/carpet/red, +/area/security/detectives_office) "sUI" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -60664,11 +60639,6 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/engine_room) -"tmS" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, -/turf/open/floor/engine, -/area/science/mixing/chamber) "tmX" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/structure/disposalpipe/segment{ @@ -61489,6 +61459,16 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"tyg" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + alpha = 180 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/security/checkpoint/escape) "tyh" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 @@ -64471,15 +64451,6 @@ }, /turf/open/floor/wood, /area/vacant_room/office) -"uwZ" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - alpha = 180; - dir = 4 - }, -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/security/checkpoint/engineering) "uxe" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -65933,6 +65904,11 @@ dir = 4 }, /area/hallway/primary/central) +"uVA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "uVC" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/guideline/guideline_edge/brown{ @@ -66577,11 +66553,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/science/robotics) -"vhE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/mob/living/carbon/monkey, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "vhM" = ( /obj/machinery/door/airlock/maintenance{ name = "Plumbing Factory Maintenance"; @@ -67361,6 +67332,15 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/science/mixing) +"vxq" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + alpha = 180; + dir = 4 + }, +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/security/checkpoint/engineering) "vxB" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -68913,6 +68893,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"vXO" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8 + }, +/obj/machinery/camera/directional/east, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/engine, +/area/science/mixing/chamber) "vXW" = ( /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ @@ -69087,13 +69075,6 @@ "waw" = ( /turf/closed/wall, /area/quartermaster/sorting) -"waM" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/mob/living/carbon/monkey, -/turf/open/floor/vault, -/area/medical/genetics) "waT" = ( /obj/effect/turf_decal/guideline/guideline_in/darkblue{ dir = 8 @@ -69939,6 +69920,17 @@ }, /turf/open/floor/engine, /area/science/explab) +"wrJ" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/light{ + dir = 1 + }, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/vault, +/area/medical/genetics) "wrO" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -70886,16 +70878,6 @@ /obj/structure/closet/l3closet/virology, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"wGq" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/closet/crate/silvercrate, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) "wGw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -72849,28 +72831,6 @@ }, /turf/open/floor/iron/sepia, /area/maintenance/port/central) -"xos" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = 25 - }, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 40 - }, -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/machinery/computer/records/medical/laptop{ - dir = 8; - pixel_x = 2 - }, -/turf/open/floor/carpet/red, -/area/security/detectives_office) "xow" = ( /obj/machinery/door/airlock/public/glass{ name = "Primary Hallway" @@ -74377,6 +74337,19 @@ }, /turf/open/floor/engine, /area/security/nuke_storage) +"xLM" = ( +/obj/machinery/computer/security/telescreen/prison{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/security/warden) "xMx" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable{ @@ -74729,6 +74702,25 @@ /obj/item/stack/cable_coil, /turf/open/space/basic, /area/solar/port/fore) +"xUq" = ( +/obj/machinery/camera/directional/east, +/obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/radio/intercom{ + dir = 8; + freerange = 1; + name = "Station Intercom (Captain)"; + pixel_x = 32; + pixel_y = -2 + }, +/obj/machinery/computer/records/medical{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/bridge) "xUy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -75760,6 +75752,14 @@ /obj/structure/disposalpipe/sorting/mail/destination/detective_office, /turf/open/floor/iron, /area/security/main) +"ymg" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/turf/open/floor/engine, +/area/engine/atmospherics_engine) "ymh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -97799,7 +97799,7 @@ vYS utW fSH pOL -tmS +eQJ pOL fFP lfC @@ -98055,9 +98055,9 @@ vcJ iZr fAX fSH -kCg -jsN -sLe +rPi +evh +vXO ndC gxD rri @@ -99022,7 +99022,7 @@ gsA eSK xkc mNu -wGq +liS eBH eSK wXg @@ -99776,7 +99776,7 @@ aCn jyu fIv jyu -rKH +hFw bAo iqW arO @@ -100358,7 +100358,7 @@ fYu fwK hmW gCM -suI +lKE ygl wwS fTF @@ -101825,7 +101825,7 @@ gjf nCb hCO dwT -mev +les nCb nCb wmw @@ -102869,7 +102869,7 @@ fVQ eLm aUg cUa -kYf +dil kiy qOH gCT @@ -103373,7 +103373,7 @@ eto eto eto tsy -nvc +gag khA cIA eto @@ -103384,7 +103384,7 @@ gCh gQR cUa fhK -xos +sUF ijM onV jgM @@ -103885,7 +103885,7 @@ wPU fOb imo gut -kWP +xLM pZe iSf iaG @@ -106476,7 +106476,7 @@ hTJ seT uXx ggO -bhP +fhR seT gHo nQL @@ -106688,7 +106688,7 @@ gsA tfi rou luu -gAB +qWp lGH prv sZS @@ -106772,7 +106772,7 @@ fcP mKM ewi itk -rGp +nXP ykx rUt nvJ @@ -109366,7 +109366,7 @@ qID wUW aKg nFD -uwZ +vxq oXS tQi fmy @@ -109850,7 +109850,7 @@ dFC ayJ eFL eAC -ssr +gxl rog tSP ggX @@ -110029,7 +110029,7 @@ gsA ksN owz swK -mkH +xUq dVy pXK lKz @@ -110366,7 +110366,7 @@ oIs fxR rNi jGb -jNG +rBk qZM kDQ bgb @@ -112415,7 +112415,7 @@ jdC pJi agj eGd -sFd +bAu tbo qde esk @@ -112432,9 +112432,9 @@ rtj req gxo bWm -rGf -cLH -waM +wrJ +heZ +dVM bWm bQH dHW @@ -114991,7 +114991,7 @@ cYI lph hNX gtr -lZU +mqk eYn dqV jVS @@ -115488,7 +115488,7 @@ krA iLs rEE dqI -rjl +exh hti dKh wAF @@ -118054,7 +118054,7 @@ wTw fZb iCN ekZ -sPf +oyC eUC dDq eqb @@ -118612,9 +118612,9 @@ cXE dHW dHW gLb -fDt -acB -hqx +lIO +eHm +fpo xtQ qSS gLb @@ -118870,7 +118870,7 @@ dHW dHW gLb vZB -jjt +ymg vZB gLb xnE @@ -119625,7 +119625,7 @@ aJb odc nan tfq -ktc +fjv hzd nSi rGU @@ -119882,8 +119882,8 @@ kLq vwY fbJ tfq -ktc -pFF +fjv +uVA hOa mbJ eTq @@ -120130,9 +120130,9 @@ hTj ejx tvU sRs -fOw +tyg kyR -qoI +guz fvs oLk jGO @@ -120140,7 +120140,7 @@ soP rKv tfq qXN -vhE +acO jeg dxq oYZ diff --git a/beestation.dme b/beestation.dme index 2e6b25ac1173c..d139351d98703 100644 --- a/beestation.dme +++ b/beestation.dme @@ -384,7 +384,6 @@ #include "code\_onclick\hud\lavaland_elite.dm" #include "code\_onclick\hud\map_popups.dm" #include "code\_onclick\hud\minebot.dm" -#include "code\_onclick\hud\monkey.dm" #include "code\_onclick\hud\movable_screen_objects.dm" #include "code\_onclick\hud\nymph.dm" #include "code\_onclick\hud\pai.dm" @@ -561,7 +560,6 @@ #include "code\datums\mind.dm" #include "code\datums\movement_detector.dm" #include "code\datums\mutable_appearance.dm" -#include "code\datums\mutations.dm" #include "code\datums\numbered_display.dm" #include "code\datums\outfit.dm" #include "code\datums\profiling.dm" @@ -639,6 +637,7 @@ #include "code\datums\brain_damage\split_personality.dm" #include "code\datums\components\_component.dm" #include "code\datums\components\aiming.dm" +#include "code\datums\components\anchor.dm" #include "code\datums\components\anti_artifact.dm" #include "code\datums\components\anti_magic.dm" #include "code\datums\components\aquarium.dm" @@ -963,6 +962,7 @@ #include "code\datums\mood_events\mood_event.dm" #include "code\datums\mood_events\needs_events.dm" #include "code\datums\mutations\_combined.dm" +#include "code\datums\mutations\_mutations.dm" #include "code\datums\mutations\actions.dm" #include "code\datums\mutations\antenna.dm" #include "code\datums\mutations\body.dm" @@ -3092,6 +3092,7 @@ #include "code\modules\mob\living\carbon\human\init_signals.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" +#include "code\modules\mob\living\carbon\human\monkey.dm" #include "code\modules\mob\living\carbon\human\physiology.dm" #include "code\modules\mob\living\carbon\human\say.dm" #include "code\modules\mob\living\carbon\human\species.dm" @@ -3112,7 +3113,7 @@ #include "code\modules\mob\living\carbon\human\species_types\IPC.dm" #include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm" #include "code\modules\mob\living\carbon\human\species_types\lizardpeople.dm" -#include "code\modules\mob\living\carbon\human\species_types\monkey.dm" +#include "code\modules\mob\living\carbon\human\species_types\monkeys.dm" #include "code\modules\mob\living\carbon\human\species_types\mothmen.dm" #include "code\modules\mob\living\carbon\human\species_types\oozelings.dm" #include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm" @@ -3124,13 +3125,6 @@ #include "code\modules\mob\living\carbon\human\species_types\vampire.dm" #include "code\modules\mob\living\carbon\human\species_types\zombies.dm" #include "code\modules\mob\living\carbon\human\verbs\give.dm" -#include "code\modules\mob\living\carbon\monkey\death.dm" -#include "code\modules\mob\living\carbon\monkey\inventory.dm" -#include "code\modules\mob\living\carbon\monkey\life.dm" -#include "code\modules\mob\living\carbon\monkey\monkey.dm" -#include "code\modules\mob\living\carbon\monkey\monkey_defense.dm" -#include "code\modules\mob\living\carbon\monkey\punpun.dm" -#include "code\modules\mob\living\carbon\monkey\update_icons.dm" #include "code\modules\mob\living\silicon\damage_procs.dm" #include "code\modules\mob\living\silicon\death.dm" #include "code\modules\mob\living\silicon\examine.dm" diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 132effc767fd6..b712f9f6a20a0 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -3,61 +3,61 @@ #define CHECK_DNA_AND_SPECIES(C) if((!(C.dna)) || (!(C.dna.species))) return // Defines copying names of mutations in all cases, make sure to change this if you change mutation's type -#define HULK /datum/mutation/hulk -#define XRAY /datum/mutation/thermal/x_ray -#define SPACEMUT /datum/mutation/space_adaptation -#define TK /datum/mutation/telekinesis -#define NERVOUS /datum/mutation/nervousness -#define EPILEPSY /datum/mutation/epilepsy -#define MUTATE /datum/mutation/bad_dna -#define COUGH /datum/mutation/cough -#define DWARFISM /datum/mutation/dwarfism -#define GIGANTISM /datum/mutation/gigantism -#define CLOWNMUT /datum/mutation/clumsy -#define TOURETTES /datum/mutation/tourettes -#define DEAFMUT /datum/mutation/deaf -#define BLINDMUT /datum/mutation/blind -#define RACEMUT /datum/mutation/race -#define BADSIGHT /datum/mutation/nearsight -#define LASEREYES /datum/mutation/laser_eyes -#define CHAMELEON /datum/mutation/chameleon -#define WACKY /datum/mutation/wacky -#define MUT_MUTE /datum/mutation/mute -#define SMILE /datum/mutation/smile -#define STONER /datum/mutation/stoner -#define UNINTELLIGIBLE /datum/mutation/unintelligible -#define SWEDISH /datum/mutation/swedish -#define CHAV /datum/mutation/chav -#define ELVIS /datum/mutation/elvis -#define RADIOACTIVE /datum/mutation/radioactive -#define GLOWY /datum/mutation/glow -#define ANTIGLOWY /datum/mutation/glow/anti -#define TELEPATHY /datum/mutation/telepathy -#define FIREBREATH /datum/mutation/firebreath -#define VOID /datum/mutation/void -#define STRONG /datum/mutation/strong -#define FIRESWEAT /datum/mutation/fire -#define THERMAL /datum/mutation/thermal -#define ANTENNA /datum/mutation/antenna -#define PARANOIA /datum/mutation/paranoia -#define INSULATED /datum/mutation/insulated -#define SHOCKTOUCH /datum/mutation/shock -#define OLFACTION /datum/mutation/olfaction -#define ACIDFLESH /datum/mutation/acidflesh -#define BADBLINK /datum/mutation/badblink -#define SPASTIC /datum/mutation/spastic -#define EXTRASTUN /datum/mutation/extrastun -#define GELADIKINESIS /datum/mutation/geladikinesis -#define CRYOKINESIS /datum/mutation/cryokinesis -#define CLUWNEMUT /datum/mutation/cluwne -#define WAXSALIVA /datum/mutation/wax_saliva -#define STRONGWINGS /datum/mutation/strongwings -#define CATCLAWS /datum/mutation/catclaws -#define OVERLOAD /datum/mutation/overload -#define ACIDOOZE /datum/mutation/acidooze -#define MEDIEVAL /datum/mutation/medieval -#define SPORES /datum/mutation/spores -#define DRONE /datum/mutation/drone +#define HULK /datum/mutation/human/hulk +#define XRAY /datum/mutation/human/thermal/x_ray +#define SPACEMUT /datum/mutation/human/space_adaptation +#define TK /datum/mutation/human/telekinesis +#define NERVOUS /datum/mutation/human/nervousness +#define EPILEPSY /datum/mutation/human/epilepsy +#define MUTATE /datum/mutation/human/bad_dna +#define COUGH /datum/mutation/human/cough +#define DWARFISM /datum/mutation/human/dwarfism +#define GIGANTISM /datum/mutation/human/gigantism +#define CLOWNMUT /datum/mutation/human/clumsy +#define TOURETTES /datum/mutation/human/tourettes +#define DEAFMUT /datum/mutation/human/deaf +#define BLINDMUT /datum/mutation/human/blind +#define RACEMUT /datum/mutation/human/race +#define BADSIGHT /datum/mutation/human/nearsight +#define LASEREYES /datum/mutation/human/laser_eyes +#define CHAMELEON /datum/mutation/human/chameleon +#define WACKY /datum/mutation/human/wacky +#define MUT_MUTE /datum/mutation/human/mute +#define SMILE /datum/mutation/human/smile +#define STONER /datum/mutation/human/stoner +#define UNINTELLIGIBLE /datum/mutation/human/unintelligible +#define SWEDISH /datum/mutation/human/swedish +#define CHAV /datum/mutation/human/chav +#define ELVIS /datum/mutation/human/elvis +#define RADIOACTIVE /datum/mutation/human/radioactive +#define GLOWY /datum/mutation/human/glow +#define ANTIGLOWY /datum/mutation/human/glow/anti +#define TELEPATHY /datum/mutation/human/telepathy +#define FIREBREATH /datum/mutation/human/firebreath +#define VOID /datum/mutation/human/void +#define STRONG /datum/mutation/human/strong +#define FIRESWEAT /datum/mutation/human/fire +#define THERMAL /datum/mutation/human/thermal +#define ANTENNA /datum/mutation/human/antenna +#define PARANOIA /datum/mutation/human/paranoia +#define INSULATED /datum/mutation/human/insulated +#define SHOCKTOUCH /datum/mutation/human/shock +#define OLFACTION /datum/mutation/human/olfaction +#define ACIDFLESH /datum/mutation/human/acidflesh +#define BADBLINK /datum/mutation/human/badblink +#define SPASTIC /datum/mutation/human/spastic +#define EXTRASTUN /datum/mutation/human/extrastun +#define GELADIKINESIS /datum/mutation/human/geladikinesis +#define CRYOKINESIS /datum/mutation/human/cryokinesis +#define CLUWNEMUT /datum/mutation/human/cluwne +#define WAXSALIVA /datum/mutation/human/wax_saliva +#define STRONGWINGS /datum/mutation/human/strongwings +#define CATCLAWS /datum/mutation/human/catclaws +#define OVERLOAD /datum/mutation/human/overload +#define ACIDOOZE /datum/mutation/human/acidooze +#define MEDIEVAL /datum/mutation/human/medieval +#define SPORES /datum/mutation/human/spores +#define DRONE /datum/mutation/human/drone #define UI_CHANGED "ui changed" #define UE_CHANGED "ue changed" @@ -95,17 +95,6 @@ #define DNA_MUTATION_BLOCKS 8 #define DNA_UNIQUE_ENZYMES_LEN 32 -//Transformation proc stuff -#define TR_KEEPITEMS (1<<0) -#define TR_KEEPVIRUS (1<<1) -#define TR_KEEPDAMAGE (1<<2) -#define TR_HASHNAME (1<<3) // hashing names (e.g. monkey(e34f)) (only in monkeyize) -#define TR_KEEPIMPLANTS (1<<4) -#define TR_KEEPSE (1<<5) // changelings shouldn't edit the DNA's SE when turning into a monkey -#define TR_DEFAULTMSG (1<<6) -#define TR_KEEPORGANS (1<<8) -#define TR_KEEPAI (1<<9) - #define CLONER_FRESH_CLONE "fresh" #define CLONER_MATURE_CLONE "mature" @@ -140,6 +129,10 @@ // #define HAS_BONE 24 [add if we ever port TGs wound system] /// If we have a limb-specific overlay sprite #define HAS_MARKINGS 25 +/// Do not draw blood overlay +#define NOBLOODOVERLAY 26 +///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png +#define NOAUGMENTS 27 //organ slots #define ORGAN_SLOT_BRAIN "brain" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm index 3748b57a5271d..c5f1435bac6d6 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm @@ -14,6 +14,8 @@ #define COMSIG_MOB_ITEM_ATTACK_QDELETED "mob_item_attack_qdeleted" ///from base of mob/RangedAttack(): (atom/A, params) #define COMSIG_MOB_ATTACK_RANGED "mob_attack_ranged" +///From base of atom/ctrl_click(): (atom/A) +#define COMSIG_MOB_CTRL_CLICKED "mob_ctrl_clicked" ///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity) #define COMSIG_HUMAN_EARLY_UNARMED_ATTACK "human_early_unarmed_attack" ///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index f91c1f44bad1c..a86ab0841e6e5 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -101,14 +101,13 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isethereal(A) (is_species(A, /datum/species/ethereal)) #define isvampire(A) (is_species(A,/datum/species/vampire)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) +#define ismonkey(A) (is_species(A, /datum/species/monkey)) +#define isteratoma(A) (is_species(A, /datum/species/monkey/teratoma)) #define isipc(A) (is_species(A, /datum/species/ipc)) #define isapid(A) (is_species(A, /datum/species/apid)) #define isandroid(A) (is_species(A, /datum/species/android)) #define ispsyphoza(A) (is_species(A, /datum/species/psyphoza)) -//more carbon mobs -#define ismonkey(A) (istype(A, /mob/living/carbon/monkey)) - #define isxeno(A) (istype(A, /mob/living/carbon/xenomorph)) #define isalien(A) (istype(A, /mob/living/carbon/alien)) diff --git a/code/__DEFINES/monkeys.dm b/code/__DEFINES/monkeys.dm index 139933bbeb5c9..fb68009ebab3e 100644 --- a/code/__DEFINES/monkeys.dm +++ b/code/__DEFINES/monkeys.dm @@ -1,7 +1,7 @@ //Monkey defines, placed here so they can be read by other things! /// below this health value the monkey starts to flee from enemies -#define MONKEY_FLEE_HEALTH 50 +#define MONKEY_FLEE_HEALTH 40 /// how close an enemy must be to trigger aggression #define MONKEY_ENEMY_VISION 9 /// how close an enemy must be before it triggers flee @@ -22,7 +22,7 @@ /// probability that monkey will get into mischief, i.e. finding/stealing items #define MONKEY_SHENANIGAN_PROB 20 /// probability that monkey will disarm an armed attacker -#define MONKEY_ATTACK_DISARM_PROB 50 +#define MONKEY_ATTACK_DISARM_PROB 20 /// probability that monkey will get recruited when friend is attacked #define MONKEY_RECRUIT_PROB 25 @@ -44,6 +44,3 @@ ///Monkey recruit cooldown #define MONKEY_RECRUIT_COOLDOWN 1 MINUTES - -/// List of monkey_icons for clothing -GLOBAL_LIST_EMPTY(monkey_icon_cache) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 3263780f5015f..324dbccdb91ec 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -153,7 +153,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_NONECRODISEASE "nonecrodisease" #define TRAIT_NICE_SHOT "nice_shot" //hnnnnnnnggggg..... you're pretty good.... #define TRAIT_ALWAYS_STUBS "always_stubs_toe" //you will always stub your toe on tables, even if you're wearing shoes -#define TRAIT_NAIVE "naive" //All dead people will appear as sleeping. +//All dead people will appear as sleeping. +#define TRAIT_NAIVE "naive" +//Catch-all inherent species trait for when we want a carbon to not be mentally developed enough to understand how to operate something (ashwalkers, monkeys) +#define TRAIT_PRIMITIVE "primitive" +//Catch-all inherent species trait for when we want a carbon to not physically be able to operate something (monkeys) +#define TRAIT_INFERIORFORM "inferiorform" #define TRAIT_DROPS_ITEMS_ON_DEATH "drops_items_on_death" //used for battle royale #define TRAIT_DRINKSBLOOD "drinks_blood" #define TRAIT_MINDSWAPPED "mindswapped" @@ -163,9 +168,13 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_MOTH_BURNT "moth_burnt" #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" ///Increases chance of getting special traumas, makes them harder to cure #define TRAIT_METALANGUAGE_KEY_ALLOWED "metalanguage_key_allowed" // you can use language key for metalanguage (,`) and but also you see lang icon -#define TRAIT_HYPERSPACED "hyperspaced" // Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent -#define TRAIT_FREE_HYPERSPACE_MOVEMENT "free_hyperspace_movement" // Gives the movable free hyperspace movement without being pulled during shuttle transit +/// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent +#define TRAIT_HYPERSPACED "hyperspaced" +///Gives the movable free hyperspace movement without being pulled during shuttle transit +#define TRAIT_FREE_HYPERSPACE_MOVEMENT "free_hyperspace_movement" #define TRAIT_FAST_CUFF_REMOVAL "fast_cuff_removal" // Faster cuff removal +/// Revenants draining you only get a very small benefit. +#define TRAIT_WEAK_SOUL "weak_soul" #define TRAIT_BLEED_HELD "bleed_held" // For when a mob is holding their wounds, preventing them from bleeding further #define TRAIT_NO_BLOOD "no_blood" // Bleeding heals itself and bleeding is impossible #define TRAIT_NO_BLEEDING "no_bleed" // The user can acquire the bleeding status effect, but will no lose blood @@ -272,6 +281,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // Trait for allowing an item that isn't food into the customizable reagent holder #define TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT "odd_customizable_food_ingredient" +/* Traits for ventcrawling. + * Both give access to ventcrawling, but *_NUDE requires the user to be + * wearing no clothes and holding no items. If both present, *_ALWAYS + * takes precedence. + */ +#define TRAIT_VENTCRAWLER_ALWAYS "ventcrawler_always" +#define TRAIT_VENTCRAWLER_NUDE "ventcrawler_nude" + ///Trait applied to turfs when an atmos holosign is placed on them. It will stop firedoors from closing. #define TRAIT_FIREDOOR_STOP "firedoor_stop" diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 3401f7841e6a8..733702a05f8ce 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -750,6 +750,15 @@ return TRUE return FALSE +/proc/assoc_to_keys_features(list/input) + var/list/keys = list() + for(var/key in input) + var/datum/sprite_accessory/value = input[key] + if(value?.locked) + continue + UNTYPED_LIST_ADD(keys, key) + return keys + /// Gets the first key that contains the given value in an associative list, otherwise, returns null. /proc/assoc_key_for_value(list/input, check_for) for(var/key in input) diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm index 8845301ac8add..1aafefdb6f149 100644 --- a/code/_globalvars/genetics.dm +++ b/code/_globalvars/genetics.dm @@ -1,5 +1,5 @@ //faster than having to constantly loop for them -GLOBAL_LIST_EMPTY_TYPED(all_mutations, /datum/mutation) //! type = initialized mutation +GLOBAL_LIST_EMPTY_TYPED(all_mutations, /datum/mutation/human) //! type = initialized mutation GLOBAL_LIST_EMPTY(full_sequences) //! type = correct sequence GLOBAL_LIST_EMPTY(bad_mutations) //! bad initialized mutations GLOBAL_LIST_EMPTY(good_mutations) //! good initialized mutations diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 3c7a948fdfa5b..fbea19345a8b4 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name //Socks GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name + /// Body sizes. The names (keys) are what is actually stored in the database. Don't get crazy with changing them. GLOBAL_LIST_INIT(body_sizes, list( "Normal" = BODY_SIZE_NORMAL, diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index af9e7b2e6796e..e3cc51549a720 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -49,6 +49,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE, "TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE, "TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE, + "TRAIT_VENTCRAWLER_ALWAYS" = TRAIT_VENTCRAWLER_ALWAYS, + "TRAIT_VENTCRAWLER_NUDE" = TRAIT_VENTCRAWLER_NUDE, "TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE, "TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE, "TRAIT_NODISMEMBER" = TRAIT_NODISMEMBER, @@ -127,6 +129,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NICE_SHOT" = TRAIT_NICE_SHOT, "TRAIT_ALWAYS_STUBS" = TRAIT_ALWAYS_STUBS, "TRAIT_NAIVE" = TRAIT_NAIVE, + "TRAIT_PRIMITIVE" = TRAIT_PRIMITIVE, + "TRAIT_INFERIORFORM" = TRAIT_INFERIORFORM, "TRAIT_DROPS_ITEMS_ON_DEATH" = TRAIT_DROPS_ITEMS_ON_DEATH, "TRAIT_DRINKSBLOOD" = TRAIT_DRINKSBLOOD, "TRAIT_MINDSWAPPED" = TRAIT_MINDSWAPPED, @@ -174,6 +178,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_SUIT_SENSORS" = TRAIT_SUIT_SENSORS, "TRAIT_NANITE_SENSORS" = TRAIT_NANITE_SENSORS, "TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE, + "TRAIT_WEAK_SOUL" = TRAIT_WEAK_SOUL, + "TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE, "TRAIT_PLANTHEALING" = TRAIT_PLANTHEALING, "TRAIT_NORADDAMAGE" = TRAIT_NORADDAMAGE, "TRAIT_MOBILE" = TRAIT_MOBILE, diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 027d1f498fc82..16c6057c7bafe 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -333,6 +333,7 @@ /atom/proc/CtrlClick(mob/user) SEND_SIGNAL(src, COMSIG_CLICK_CTRL, user) + SEND_SIGNAL(user, COMSIG_MOB_CTRL_CLICKED, src) var/mob/living/ML = user if(istype(ML)) ML.pulled(src) diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm deleted file mode 100644 index 42d0ff7866dfc..0000000000000 --- a/code/_onclick/hud/monkey.dm +++ /dev/null @@ -1,183 +0,0 @@ -/datum/hud/monkey/New(mob/living/carbon/monkey/owner) - ..() - var/atom/movable/screen/using - var/atom/movable/screen/inventory/inv_box - - action_intent = new /atom/movable/screen/act_intent() - action_intent.icon = ui_style - action_intent.icon_state = mymob.a_intent - action_intent.screen_loc = ui_acti - action_intent.hud = src - static_inventory += action_intent - - using = new /atom/movable/screen/mov_intent() - using.icon = ui_style - using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") - using.screen_loc = ui_movi - using.hud = src - static_inventory += using - - using = new/atom/movable/screen/language_menu - using.icon = ui_style - using.hud = src - static_inventory += using - - using = new /atom/movable/screen/drop() - using.icon = ui_style - using.screen_loc = ui_drop_throw - using.hud = src - static_inventory += using - - build_hand_slots() - - using = new /atom/movable/screen/swap_hand() - using.icon = ui_style - using.icon_state = "swap_1_m" //extra wide! - using.screen_loc = ui_swaphand_position(owner,1) - using.hud = src - static_inventory += using - - using = new /atom/movable/screen/swap_hand() - using.icon = ui_style - using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) - using.hud = src - static_inventory += using - - inv_box = new /atom/movable/screen/inventory() - inv_box.name = "uniform" - inv_box.icon = ui_style - inv_box.icon_state = "uniform" - inv_box.screen_loc = ui_monkey_body - inv_box.slot_id = ITEM_SLOT_ICLOTHING - inv_box.hud = src - static_inventory += inv_box - - inv_box = new /atom/movable/screen/inventory() - inv_box.name = "mask" - inv_box.icon = ui_style - inv_box.icon_state = "mask" -// inv_box.icon_full = "template" - inv_box.screen_loc = ui_monkey_mask - inv_box.slot_id = ITEM_SLOT_MASK - inv_box.hud = src - static_inventory += inv_box - - inv_box = new /atom/movable/screen/inventory() - inv_box.name = "neck" - inv_box.icon = ui_style - inv_box.icon_state = "neck" -// inv_box.icon_full = "template" - inv_box.screen_loc = ui_monkey_neck - inv_box.slot_id = ITEM_SLOT_NECK - inv_box.hud = src - static_inventory += inv_box - - inv_box = new /atom/movable/screen/inventory() - inv_box.name = "head" - inv_box.icon = ui_style - inv_box.icon_state = "head" -// inv_box.icon_full = "template" - inv_box.screen_loc = ui_monkey_head - inv_box.slot_id = ITEM_SLOT_HEAD - inv_box.hud = src - static_inventory += inv_box - - inv_box = new /atom/movable/screen/inventory() - inv_box.name = "back" - inv_box.icon = ui_style - inv_box.icon_state = "back" - inv_box.screen_loc = ui_monkey_back - inv_box.slot_id = ITEM_SLOT_BACK - inv_box.hud = src - static_inventory += inv_box - - throw_icon = new /atom/movable/screen/throw_catch() - throw_icon.icon = ui_style - throw_icon.screen_loc = ui_drop_throw - throw_icon.hud = src - hotkeybuttons += throw_icon - - internals = new /atom/movable/screen/internals() - internals.hud = src - infodisplay += internals - - healths = new /atom/movable/screen/healths() - healths.hud = src - infodisplay += healths - - pull_icon = new /atom/movable/screen/pull() - pull_icon.icon = ui_style - pull_icon.update_icon() - pull_icon.screen_loc = ui_above_movement - pull_icon.hud = src - static_inventory += pull_icon - - lingchemdisplay = new /atom/movable/screen/ling/chems() - lingchemdisplay.hud = src - infodisplay += lingchemdisplay - - lingstingdisplay = new /atom/movable/screen/ling/sting() - lingstingdisplay.hud = src - infodisplay += lingstingdisplay - - - zone_select = new /atom/movable/screen/zone_sel() - zone_select.icon = ui_style - zone_select.update_icon() - zone_select.hud = src - static_inventory += zone_select - - mymob.client.screen = list() - - using = new /atom/movable/screen/resist() - using.icon = ui_style - using.screen_loc = ui_above_intent - using.hud = src - hotkeybuttons += using - - for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) - if(inv.slot_id) - inv.hud = src - inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv - inv.update_icon() - -/datum/hud/monkey/persistent_inventory_update() - if(!mymob) - return - var/mob/living/carbon/monkey/M = mymob - - if(hud_shown) - if(M.back) - M.back.screen_loc = ui_monkey_back - M.client.screen += M.back - if(M.wear_mask) - M.wear_mask.screen_loc = ui_monkey_mask - M.client.screen += M.wear_mask - if(M.wear_neck) - M.wear_neck.screen_loc = ui_monkey_neck - M.client.screen += M.wear_neck - if(M.head) - M.head.screen_loc = ui_monkey_head - M.client.screen += M.head - if(M.w_uniform) - M.w_uniform.screen_loc = ui_monkey_body - M.client.screen += M.w_uniform - else - if(M.back) - M.back.screen_loc = null - if(M.wear_mask) - M.wear_mask.screen_loc = null - if(M.head) - M.head.screen_loc = null - if(M.w_uniform) - M.w_uniform.screen_loc = null - - if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in M.held_items) - I.screen_loc = ui_hand_position(M.get_held_index_of_item(I)) - M.client.screen += I - else - for(var/obj/item/I in M.held_items) - I.screen_loc = null - M.client.screen -= I diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index f0c53ad7a8884..0a4a15872e1b0 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -27,13 +27,16 @@ var/override = 0 - for(var/datum/mutation/HM as() in dna.mutations) + for(var/datum/mutation/human/HM as() in dna.mutations) override += HM.on_attack_hand(A, proximity) if(override) return - SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A) + SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, proximity) + + if(dna?.species?.spec_unarmedattack(src, A)) //Because species like monkeys dont use attack hand + return A.attack_hand(src) /// Return TRUE to cancel other attack hand effects that respect it. @@ -99,7 +102,7 @@ . = ..() if(!dna) return - for(var/datum/mutation/HM as() in dna.mutations) + for(var/datum/mutation/human/HM as() in dna.mutations) HM.on_ranged_attack(A, mouseparams) /mob/living/carbon/human/RangedAttack(atom/A, mouseparams) @@ -131,38 +134,6 @@ SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_BASIC_MOB, user) return -/* - Monkeys -*/ -/mob/living/carbon/monkey/UnarmedAttack(atom/A, proximity) - if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED)) - if(a_intent != INTENT_HARM || is_muzzled()) - return - if(!iscarbon(A)) - return - var/mob/living/carbon/victim = A - var/obj/item/bodypart/affecting = null - if(ishuman(victim)) - var/mob/living/carbon/human/human_victim = victim - affecting = human_victim.get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - var/armor = victim.run_armor_check(affecting, MELEE) - if(prob(25)) - victim.visible_message("[src]'s bite misses [victim]!", - "You avoid [src]'s bite!", "You hear jaws snapping shut!", COMBAT_MESSAGE_RANGE, src) - to_chat(src, "Your bite misses [victim]!") - return - victim.apply_damage(rand(1, 3), BRUTE, affecting, armor) - victim.visible_message("[name] bites [victim]!", - "[name] bites you!", "You hear a chomp!", COMBAT_MESSAGE_RANGE, name) - to_chat(name, "You bite [victim]!") - if(armor >= 2) - return - for(var/d in diseases) - var/datum/disease/bite_infection = d - victim.ForceContractDisease(bite_infection) - return - A.attack_paw(src) - /atom/proc/attack_paw(mob/user) if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_CANCEL_ATTACK_CHAIN) return TRUE diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 142f1539861a5..2594a7864134c 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -222,13 +222,13 @@ SUBSYSTEM_DEF(atoms) BadInitializeCalls = SSatoms.BadInitializeCalls /datum/controller/subsystem/atoms/proc/setupGenetics() - var/list/mutations = subtypesof(/datum/mutation) + var/list/mutations = subtypesof(/datum/mutation/human) shuffle_inplace(mutations) for(var/datum/generecipe/GR as() in subtypesof(/datum/generecipe)) GLOB.mutation_recipes[initial(GR.required)] = initial(GR.result) for(var/i in 1 to length(mutations)) var/path = mutations[i] //byond gets pissy when we do it in one line - var/datum/mutation/B = new path () + var/datum/mutation/human/B = new path () B.alias = "Mutation [i]" GLOB.all_mutations[B.type] = B GLOB.full_sequences[B.type] = generate_gene_sequence(B.blocks) diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index f7abdcdc659c6..667603ad6bd40 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -270,3 +270,8 @@ multiple modular subtrees with behaviors if(iter_behavior.required_distance < minimum_distance) minimum_distance = iter_behavior.required_distance return minimum_distance + +/// If this controller is applied to a human subtype, this proc will be called to generate examine text +/datum/ai_controller/proc/get_human_examine_text() + var/text = "["[pawn.p_they(TRUE)] do[pawn.p_es()]n't appear to be [pawn.p_them()]self."]" + return text diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index 8195daac3be6b..7bea409430c8b 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -81,6 +81,10 @@ have ways of interacting with a specific mob and control it. if(IS_DEAD_OR_INCAP(living_pawn)) return FALSE +/datum/ai_controller/monkey/get_human_examine_text() + var/text = "["[pawn.p_they(TRUE)] have a primal look in [pawn.p_their()] eyes."]" + return text + ///re-used behavior pattern by monkeys for finding a weapon /datum/ai_controller/monkey/proc/TryFindWeapon() var/mob/living/living_pawn = pawn diff --git a/code/datums/components/anchor.dm b/code/datums/components/anchor.dm new file mode 100644 index 0000000000000..e110e550a1582 --- /dev/null +++ b/code/datums/components/anchor.dm @@ -0,0 +1,37 @@ +/* + Sometimes you need to anchor one thing to another, and adding it to vis contents just ain't right + + This is used for stuff like species height maps, which break the context menu when vis contents is used +*/ + +/datum/component/anchor + ///Do the copy their position + var/copy_position = TRUE + ///Do we copy the target's direction + var/copy_direction = TRUE + +/datum/component/anchor/Initialize(atom/movable/anchor_target) + . = ..() + if(!ismovable(parent) || !ismovable(anchor_target)) + return + //Setup signals to catch movement and direction stuff + RegisterSignal(anchor_target, COMSIG_MOVABLE_MOVED, PROC_REF(catch_move)) + RegisterSignal(anchor_target, COMSIG_ATOM_DIR_CHANGE, PROC_REF(catch_dir)) + //Initial respects + catch_move(anchor_target) + catch_dir(anchor_target, 0, anchor_target.dir) + +/datum/component/anchor/proc/catch_move(datum/source) + SIGNAL_HANDLER + + if(!copy_position) + return + var/atom/movable/movable_parent = parent + movable_parent.forceMove(get_turf(source)) + +/datum/component/anchor/proc/catch_dir(datum/source, old_dir, new_dir) + SIGNAL_HANDLER + if(!copy_direction) + return + var/atom/movable/movable_parent = parent + movable_parent.dir = new_dir diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm index 0a68478904236..b15f36c6dfb4b 100644 --- a/code/datums/components/bloodysoles.dm +++ b/code/datums/components/bloodysoles.dm @@ -241,19 +241,17 @@ /datum/component/bloodysoles/feet/update_icon() if(ishuman(wielder)) - // Monkeys get no bloody feet :( + var/mob/living/carbon/human/human = wielder + if(NOBLOODOVERLAY in human.dna.species.species_traits) + return if(bloody_shoes[BLOOD_STATE_HUMAN] > 0 && !is_obscured()) - wielder.remove_overlay(SHOES_LAYER) - wielder.overlays_standing[SHOES_LAYER] = bloody_feet - wielder.apply_overlay(SHOES_LAYER) + human.remove_overlay(SHOES_LAYER) + human.overlays_standing[SHOES_LAYER] = bloody_feet + human.apply_overlay(SHOES_LAYER) else - wielder.update_inv_shoes() + human.update_inv_shoes() /datum/component/bloodysoles/feet/add_parent_to_footprint(obj/effect/decal/cleanable/blood/footprints/FP) - if(ismonkey(wielder)) - FP.species_types |= "monkey" - return - if(!ishuman(wielder)) FP.species_types |= "unknown" return diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm index 5e735edae3d25..75e7b47d3049d 100644 --- a/code/datums/components/creamed.dm +++ b/code/datums/components/creamed.dm @@ -1,6 +1,5 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( /mob/living/carbon/human, - /mob/living/carbon/monkey, /mob/living/simple_animal/pet/dog/corgi, /mob/living/silicon/ai))) @@ -24,11 +23,11 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( var/mob/living/carbon/human/H = parent if(islizard(H)) creamface.icon_state = "creampie_lizard" + else if(ismonkey(H)) + creamface.icon_state = "creampie_monkey" else creamface.icon_state = "creampie_human" SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "creampie", /datum/mood_event/creampie) - else if(ismonkey(parent)) - creamface.icon_state = "creampie_monkey" else if(iscorgi(parent)) creamface.icon_state = "creampie_corgi" else if(isAI(parent)) diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 7175e68cf58fe..b1ce7e2a430c6 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -98,7 +98,7 @@ var/mob/living/carbon/human/H = C equipment_items += list(H.wear_suit, H.w_uniform, H.belt, H.s_store, H.wear_id) if(ismonkey(C)) - var/mob/living/carbon/monkey/H = C + var/mob/living/carbon/human/species/monkey/H = C equipment_items += list(H.w_uniform) for(var/bp in equipment_items) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index b0b1127c7cb01..ac9ca10d2c518 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -162,15 +162,15 @@ if(attached_atom.loc != user) to_chat(user, "You attempt to wield [parent] via the power of telekenisis, but it is too much for you to handle...") return - if(ismonkey(user)) - to_chat(user, "It's too heavy for you to wield fully.") - return - if(swap_hands ? user.get_active_held_item() : user.get_inactive_held_item()) + if((swap_hands ? user.get_active_held_item() : user.get_inactive_held_item()) || ismonkey(user)) if(require_twohands) to_chat(user, "[parent] is too cumbersome to carry in one hand!") user.dropItemToGround(parent, force=TRUE) else - to_chat(user, "You need your other hand to be empty!") + if(HAS_TRAIT(user, TRAIT_INFERIORFORM)) //monkeys + to_chat(user, "You don't have the upper body strength to hold this in two hands!") + else + to_chat(user, "You need your other hand to be empty!") return if(user.usable_hands < 2) if(require_twohands) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index affaee1538536..d397808b99c97 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -61,7 +61,17 @@ else target_zone = check_zone(target_zone) - if(ishuman(src)) + + + if(ismonkey(src)) + var/mob/living/carbon/human/M = src + switch(target_zone) + if(BODY_ZONE_HEAD) + if(M.wear_mask && isobj(M.wear_mask)) + Cl = M.wear_mask + passed = prob((Cl.permeability_coefficient*100) - 1) + + else if(ishuman(src)) var/mob/living/carbon/human/H = src switch(target_zone) @@ -99,14 +109,6 @@ Cl = H.shoes passed = prob((Cl.permeability_coefficient*100) - 1) - else if(ismonkey(src)) - var/mob/living/carbon/monkey/M = src - switch(target_zone) - if(BODY_ZONE_HEAD) - if(M.wear_mask && isobj(M.wear_mask)) - Cl = M.wear_mask - passed = prob((Cl.permeability_coefficient*100) - 1) - if(passed) D.try_infect(src) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 3903f5cb097c5..5f2db993dc306 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -23,7 +23,7 @@ agent = "advance microbes" max_stages = 5 spread_text = "Unknown" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/monkey/tumor) + viable_mobtypes = list(/mob/living/carbon/human) /// last player to modify the disease. var/last_modified_by = "no CKEY" diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index d039923f63231..9b00e69e1d4a6 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -7,7 +7,7 @@ cure_text = "Ethanol" cures = list(/datum/reagent/consumable/ethanol) agent = "Excess Lepidopticides" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + viable_mobtypes = list(/mob/living/carbon/human) desc = "If left untreated subject will regurgitate butterflies." danger = DISEASE_MINOR diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index b26618640fefe..1fd6701d7ce0a 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -7,7 +7,7 @@ cure_text = "Sugar" cures = list(/datum/reagent/consumable/sugar) agent = "Apidae Infection" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + viable_mobtypes = list(/mob/living/carbon/human) desc = "If left untreated subject will regurgitate bees." danger = DISEASE_MEDIUM infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD) //bees nesting in corpses diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 0e2254d6d9450..05ea3dd306b1a 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -4,7 +4,7 @@ cure_text = "Rest & Spaceacillin" cures = list(/datum/reagent/medicine/spaceacillin) agent = "XY-rhinovirus" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.5 desc = "If left untreated, the subject will contract the flu." danger = DISEASE_NONTHREAT diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index cb7776969c7c7..caf085b354934 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -6,7 +6,7 @@ cure_text = "Synaptizine & Sulfur" cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur) agent = "Gravitokinetic Bipotential SADS-" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + viable_mobtypes = list(/mob/living/carbon/human) desc = "If left untreated death will occur." danger = DISEASE_BIOHAZARD diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index 9989f839c5a9b..14987e350e9a8 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -6,7 +6,7 @@ cures = list(/datum/reagent/medicine/spaceacillin) cure_chance = 10 agent = "H13N1 flu virion" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 desc = "If left untreated the subject will feel quite unwell." danger = DISEASE_MINOR diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 984492979b8e2..9ef81ddd5ac83 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -5,7 +5,7 @@ spread_flags = DISEASE_SPREAD_SPECIAL cure_text = "A coder's love (theoretical)." agent = "Shenanigans" - viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/alien) + viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/alien) danger = DISEASE_BIOHAZARD stage_prob = 10 visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC diff --git a/code/datums/dna.dm b/code/datums/dna.dm index cb5f1b1cd4bd9..0e23dfd8db781 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -18,12 +18,12 @@ var/scrambled = FALSE //Did we take something like mutagen? In that case we cant get our genes scanned to instantly cheese all the powers. var/current_body_size = BODY_SIZE_NORMAL //Holder for the displacement appearance, related to species height - var/icon/height_displacement + var/atom/movable/height_displacement_holder/height_displacement_holder /datum/dna/New(mob/living/new_holder) if(istype(new_holder)) holder = new_holder - height_displacement = icon('icons/effects/64x64.dmi', "height_displacement") + update_height_holder() /datum/dna/Destroy() if(iscarbon(holder)) @@ -32,7 +32,7 @@ cholder.dna = null holder?.remove_filter("species_height_displacement") holder = null - QDEL_NULL(height_displacement) + QDEL_NULL(height_displacement_holder) if(delete_species) QDEL_NULL(species) @@ -56,7 +56,7 @@ if(transfer_SE) destination.dna.mutation_index = mutation_index destination.dna.default_mutation_genes = default_mutation_genes - for(var/datum/mutation/M as() in mutations) + for(var/datum/mutation/human/M as() in mutations) if(!istype(M, RACEMUT)) destination.dna.add_mutation(M, M.class) @@ -69,7 +69,7 @@ new_dna.features = features.Copy() new_dna.species = new species.type new_dna.real_name = real_name - new_dna.update_body_size() //Must come after features.Copy() + new_dna.update_body_size(TRUE) //Must come after features.Copy() new_dna.mutations = mutations.Copy() /datum/dna/proc/compare_dna(datum/dna/other) @@ -84,8 +84,8 @@ //See mutation.dm for what 'class' does. 'time' is time till it removes itself in decimals. 0 for no timer /datum/dna/proc/add_mutation(mutation, class = MUT_OTHER, time) var/mutation_type = mutation - if(istype(mutation, /datum/mutation)) - var/datum/mutation/HM = mutation + if(istype(mutation, /datum/mutation/human)) + var/datum/mutation/human/HM = mutation mutation_type = HM.type if(get_mutation(mutation_type)) return @@ -104,7 +104,7 @@ /datum/dna/proc/remove_mutation_group(list/group, list/classes = list(MUT_NORMAL, MUT_EXTRA, MUT_OTHER), mutadone = FALSE) if(!group) return - for(var/datum/mutation/HM as() in group) + for(var/datum/mutation/human/HM as() in group) if((HM.class in classes) && !(HM.mutadone_proof && mutadone)) force_lose(HM) @@ -150,14 +150,10 @@ mutation_index.Cut() default_mutation_genes.Cut() shuffle_inplace(mutations_temp) - if(ismonkey(holder)) - mutations |= new RACEMUT(MUT_NORMAL) - mutation_index[RACEMUT] = GET_SEQUENCE(RACEMUT) - else - mutation_index[RACEMUT] = create_sequence(RACEMUT, FALSE) + mutation_index[RACEMUT] = create_sequence(RACEMUT, FALSE) default_mutation_genes[RACEMUT] = mutation_index[RACEMUT] for(var/i in 2 to DNA_MUTATION_BLOCKS) - var/datum/mutation/M = mutations_temp[i] + var/datum/mutation/human/M = mutations_temp[i] mutation_index[M.type] = create_sequence(M.type, FALSE, M.difficulty) default_mutation_genes[M.type] = mutation_index[M.type] shuffle_inplace(mutation_index) @@ -173,7 +169,7 @@ //Used to create a chipped gene sequence /proc/create_sequence(mutation, active, difficulty) if(!difficulty) - var/datum/mutation/A = GET_INITIALIZED_MUTATION(mutation) //leaves the possibility to change difficulty mid-round + var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(mutation) //leaves the possibility to change difficulty mid-round if(!A) return difficulty = A.difficulty @@ -227,7 +223,7 @@ setblock(uni_identity, blocknumber, construct_block(GLOB.hair_gradients_list.Find(H.gradient_style), GLOB.hair_gradients_list.len)) //Please use add_mutation or activate_mutation instead -/datum/dna/proc/force_give(datum/mutation/HM) +/datum/dna/proc/force_give(datum/mutation/human/HM) if(holder && HM) if(HM.class == MUT_NORMAL) set_se(TRUE, HM) @@ -237,10 +233,11 @@ update_instability() //Use remove_mutation instead -/datum/dna/proc/force_lose(datum/mutation/HM) +/datum/dna/proc/force_lose(datum/mutation/human/HM) if(holder && (HM in mutations)) set_se(FALSE, HM) . = HM.on_losing(holder) + qdel() update_instability(FALSE) return @@ -252,7 +249,7 @@ /datum/dna/proc/update_instability(alert=TRUE) stability = 100 - for(var/datum/mutation/M as() in mutations) + for(var/datum/mutation/human/M as() in mutations) if(M.class == MUT_EXTRA) stability -= M.instability * GET_MUTATION_STABILIZER(M) if(holder) @@ -301,22 +298,20 @@ return /////////////////////////// DNA MOB-PROCS ////////////////////// -/datum/dna/proc/update_body_size(force) +/datum/dna/proc/update_body_size(force, height) + update_height_holder() var/list/heights = species?.get_species_height() if((!holder || !features["body_size"] || !length(heights)) && !force) return - - var/desired_size = heights[features["body_size"]] - + var/desired_size = height || heights[features["body_size"]] if(desired_size == current_body_size && !force) return - //Weird little fix - if height < 0, our guy gets cut off!! We can fix this by layering an invisible 64x64 icon, aka the displacement holder.remove_filter("height_cutoff_fix") - holder.add_filter("height_cutoff_fix", 1, layering_filter(icon = height_displacement, color = "#ffffff00")) + holder.add_filter("height_cutoff_fix", 1, layering_filter(render_source = height_displacement_holder.render_target, color = "#ffffff00")) //Build / setup displacement filter holder.remove_filter("species_height_displacement") - holder.add_filter("species_height_displacement", 1.1, displacement_map_filter(icon = height_displacement, y = 8, size = desired_size)) + holder.add_filter("species_height_displacement", 1.1, displacement_map_filter(render_source = height_displacement_holder.render_target, y = 8, size = desired_size)) /mob/proc/set_species(datum/species/mrace, icon_update = 1) return @@ -328,7 +323,6 @@ else stored_dna.species = mrace //not calling any species update procs since we're a brain, not a monkey/human - /mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) if(mrace && has_dna()) var/datum/species/new_race @@ -401,7 +395,7 @@ update_mutations_overlay() if(LAZYLEN(mutations)) - for(var/datum/mutation/HM as() in mutations) + for(var/datum/mutation/human/HM as() in mutations) if(HM.allow_transfer || force_transfer_mutations) dna.force_give(new HM.type(HM.class, copymut=HM)) //using force_give since it may include exotic mutations that otherwise wont be handled properly @@ -460,13 +454,12 @@ return for(var/mutation in dna.mutation_index) - if(ismob(dna.check_block(mutation))) - return //we got monkeyized/humanized, this mob will be deleted, no need to continue. + dna.check_block(mutation) update_mutations_overlay() /datum/dna/proc/check_block(mutation) - var/datum/mutation/HM = get_mutation(mutation) + var/datum/mutation/human/HM = get_mutation(mutation) if(check_block_string(mutation)) if(!HM) . = add_mutation(mutation, MUT_NORMAL) @@ -475,7 +468,7 @@ //Return the active mutation of a type if there is one /datum/dna/proc/get_mutation(A) - for(var/datum/mutation/HM in mutations) + for(var/datum/mutation/human/HM in mutations) if(HM.type == A) return HM @@ -487,7 +480,7 @@ /datum/dna/proc/is_gene_active(mutation) return (mutation_index[mutation] == GET_SEQUENCE(mutation)) -/datum/dna/proc/set_se(on=TRUE, datum/mutation/HM) +/datum/dna/proc/set_se(on=TRUE, datum/mutation/human/HM) if(!HM || !(HM.type in mutation_index) || (LAZYLEN(mutation_index) < DNA_MUTATION_BLOCKS)) return . = TRUE @@ -502,8 +495,8 @@ if(!mutation) return FALSE var/mutation_type = mutation - if(istype(mutation, /datum/mutation)) - var/datum/mutation/M = mutation + if(istype(mutation, /datum/mutation/human)) + var/datum/mutation/human/M = mutation mutation_type = M.type if(!mutation_in_sequence(mutation_type)) //cant activate what we dont have, use add_mutation return FALSE @@ -531,8 +524,8 @@ /datum/dna/proc/mutation_in_sequence(mutation) if(!mutation) return - if(istype(mutation, /datum/mutation)) - var/datum/mutation/HM = mutation + if(istype(mutation, /datum/mutation/human)) + var/datum/mutation/human/HM = mutation if(HM.type in mutation_index) return TRUE else if(mutation in mutation_index) @@ -556,7 +549,7 @@ if(quality & MINOR_NEGATIVE) mutations += GLOB.not_good_mutations var/list/possible = list() - for(var/datum/mutation/A as() in mutations) + for(var/datum/mutation/human/A as() in mutations) if((!sequence || dna.mutation_in_sequence(A.type)) && !dna.get_mutation(A.type)) possible += A.type if(exclude_monkey) @@ -565,7 +558,7 @@ var/mutation = pick(possible) . = dna.activate_mutation(mutation) if(scrambled) - var/datum/mutation/HM = dna.get_mutation(mutation) + var/datum/mutation/human/HM = dna.get_mutation(mutation) if(HM) HM.scrambled = TRUE return TRUE @@ -714,3 +707,19 @@ qdel(eyes) visible_message("[src] looks up and their eyes melt away!", "I understand now.") addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20) + +/datum/dna/proc/update_height_holder() + if(!height_displacement_holder) + height_displacement_holder = new() + height_displacement_holder.AddComponent(/datum/component/anchor, holder) + //Update the icon, just in-case we changed species or whatever, also becuase of species delay in general //TODO: make sure this isn't expensive with changing clothes - Racc + height_displacement_holder.appearance = species?.get_species_height_map() || icon('icons/effects/64x64.dmi', "height_displacement") + //ALL our important visual stuff gets reset when we update appearance, so we have to set it back + height_displacement_holder.vis_flags = VIS_UNDERLAY | VIS_INHERIT_DIR + height_displacement_holder.appearance_flags = TILE_BOUND | PIXEL_SCALE | RESET_TRANSFORM | RESET_COLOR + height_displacement_holder.plane = PLANE_SPACE + height_displacement_holder.layer = 0 + height_displacement_holder.render_target = "*[REF(height_displacement_holder)]" + +//Throw any extras you want in here when we eventually do more custom stuff +/atom/movable/height_displacement_holder diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index e5d98218dbf6d..38559abaade86 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -108,9 +108,6 @@ if(HAS_TRAIT(equipping, TRAIT_NODROP)) to_chat(user, "You can't put [equipping] on [source], it's stuck to your hand!") return FALSE - //This is important due to the fact otherwise it will be equipped without a proper existing icon, because it's forced on through the strip menu - if(ismonkey(source)) - equipping.compile_monkey_icon() return TRUE /// Start the equipping process. This is the proc you should yield in. diff --git a/code/datums/mapgen/biomes/_biome.dm b/code/datums/mapgen/biomes/_biome.dm index e1e1f7e11988b..f84b239e6d537 100644 --- a/code/datums/mapgen/biomes/_biome.dm +++ b/code/datums/mapgen/biomes/_biome.dm @@ -134,7 +134,7 @@ /mob/living/simple_animal/hostile/lizard, /mob/living/simple_animal/parrot, /mob/living/simple_animal/sloth, - /mob/living/carbon/monkey + /mob/living/carbon/human/species/monkey ) /datum/biome/grassclearing diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm index 842aaddb8aba4..f8e474d5f28b2 100644 --- a/code/datums/mutations/_combined.dm +++ b/code/datums/mutations/_combined.dm @@ -14,17 +14,17 @@ /* RECIPES */ /datum/generecipe/hulk - required = "/datum/mutation/strong; /datum/mutation/radioactive" + required = "/datum/mutation/human/strong; /datum/mutation/human/radioactive" result = HULK /datum/generecipe/shock - required = "/datum/mutation/insulated; /datum/mutation/radioactive" + required = "/datum/mutation/human/insulated; /datum/mutation/human/radioactive" result = SHOCKTOUCH /datum/generecipe/antiglow - required = "/datum/mutation/glow; /datum/mutation/void" + required = "/datum/mutation/human/glow; /datum/mutation/human/void" result = ANTIGLOWY /datum/generecipe/cluwne - required = "/datum/mutation/clumsy; /datum/mutation/badblink" + required = "/datum/mutation/human/clumsy; /datum/mutation/human/badblink" result = CLUWNEMUT diff --git a/code/datums/mutations.dm b/code/datums/mutations/_mutations.dm similarity index 61% rename from code/datums/mutations.dm rename to code/datums/mutations/_mutations.dm index 4de7dbca16153..d9e0cda8cda9e 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -1,57 +1,98 @@ /datum/mutation - var/name = "mutation" + var/name + +/datum/mutation/human + name = "mutation" + /// Description of the mutation var/desc = "A mutation." + /// Is this mutation currently locked? var/locked + /// Quality of the mutation var/quality + /// Visual indicators upon the character of the owner of this mutation var/static/list/visual_indicators = list() + /// The path of action we grant to our user on mutation gain var/obj/effect/proc_holder/spell/power /// A list of traits to apply to the user whenever this mutation is active. var/list/traits - var/layer_used = MUTATIONS_LAYER //which mutation layer to use - var/list/species_allowed = list() //to restrict mutation to only certain species - var/list/mobtypes_allowed = list() //to restrict mutation to only certain mobs - var/health_req //minimum health required to acquire the mutation - var/limb_req //required limbs to acquire this mutation + /// which mutation layer to use + var/layer_used = MUTATIONS_LAYER + /// To restrict mutation to only certain species + var/list/species_allowed = list() + /// To restrict mutation to only certain mobs + var/list/mobtypes_allowed = list() + /// Minimum health required to acquire the mutation + var/health_req + /// Required limbs to acquire this mutation + var/limb_req + /// The owner of this mutation's DNA var/datum/dna/dna + /// Owner of this mutation var/mob/living/carbon/owner - var/instability = 0 //instability the holder gets when the mutation is not native - var/blocks = 4 //Amount of those big blocks with gene sequences - var/difficulty = 8 //Amount of missing sequences. Sometimes it removes an entire pair for 2 points - var/timed = FALSE //Boolean to easily check if we're going to self-destruct - var/alias //'Mutation #49', decided every round to get some form of distinction between undiscovered mutations - var/scrambled = FALSE //Wheter we can read it if it's active. To avoid cheesing with mutagen - var/class //Decides player accesibility, sorta - var/list/conflicts //any mutations that might conflict. put mutation typepath defines in here. make sure to enter it both ways (so that A conflicts with B, and B with A) - var/allow_transfer //Do we transfer upon cloning? + /// Instability the holder gets when the mutation is not native + var/instability = 0 + /// Amount of those big blocks with gene sequences + var/blocks = 4 + /// Amount of missing sequences. Sometimes it removes an entire pair for 2 points + var/difficulty = 8 + //Boolean to easily check if we're going to self-destruct + var/timed = FALSE + /// 'Mutation #49', decided every round to get some form of distinction between undiscovered mutations + var/alias + /// Whether we can read it if it's active. To avoid cheesing with mutagen + var/scrambled = FALSE + /// The class of mutation (MUT_NORMAL, MUT_EXTRA, MUT_OTHER) + var/class + /** + * any mutations that might conflict. + * put mutation typepath defines in here. + * make sure to enter it both ways (so that A conflicts with B, and B with A) + */ + var/list/conflicts + //Do we transfer upon cloning? + var/allow_transfer //MUT_NORMAL - A mutation that can be activated and deactived by completing a sequence //MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console //MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate - var/list/valid_chrom_list = list() //List of strings of valid chromosomes this mutation can accept. - - var/can_chromosome = CHROMOSOME_NONE //can we take chromosomes? 0: CHROMOSOME_NEVER never, 1:CHROMOSOME_NONE yeah, 2: CHROMOSOME_USED no, already have one - var/chromosome_name //purely cosmetic - var/modified = FALSE //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers + /** + * can we take chromosomes? + * 0: CHROMOSOME_NEVER never + * 1: CHROMOSOME_NONE yeah + * 2: CHROMOSOME_USED no, already have one + */ + var/can_chromosome = CHROMOSOME_NONE + /// Name of the chromosome + var/chromosome_name + /// Has the chromosome been modified + var/modified = FALSE //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers + /// Is this mutation mutadone proof var/mutadone_proof = FALSE //Chromosome stuff - set to -1 to prevent people from changing it. Example: It'd be a waste to decrease cooldown on mutism - var/stabilizer_coeff = 1 //genetic stability coeff - var/synchronizer_coeff = -1 //makes the mutation hurt the user less - var/power_coeff = -1 //boosts mutation strength - var/energy_coeff = -1 //lowers mutation cooldown - -/datum/mutation/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) + /// genetic stability coeff + var/stabilizer_coeff = 1 + /// Makes the mutation hurt the user less + var/synchronizer_coeff = -1 + /// Boosts mutation strength + var/power_coeff = -1 + /// Lowers mutation cooldown + var/energy_coeff = -1 + /// List of strings of valid chromosomes this mutation can accept. + var/list/valid_chrom_list = list() + +/datum/mutation/human/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) . = ..() class = class_ if(timer) addtimer(CALLBACK(src, PROC_REF(remove)), timer) timed = TRUE - if(copymut && istype(copymut, /datum/mutation)) + if(copymut && istype(copymut, /datum/mutation/human)) copy_mutation(copymut) if(traits && !islist(traits)) traits = list(traits) -/datum/mutation/proc/on_acquiring(mob/living/carbon/C) +/datum/mutation/human/proc/on_acquiring(mob/living/carbon/C) if(!istype(C) || C.stat == DEAD || !C.has_dna() || (src in C.dna.mutations)) return TRUE if(length(mobtypes_allowed) && !mobtypes_allowed.Find(C.type)) @@ -62,7 +103,7 @@ return TRUE if(limb_req && !C.get_bodypart(limb_req)) return TRUE - for(var/datum/mutation/M as() in C.dna.mutations)//check for conflicting powers + for(var/datum/mutation/human/M as() in C.dna.mutations)//check for conflicting powers if(!(M.type in conflicts) && !(type in M.conflicts)) continue to_chat(C, "You feel your genes resisting something.") @@ -87,23 +128,23 @@ for(var/trait in traits) ADD_TRAIT(C, trait, "[type]") -/datum/mutation/proc/get_visual_indicator() +/datum/mutation/human/proc/get_visual_indicator() return -/datum/mutation/proc/on_attack_hand(atom/target, proximity) +/datum/mutation/human/proc/on_attack_hand(atom/target, proximity) return -/datum/mutation/proc/on_ranged_attack(atom/target) +/datum/mutation/human/proc/on_ranged_attack(atom/target) return -/datum/mutation/proc/on_move(new_loc) +/datum/mutation/human/proc/on_move(new_loc) SIGNAL_HANDLER return -/datum/mutation/proc/on_life() +/datum/mutation/human/proc/on_life() return -/datum/mutation/proc/on_losing(mob/living/carbon/owner) +/datum/mutation/human/proc/on_losing(mob/living/carbon/owner) if(istype(owner) && (owner.dna.mutations.Remove(src))) if(length(visual_indicators)) var/list/mut_overlay = list() @@ -124,7 +165,7 @@ /mob/living/carbon/proc/update_mutations_overlay() if(!has_dna()) return - for(var/datum/mutation/CM as() in dna.mutations) + for(var/datum/mutation/human/CM as() in dna.mutations) if(length(CM.mobtypes_allowed) && !CM.mobtypes_allowed.Find(src.type)) dna.force_lose(CM) continue @@ -144,14 +185,14 @@ overlays_standing[CM.layer_used] = mut_overlay apply_overlay(CM.layer_used) -/datum/mutation/proc/modify() //called when a genome is applied so we can properly update some stats without having to remove and reapply the mutation from someone +/datum/mutation/human/proc/modify() //called when a genome is applied so we can properly update some stats without having to remove and reapply the mutation from someone if(modified || !power || !owner) return power.charge_max *= GET_MUTATION_ENERGY(src) power.charge_counter *= GET_MUTATION_ENERGY(src) modified = TRUE -/datum/mutation/proc/copy_mutation(datum/mutation/HM) +/datum/mutation/human/proc/copy_mutation(datum/mutation/human/HM) if(!istype(HM)) return chromosome_name = HM.chromosome_name @@ -163,7 +204,7 @@ can_chromosome = HM.can_chromosome valid_chrom_list = HM.valid_chrom_list -/datum/mutation/proc/remove_chromosome() +/datum/mutation/human/proc/remove_chromosome() stabilizer_coeff = initial(stabilizer_coeff) synchronizer_coeff = initial(synchronizer_coeff) power_coeff = initial(power_coeff) @@ -172,13 +213,13 @@ can_chromosome = initial(can_chromosome) chromosome_name = null -/datum/mutation/proc/remove() +/datum/mutation/human/proc/remove() if(dna) dna.force_lose(src) else qdel(src) -/datum/mutation/proc/grant_spell() +/datum/mutation/human/proc/grant_spell() if(!ispath(power) || !owner) return FALSE @@ -193,7 +234,7 @@ // Runs through all the coefficients and uses this to determine which chromosomes the // mutation can take. Stores these as text strings in a list. -/datum/mutation/proc/update_valid_chromosome_list() +/datum/mutation/human/proc/update_valid_chromosome_list() valid_chrom_list.Cut() if(can_chromosome == CHROMOSOME_NEVER) diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index a086dc49f19d3..23e1ad93d5f79 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -1,4 +1,4 @@ -/datum/mutation/telepathy +/datum/mutation/human/telepathy name = "Telepathy" desc = "A rare mutation that allows the user to telepathically communicate to others." quality = POSITIVE @@ -6,7 +6,7 @@ power = /obj/effect/proc_holder/spell/targeted/telepathy instability = 10 -/datum/mutation/olfaction +/datum/mutation/human/olfaction name = "Transcendent Olfaction" desc = "Your sense of smell is comparable to that of a canine." quality = POSITIVE @@ -73,7 +73,7 @@ if(direction_text) to_chat(user,"You consider [tracking_target]'s scent. The trail leads [direction_text].") -/datum/mutation/firebreath +/datum/mutation/human/firebreath name = "Fire Breath" desc = "An ancient mutation that gives lizards breath of fire." quality = POSITIVE @@ -85,7 +85,7 @@ power_coeff = 1 species_allowed = list(SPECIES_LIZARD) -/datum/mutation/firebreath/modify() +/datum/mutation/human/firebreath/modify() ..() if(power) var/obj/effect/proc_holder/spell/aimed/firebreath/firebreath = power @@ -133,7 +133,7 @@ exp_fire = 4 magic = FALSE -/datum/mutation/void +/datum/mutation/human/void name = "Void Magnet" desc = "A rare genome that attracts odd forces not usually observed." quality = MINOR_NEGATIVE //upsides and downsides @@ -142,7 +142,7 @@ energy_coeff = 1 synchronizer_coeff = 1 -/datum/mutation/void/on_life() +/datum/mutation/human/void/on_life() if(!isturf(owner.loc)) return if(prob((0.5 + ((100 - dna.stability) / 20))) * GET_MUTATION_SYNCHRONIZER(src)) //very rare, but enough to annoy you hopefully. +0.5 probability for every 10 points lost in stability @@ -167,7 +167,7 @@ . = ..() new /obj/effect/immortality_talisman/void(get_turf(user), user) -/datum/mutation/self_amputation +/datum/mutation/human/self_amputation name = "Autotomy" desc = "Allows a creature to voluntary discard a random appendage." quality = POSITIVE @@ -196,7 +196,7 @@ var/obj/item/bodypart/yeeted_limb = pick(parts) yeeted_limb.dismember() -/datum/mutation/overload +/datum/mutation/human/overload name = "Overload" desc = "Allows an Ethereal to overload their skin to cause a bright flash." quality = POSITIVE @@ -207,7 +207,7 @@ energy_coeff = 1 power_coeff = 1 -/datum/mutation/overload/modify() +/datum/mutation/human/overload/modify() ..() if(power) var/static/max_range = min(getviewsize(world.view)[1], getviewsize(world.view)[2]) - 2 @@ -236,13 +236,13 @@ if(C.flash_act(1)) C.Paralyze(10 + (5*max_distance)) -/datum/mutation/overload/modify() +/datum/mutation/human/overload/modify() if(power) var/obj/effect/proc_holder/spell/self/overload/S = power S.max_distance = 4 * GET_MUTATION_POWER(src) //Psyphoza species mutation -/datum/mutation/spores +/datum/mutation/human/spores name = "Agaricale Pores" //Pores, not spores desc = "An ancient mutation that gives psyphoza the ability to produce spores." quality = POSITIVE @@ -291,7 +291,7 @@ holder.clear_reagents() //Diona species mutation -/datum/mutation/drone +/datum/mutation/human/drone name = "Nymph Drone" desc = "An ancient mutation that gives diona the ability to send out a nymph drone." quality = POSITIVE diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm index 237b1d64e372b..15d7bd78b42f3 100644 --- a/code/datums/mutations/antenna.dm +++ b/code/datums/mutations/antenna.dm @@ -1,4 +1,4 @@ -/datum/mutation/antenna +/datum/mutation/human/antenna name = "Antenna" desc = "The affected person sprouts an antenna. This is known to allow them to access common radio channels passively." quality = POSITIVE @@ -7,26 +7,26 @@ layer_used = BODY_LAYER var/datum/weakref/radio_weakref -/datum/mutation/antenna/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/antenna/on_acquiring(mob/living/carbon/owner) if(..()) return var/obj/item/implant/radio/antenna/linked_radio = new(owner) linked_radio.implant(owner, null, TRUE, TRUE) radio_weakref = WEAKREF(linked_radio) -/datum/mutation/antenna/on_losing(mob/living/carbon/owner) +/datum/mutation/human/antenna/on_losing(mob/living/carbon/owner) if(..()) return var/obj/item/implant/radio/antenna/linked_radio = radio_weakref.resolve() if(linked_radio) QDEL_NULL(linked_radio) -/datum/mutation/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) +/datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) ..() if(!(type in visual_indicators)) visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna")) -/datum/mutation/antenna/get_visual_indicator() +/datum/mutation/human/antenna/get_visual_indicator() return visual_indicators[type][1] /obj/item/implant/radio/antenna diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index f9a35479b9b8f..7c28adb77c180 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -1,14 +1,14 @@ //These mutations change your overall "form" somehow, like size //Epilepsy gives a very small chance to have a seizure every life tick, knocking you unconscious. -/datum/mutation/epilepsy +/datum/mutation/human/epilepsy name = "Epilepsy" desc = "A genetic defect that sporadically causes seizures." quality = NEGATIVE synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/epilepsy/on_life() +/datum/mutation/human/epilepsy/on_life() if(prob(1 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS) owner.visible_message("[owner] starts having a seizure!", "You have a seizure!") owner.Unconscious(200 * GET_MUTATION_POWER(src)) @@ -16,19 +16,19 @@ SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy) addtimer(CALLBACK(src, PROC_REF(jitter_less)), 9 SECONDS) -/datum/mutation/epilepsy/proc/jitter_less() +/datum/mutation/human/epilepsy/proc/jitter_less() if(owner) owner.jitteriness = 10 //Unstable DNA induces random mutations! -/datum/mutation/bad_dna +/datum/mutation/human/bad_dna name = "Unstable DNA" desc = "Strange mutation that causes the holder to randomly mutate." quality = NEGATIVE locked = TRUE -/datum/mutation/bad_dna/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/owner) if(..()) return var/mob/new_mob @@ -46,14 +46,14 @@ //Cough gives you a chronic cough that causes you to drop items. -/datum/mutation/cough +/datum/mutation/human/cough name = "Cough" desc = "A chronic cough." quality = MINOR_NEGATIVE synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/cough/on_life() +/datum/mutation/human/cough/on_life() if(prob(5 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS) owner.drop_all_held_items() owner.emote("cough") @@ -62,19 +62,19 @@ var/turf/target = get_ranged_target_turf(owner, turn(owner.dir, 180), cough_range) owner.throw_at(target, cough_range, GET_MUTATION_POWER(src)) -/datum/mutation/paranoia +/datum/mutation/human/paranoia name = "Paranoia" desc = "Subject is easily terrified, and may suffer from hallucinations." quality = NEGATIVE -/datum/mutation/paranoia/on_life() +/datum/mutation/human/paranoia/on_life() if(prob(5) && owner.stat == CONSCIOUS) owner.emote("scream") if(prob(25)) owner.hallucination += 20 //Dwarfism shrinks your body and lets you pass tables. -/datum/mutation/dwarfism +/datum/mutation/human/dwarfism name = "Dwarfism" desc = "A mutation believed to be the cause of dwarfism." quality = POSITIVE @@ -83,7 +83,7 @@ conflicts = list(GIGANTISM) locked = TRUE // Default intert species for now, so locked from regular pool. -/datum/mutation/dwarfism/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/owner) if(..()) return owner.resize = 0.8 @@ -91,7 +91,7 @@ passtable_on(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") -/datum/mutation/dwarfism/on_losing(mob/living/carbon/owner) +/datum/mutation/human/dwarfism/on_losing(mob/living/carbon/owner) if(..()) return owner.resize = 1.25 @@ -101,20 +101,20 @@ //Clumsiness has a very large amount of small drawbacks depending on item. -/datum/mutation/clumsy +/datum/mutation/human/clumsy name = "Clumsiness" desc = "A genome that inhibits certain brain functions, causing the holder to appear clumsy. Honk" quality = MINOR_NEGATIVE traits = TRAIT_CLUMSY //Tourettes causes you to randomly stand in place and shout. -/datum/mutation/tourettes +/datum/mutation/human/tourettes name = "Tourette's Syndrome" desc = "A chronic twitch that forces the user to scream bad words." //definitely needs rewriting quality = NEGATIVE synchronizer_coeff = 1 -/datum/mutation/tourettes/on_life() +/datum/mutation/human/tourettes/on_life() if(prob(10 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS && !owner.IsStun()) owner.Stun(20) switch(rand(1, 3)) @@ -131,37 +131,41 @@ //Deafness makes you deaf. -/datum/mutation/deaf +/datum/mutation/human/deaf name = "Deafness" desc = "The holder of this genome is completely deaf." quality = NEGATIVE traits = TRAIT_DEAF -/datum/mutation/deaf/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/deaf/on_acquiring(mob/living/carbon/owner) if(..()) return SEND_SOUND(owner, sound(null)) //Monified turns you into a monkey. -/datum/mutation/race +/datum/mutation/human/race name = "Monkified" desc = "A strange genome, believed to be what differentiates monkeys from humans." quality = NEGATIVE - mobtypes_allowed = list(/mob/living/carbon/human, /mob/living/carbon/monkey) locked = TRUE //Species specific, keep out of actual gene pool var/datum/species/original_species = /datum/species/human + var/original_name -/datum/mutation/race/on_acquiring(mob/living/carbon/human/owner) +/datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner) if(..()) return - original_species = owner.dna.species.type - . = owner.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE | TR_KEEPAI, FALSE, TRUE) - -/datum/mutation/race/on_losing(mob/living/carbon/monkey/owner) - if(istype(owner) && owner.stat != DEAD && !..()) - . = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE | TR_KEEPAI, TRUE, original_species) - -/datum/mutation/glow + if(!ismonkey(owner)) + original_species = owner.dna.species.type + original_name = owner.real_name + owner.fully_replace_character_name(null, "monkey ([rand(1,999)])") + . = owner.monkeyize() + +/datum/mutation/human/race/on_losing(mob/living/carbon/human/owner) + if(owner && owner.stat != DEAD && (owner.dna.mutations.Remove(src)) && ismonkey(owner)) + owner.fully_replace_character_name(null, original_name) + . = owner.humanize(original_species) + +/datum/mutation/human/glow name = "Glowy" desc = "You permanently emit a light with a random color and intensity." quality = POSITIVE @@ -173,7 +177,7 @@ var/glow_color var/obj/effect/dummy/lighting_obj/moblight/glow -/datum/mutation/glow/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/glow/on_acquiring(mob/living/carbon/owner) . = ..() if(.) return @@ -181,43 +185,43 @@ glow = owner.mob_light() modify() -/datum/mutation/glow/modify() +/datum/mutation/human/glow/modify() if(!glow) return glow.set_light_range_power_color(glow_range * GET_MUTATION_POWER(src), glow_power, glow_color) /// Returns the color for the glow effect -/datum/mutation/glow/proc/glow_color() +/datum/mutation/human/glow/proc/glow_color() return pick(COLOR_RED, COLOR_BLUE, COLOR_YELLOW, COLOR_GREEN, COLOR_PURPLE, COLOR_ORANGE) -/datum/mutation/glow/on_losing(mob/living/carbon/owner) +/datum/mutation/human/glow/on_losing(mob/living/carbon/owner) . = ..() if(.) return QDEL_NULL(glow) /// Returns a color for the glow effect -/datum/mutation/glow/proc/get_glow_color() +/datum/mutation/human/glow/proc/get_glow_color() return pick(COLOR_RED, COLOR_BLUE, COLOR_YELLOW, COLOR_GREEN, COLOR_PURPLE, COLOR_ORANGE) -/datum/mutation/glow/anti +/datum/mutation/human/glow/anti name = "Anti-Glow" desc = "Your skin seems to attract and absorb nearby light creating 'darkness' around you." glow_power = -1.5 conflicts = list(GLOWY) locked = TRUE -/datum/mutation/glow/anti/get_glow_color() +/datum/mutation/human/glow/anti/get_glow_color() return COLOR_BLACK -/datum/mutation/strong +/datum/mutation/human/strong name = "Strength" desc = "The user's muscles slightly expand." quality = POSITIVE difficulty = 16 -/datum/mutation/insulated +/datum/mutation/human/insulated name = "Insulated" desc = "The affected person does not conduct electricity." quality = POSITIVE @@ -225,7 +229,7 @@ instability = 25 traits = TRAIT_SHOCKIMMUNE -/datum/mutation/fire +/datum/mutation/human/fire name = "Fiery Sweat" desc = "The user's skin will randomly combust, but is generally alot more resilient to burning." quality = NEGATIVE @@ -233,26 +237,26 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/fire/on_life() +/datum/mutation/human/fire/on_life() if(prob((1+(100-dna.stability)/10)) * GET_MUTATION_SYNCHRONIZER(src)) owner.adjust_fire_stacks(2 * GET_MUTATION_POWER(src)) owner.IgniteMob() -/datum/mutation/fire/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/fire/on_acquiring(mob/living/carbon/owner) if(..()) return if(ishuman(owner)) var/mob/living/carbon/human/H = owner H.physiology.burn_mod *= 0.5 -/datum/mutation/fire/on_losing(mob/living/carbon/owner) +/datum/mutation/human/fire/on_losing(mob/living/carbon/owner) if(..()) return if(ishuman(owner)) var/mob/living/carbon/human/H = owner H.physiology.burn_mod *= 2 -/datum/mutation/badblink +/datum/mutation/human/badblink name = "Spatial Instability" desc = "The victim of the mutation has a very weak link to spatial reality, and may be displaced. Often causes extreme nausea." quality = NEGATIVE @@ -263,7 +267,7 @@ power_coeff = 1 var/warpchance = 0 -/datum/mutation/badblink/on_life() +/datum/mutation/human/badblink/on_life() if(prob(warpchance)) var/warpmessage = pick( "With a sickening 720 degree twist of their back, [owner] vanishes into thin air.", @@ -280,14 +284,14 @@ else warpchance += 0.25 * GET_MUTATION_ENERGY(src) -/datum/mutation/acidflesh +/datum/mutation/human/acidflesh name = "Acidic Flesh" desc = "Subject has acidic chemicals building up underneath their skin. This is often lethal." quality = NEGATIVE difficulty = 18//high so it's hard to unlock and use on others COOLDOWN_DECLARE(message_cooldown) -/datum/mutation/acidflesh/on_life() +/datum/mutation/human/acidflesh/on_life() if(prob(25)) if(COOLDOWN_FINISHED(src, message_cooldown)) to_chat(owner, "Your acid flesh bubbles...") @@ -297,51 +301,51 @@ owner.visible_message("[owner]'s skin bubbles and pops.", "Your bubbling flesh pops! It burns!") playsound(owner, 'sound/weapons/sear.ogg', vol = 50, vary = TRUE) -/datum/mutation/gigantism +/datum/mutation/human/gigantism name = "Gigantism"//negative version of dwarfism desc = "The cells within the subject spread out to cover more area, making them appear larger." quality = MINOR_NEGATIVE difficulty = 12 conflicts = list(DWARFISM) -/datum/mutation/gigantism/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/owner) if(..()) return owner.resize = 1.25 owner.update_transform() owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") -/datum/mutation/gigantism/on_losing(mob/living/carbon/owner) +/datum/mutation/human/gigantism/on_losing(mob/living/carbon/owner) if(..()) return owner.resize = 0.8 owner.update_transform() owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") -/datum/mutation/spastic +/datum/mutation/human/spastic name = "Spastic" desc = "Subject suffers from muscle spasms." quality = NEGATIVE difficulty = 16 -/datum/mutation/spastic/on_acquiring() +/datum/mutation/human/spastic/on_acquiring() if(..()) return owner.apply_status_effect(STATUS_EFFECT_SPASMS) -/datum/mutation/spastic/on_losing() +/datum/mutation/human/spastic/on_losing() if(..()) return owner.remove_status_effect(STATUS_EFFECT_SPASMS) -/datum/mutation/extrastun +/datum/mutation/human/extrastun name = "Two Left Feet" desc = "A mutation that disrupts coordination in the legs. It makes standing up after getting knocked down very difficult." quality = NEGATIVE difficulty = 16 COOLDOWN_DECLARE(stun_cooldown) -/datum/mutation/extrastun/on_life() +/datum/mutation/human/extrastun/on_life() if(!COOLDOWN_FINISHED(src, stun_cooldown)) return var/knockdown = owner.AmountKnockdown() @@ -352,7 +356,7 @@ owner.visible_message("[owner] tries to stand up, but trips!", "You trip over your own feet!") COOLDOWN_START(src, stun_cooldown, 30 SECONDS) -/datum/mutation/strongwings +/datum/mutation/human/strongwings name = "Strengthened Wings" desc = "Subject's wing muscle volume rapidly increases." quality = POSITIVE @@ -362,7 +366,7 @@ power_coeff = 1 species_allowed = list(SPECIES_APID, SPECIES_MOTH) -/datum/mutation/strongwings/on_acquiring() +/datum/mutation/human/strongwings/on_acquiring() if(..()) return var/obj/item/organ/wings/wings = owner.getorganslot(ORGAN_SLOT_WINGS) @@ -381,7 +385,7 @@ return to_chat(owner, "Your wings feel stronger.") -/datum/mutation/strongwings/on_losing() +/datum/mutation/human/strongwings/on_losing() if(..()) return var/obj/item/organ/wings/wings = owner.getorganslot(ORGAN_SLOT_WINGS) @@ -397,12 +401,12 @@ bee_wings.jumpdist = initial(bee_wings.jumpdist) to_chat(owner, "Your wings feel weak.") -/datum/mutation/strongwings/modify() +/datum/mutation/human/strongwings/modify() ..() var/obj/item/organ/wings/bee/bee_wings = owner.getorganslot(ORGAN_SLOT_WINGS) if(istype(bee_wings)) bee_wings.jumpdist = initial(bee_wings.jumpdist) + (6 * GET_MUTATION_POWER(src)) - 3 -/datum/mutation/catclaws +/datum/mutation/human/catclaws name = "Cat Claws" desc = "Subject's hands grow sharpened claws." quality = POSITIVE @@ -413,7 +417,7 @@ species_allowed = list(SPECIES_FELINID) var/added_damage = 6 -/datum/mutation/catclaws/on_acquiring() +/datum/mutation/human/catclaws/on_acquiring() if(..()) return added_damage = min(17, initial(added_damage) * GET_MUTATION_POWER(src) + owner.dna.species.punchdamage) - owner.dna.species.punchdamage @@ -423,7 +427,7 @@ owner.dna.species.miss_sound = 'sound/weapons/slashmiss.ogg' to_chat(owner, "Claws extend from your fingertips.") -/datum/mutation/catclaws/on_losing() +/datum/mutation/human/catclaws/on_losing() if(..()) return to_chat(owner, " Your claws retract into your hand.") @@ -432,7 +436,7 @@ owner.dna.species.attack_sound = initial(owner.dna.species.attack_sound) owner.dna.species.miss_sound = initial(owner.dna.species.miss_sound) -/datum/mutation/catclaws/modify() +/datum/mutation/human/catclaws/modify() ..() if(added_damage) owner.dna.species.punchdamage -= added_damage diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 9c9e06915347c..ac3a9917f46b9 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -1,5 +1,5 @@ //Chameleon causes the owner to slowly become transparent when not moving. -/datum/mutation/chameleon +/datum/mutation/human/chameleon name = "Chameleon" desc = "A mutation that adapts the user's skin pigmentation to their environment. The adaptation has been observed to be most effective while the user is standing still." quality = POSITIVE @@ -9,26 +9,26 @@ /// How much the user's alpha is reduced every life tick they are not moving. var/effect_speed = 25 -/datum/mutation/chameleon/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/chameleon/on_acquiring(mob/living/carbon/owner) if(..()) return owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY -/datum/mutation/chameleon/on_losing(mob/living/carbon/owner) +/datum/mutation/human/chameleon/on_losing(mob/living/carbon/owner) if(..()) return owner.alpha = 255 -/datum/mutation/chameleon/on_life() +/datum/mutation/human/chameleon/on_life() owner.alpha = max(0, owner.alpha - effect_speed) -/datum/mutation/chameleon/on_move() +/datum/mutation/human/chameleon/on_move() owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY -/datum/mutation/chameleon/on_attack_hand(atom/target, proximity) +/datum/mutation/human/chameleon/on_attack_hand(atom/target, proximity) if(proximity) //stops tk from breaking chameleon owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY -/datum/mutation/chameleon/modify() +/datum/mutation/human/chameleon/modify() ..() effect_speed = round(initial(effect_speed) * GET_MUTATION_POWER(src)) diff --git a/code/datums/mutations/cluwne.dm b/code/datums/mutations/cluwne.dm index 318e5e63db173..0b9d819e29e65 100644 --- a/code/datums/mutations/cluwne.dm +++ b/code/datums/mutations/cluwne.dm @@ -1,10 +1,10 @@ -/datum/mutation/cluwne +/datum/mutation/human/cluwne name = "Cluwne" desc = "Turns a person into a Cluwne, a poor soul cursed to a short and miserable life by the honkmother." quality = NEGATIVE locked = TRUE -/datum/mutation/cluwne/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/cluwne/on_acquiring(mob/living/carbon/owner) if(..()) return owner.dna.add_mutation(CLOWNMUT) @@ -30,7 +30,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cluwne(H), ITEM_SLOT_FEET) owner.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/white(owner), ITEM_SLOT_GLOVES) // ditto -/datum/mutation/cluwne/on_life() +/datum/mutation/human/cluwne/on_life() if(prob(15) && owner.IsUnconscious()) owner.setOrganLoss(ORGAN_SLOT_BRAIN, 199) switch(rand(1, 6)) @@ -43,7 +43,7 @@ owner.Knockdown(20) owner.Jitter(500) -/datum/mutation/cluwne/on_losing(mob/living/carbon/owner) +/datum/mutation/human/cluwne/on_losing(mob/living/carbon/owner) owner.adjust_fire_stacks(1) owner.IgniteMob() owner.dna.add_mutation(CLUWNEMUT) diff --git a/code/datums/mutations/cold.dm b/code/datums/mutations/cold.dm index be012a988cce0..ecdc520282ec1 100644 --- a/code/datums/mutations/cold.dm +++ b/code/datums/mutations/cold.dm @@ -1,4 +1,4 @@ -/datum/mutation/geladikinesis +/datum/mutation/human/geladikinesis name = "Geladikinesis" desc = "Allows the user to concentrate moisture and sub-zero forces into snow." quality = POSITIVE @@ -15,7 +15,7 @@ delete_old = FALSE action_icon_state = "snow" -/datum/mutation/wax_saliva +/datum/mutation/human/wax_saliva name = "Waxy Saliva" desc = "Allows the user to secrete wax." quality = POSITIVE @@ -33,7 +33,7 @@ delete_old = FALSE action_icon_state = "honey" -/datum/mutation/cryokinesis +/datum/mutation/human/cryokinesis name = "Cryokinesis" desc = "Draws negative energy from the sub-zero void to freeze surrounding temperatures at subject's will." quality = POSITIVE //upsides and downsides @@ -43,7 +43,7 @@ power_coeff = 1 power = /obj/effect/proc_holder/spell/aimed/cryo -/datum/mutation/cryokinesis/modify() +/datum/mutation/human/cryokinesis/modify() ..() if(power) var/obj/effect/proc_holder/spell/aimed/cryo/cryobeam = power diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 35b65db187607..9e107e6db6386 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -1,5 +1,5 @@ //Hulk turns your skin green, and allows you to punch through walls. -/datum/mutation/hulk +/datum/mutation/human/hulk name = "Hulk" desc = "A poorly understood genome that causes the holder's muscles to expand, inhibit speech and gives the person a bad skin condition." quality = POSITIVE @@ -20,30 +20,30 @@ TRAIT_FAST_CUFF_REMOVAL ) -/datum/mutation/hulk/on_acquiring(mob/living/carbon/human/owner) +/datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner) if(..()) return SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk) RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) owner.update_body_parts() -/datum/mutation/hulk/on_attack_hand(atom/target, proximity) +/datum/mutation/human/hulk/on_attack_hand(atom/target, proximity) if(proximity) //no telekinetic hulk attack return target.attack_hulk(owner) -/datum/mutation/hulk/on_life() +/datum/mutation/human/hulk/on_life() if(owner.health < 0) on_losing(owner) to_chat(owner, "You suddenly feel very weak.") -/datum/mutation/hulk/on_losing(mob/living/carbon/human/owner) +/datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner) if(..()) return SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk") owner.update_body_parts() UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/hulk/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/hulk/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER var/message = speech_args[SPEECH_MESSAGE] diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm index 2ede583cb1467..b3a83d2959049 100644 --- a/code/datums/mutations/radioactive.dm +++ b/code/datums/mutations/radioactive.dm @@ -1,4 +1,4 @@ -/datum/mutation/radioactive +/datum/mutation/human/radioactive name = "Radioactivity" desc = "A volatile mutation that causes the host to sent out deadly beta radiation. This affects both the hosts and their surroundings." quality = NEGATIVE @@ -6,13 +6,13 @@ difficulty = 8 power_coeff = 1 -/datum/mutation/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) +/datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) ..() if(!(type in visual_indicators)) visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation")) -/datum/mutation/radioactive/on_life() +/datum/mutation/human/radioactive/on_life() radiation_pulse(owner, 20 * GET_MUTATION_POWER(src)) -/datum/mutation/radioactive/get_visual_indicator() +/datum/mutation/human/radioactive/get_visual_indicator() return visual_indicators[type][1] diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index 67b4925fdfeed..7c41bbf7b314a 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -1,38 +1,38 @@ //Nearsightedness restricts your vision by several tiles. -/datum/mutation/nearsight +/datum/mutation/human/nearsight name = "Near Sightness" desc = "A hereditary mutation causing Myopia and poor vision." quality = MINOR_NEGATIVE -/datum/mutation/nearsight/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/owner) if(..()) return owner.become_nearsighted(GENETIC_MUTATION) -/datum/mutation/nearsight/on_losing(mob/living/carbon/owner) +/datum/mutation/human/nearsight/on_losing(mob/living/carbon/owner) if(..()) return owner.cure_nearsighted(GENETIC_MUTATION) //Blind makes you blind. Who knew? -/datum/mutation/blind +/datum/mutation/human/blind name = "Blindness" desc = "A hereditary mutation which renders the optic nerves of the individual inert, making them effectively blind. No amount of corrective surgery can fix this." quality = NEGATIVE -/datum/mutation/blind/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/blind/on_acquiring(mob/living/carbon/owner) if(..()) return owner.become_blind(GENETIC_MUTATION) -/datum/mutation/blind/on_losing(mob/living/carbon/owner) +/datum/mutation/human/blind/on_losing(mob/living/carbon/owner) if(..()) return owner.cure_blind(GENETIC_MUTATION) -/datum/mutation/thermal +/datum/mutation/human/thermal name = "Thermal Vision" desc = "The mutation enables the growth of Heat Pits in the eyes, not unlike those of a reptile, which can visually perceive the unique infrared thermal signature of living creatures." quality = POSITIVE @@ -41,18 +41,18 @@ locked = TRUE traits = TRAIT_THERMAL_VISION -/datum/mutation/thermal/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/thermal/on_acquiring(mob/living/carbon/owner) if(..()) return owner.update_sight() -/datum/mutation/thermal/on_losing(mob/living/carbon/owner) +/datum/mutation/human/thermal/on_losing(mob/living/carbon/owner) if(..()) return owner.update_sight() //X-ray Vision lets you see through walls. -/datum/mutation/thermal/x_ray +/datum/mutation/human/thermal/x_ray name = "X Ray Vision" desc = "A strange mutation that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb instability = 35 @@ -60,7 +60,7 @@ traits = TRAIT_XRAY_VISION //Laser Eyes lets you shoot lasers from your eyes! -/datum/mutation/laser_eyes +/datum/mutation/human/laser_eyes name = "Laser Eyes" desc = "A mutation that allows for the reflection of concentrated light from the back of the eyes." quality = POSITIVE @@ -69,14 +69,14 @@ layer_used = FRONT_MUTATIONS_LAYER limb_req = BODY_ZONE_HEAD -/datum/mutation/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) +/datum/mutation/human/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) ..() if(!(type in visual_indicators)) visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "lasereyes")) -/datum/mutation/laser_eyes/get_visual_indicator() +/datum/mutation/human/laser_eyes/get_visual_indicator() return visual_indicators[type][1] -/datum/mutation/laser_eyes/on_ranged_attack(atom/target, mouseparams) +/datum/mutation/human/laser_eyes/on_ranged_attack(atom/target, mouseparams) if(owner.a_intent == INTENT_HARM) owner.LaserEyes(target, mouseparams) diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm index 3b19fa3e9e622..5372bef1dd00b 100644 --- a/code/datums/mutations/space_adaptation.dm +++ b/code/datums/mutations/space_adaptation.dm @@ -1,5 +1,5 @@ //Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold. -/datum/mutation/space_adaptation +/datum/mutation/human/space_adaptation name = "Space Adaptation" desc = "A strange mutation that renders the host's skin, muscuoskeletal system and sensory organs immune to the vacuum of space. The mutation is ineffective toward lung tissue, which will remain vulnerable without an air tank." quality = POSITIVE @@ -7,10 +7,10 @@ instability = 30 traits = list(TRAIT_RESISTCOLD, TRAIT_RESISTLOWPRESSURE) -/datum/mutation/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) +/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) ..() if(!(type in visual_indicators)) visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire")) -/datum/mutation/space_adaptation/get_visual_indicator() +/datum/mutation/human/space_adaptation/get_visual_indicator() return visual_indicators[type][1] diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 4bd9acdc358d9..9e4bc04c45963 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -1,57 +1,57 @@ //These are all minor mutations that affect your speech somehow. //Individual ones aren't commented since their functions should be evident at a glance -/datum/mutation/nervousness +/datum/mutation/human/nervousness name = "Nervousness" desc = "A hereditary mutation characterized by its signature speech disorder." quality = MINOR_NEGATIVE -/datum/mutation/nervousness/on_life() +/datum/mutation/human/nervousness/on_life() if(prob(10)) owner.stuttering = max(10, owner.stuttering) -/datum/mutation/wacky +/datum/mutation/human/wacky name = "Wacky" desc = "A mutation that causes the user to talk in an odd manner." quality = MINOR_NEGATIVE -/datum/mutation/wacky/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/wacky/on_acquiring(mob/living/carbon/owner) if(..()) return RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) -/datum/mutation/wacky/on_losing(mob/living/carbon/owner) +/datum/mutation/human/wacky/on_losing(mob/living/carbon/owner) if(..()) return UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/wacky/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/wacky/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER speech_args[SPEECH_SPANS] |= SPAN_SANS -/datum/mutation/mute +/datum/mutation/human/mute name = "Mute" desc = "Inherited mutation that completely inhibits the vocal section of the brain." quality = NEGATIVE traits = TRAIT_MUTE -/datum/mutation/smile +/datum/mutation/human/smile name = "Smile" desc = "Hereditary mutation reminiscent of Bipolar Disorder. Characterized by a near constant state of mania and an apathy towards negative stimuli." quality = MINOR_NEGATIVE -/datum/mutation/smile/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/smile/on_acquiring(mob/living/carbon/owner) if(..()) return RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) -/datum/mutation/smile/on_losing(mob/living/carbon/owner) +/datum/mutation/human/smile/on_losing(mob/living/carbon/owner) if(..()) return UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/smile/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/smile/proc/handle_speech(datum/source, list/speech_args) var/message = speech_args[SPEECH_MESSAGE] if(message) message = " [message] " @@ -101,28 +101,28 @@ speech_args[SPEECH_MESSAGE] = trim(message) -/datum/mutation/unintelligible +/datum/mutation/human/unintelligible name = "Unintelligible" desc = "Hereditary mutation that partially inhibits the vocal center of the brain, resulting in a severe speech disorder." quality = NEGATIVE traits = TRAIT_UNINTELLIGIBLE_SPEECH -/datum/mutation/swedish +/datum/mutation/human/swedish name = "Swedish" desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037." quality = MINOR_NEGATIVE -/datum/mutation/swedish/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/owner) if(..()) return RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) -/datum/mutation/swedish/on_losing(mob/living/carbon/owner) +/datum/mutation/human/swedish/on_losing(mob/living/carbon/owner) if(..()) return UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/swedish/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER var/message = speech_args[SPEECH_MESSAGE] @@ -136,22 +136,22 @@ message += " Bork[pick("",", bork",", bork, bork")]!" speech_args[SPEECH_MESSAGE] = trim(message) -/datum/mutation/chav +/datum/mutation/human/chav name = "Chav" desc = "A mutation that causes the user to construct sentences in a more rudimentary manner." quality = MINOR_NEGATIVE -/datum/mutation/chav/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/chav/on_acquiring(mob/living/carbon/owner) if(..()) return RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) -/datum/mutation/chav/on_losing(mob/living/carbon/owner) +/datum/mutation/human/chav/on_losing(mob/living/carbon/owner) if(..()) return UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/chav/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER var/message = speech_args[SPEECH_MESSAGE] @@ -184,13 +184,13 @@ speech_args[SPEECH_MESSAGE] = trim(message) -/datum/mutation/elvis +/datum/mutation/human/elvis name = "Elvis" desc = "A terrifying mutation named after its 'patient-zero'." quality = MINOR_NEGATIVE locked = TRUE -/datum/mutation/elvis/on_life() +/datum/mutation/human/elvis/on_life() switch(pick(1,2)) if(1) if(prob(15)) @@ -201,17 +201,17 @@ if(prob(15)) owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!") -/datum/mutation/elvis/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/owner) if(..()) return RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) -/datum/mutation/elvis/on_losing(mob/living/carbon/owner) +/datum/mutation/human/elvis/on_losing(mob/living/carbon/owner) if(..()) return UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/elvis/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER var/message = speech_args[SPEECH_MESSAGE] @@ -229,38 +229,38 @@ speech_args[SPEECH_MESSAGE] = trim(message) -/datum/mutation/stoner +/datum/mutation/human/stoner name = "Stoner" desc = "A common mutation that severely decreases intelligence." quality = NEGATIVE locked = TRUE -/datum/mutation/stoner/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/stoner/on_acquiring(mob/living/carbon/owner) ..() owner.grant_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_STONER) owner.add_blocked_language(subtypesof(/datum/language) - /datum/language/beachbum, LANGUAGE_STONER) -/datum/mutation/stoner/on_losing(mob/living/carbon/owner) +/datum/mutation/human/stoner/on_losing(mob/living/carbon/owner) ..() owner.remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_STONER) owner.remove_blocked_language(subtypesof(/datum/language) - /datum/language/beachbum, LANGUAGE_STONER) -/datum/mutation/medieval +/datum/mutation/human/medieval name = "Medieval" desc = "A horrific genetic condition suffered in ancient times." quality = MINOR_NEGATIVE -/datum/mutation/medieval/on_acquiring(mob/living/carbon/owner) +/datum/mutation/human/medieval/on_acquiring(mob/living/carbon/owner) if(..()) return RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) -/datum/mutation/medieval/on_losing(mob/living/carbon/owner) +/datum/mutation/human/medieval/on_losing(mob/living/carbon/owner) if(..()) return UnregisterSignal(owner, COMSIG_MOB_SAY) -/datum/mutation/medieval/proc/handle_speech(datum/source, list/speech_args) +/datum/mutation/human/medieval/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER var/message = speech_args[SPEECH_MESSAGE] diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm index 906b27c316380..651ec6639ab30 100644 --- a/code/datums/mutations/telekinesis.dm +++ b/code/datums/mutations/telekinesis.dm @@ -1,5 +1,5 @@ //Telekinesis lets you interact with objects from range, and gives you a light blue halo around your head. -/datum/mutation/telekinesis +/datum/mutation/human/telekinesis name = "Telekinesis" desc = "A strange mutation that allows the holder to interact with objects purely through thought." quality = POSITIVE @@ -7,13 +7,13 @@ limb_req = BODY_ZONE_HEAD instability = 30 -/datum/mutation/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) +/datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/copymut) ..() if(!(type in visual_indicators)) visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead")) -/datum/mutation/telekinesis/get_visual_indicator() +/datum/mutation/human/telekinesis/get_visual_indicator() return visual_indicators[type][1] -/datum/mutation/telekinesis/on_ranged_attack(atom/target) +/datum/mutation/human/telekinesis/on_ranged_attack(atom/target) target.attack_tk(owner) diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index e0d6164274f40..939c05fa5ed3d 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -1,4 +1,4 @@ -/datum/mutation/shock +/datum/mutation/human/shock name = "Shock Touch" desc = "A mutation that allows the user to store accumulated bioelectric and static charge, consciously discharging it upon others with no harm to themselves." quality = POSITIVE @@ -48,7 +48,7 @@ use_charge(user) return ..() -/datum/mutation/acidooze +/datum/mutation/human/acidooze name = "Acidic Hands" desc = "Allows an Oozeling to metabolize some of their blood into acid, concentrated on their hands." quality = POSITIVE diff --git a/code/game/gamemodes/objectives/basic/ninja/capture.dm b/code/game/gamemodes/objectives/basic/ninja/capture.dm index 13210347918e5..563e69420584e 100644 --- a/code/game/gamemodes/objectives/basic/ninja/capture.dm +++ b/code/game/gamemodes/objectives/basic/ninja/capture.dm @@ -18,7 +18,7 @@ var/worth = 0 if (istype(L, /mob/living/carbon/human)) worth = 1 - else if (istype(L, /mob/living/carbon/monkey)) + else if (istype(L, /mob/living/carbon/human/species/monkey)) worth = 0.1 else if (istype(L, /mob/living/carbon/alien/larva)) worth = 1 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 301b7ddd293e1..aaaaab5fc2095 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -173,7 +173,7 @@ for(var/datum/mind/rev_mind in revolution.head_revolutionaries()) var/turf/T = get_turf(rev_mind.current) if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z)) - if(ishuman(rev_mind.current) || ismonkey(rev_mind.current)) + if(ishuman(rev_mind.current)) return FALSE return TRUE diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 78cbdbe27c36d..47cbe13f7be31 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -166,6 +166,18 @@ Class Procs: return INITIALIZE_HINT_LATELOAD +/obj/machinery/computer/can_interact(mob/user) + var/mob/living/living_user = user + //Quick check for lesserbeings (monkeys, teratomas) + if(HAS_TRAIT(living_user, TRAIT_INFERIORFORM)) + to_chat(living_user, "What is this thing?! Your fingers dance around the buttons.") + //We fuck around on the keys for a bit, like any toddler would + if(do_after(living_user, 2 SECONDS, src)) + to_chat(living_user, " Shiny! Not much use to me though!") + else + . = ..() + + /obj/machinery/proc/set_occupant(atom/movable/new_occupant) SHOULD_CALL_PARENT(TRUE) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 79e5ffd68661b..5850e2c12814a 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -150,7 +150,7 @@ /obj/item/disk/data/debug/Initialize(mapload) . = ..() - for(var/datum/mutation/HM as() in GLOB.all_mutations) + for(var/datum/mutation/human/HM as() in GLOB.all_mutations) mutations += new HM //Clonepod diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 876a1a417104c..bfccb359c156d 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -105,7 +105,7 @@ else if(sbed) data["table"] = sbed - if(!ishuman(sbed.occupant) && !ismonkey(sbed.occupant)) + if(!ishuman(sbed.occupant)) return data data["patient"] = list() if(isliving(sbed.occupant)) diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 39175fd2bf73f..c09ecd974057c 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -512,7 +512,7 @@ // Go over all standard mutations and check if they've been discovered. for(var/mutation_type in scanner_occupant.dna.mutation_index) - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(mutation_type) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type) check_discovery(HM.alias) return @@ -613,7 +613,7 @@ // GUARD CHECK - Only search occupant for this specific ref, since your // can only apply chromosomes to mutations occupants. - var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT) + var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) @@ -670,7 +670,7 @@ search_flags |= SEARCH_DISKETTE var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, search_flags) + var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) @@ -734,7 +734,7 @@ var/path = GET_MUTATION_TYPE_FROM_ALIAS(params["alias"]) if(stored_research && stored_research.discovered_mutations[path]) - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(path) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(path) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) return @@ -765,7 +765,7 @@ search_flags |= SEARCH_DISKETTE var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, search_flags) + var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags) if(!HM) return @@ -805,13 +805,13 @@ return var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, search_flags) + var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) return - var/datum/mutation/A = new HM.type() + var/datum/mutation/human/A = new HM.type() A.copy_mutation(HM) stored_mutations += A to_chat(usr, "Mutation successfully stored.") @@ -855,13 +855,13 @@ search_flags |= SEARCH_STORED var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, search_flags) + var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) return - var/datum/mutation/A = new HM.type() + var/datum/mutation/human/A = new HM.type() A.copy_mutation(HM) diskette.mutations += A to_chat(usr, "Mutation successfully stored to disk.") @@ -878,7 +878,7 @@ return var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT) + var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) @@ -897,7 +897,7 @@ // params["mutref"] - ATOM Ref of specific mutation to delete if("delete_console_mut") var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_STORED) + var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_STORED) if(HM) stored_mutations.Remove(HM) @@ -921,7 +921,7 @@ return var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_DISKETTE) + var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_DISKETTE) if(HM) diskette.mutations.Remove(HM) @@ -967,11 +967,11 @@ // GUARD CHECK - Find the source and destination mutations on the console // and make sure they actually exist. - var/datum/mutation/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE) + var/datum/mutation/human/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE) if(!source_mut) return - var/datum/mutation/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE) + var/datum/mutation/human/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE) if(!dest_mut) return @@ -991,7 +991,7 @@ if(stored_research.discovered_mutations[result_path]) return - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(result_path) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(result_path) stored_research.discovered_mutations[result_path] = TRUE say("Successfully mutated [HM.name].") return @@ -1029,11 +1029,11 @@ // GUARD CHECK - Find the source and destination mutations on the console // and make sure they actually exist. - var/datum/mutation/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE) + var/datum/mutation/human/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE) if(!source_mut) return - var/datum/mutation/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE) + var/datum/mutation/human/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE) if(!dest_mut) return @@ -1053,7 +1053,7 @@ if(stored_research.discovered_mutations[result_path]) return - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(result_path) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(result_path) stored_research.discovered_mutations[result_path] = TRUE say("Successfully mutated [HM.name].") return @@ -1443,7 +1443,7 @@ // Run through each mutation in our Advanced Injector and add them to a // new injector - for(var/datum/mutation/HM as() in injector) + for(var/datum/mutation/human/HM as() in injector) I.add_mutations += new HM.type(copymut=HM) // Force apply any mutations, this is functionality similar to mutators @@ -1501,7 +1501,7 @@ var/bref = params["mutref"] // We've already made sure we can modify the occupant, so this is safe to // call - var/datum/mutation/HM = get_mut_by_ref(bref, search_flag) + var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flag) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) @@ -1513,7 +1513,7 @@ // We then add the instabilities of all other mutations in the injector, // remembering to apply the Stabilizer chromosome modifiers - for(var/datum/mutation/I as() in injector_selection[adv_inj]) + for(var/datum/mutation/human/I as() in injector_selection[adv_inj]) instability_total += I.instability * GET_MUTATION_STABILIZER(I) // If this would take us over the max instability, we inform the user. @@ -1523,7 +1523,7 @@ // If we've got here, all our checks are passed and we can successfully // add the mutation to the advanced injector. - var/datum/mutation/A = new HM.type() + var/datum/mutation/human/A = new HM.type() A.copy_mutation(HM) injector_selection[adv_inj] += A to_chat(usr, "Mutation successfully added to advanced injector.") @@ -1535,7 +1535,7 @@ if("delete_injector_mut") var/bref = params["mutref"] - var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_ADV_INJ) + var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_ADV_INJ) // GUARD CHECK - This should not be possible. Unexpected result if(!HM) @@ -1740,7 +1740,7 @@ // ---------------------------------------------------------------------- // // Start cataloguing all mutations that the occupant has by default for(var/mutation_type in scanner_occupant.dna.mutation_index) - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(mutation_type) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type) var/list/mutation_data = list() var/text_sequence = scanner_occupant.dna.mutation_index[mutation_type] @@ -1767,7 +1767,7 @@ // Check if the mutation is currently activated. If it is, we can add even // MORE information to send to tgui. - var/datum/mutation/A = scanner_occupant.dna.get_mutation(mutation_type) + var/datum/mutation/human/A = scanner_occupant.dna.get_mutation(mutation_type) if(A) mutation_data["Active"] = TRUE mutation_data["Scrambled"] = A.scrambled @@ -1800,7 +1800,7 @@ // ---------------------------------------------------------------------- // // Now get additional/"extra" mutations that they shouldn't have by default - for(var/datum/mutation/HM as() in scanner_occupant.dna.mutations) + for(var/datum/mutation/human/HM as() in scanner_occupant.dna.mutations) // If it's in the mutation index array, we've already catalogued this // mutation and can safely skip over it. It really shouldn't be, but this // will catch any weird edge cases @@ -1813,7 +1813,7 @@ // These will all be active mutations. They're added by injector and their // sequencing code can't be changed. They can only be nullified, which // completely removes them. - var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type) + var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type) mutation_data["Alias"] = A.alias mutation_data["Sequence"] = text_sequence @@ -1848,10 +1848,10 @@ // ------------------------------------------------------------------------ // // Build the list of mutations stored within the DNA Console - for(var/datum/mutation/HM as() in stored_mutations) + for(var/datum/mutation/human/HM as() in stored_mutations) var/list/mutation_data = list() - var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type) + var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type) mutation_data["Alias"] = A.alias mutation_data["Name"] = HM.name @@ -1886,10 +1886,10 @@ // ------------------------------------------------------------------------ // // Build the list of mutations stored on any inserted diskettes if(diskette) - for(var/datum/mutation/HM as() in diskette.mutations) + for(var/datum/mutation/human/HM as() in diskette.mutations) var/list/mutation_data = list() - var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type) + var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type) mutation_data["Alias"] = A.alias mutation_data["Name"] = HM.name @@ -1914,10 +1914,10 @@ if(LAZYLEN(injector_selection)) for(var/I in injector_selection) var/list/mutations = list() - for(var/datum/mutation/HM as() in injector_selection[I]) + for(var/datum/mutation/human/HM as() in injector_selection[I]) var/list/mutation_data = list() - var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type) + var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type) mutation_data["Alias"] = A.alias mutation_data["Name"] = HM.name @@ -1983,13 +1983,13 @@ // then the mutation isn't eligible for discovery. If it is but is scrambled, // then the mutation isn't eligible for discovery. Finally, check if the // mutation is in discovered mutations - If it isn't, add it to discover. - var/datum/mutation/M = scanner_occupant.dna.get_mutation(path) + var/datum/mutation/human/M = scanner_occupant.dna.get_mutation(path) if(!M) return FALSE if(M.scrambled) return FALSE if(stored_research && !stored_research.discovered_mutations[path]) - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(path) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(path) stored_research.discovered_mutations[path] = TRUE say("Successfully discovered [HM.name].") return TRUE @@ -2112,7 +2112,7 @@ to_chat(user, "You insert [diskie].") if(stored_research) var/list/upload_names - for(var/datum/mutation/upload in diskie.mutations) + for(var/datum/mutation/human/upload in diskie.mutations) var/path = upload.type if(stored_research.discovered_mutations[path]) continue diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index c2c178a990861..c9ae6d5589f56 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -355,10 +355,6 @@ L.emote("scream") if(!L.IsParalyzed()) L.Paralyze(60) - else if(ismonkey(L)) //For monkeys - L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) - if(!L.IsParalyzed()) - L.Paralyze(60) else //for simple_animals & borgs L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) var/turf/location = get_turf(src) diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index e0790ab8cea16..1d422aedf1ea4 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -76,9 +76,6 @@ else if(ispath(mobtype, /mob/living/simple_animal/slime)) race = "Slime" - else if(ispath(mobtype, /mob/living/carbon/monkey)) - race = "Monkey" - // sometimes M gets deleted prematurely for AIs... just check the job else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == JOB_NAME_AI) race = "Artificial Life" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 7103a3487cd88..92eed702caa20 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -219,9 +219,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /// A reagent list containing the reagents this item produces when JUICED in a grinder! var/list/juice_results - ///Icon for monkey - var/icon/monkey_icon - var/canMouseDown = FALSE ///Icons used to show the item in vendors instead of the item's actual icon, drawn from the item's icon file (just chemical.dm for now) @@ -744,8 +741,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(item_flags & SLOWS_WHILE_IN_HAND || slowdown) user.update_equipment_speed_mods() - if(ismonkey(user)) //Only generate icons if we have to - compile_monkey_icon() log_item(user, INVESTIGATE_VERB_EQUIPPED) if(!initial) if(equip_sound && slot_flags) @@ -1422,12 +1417,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/on_outfit_equip(mob/living/carbon/human/outfit_wearer, visuals_only, item_slot) return -/** - * * Overridden to generate icons for monkey clothing - */ -/obj/item/proc/compile_monkey_icon() - return - /// Called on [/datum/element/openspace_item_click_handler/proc/on_afterattack]. Check the relative file for information. /obj/item/proc/handle_openspace_click(turf/target, mob/user, proximity_flag, click_parameters) CRASH("Undefined handle_openspace_click() behaviour. Ascertain the openspace_item_click_handler element has been attached to the right item and that its proc override doesn't call parent.") diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm index 994e394468adf..c6ee7f174aab9 100644 --- a/code/game/objects/items/chromosome.dm +++ b/code/game/objects/items/chromosome.dm @@ -13,7 +13,7 @@ var/weight = 5 -/obj/item/chromosome/proc/can_apply(datum/mutation/HM) +/obj/item/chromosome/proc/can_apply(datum/mutation/human/HM) if(!HM || !(HM.can_chromosome == CHROMOSOME_NONE)) return FALSE if((stabilizer_coeff != 1) && (HM.stabilizer_coeff != -1)) //if the chromosome is 1, we dont change anything. If the mutation is -1, we cant change it. sorry @@ -25,7 +25,7 @@ if((energy_coeff != 1) && (HM.energy_coeff != -1)) return TRUE -/obj/item/chromosome/proc/apply(datum/mutation/HM) +/obj/item/chromosome/proc/apply(datum/mutation/human/HM) if(HM.stabilizer_coeff != -1) HM.stabilizer_coeff = stabilizer_coeff if(HM.synchronizer_coeff != -1) @@ -82,11 +82,11 @@ icon_state = "reinforcer" weight = 3 -/obj/item/chromosome/reinforcer/can_apply(datum/mutation/HM) +/obj/item/chromosome/reinforcer/can_apply(datum/mutation/human/HM) if(!HM || !(HM.can_chromosome == CHROMOSOME_NONE)) return FALSE return !HM.mutadone_proof -/obj/item/chromosome/reinforcer/apply(datum/mutation/HM) +/obj/item/chromosome/reinforcer/apply(datum/mutation/human/HM) HM.mutadone_proof = TRUE ..() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index e29026f0c94d2..f4efa35135165 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -938,12 +938,12 @@ GENE SCANNER var/list/full_list_mutations = list() for(var/each in buffer) // get inherent mutations first full_list_mutations[each] = FALSE - for(var/datum/mutation/each_mutation in C.dna.mutations) + for(var/datum/mutation/human/each_mutation in C.dna.mutations) if(each_mutation.type in buffer) // active inherent mutation full_list_mutations[each_mutation.type] = "Activated" else // active artificial mutation full_list_mutations[each_mutation.type] = "Injected" - for(var/datum/mutation/each_mutation in C.dna.temporary_mutations) + for(var/datum/mutation/human/each_mutation in C.dna.temporary_mutations) full_list_mutations[each_mutation.type] = "Temporary" for(var/A in full_list_mutations) @@ -986,7 +986,7 @@ GENE SCANNER ready = TRUE /obj/item/sequence_scanner/proc/get_display_name(mutation, active_detail=FALSE) - var/datum/mutation/HM = GET_INITIALIZED_MUTATION(mutation) + var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation) if(!HM) return "ERROR" if(discovered[mutation]) diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 625224cf05b48..692a2b630cacf 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -505,7 +505,7 @@ var/endtime = world.time+duration for(var/mutation in remove_mutations) if(mutation == RACEMUT) - if(ishuman(M)) + if(!ismonkey(M)) continue M = M.dna.remove_mutation(mutation) else @@ -513,7 +513,7 @@ for(var/mutation in add_mutations) if(M.dna.get_mutation(mutation)) continue //Skip permanent mutations we already have. - if(mutation == RACEMUT && ishuman(M)) + if(mutation == RACEMUT && !ismonkey(M)) message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") log_msg += " (MONKEY)" M = M.dna.add_mutation(mutation, MUT_OTHER, endtime) @@ -565,8 +565,8 @@ M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2)) var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" for(var/mutation in add_mutations) - var/datum/mutation/HM = mutation - if(istype(HM, /datum/mutation)) + var/datum/mutation/human/HM = mutation + if(istype(HM, /datum/mutation/human)) mutation = HM.type if(!M.dna.activate_mutation(HM)) if(!doitanyway) diff --git a/code/game/objects/items/food/monkeycube.dm b/code/game/objects/items/food/monkeycube.dm index 22c431cf1a0a2..0408725f68555 100644 --- a/code/game/objects/items/food/monkeycube.dm +++ b/code/game/objects/items/food/monkeycube.dm @@ -11,7 +11,7 @@ food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_TINY var/faction - var/spawned_mob = /mob/living/carbon/monkey + var/spawned_mob = /mob/living/carbon/human/species/monkey /obj/item/food/monkeycube/proc/Expand() if(GLOB.total_cube_monkeys >= CONFIG_GET(number/max_cube_monkeys)) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index d1090f957b4a2..eace426c7639d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -110,7 +110,7 @@ if(2) if(scooldown < world.time) if(M.health >= 0) - if(ishuman(M)||ismonkey(M)) + if(ishuman(M)) M.electrocute_act(5, "[user]", flags = SHOCK_NOGLOVES) user.visible_message("[user] electrocutes [M] with [user.p_their()] touch!", \ "You electrocute [M] with your touch!") diff --git a/code/game/objects/items/stacks/sheets/mineral/glass.dm b/code/game/objects/items/stacks/sheets/mineral/glass.dm index 80f392130647d..0c0eaf89130aa 100644 --- a/code/game/objects/items/stacks/sheets/mineral/glass.dm +++ b/code/game/objects/items/stacks/sheets/mineral/glass.dm @@ -265,12 +265,6 @@ if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc to_chat(H, "[src] cuts into your hand!") H.apply_damage(force*0.5, BRUTE, hit_hand) - else if(ismonkey(user)) - var/mob/living/carbon/monkey/M = user - if(!HAS_TRAIT(M, TRAIT_PIERCEIMMUNE)) - to_chat(M, "[src] cuts into your hand!") - M.apply_damage(force*0.5, BRUTE, hit_hand) - /obj/item/shard/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/lightreplacer)) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index d6699e22e06c1..ba4b4db225d7a 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -385,7 +385,7 @@ else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) - if(ishuman(M) || ismonkey(M)) + if(ishuman(M)) if(prob(10)) M.Paralyze(40) update_icon() diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index c9587f23dbded..aaf34a5834e4f 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -67,43 +67,8 @@ dat += "[custom_data ? ",\n[custom_data]" : ""]" return dat -/obj/item/storage/compile_monkey_icon() - var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing - //If the icon, for this type of item, is already made by something else, don't make it again - if(GLOB.monkey_icon_cache[identity]) - monkey_icon = GLOB.monkey_icon_cache[identity] - return - - //Start with two sides - var/icon/main = icon('icons/mob/clothing/back.dmi', icon_state) //This takes the icon and uses the worn version of the icon - var/icon/sub = icon('icons/mob/clothing/back.dmi', icon_state) - - //merge the sub side with the main, after masking off the middle pixel line - var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking - main.AddAlphaMask(mask) - mask = new('icons/mob/monkey.dmi', "monkey_mask_left") - sub.AddAlphaMask(mask) - sub.Shift(EAST, 1) - main.Blend(sub, ICON_OVERLAY) - - //Shift it facing west, due to a spriting quirk - sub = icon(main, dir = WEST) - sub.Shift(WEST, 1) - main.Insert(sub, dir = WEST) - - //Shift it down one, backpack specific quirk - main.Shift(SOUTH, 1) - - //Mix in GAG color - if(greyscale_colors) - main.Blend(greyscale_colors, ICON_MULTIPLY) - - //Finished - monkey_icon = main - GLOB.monkey_icon_cache[identity] = icon(monkey_icon) - /// Returns a list of object types to be preloaded by our code /// I'll say it again, be very careful with this. We only need it for a few things /// Don't do anything stupid, please /obj/item/storage/proc/get_types_to_preload() - return + return \ No newline at end of file diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index 06c17e96e169d..e9fd4cbe68d00 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -90,14 +90,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified) S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) return 1 -/mob/living/carbon/monkey/petrify(statue_timer) - if(!isturf(loc)) - return 0 - var/obj/structure/statue/petrified/S = new(loc, src, statue_timer) - S.name = "statue of a monkey" - S.icon_state = "monkey" - return 1 - /mob/living/simple_animal/pet/dog/corgi/petrify(statue_timer) if(!isturf(loc)) return 0 diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index ac850ce157a0d..dd48ca7d09a3c 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -62,7 +62,8 @@ return TRUE var/mob/living/living_caller = caller - if(!living_caller.ventcrawler && living_caller.mob_size != MOB_SIZE_TINY) + var/ventcrawler = HAS_TRAIT(living_caller, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(living_caller, TRAIT_VENTCRAWLER_NUDE) + if(!ventcrawler && living_caller.mob_size != MOB_SIZE_TINY) return FALSE if(caller?.pulling) @@ -95,7 +96,8 @@ if(istype(living_mover.buckled, /mob/living/simple_animal/bot/mulebot)) // mulebot passenger gets a free pass. return TRUE - if(living_mover.body_position == STANDING_UP && living_mover.mob_size != MOB_SIZE_TINY && !living_mover.ventcrawler) //If your not laying down, or a ventcrawler or a small creature, no pass. + var/ventcrawler = HAS_TRAIT(living_mover, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(living_mover, TRAIT_VENTCRAWLER_NUDE) + if(living_mover.body_position == STANDING_UP && !ventcrawler && living_mover.mob_size != MOB_SIZE_TINY) //If your not laying down, or a ventcrawler or a small creature, no pass. return FALSE /obj/structure/plasticflaps/deconstruct(disassembled = TRUE) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 544cb9177e98b..3cafca7175129 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -653,7 +653,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/table) return FALSE if (!patient.resting) return FALSE - if(ishuman(patient) || ismonkey(patient)) + if(ishuman(patient)) return TRUE return FALSE diff --git a/code/game/points_of_interest.dm b/code/game/points_of_interest.dm index baf46ebe6b407..92a8a5ae3507f 100644 --- a/code/game/points_of_interest.dm +++ b/code/game/points_of_interest.dm @@ -50,8 +50,6 @@ moblist.Add(M) for(var/mob/dead/new_player/M in sortmob) moblist.Add(M) - for(var/mob/living/carbon/monkey/M in sortmob) - moblist.Add(M) for(var/mob/living/simple_animal/slime/M in sortmob) moblist.Add(M) for(var/mob/living/simple_animal/M in sortmob) diff --git a/code/game/turfs/turf_integrity.dm b/code/game/turfs/turf_integrity.dm index dc685c2952001..46f0d89fa92a2 100644 --- a/code/game/turfs/turf_integrity.dm +++ b/code/game/turfs/turf_integrity.dm @@ -189,7 +189,7 @@ take_damage(I.force, I.damtype, MELEE, 1) /turf/attackby(obj/item/W, mob/user, params) - if (!user.IsAdvancedToolUser()) + if (!user.IsAdvancedToolUser() && !ismonkey(user)) to_chat(user, "You don't have the dexterity to do this!") return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 1a89b834bf8f7..86f70343010a4 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -138,7 +138,7 @@ body += "
" //Human - if(ishuman(M)) + if(ishuman(M) && !ismonkey(M)) body += "Human " else body += "Humanize " diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 944211ece19e1..84173772011e8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -536,7 +536,7 @@ if("slime") M.change_mob_type( /mob/living/simple_animal/slime , null, null, delmob ) if("monkey") - M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob ) + M.change_mob_type( /mob/living/carbon/human/species/monkey , null, null, delmob ) if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob ) if("cat") @@ -805,9 +805,9 @@ if(!check_rights(R_SPAWN)) return - var/mob/living/carbon/monkey/Mo = locate(href_list["humanone"]) + var/mob/living/carbon/human/species/monkey/Mo = locate(href_list["humanone"]) if(!istype(Mo)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/monkey.") + to_chat(usr, "This can only be used on monkeys.") return log_admin("[key_name(src.owner)] attempting to humanize [key_name(Mo)].") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index fb7da1e22b329..77594c347b2c8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -403,12 +403,12 @@ Traitors and the like can also be revived with the previous role mostly intact. //check if they were a monkey else if(findtext(G_found.real_name,"monkey")) if(alert("This character appears to have been a monkey. Would you like to respawn them as such?",,"Yes","No")=="Yes") - var/mob/living/carbon/monkey/new_monkey = new + var/mob/living/carbon/human/species/monkey/new_monkey = new SSjob.SendToLateJoin(new_monkey) G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use new_monkey.key = G_found.key to_chat(new_monkey, "You have been fully respawned. Enjoy the game.") - var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno." + var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy monkey." message_admins(msg) admin_ticket_log(new_monkey, msg) return //all done. The ghost is auto-deleted diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index f9fa46664469f..febb4654d1aa0 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -61,9 +61,9 @@ if(!check_rights(R_SPAWN)) return - var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list + var/mob/living/carbon/human/species/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list if(!istype(Mo)) - to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey") + to_chat(usr, "This can only be done to monkeys") return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 403ea59a3a549..44a48a022ef2a 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -204,7 +204,7 @@ /obj/item/organ/heart/gland/ventcrawling/activate() to_chat(owner, "You feel very stretchy.") - owner.ventcrawler = VENTCRAWLER_ALWAYS + ADD_TRAIT(owner, TRAIT_VENTCRAWLER_ALWAYS, type) /obj/item/organ/heart/gland/viral true_name = "contamination incubator" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 55d80201db5f0..3024cdbdd6e1a 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -122,7 +122,7 @@ chem_recharge_slowdown = initial(chem_recharge_slowdown) /datum/antagonist/changeling/proc/remove_changeling_powers() - if(ishuman(owner.current) || ismonkey(owner.current)) + if(ishuman(owner.current)) reset_properties() for(var/datum/action/changeling/p in purchasedpowers) purchasedpowers -= p diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index 70c292f826735..de4af39ae8ca5 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -54,11 +54,8 @@ the same goes for Remove(). if you override Remove(), call parent or else your p //Fairly important to remember to return 1 on success >.< /datum/action/changeling/proc/can_sting(mob/living/user, mob/target) - if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards - return 0 - if(req_human && !ishuman(user)) - to_chat(user, "We cannot do that in this form!") - return 0 + if(!ishuman(user)) //typecast everything from mob to carbon from this point onwards + return FALSE var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling) if(c.chem_charges < chemical_cost) to_chat(user, "We require at least [chemical_cost] unit\s of chemicals to do that!") @@ -80,7 +77,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p /datum/action/changeling/proc/can_be_used_by(mob/user) if(!user || QDELETED(user)) return 0 - if(!ishuman(user) && !ismonkey(user)) + if(!ishuman(user)) return FALSE if(req_human && !ishuman(user)) return FALSE diff --git a/code/modules/antagonists/changeling/powers/humanform.dm b/code/modules/antagonists/changeling/powers/humanform.dm index 058d1bc8d7ea0..d4831ca5d8da2 100644 --- a/code/modules/antagonists/changeling/powers/humanform.dm +++ b/code/modules/antagonists/changeling/powers/humanform.dm @@ -25,7 +25,7 @@ ..() changeling.purchasedpowers -= src - var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) + var/newmob = user.humanize() changeling.transform(newmob, chosen_prof) return TRUE diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm index 86efb16e33733..e222d0c5d7f1f 100644 --- a/code/modules/antagonists/changeling/powers/lesserform.dm +++ b/code/modules/antagonists/changeling/powers/lesserform.dm @@ -13,5 +13,5 @@ return FALSE to_chat(user, "Our genes cry out!") ..() - user.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) + user.monkeyize() return TRUE diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm index 130ced301e540..c3c56b6359e0a 100644 --- a/code/modules/antagonists/changeling/powers/regenerate.dm +++ b/code/modules/antagonists/changeling/powers/regenerate.dm @@ -95,7 +95,6 @@ response_disarm_simple = "shoo" response_harm_continuous = "steps on" response_harm_simple = "step on" - ventcrawler = VENTCRAWLER_ALWAYS density = FALSE pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL @@ -108,3 +107,7 @@ poison_per_bite = 4 poison_type = /datum/reagent/toxin/staminatoxin discovery_points = 1000 + +/mob/living/simple_animal/hostile/poison/limbsnake/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) diff --git a/code/modules/antagonists/changeling/powers/teratoma.dm b/code/modules/antagonists/changeling/powers/teratoma.dm index 30da334d3aa7e..010ea59ddc243 100644 --- a/code/modules/antagonists/changeling/powers/teratoma.dm +++ b/code/modules/antagonists/changeling/powers/teratoma.dm @@ -28,7 +28,7 @@ to_chat(usr, "You fail at creating a tumor. Perhaps you should try again later?") c.chem_charges += chemical_cost //If it fails we want to refund the chemicals return FALSE - var/mob/living/carbon/monkey/tumor/T = new /mob/living/carbon/monkey/tumor(A) + var/mob/living/carbon/human/species/monkey/tumor/T = new /mob/living/carbon/human/species/monkey/tumor(A) var/mob/dead/observer/C = pick(candidates) T.key = C.key var/datum/antagonist/teratoma/D = new diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 44ff428fdaff9..40a9f002519cf 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -105,14 +105,10 @@ /datum/action/changeling/sting/transformation/sting_action(mob/user, mob/target) log_combat(user, target, "stung", "transformation sting", " new identity is '[selected_dna.dna.real_name]'") var/datum/dna/new_dna = selected_dna.dna - if(ismonkey(target)) - to_chat(user, "Our genes cry out as we sting [target.name]!") var/mob/living/carbon/C = target . = TRUE if(istype(C)) - if(ismonkey(C)) - C = C.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPAI) var/datum/status_effect/ling_transformation/previous_transformation = C.has_status_effect(STATUS_EFFECT_LING_TRANSFORMATION) C.apply_status_effect(STATUS_EFFECT_LING_TRANSFORMATION, new_dna, istype(previous_transformation) ? previous_transformation.original_dna : null) COOLDOWN_START(src, next_sting, TRANSFORM_STING_COOLDOWN) diff --git a/code/modules/antagonists/changeling/teratoma.dm b/code/modules/antagonists/changeling/teratoma.dm index 3e5a4c51aaf75..7dd06644f3da6 100644 --- a/code/modules/antagonists/changeling/teratoma.dm +++ b/code/modules/antagonists/changeling/teratoma.dm @@ -26,9 +26,9 @@ objectives -= O /datum/antagonist/teratoma/admin_remove(mob/admin) - var/mob/living/carbon/monkey/tumor/M = owner.current + var/mob/living/carbon/human/species/monkey/tumor/M = owner.current if(alert(admin, "Humanize?", "Humanize", "Yes", "No") == "Yes") - M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) + M.humanize() . = ..() /datum/antagonist/teratoma/admin_add(datum/mind/new_owner, mob/admin) diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index 703848cf0922b..cd4d339050a96 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -15,7 +15,6 @@ stop_automated_movement = 1 status_flags = CANPUSH pass_flags = PASSTABLE - ventcrawler = VENTCRAWLER_ALWAYS atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxHealth = 150 @@ -60,6 +59,7 @@ var/datum/action/innate/morph_stomach/stomach_action /mob/living/simple_animal/hostile/morph/Initialize(mapload) + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) morph_stomach = new(src) stomach_action = new(morph_stomach) stomach_action.Grant(src) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index abf2c51171a6d..83e9e2448a420 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -79,12 +79,18 @@ essence_drained += rand(15, 20) to_chat(src, "You search for the soul of [target].") if(do_after(src, rand(10, 20), target, timed_action_flags = IGNORE_HELD_ITEM)) //did they get deleted in that second? + //We suck upon a player if(target.ckey) to_chat(src, "[target.p_their(TRUE)] soul burns with intelligence.") essence_drained += rand(20, 30) - if(target.stat != DEAD) + //We suck upon a LIVING HUMAN player + if(target.stat != DEAD && !HAS_TRAIT(target, TRAIT_WEAK_SOUL)) to_chat(src, "[target.p_their(TRUE)] soul blazes with life!") essence_drained += rand(40, 50) + //We suck upon a nonplayer thats a monkey + if(HAS_TRAIT(target, TRAIT_WEAK_SOUL) && !target.ckey) + to_chat(src, "[target.p_their(TRUE)] soul is weak and underdeveloped. They won't be worth very much.") + essence_drained = 5 else to_chat(src, "[target.p_their(TRUE)] soul is weak and faltering.") if(do_after(src, rand(15, 20), target, timed_action_flags = IGNORE_HELD_ITEM)) //did they get deleted NOW? @@ -121,7 +127,7 @@ var/datum/beam/B = Beam(target,icon_state="drain_life") if(do_after(src, 46, target, timed_action_flags = IGNORE_HELD_ITEM)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining. change_essence_amount(essence_drained, FALSE, target) - if(essence_drained <= 90 && target.stat != DEAD) + if(essence_drained <= 90 && target.stat != DEAD && !HAS_TRAIT(target, TRAIT_WEAK_SOUL)) essence_regen_cap += 5 to_chat(src, "The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].") if(essence_drained > 90) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 8c4e89b264c17..c78790695d645 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -244,7 +244,7 @@ /datum/antagonist/rev/head/equip_rev() var/mob/living/carbon/H = owner.current - if(!ishuman(H) && !ismonkey(H)) + if(!ishuman(H)) return if(remove_clumsy) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index 6a7d79f0fb1d0..127cb524dfbd4 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -86,7 +86,6 @@ AIStatus = AI_OFF pass_flags = PASSTABLE mob_size = MOB_SIZE_TINY - ventcrawler = VENTCRAWLER_ALWAYS ranged = 1 projectiletype = /obj/projectile/beam/disabler ranged_cooldown_time = 20 @@ -108,6 +107,7 @@ /mob/living/simple_animal/hostile/swarmer/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) remove_verb(/mob/living/verb/pulled) for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_to_hud(src) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 68aeead0da8bd..f660e5c72d478 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -47,7 +47,7 @@ . = ..() if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user)) var/mob/living/L = user - if(L.ventcrawler) + if(HAS_TRAIT(L, TRAIT_VENTCRAWLER_NUDE) || HAS_TRAIT(L, TRAIT_VENTCRAWLER_ALWAYS)) . += "Alt-click to crawl through it." /obj/machinery/atmospherics/New(loc, process = TRUE, setdir) diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 84c95fda8662c..00fd4f47d709b 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -136,24 +136,6 @@ death(FALSE) ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind -/mob/living/carbon/monkey/verb/suicide() - set hidden = 1 - if(!canSuicide()) - return - var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") - if(!canSuicide()) - return - if(confirm == "Yes") - set_suicide(TRUE) - visible_message("[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.", \ - "[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.") - - suicide_log() - - adjustOxyLoss(max(200- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) - death(FALSE) - ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind - /mob/living/silicon/ai/verb/suicide() set hidden = 1 if(!canSuicide()) diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index 48d68753eecb8..337bc4630ad5e 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -148,36 +148,3 @@ if(ismob(loc)) var/mob/M = loc M.update_inv_head() - -/obj/item/clothing/head/compile_monkey_icon() - var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing - //If the icon, for this type of item, is already made by something else, don't make it again - if(GLOB.monkey_icon_cache[identity]) - monkey_icon = GLOB.monkey_icon_cache[identity] - return - - //Start with two sides for the front - var/icon/main = icon('icons/mob/clothing/head/default.dmi', icon_state) //This takes the icon and uses the worn version of the icon - var/icon/sub = icon('icons/mob/clothing/head/default.dmi', icon_state) - - //merge the sub side with the main, after masking off the middle pixel line - var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking - main.AddAlphaMask(mask) - mask = new('icons/mob/monkey.dmi', "monkey_mask_left") - sub.AddAlphaMask(mask) - sub.Shift(EAST, 1) - main.Blend(sub, ICON_OVERLAY) - - //handle side icons - sub = icon('icons/mob/clothing/head/default.dmi', icon_state, dir = EAST) - main.Insert(sub, dir = EAST) - sub.Flip(WEST) - main.Insert(sub, dir = WEST) - - //Mix in GAG color - if(greyscale_colors) - main.Blend(greyscale_colors, ICON_MULTIPLY) - - //Finished - monkey_icon = main - GLOB.monkey_icon_cache[identity] = icon(monkey_icon) diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm index 0ca06931a9028..7cee16c3b37d2 100644 --- a/code/modules/clothing/head/mind_monkey_helmet.dm +++ b/code/modules/clothing/head/mind_monkey_helmet.dm @@ -12,7 +12,6 @@ /obj/item/clothing/head/helmet/monkey_sentience_helmet/update_icon() . = ..() - compile_monkey_icon() if(ismob(loc)) var/mob/mob = loc mob.update_inv_head() @@ -35,7 +34,7 @@ return INVOKE_ASYNC(src, PROC_REF(poll), user) -/obj/item/clothing/head/helmet/monkey_sentience_helmet/proc/poll(mob/living/carbon/monkey/user) //At this point, we can assume we're given a monkey, since this'll put them in the body anyways +/obj/item/clothing/head/helmet/monkey_sentience_helmet/proc/poll(mob/living/carbon/human/user) //At this point, we can assume we're given a monkey, since this'll put them in the body anyways if (user.stat) //Checks if the monkey is dead. playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) //If so, buzz and do not poll ghosts return @@ -108,9 +107,9 @@ /obj/item/clothing/head/helmet/monkey_sentience_helmet/attack_paw(mob/user) //Typecasting to monkey just to see if we're on the user's head - if (!istype(user, /mob/living/carbon/monkey)) + if (!istype(user, /mob/living/carbon/human/species/monkey)) return ..() - var/mob/living/carbon/monkey/M = user + var/mob/living/carbon/human/species/monkey/M = user if(src!=M.head) return ..() if(!magnification) diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index e25003b96afd4..c3d52b6629cc1 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -84,36 +84,3 @@ if(loc == user) // Update action button icon for adjusted mask, if someone is holding it. user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off. - -/obj/item/clothing/mask/compile_monkey_icon() - var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing - //If the icon, for this type of item, is already made by something else, don't make it again - if(GLOB.monkey_icon_cache[identity]) - monkey_icon = GLOB.monkey_icon_cache[identity] - return - - //Start with two sides - var/icon/main = icon('icons/mob/clothing/mask.dmi', icon_state) //This takes the icon and uses the worn version of the icon - var/icon/sub = icon('icons/mob/clothing/mask.dmi', icon_state) - - //merge the sub side with the main, after masking off the middle pixel line - var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking - main.AddAlphaMask(mask) - mask = new('icons/mob/monkey.dmi', "monkey_mask_left") - sub.AddAlphaMask(mask) - sub.Shift(EAST, 1) - main.Blend(sub, ICON_OVERLAY) - - //Flip it facing west, due to a spriting quirk - sub = icon('icons/mob/clothing/mask.dmi', icon_state, dir = EAST) - main.Insert(sub, dir = EAST) - sub.Flip(WEST) - main.Insert(sub, dir = WEST) - - //Mix in GAG color - if(greyscale_colors) - main.Blend(greyscale_colors, ICON_MULTIPLY) - - //Finished - monkey_icon = main - GLOB.monkey_icon_cache[identity] = icon(monkey_icon) diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 3707e40f06c56..3f915be847f63 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -150,7 +150,7 @@ H.update_inv_w_uniform() H.update_inv_wear_suit() if(ismonkey(loc)) - var/mob/living/carbon/monkey/H = loc + var/mob/living/carbon/human/species/monkey/H = loc H.update_inv_w_uniform() return TRUE @@ -174,7 +174,7 @@ H.update_inv_w_uniform() H.update_inv_wear_suit() if(ismonkey(loc)) - var/mob/living/carbon/monkey/H = loc + var/mob/living/carbon/human/species/monkey/H = loc H.update_inv_w_uniform() //Adds or removes mob from suit sensor global list @@ -290,71 +290,3 @@ /obj/item/clothing/under/rank dying_key = DYE_REGISTRY_UNDER - -/obj/item/clothing/under/compile_monkey_icon() - var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing - //If the icon, for this type of clothing, is already made by something else, don't make it again - if(GLOB.monkey_icon_cache[identity]) - monkey_icon = GLOB.monkey_icon_cache[identity] - return - - //Start with a base and align it with the mask - var/icon/base = icon('icons/mob/clothing/under/default.dmi', icon_state, SOUTH) //This takes the icon and uses the worn version of the icon - var/icon/back = icon('icons/mob/clothing/under/default.dmi', icon_state, NORTH) //Awkard but, we have to manually insert the back - back.Shift(SOUTH, 2) //Allign with masks - base.Shift(SOUTH, 2) - - //Break the base down into two parts and lay it on-top of the original. This helps with clothing being too small for monkeys - var/icon/left = new(base) - var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_left") - left.AddAlphaMask(mask) - - var/icon/right = new(base) - mask = new('icons/mob/monkey.dmi', "monkey_mask_right") - right.AddAlphaMask(mask) - right.Shift(EAST, 1) - - var/icon/middle = new(base) //This part is used to correct a line of pixels - mask = new('icons/mob/monkey.dmi', "monkey_mask_middle") - middle.AddAlphaMask(mask) - middle.Shift(EAST, 1) - - left.Blend(right, ICON_OVERLAY) - left.Blend(middle, ICON_OVERLAY) - base.Blend(left, ICON_OVERLAY) - - //Again for the back - left = new(back) - mask = new('icons/mob/monkey.dmi', "monkey_mask_left") - left.AddAlphaMask(mask) - - right = new(back) - right.Shift(EAST, 1) - mask = new('icons/mob/monkey.dmi', "monkey_mask_right") - right.AddAlphaMask(mask) - - left.Blend(right, ICON_OVERLAY) - back.Blend(left, ICON_OVERLAY) //blend the outcome into the current to avoid a bald stripe - - //Now modify the left & right facing icons to better emphasize direction / volume - left = new(base) - left.Shift(WEST, 3) - base.Insert(left, dir = WEST) - - right = new(left) - right.Flip(EAST) - base.Insert(right, dir = EAST) - - //Apply masking - mask = new('icons/mob/monkey.dmi', "monkey_mask_cloth")//Roughly monkey shaped clothing - base.AddAlphaMask(mask) - back.AddAlphaMask(mask) - base.Insert(back, dir = NORTH)//Insert faces into the base - - //Mix in GAG color - if(greyscale_colors) - base.Blend(greyscale_colors, ICON_MULTIPLY) - - //Finished! - monkey_icon = base - GLOB.monkey_icon_cache[identity] = icon(monkey_icon) //Don't create a reference to monkey icon diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 619763320be1f..a7b92e70e43d6 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -174,9 +174,7 @@ var/mob/living/carbon/C = occupant typeofmeat = C.type_of_meat gibtype = C.gib_type - if(ismonkey(C)) - typeofskin = /obj/item/stack/sheet/animalhide/monkey - else if(isalien(C)) + if(isalien(C)) typeofskin = /obj/item/stack/sheet/animalhide/xeno var/occupant_volume if(occupant?.reagents) diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 70e3b864ed776..4aa4fb723c4d7 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) if(ismonkey(target)) stuff_monkey_in(target, user) -/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/monkey/target, mob/living/user) +/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/human/species/monkey/target, mob/living/user) if(!istype(target)) return if(target.stat == CONSCIOUS) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index b1a58acc331d1..3a63e5596ef96 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -24,10 +24,10 @@ //if they are holding or wearing a card that has access, that works if(check_access(H.get_active_held_item()) || src.check_access(H.wear_id) || check_access(accessor.get_inactive_held_item())) return TRUE - else if(ismonkey(accessor) || isalienadult(accessor)) - var/mob/living/carbon/george = accessor - //they can only hold things :( - if(check_access(george.get_active_held_item())) + else if(isalienadult(accessor)) + var/mob/living/carbon/xenolady = accessor + //she can only hold things :( + if(check_access(xenolady.get_active_held_item())) return TRUE else if(isanimal(accessor)) var/mob/living/simple_animal/A = accessor diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index add25a6e3ee06..b6153c911efd6 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -1750,6 +1750,11 @@ locked = TRUE color_src = null +/datum/sprite_accessory/tails/human/monkey + name = "Monkey" + icon_state = "monkey" + color_src = FALSE + /datum/sprite_accessory/snouts icon = 'icons/mob/mutant_bodyparts.dmi' diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 7851d62ac9e6a..88dfa4fe54c55 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -107,6 +107,12 @@ /mob/proc/get_held_index_of_item(obj/item/I) return held_items.Find(I) +///Find number of held items, multihand compatible +/mob/proc/get_num_held_items() + . = 0 + for(var/i in 1 to held_items.len) + if(held_items[i]) + .++ //Sad that this will cause some overhead, but the alias seems necessary //*I* may be happy with a million and one references to "indexes" but others won't be diff --git a/code/modules/mob/living/basic/vermin/cockroach.dm b/code/modules/mob/living/basic/vermin/cockroach.dm index 47e000da38d15..91a3231a75ef2 100644 --- a/code/modules/mob/living/basic/vermin/cockroach.dm +++ b/code/modules/mob/living/basic/vermin/cockroach.dm @@ -11,7 +11,6 @@ speed = 1.25 gold_core_spawnable = FRIENDLY_SPAWN pass_flags = PASSTABLE | PASSMOB - ventcrawler = VENTCRAWLER_ALWAYS verb_say = "chitters" verb_ask = "chitters inquisitively" @@ -30,6 +29,7 @@ /mob/living/basic/cockroach/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) AddElement(/datum/element/death_drops, list(/obj/effect/decal/cleanable/insectguts)) // AddElement(/datum/element/swabable, CELL_LINE_TABLE_COCKROACH, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7) //Bee edit: No swabable elements AddElement(/datum/element/basic_body_temp_sensetive, 270, INFINITY) diff --git a/code/modules/mob/living/basic/vermin/mothroach.dm b/code/modules/mob/living/basic/vermin/mothroach.dm index 2f232fc6275fd..130f9abf836f1 100644 --- a/code/modules/mob/living/basic/vermin/mothroach.dm +++ b/code/modules/mob/living/basic/vermin/mothroach.dm @@ -19,7 +19,6 @@ gold_core_spawnable = FRIENDLY_SPAWN can_be_held = TRUE worn_slot_flags = ITEM_SLOT_HEAD - ventcrawler = VENTCRAWLER_ALWAYS verb_say = "flutters" verb_ask = "flutters inquisitively" @@ -38,6 +37,7 @@ /mob/living/basic/mothroach/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) AddElement(/datum/element/pet_bonus, "squeaks happily!", emote_sound = 'sound/voice/moth/scream_moth.ogg') /mob/living/basic/mothroach/update_resting() diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 91d2491cfd301..582039d3a639f 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -250,14 +250,6 @@ bleedsuppress has been replaced for is_bandaged(). Note that is_bleeding() retur if (bleed.bleed_rate <= 0) stop_holding_wounds() -/mob/living/carbon/monkey/handle_blood() - if(bodytemperature >= TCRYO && !(HAS_TRAIT(src, TRAIT_HUSK))) //cryosleep or husked people do not pump the blood. - //Blood regeneration if there is some space - if(blood_volume < BLOOD_VOLUME_NORMAL) - blood_volume += 0.1 // regenerate blood VERY slowly - if(blood_volume < BLOOD_VOLUME_OKAY) - adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1)) - // Takes care blood loss and regeneration /mob/living/carbon/human/handle_blood() @@ -447,10 +439,6 @@ bleedsuppress has been replaced for is_bandaged(). Note that is_bleeding() retur if(blood_volume) return /datum/reagent/blood -/mob/living/carbon/monkey/get_blood_id() - if(!(HAS_TRAIT(src, TRAIT_HUSK))) - return /datum/reagent/blood - /mob/living/carbon/human/get_blood_id() if(HAS_TRAIT(src, TRAIT_HUSK)) return diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 594fb65d2a303..371c0c718de3e 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -4,7 +4,6 @@ gender = FEMALE //All xenos are girls!! dna = null faction = list(FACTION_ALIEN) - ventcrawler = VENTCRAWLER_ALWAYS sight = SEE_MOBS see_in_dark = 4 verb_say = "hisses" @@ -24,6 +23,7 @@ var/move_delay_add = 0 // movement delay to add /mob/living/carbon/alien/Initialize(mapload) + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) add_verb(/mob/living/proc/mob_sleep) add_verb(/mob/living/proc/toggle_resting) diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 383f9afec9951..408f42fe984ec 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -50,7 +50,7 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L) return attack_alien(L) -/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M) +/mob/living/carbon/alien/attack_paw(mob/living/carbon/human/M) if(!..()) return if(stat != DEAD) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index db3d5e6dc2cb3..44a73cdbc8dd2 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -2,7 +2,6 @@ //Common stuffs for Praetorian and Queen icon = 'icons/mob/alienqueen.dmi' status_flags = 0 - ventcrawler = VENTCRAWLER_NONE //pull over that ass too fat unique_name = 0 pixel_x = -16 base_pixel_x = -16 @@ -15,6 +14,11 @@ var/alt_inhands_file = 'icons/mob/alienqueen.dmi' var/game_end_timer +/mob/living/carbon/alien/humanoid/royal/Initialize(mapload) + . = ..() + // as a wise man once wrote: "pull over that ass too fat" + REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE) return FALSE diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 40168e56f1f3d..83cbae7bcbfde 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -35,14 +35,6 @@ ) AddElement(/datum/element/connect_loc, loc_connections) -/obj/item/clothing/mask/facehugger/compile_monkey_icon() - //If the icon, for this type of item, is already made by something else, don't make it again - if(GLOB.monkey_icon_cache[type]) - monkey_icon = GLOB.monkey_icon_cache[type] - return - monkey_icon = icon('icons/obj/clothing/monkey_alt.dmi', "facehugger") - GLOB.monkey_icon_cache[type] = icon(monkey_icon) - /obj/item/clothing/mask/facehugger/lamarr name = "Lamarr" sterile = TRUE @@ -102,7 +94,6 @@ /obj/item/clothing/mask/facehugger/equipped(mob/M) . = ..() Attach(M) - compile_monkey_icon() /obj/item/clothing/mask/facehugger/proc/on_entered(datum/source, atom/target) SIGNAL_HANDLER @@ -260,9 +251,6 @@ if(!istype(M) || M.stat == DEAD || M.getorgan(/obj/item/organ/alien/hivenode)) return FALSE - if(ismonkey(M)) - return TRUE - var/mob/living/carbon/C = M if(ishuman(C) && !(ITEM_SLOT_MASK in C.dna.species.no_equip)) var/mob/living/carbon/human/H = C diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d4c63aa181606..e5e500c1312aa 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1097,7 +1097,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon) if(HAS_TRAIT(src, TRAIT_RADIMMUNE) || HAS_TRAIT(src, TRAIT_BADDNA)) to_chat(usr, "Mob cannot mutate") return - var/list/mutations = subtypesof(/datum/mutation) + var/list/mutations = subtypesof(/datum/mutation/human) var/result = input(usr, "Choose the mutation to give", "Mutate") as null|anything in mutations if(!usr) return @@ -1106,7 +1106,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon) if(QDELETED(src)) to_chat(usr, "Mob doesn't exist anymore") return - var/datum/mutation/MT = result + var/datum/mutation/human/MT = result if(dna.mutation_in_sequence(MT)) dna.activate_mutation(MT) log_admin("[key_name(usr)] has activated the mutation [initial(MT.name)] in [key_name(src)]") @@ -1131,7 +1131,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon) return if(!result) return - var/datum/mutation/MT = result + var/datum/mutation/human/MT = result dna.remove_mutation(MT.type) log_admin("[key_name(usr)] has removed [MT.name] from [key_name(src)]") message_admins("[key_name_admin(usr)] has removed [MT.name] from [key_name_admin(src)].") diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 3b46d8299efa2..18e7fa154e5c1 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -180,7 +180,7 @@ return 0 -/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M) +/mob/living/carbon/attack_paw(mob/living/carbon/human/M) if(can_inject(M, TRUE)) for(var/thing in diseases) diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index 4b3beebc9e457..09e5449a3bd28 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -52,12 +52,6 @@ var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES) return istype(E) -/datum/emote/living/carbon/gnarl - key = "gnarl" - key_third_person = "gnarls" - message = "gnarls and shows its teeth.." - mob_type_allowed_typecache = list(/mob/living/carbon/monkey) - /datum/emote/living/carbon/moan key = "moan" key_third_person = "moans" @@ -69,32 +63,16 @@ key = "roll" key_third_person = "rolls" message = "rolls" - mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien) + mob_type_allowed_typecache = list(/mob/living/carbon/alien) hands_use_check = TRUE /datum/emote/living/carbon/scratch key = "scratch" key_third_person = "scratches" message = "scratches" - mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien) + mob_type_allowed_typecache = list(/mob/living/carbon/alien) hands_use_check = TRUE -/datum/emote/living/carbon/screech - key = "screech" - key_third_person = "screeches" - message = "screeches" - mob_type_allowed_typecache = list(/mob/living/carbon/monkey) - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/screech/get_sound(mob/living/user) - return pick('sound/creatures/monkey/monkey_screech_1.ogg', - 'sound/creatures/monkey/monkey_screech_2.ogg', - 'sound/creatures/monkey/monkey_screech_3.ogg', - 'sound/creatures/monkey/monkey_screech_4.ogg', - 'sound/creatures/monkey/monkey_screech_5.ogg', - 'sound/creatures/monkey/monkey_screech_6.ogg', - 'sound/creatures/monkey/monkey_screech_7.ogg') - /datum/emote/living/carbon/snap emote_type = EMOTE_AUDIBLE muzzle_ignore = TRUE @@ -129,16 +107,11 @@ message_param = "snaps their fingers at %t thrice" sound = 'sound/emotes/snap3.ogg' -/datum/emote/living/carbon/screech/roar - key = "roar" - key_third_person = "roars" - message = "roars" - /datum/emote/living/carbon/sign key = "sign" key_third_person = "signs" message_param = "signs the number %t" - mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien) + mob_type_allowed_typecache = list(/mob/living/carbon/alien) hands_use_check = TRUE /datum/emote/living/carbon/sign/select_param(mob/user, params) @@ -156,7 +129,7 @@ /datum/emote/living/carbon/tail key = "tail" message = "waves their tail" - mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien) + mob_type_allowed_typecache = list(/mob/living/carbon/alien) /datum/emote/living/carbon/wink key = "wink" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 95b5d8cab1761..fe9d4dad6b4ef 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -4,7 +4,7 @@ return switch(dna.species.species_gibs) if(GIB_TYPE_HUMAN) - new /obj/effect/temp_visual/gib_animation(loc, "gibbed-h") + new /obj/effect/temp_visual/gib_animation(loc, dna.species.gib_anim) if(GIB_TYPE_ROBOTIC) new /obj/effect/temp_visual/gib_animation(loc, "gibbed-r") @@ -14,7 +14,7 @@ return switch(dna.species.species_gibs) if(GIB_TYPE_HUMAN) - new /obj/effect/temp_visual/dust_animation(loc, "dust-h") + new /obj/effect/temp_visual/dust_animation(loc, dna.species.dust_anim) if(GIB_TYPE_ROBOTIC) new /obj/effect/temp_visual/dust_animation(loc, "dust-r") diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 12961b8d82daa..432184c18327a 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -165,6 +165,23 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) /mob/living/carbon/human/dummy/remove_from_alive_mob_list() return +/mob/living/carbon/human/dummy/create_dna() + dna = new /datum/dna/dummy(src) + if(!dna.species) + var/rando_race = pick(get_selectable_species()) + dna.species = new rando_race() + +/* + Specialized dummy DNA to remove artifacts from character preview +*/ +/datum/dna/dummy + +/datum/dna/dummy/update_height_holder() + return + +/datum/dna/dummy/update_body_size(force, height) + return + /proc/create_consistent_human_dna(mob/living/carbon/human/target) target.create_dna() target.dna.features["body_markings"] = "None" diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1f58b92024368..11d6fccc3a65f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -124,6 +124,13 @@ var/mob/living/carbon/H = user return H.dna?.species?.get_scream_sound(H) +/datum/emote/living/carbon/human/scream/screech //If a human tries to screech it'll just scream. + key = "screech" + key_third_person = "screeches" + message = "screeches." + emote_type = EMOTE_AUDIBLE + vary = FALSE + /datum/emote/living/carbon/human/pale key = "pale" message = "goes pale for a second" @@ -365,3 +372,45 @@ vary = TRUE sound = 'sound/emotes/diona/cricket.ogg' sound_volume = 30 + + + +///Snowflake emotes only for le epic chimp +/datum/emote/living/carbon/human/monkey + +/datum/emote/living/carbon/human/monkey/can_run_emote(mob/user, status_check = TRUE, intentional) + if(ismonkey(user)) + return ..() + return FALSE + +/datum/emote/living/carbon/human/monkey/gnarl + key = "gnarl" + key_third_person = "gnarls" + message = "gnarls and shows its teeth..." + +/datum/emote/living/carbon/human/monkey/roll + key = "roll" + key_third_person = "rolls" + message = "rolls." + hands_use_check = TRUE + +/datum/emote/living/carbon/human/monkey/scratch + key = "scratch" + key_third_person = "scratches" + message = "scratches." + hands_use_check = TRUE + +/datum/emote/living/carbon/human/monkey/screech/roar + key = "roar" + key_third_person = "roars" + message = "roars." + +/datum/emote/living/carbon/human/monkey/tail + key = "tail" + message = "waves their tail." + +/datum/emote/living/carbon/human/monkeysign + key = "sign" + key_third_person = "signs" + message_param = "signs the number %t." + hands_use_check = TRUE diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index e303b650155e0..a9c4c9eb189da 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -6,7 +6,6 @@ var/t_him = p_them() var/t_has = p_have() var/t_is = p_are() - var/t_es = p_es() var/obscure_name var/obscure_examine @@ -325,8 +324,9 @@ msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" if(getorgan(/obj/item/organ/brain)) if(ai_controller?.ai_status == AI_STATUS_ON) - msg += "[t_He] do[t_es]n't appear to be [t_him]self.\n" - if(!key) + if(!dna.species.ai_controlled_species) + msg += "[ai_controller.get_human_examine_text()]\n" + else if(!key) msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.\n" else if(!client) msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6cb3b134322a1..2760240b16828 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -779,7 +779,7 @@ remove_all_embedded_objects() set_heartattack(FALSE) drunkenness = 0 - for(var/datum/mutation/HM as() in dna.mutations) + for(var/datum/mutation/human/HM as() in dna.mutations) if(HM.quality != POSITIVE) dna.remove_mutation(HM.name) coretemperature = get_body_temp_normal(apply_change=FALSE) @@ -1137,11 +1137,12 @@ src.apply_damage(power, BRUTE, def_zone = pick(BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT)) src.Paralyze(10 * power) -/mob/living/carbon/human/monkeybrain +/mob/living/carbon/human/species/monkeybrain ai_controller = /datum/ai_controller/monkey /mob/living/carbon/human/species var/race = null + var/use_random_name = TRUE CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/human/species) @@ -1149,6 +1150,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/human/species) . = ..() set_species(race || specific_race) +/mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update, pref_load) + . = ..() + if(use_random_name) + fully_replace_character_name(real_name, dna.species.random_name()) + /mob/living/carbon/human/species/abductor race = /datum/species/abductor diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index c99ad23717fe3..02317bf9bb682 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -233,7 +233,7 @@ var/mob/living/carbon/human/H = user H.dna.species.spec_attack_hand(H, src) -/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M) +/mob/living/carbon/human/attack_paw(mob/living/carbon/human/M) if(check_shields(M, 0, "the [M.name]", UNARMED_ATTACK)) visible_message("[M] attempts to touch [src]!", \ "[M] attempts to touch you!", "You hear a swoosh!", null, M) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 0f105db785b97..7b44fe404876a 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -57,7 +57,7 @@ var/list/datum/bioware = list() - var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot, /mob/living/carbon/monkey)) + var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot, /mob/living/carbon/human/species/monkey)) var/lastpuke = 0 var/last_fire_update diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/human/monkey.dm similarity index 65% rename from code/modules/mob/living/carbon/monkey/punpun.dm rename to code/modules/mob/living/carbon/human/monkey.dm index faa5270193e61..ed6d6ce468f54 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/human/monkey.dm @@ -1,6 +1,23 @@ -/mob/living/carbon/monkey/punpun //except for a few special persistence features, pun pun is just a normal monkey +/mob/living/carbon/human/species/monkey + icon_state = "monkey" //for mapping + race = /datum/species/monkey + ai_controller = /datum/ai_controller/monkey + faction = list("neutral", "monkey") + +/mob/living/carbon/human/species/monkey/angry + ai_controller = /datum/ai_controller/monkey/angry + +/mob/living/carbon/human/species/monkey/angry/Initialize(mapload) + . = ..() + if(prob(10)) + var/obj/item/clothing/head/helmet/toggleable/justice/escape/helmet = new(src) + equip_to_slot_or_del(helmet,ITEM_SLOT_HEAD) + helmet.attack_self(src) // todo encapsulate toggle + +/mob/living/carbon/human/species/monkey/punpun //except for a few special persistence features, pun pun is just a normal monkey name = "Pun Pun" //C A N O N - unique_name = 0 + unique_name = FALSE + use_random_name = FALSE var/ancestor_name var/ancestor_chain = 1 var/relic_hat //Note: relic_hat and relic_mask are paths @@ -9,23 +26,28 @@ var/relic_mask_blacklist var/memory_saved = FALSE -/mob/living/carbon/monkey/punpun/Initialize(mapload) +/mob/living/carbon/human/species/monkey/punpun/Initialize(mapload) // Init our blacklists. relic_hat_blacklist = typecacheof(list(/obj/item/clothing/head/chameleon,/obj/item/clothing/head/helmet/monkey_sentience_helmet), only_root_path = TRUE) relic_mask_blacklist = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/clothing/mask/chameleon), only_root_path = TRUE) // Read memory Read_Memory() + + var/name_to_use = name + if(ancestor_name) - name = ancestor_name + name_to_use = ancestor_name if(ancestor_chain > 1) - name += " \Roman[ancestor_chain]" + name_to_use += " \Roman[ancestor_chain]" else if(prob(10)) - name = pick(list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky")) - if(name == "Furious George") + name_to_use = pick(list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky")) + if(name_to_use == "Furious George") ai_controller = /datum/ai_controller/monkey/angry //hes always mad . = ..() + fully_replace_character_name(real_name, name_to_use) + //These have to be after the parent new to ensure that the monkey //bodyparts are actually created before we try to equip things to //those slots @@ -34,18 +56,18 @@ if(relic_mask && !is_type_in_typecache(relic_mask, relic_mask_blacklist)) equip_to_slot_or_del(new relic_mask, ITEM_SLOT_MASK) -/mob/living/carbon/monkey/punpun/Life() +/mob/living/carbon/human/species/monkey/punpun/Life() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE, FALSE) memory_saved = TRUE ..() -/mob/living/carbon/monkey/punpun/death(gibbed) +/mob/living/carbon/human/species/monkey/punpun/death(gibbed) if(!memory_saved) Write_Memory(TRUE, gibbed) ..() -/mob/living/carbon/monkey/punpun/proc/Read_Memory() +/mob/living/carbon/human/species/monkey/punpun/proc/Read_Memory() if(fexists("data/npc_saves/Punpun.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Punpun.sav") S["ancestor_name"] >> ancestor_name @@ -65,7 +87,7 @@ relic_hat = text2path(json["relic_hat"]) // We convert these to paths for type checking relic_mask = text2path(json["relic_mask"]) -/mob/living/carbon/monkey/punpun/proc/Write_Memory(dead, gibbed) +/mob/living/carbon/human/species/monkey/punpun/proc/Write_Memory(dead, gibbed) var/json_file = file("data/npc_saves/Punpun.json") var/list/file_data = list() if(gibbed) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 920df474a4349..2b694c2cc17bd 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -98,6 +98,11 @@ GLOBAL_LIST_EMPTY(features_by_species) //Breathing! Most changes are in mutantlungs, though var/breathid = "o2" + ///What anim to use for dusting + var/dust_anim = "dust-h" + ///What anim to use for gibbing + var/gib_anim = "gibbed-h" + //Blank list. As it runs through regenerate_organs, organs that are missing are added in sequential order to the list //List is called in health analyzer and displays all missing organs var/list/required_organs = list() @@ -162,6 +167,12 @@ GLOBAL_LIST_EMPTY(features_by_species) //Should we preload this species's organs? var/preload = TRUE + ///List of results you get from knife-butchering. null means you cant butcher it. Associated by resulting type - value of amount + var/list/knife_butcher_results + + /// This supresses the "dosen't appear to be himself" examine text for if the mob is run by an AI controller. Should be used on any NPC human subtypes. Monkeys are the prime example. + var/ai_controlled_species = FALSE + /////////// // PROCS // /////////// @@ -851,7 +862,6 @@ GLOBAL_LIST_EMPTY(features_by_species) if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)) bodyparts_to_add -= "tail_human" - if(mutant_bodyparts["waggingtail_human"]) if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT)) bodyparts_to_add -= "waggingtail_human" @@ -1658,6 +1668,11 @@ GLOBAL_LIST_EMPTY(features_by_species) user.do_attack_animation(target, ATTACK_EFFECT_CLAW) if(ATTACK_EFFECT_SMASH) user.do_attack_animation(target, ATTACK_EFFECT_SMASH) + if(ATTACK_EFFECT_BITE) + if(user.is_mouth_covered(FALSE, TRUE)) + to_chat(user, "You can't bite with your mouth covered!") + return FALSE + user.do_attack_animation(target, ATTACK_EFFECT_BITE) else user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) @@ -2983,3 +2998,10 @@ GLOBAL_LIST_EMPTY(features_by_species) to_store += mutantwings //We don't cache mutant hands because it's not constrained enough, too high a potential for failure return to_store + +/datum/species/proc/get_species_height_map() + return icon('icons/effects/64x64.dmi', "height_displacement") + +///Species override for unarmed attacks because the attack_hand proc was made by a mouth-breathing troglodyte on a tricycle. Also to whoever thought it would be a good idea to make it so the original spec_unarmedattack was not actually linked to unarmed attack needs to be checked by a doctor because they clearly have a vast empty space in their head. +/datum/species/proc/spec_unarmedattack(mob/living/carbon/human/user, atom/target) + return FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm index 90696ecee5f1c..36746a4a50eaf 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm @@ -4,8 +4,28 @@ id = SPECIES_IPC bodyflag = FLAG_IPC sexes = FALSE - species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH, MUTCOLORS) - inherent_traits = list(TRAIT_BLOOD_COOLANT,TRAIT_RESISTCOLD,TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_LIMBATTACHMENT,TRAIT_EASYDISMEMBER,TRAIT_POWERHUNGRY,TRAIT_XENO_IMMUNE, TRAIT_TOXIMMUNE) + species_traits = list( + NOTRANSSTING, + NOEYESPRITES, + NO_DNA_COPY, + NOZOMBIE, + MUTCOLORS, + REVIVESBYHEALING, + NOHUSK, + NOMOUTH, + MUTCOLORS + ) + inherent_traits = list( + TRAIT_BLOOD_COOLANT, + TRAIT_RESISTCOLD, + TRAIT_NOBREATH, + TRAIT_RADIMMUNE, + TRAIT_LIMBATTACHMENT, + TRAIT_EASYDISMEMBER, + TRAIT_POWERHUNGRY, + TRAIT_XENO_IMMUNE, + TRAIT_TOXIMMUNE + ) inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID) mutantbrain = /obj/item/organ/brain/positron mutanteyes = /obj/item/organ/eyes/robotic diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 76842c3af6aee..3471662b546dd 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -919,19 +919,25 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cloth_pile) /datum/species/golem/plastic name = "Plastic Golem" id = SPECIES_GOLEM_PLASTIC + inherent_traits = list( + TRAIT_RESISTHEAT, + TRAIT_NOBREATH, + TRAIT_RESISTCOLD, + TRAIT_RESISTHIGHPRESSURE, + TRAIT_RESISTLOWPRESSURE, + TRAIT_NOFIRE, + TRAIT_NOGUNS, + TRAIT_RADIMMUNE, + TRAIT_PIERCEIMMUNE, + TRAIT_NODISMEMBER, + TRAIT_NONECRODISEASE, + TRAIT_VENTCRAWLER_NUDE, + ) prefix = "Plastic" special_names = list("Sheet", "Bag", "Bottle") fixed_mut_color = "fffa" info_text = "As a Plastic Golem, you are capable of ventcrawling and passing through plastic flaps as long as you are naked." -/datum/species/golem/plastic/on_species_gain(mob/living/carbon/C, datum/species/old_species) - . = ..() - C.ventcrawler = VENTCRAWLER_NUDE - -/datum/species/golem/plastic/on_species_loss(mob/living/carbon/C) - . = ..() - C.ventcrawler = initial(C.ventcrawler) - /datum/species/golem/bronze name = "Bronze Golem" id = SPECIES_GOLEM_BRONZE diff --git a/code/modules/mob/living/carbon/human/species_types/monkey.dm b/code/modules/mob/living/carbon/human/species_types/monkey.dm deleted file mode 100644 index 349806028e497..0000000000000 --- a/code/modules/mob/living/carbon/human/species_types/monkey.dm +++ /dev/null @@ -1,74 +0,0 @@ -///DO NOT USE set_species(/datum/species/monkey) -///USE monkeyize() INSTEAD -/datum/species/monkey - name = "\improper Monkey" - id = SPECIES_MONKEY - skinned_type = /obj/item/stack/sheet/animalhide/ - changesource_flags = MIRROR_BADMIN - offset_features = list( - OFFSET_HEAD = list(0,-3), - OFFSET_FACEMASK = list(0,-3) - ) - - species_chest = /obj/item/bodypart/chest/monkey - species_head = /obj/item/bodypart/head/monkey - species_l_arm = /obj/item/bodypart/l_arm/monkey - species_r_arm = /obj/item/bodypart/r_arm/monkey - species_l_leg = /obj/item/bodypart/l_leg/monkey - species_r_leg = /obj/item/bodypart/r_leg/monkey - -/datum/species/monkey/get_species_description() - return "Monkeys are a type of primate that exist between humans and animals on the evolutionary chain. \ - Every year, on Monkey Day, Nanotrasen shows their respect for the little guys by allowing them to roam the station freely." - -/datum/species/monkey/get_species_lore() - return list( - "Monkeys are commonly used as test subjects on board Space Station 13. \ - But what if... for one day... the Monkeys were allowed to be the scientists? \ - What experiments would they come up with? Would they (stereotypically) be related to bananas somehow? \ - There's only one way to find out.", - ) - -/datum/species/monkey/create_pref_unique_perks() - var/list/to_add = list() - - to_add += list( - list( - SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "spider", - SPECIES_PERK_NAME = "Vent Crawling", - SPECIES_PERK_DESC = "Monkeys can crawl through the vent and scrubber networks while wearing no clothing. \ - Stay out of the kitchen!", - ), - list( - SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "paw", - SPECIES_PERK_NAME = "Primal Primate", - SPECIES_PERK_DESC = "Monkeys are primitive humans, and can't do most things a human can do. Computers are impossible, \ - complex machines are right out, and most clothes don't fit your smaller form.", - ), - list( - SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "capsules", - SPECIES_PERK_NAME = "Mutadone Averse", - SPECIES_PERK_DESC = "Monkeys are reverted into normal humans upon being exposed to Mutadone.", - ), - ) - - return to_add - -/datum/species/monkey/create_pref_language_perk() - var/list/to_add = list() - // Holding these variables so we can grab the exact names for our perk. - var/datum/language/common_language = /datum/language/common - var/datum/language/monkey_language = /datum/language/monkey - - to_add += list(list( - SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "comment", - SPECIES_PERK_NAME = "Primitive Tongue", - SPECIES_PERK_DESC = "You may be able to understand [initial(common_language.name)], but you can't speak it. \ - You can only speak [initial(monkey_language.name)].", - )) - - return to_add diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm new file mode 100644 index 0000000000000..056fd3555ea16 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -0,0 +1,233 @@ +/datum/species/monkey + name = "Monkey" + id = SPECIES_MONKEY + skinned_type = /obj/item/stack/sheet/animalhide/ + changesource_flags = MIRROR_BADMIN + mutanttongue = /obj/item/organ/tongue/monkey + skinned_type = /obj/item/stack/sheet/animalhide/monkey + meat = /obj/item/food/meat/slab/monkey + knife_butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1) + species_traits = list( + NO_UNDERWEAR, + NOTRANSSTING, + EYECOLOR + ) + inherent_traits = list( + TRAIT_DISCOORDINATED, + TRAIT_VENTCRAWLER_NUDE, + TRAIT_PRIMITIVE, + TRAIT_INFERIORFORM, + TRAIT_WEAK_SOUL, + ) + changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT + inherent_factions = list("monkey") + sexes = TRUE + species_language_holder = /datum/language_holder/monkey + + mutant_organs = list(/obj/item/organ/tail/monkey) + species_l_arm = /obj/item/bodypart/l_arm/monkey + species_r_arm = /obj/item/bodypart/r_arm/monkey + species_head = /obj/item/bodypart/head/monkey + species_l_leg = /obj/item/bodypart/l_leg/monkey + species_r_leg = /obj/item/bodypart/r_leg/monkey + species_chest = /obj/item/bodypart/chest/monkey + + dust_anim = "dust-m" + gib_anim = "gibbed-m" + + ai_controlled_species = TRUE + + species_height = SPECIES_HEIGHTS(8, 8, 8) + + //payday_modifier = 1.5 + +/datum/species/monkey/random_name(gender,unique,lastname) + var/randname = "monkey ([rand(1,999)])" + + return randname + +/datum/species/monkey/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.pass_flags |= PASSTABLE + H.butcher_results = knife_butcher_results + if(!H.dna.features["tail_human"] || H.dna.features["tail_human"] == "None") + H.dna.features["tail_human"] = "Monkey" + handle_mutant_bodyparts(H) + + H.dna.add_mutation(RACEMUT, MUT_NORMAL) + H.dna.activate_mutation(RACEMUT) + + +/datum/species/monkey/on_species_loss(mob/living/carbon/C) + . = ..() + C.pass_flags = initial(C.pass_flags) + C.butcher_results = null + C.dna.remove_mutation(RACEMUT) + +/datum/species/monkey/spec_unarmedattack(mob/living/carbon/human/user, atom/target) + . = ..() + if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + if(!iscarbon(target)) + return TRUE + var/mob/living/carbon/victim = target + if(user.a_intent != INTENT_HARM || user.is_muzzled()) + return TRUE + var/obj/item/bodypart/affecting = null + if(ishuman(victim)) + var/mob/living/carbon/human/human_victim = victim + affecting = human_victim.get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + var/armor = victim.run_armor_check(affecting, MELEE) + if(prob(25)) + victim.visible_message("[user]'s bite misses [victim]!", + "You avoid [user]'s bite!", "You hear jaws snapping shut!", COMBAT_MESSAGE_RANGE, user) + to_chat(user, "Your bite misses [victim]!") + return TRUE + ///Monkeys are of a few mobs remaining in beecode that use randomized damage apply_damage(rand()) for some attacks. + ///It was the perogative a few years ago to standardize most attack procs to the same consistent damage everytime, but we are not the same codebase as then. + ///If someone wants to change this status quo by either reintroducing RNG attacks, or killing them entirely, that should be its own pr and include every remaining case. + victim.apply_damage(rand(1, 3), BRUTE, affecting, armor) + victim.visible_message("[name] bites [victim]!", + "[name] bites you!", "You hear a chomp!", COMBAT_MESSAGE_RANGE, name) + to_chat(user, "You bite [victim]!") + if(armor >= 2) + return TRUE + for(var/d in user.diseases) + var/datum/disease/bite_infection = d + victim.ForceContractDisease(bite_infection) + return TRUE + target.attack_paw(user) + return TRUE + +/datum/species/monkey/handle_mutations_and_radiation(mob/living/carbon/human/H) + . = ..() + if(H.radiation > RAD_MOB_MUTATE * 2 && prob(50)) + H.gorillize() + return + +/datum/species/monkey/get_scream_sound(mob/living/carbon/human/monkey) + return pick( + 'sound/creatures/monkey/monkey_screech_1.ogg', + 'sound/creatures/monkey/monkey_screech_2.ogg', + 'sound/creatures/monkey/monkey_screech_3.ogg', + 'sound/creatures/monkey/monkey_screech_4.ogg', + 'sound/creatures/monkey/monkey_screech_5.ogg', + 'sound/creatures/monkey/monkey_screech_6.ogg', + 'sound/creatures/monkey/monkey_screech_7.ogg', + ) + +/datum/species/monkey/get_species_description() + return "Monkeys are a type of primate that exist between humans and animals on the evolutionary chain. \ + Every year, on Monkey Day, Nanotrasen shows their respect for the little guys by allowing them to roam the station freely." + +/datum/species/monkey/get_species_lore() + return list( + "Monkeys are commonly used as test subjects on board Space Station 13. \ + But what if... for one day... the Monkeys were allowed to be the scientists? \ + What experiments would they come up with? Would they (stereotypically) be related to bananas somehow? \ + There's only one way to find out.", + ) + +/datum/species/monkey/create_pref_unique_perks() + var/list/to_add = list() + + to_add += list( + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "spider", + SPECIES_PERK_NAME = "Vent Crawling", + SPECIES_PERK_DESC = "Monkeys can crawl through the vent and scrubber networks while wearing no clothing. \ + Stay out of the kitchen!", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "paw", + SPECIES_PERK_NAME = "Primal Primate", + SPECIES_PERK_DESC = "Monkeys are primitive humans, and can't do most things a human can do. Computers are impossible, \ + complex machines are right out, and most clothes don't fit your smaller form.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "capsules", + SPECIES_PERK_NAME = "Mutadone Averse", + SPECIES_PERK_DESC = "Monkeys are reverted into normal humans upon being exposed to Mutadone.", + ), + ) + + return to_add + +/datum/species/monkey/create_pref_language_perk() + var/list/to_add = list() + // Holding these variables so we can grab the exact names for our perk. + var/datum/language/common_language = /datum/language/common + var/datum/language/monkey_language = /datum/language/monkey + + to_add += list(list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "comment", + SPECIES_PERK_NAME = "Primitive Tongue", + SPECIES_PERK_DESC = "You may be able to understand [initial(common_language.name)], but you can't speak it. \ + You can only speak [initial(monkey_language.name)].", + )) + + return to_add + +/datum/species/monkey/get_species_height_map() + return icon('icons/effects/64x64.dmi', "height_displacement_monkey") + +/datum/dna/tumor + species = new /datum/species/monkey/teratoma + +/datum/species/monkey/teratoma + name = "Teratoma" + id = "teratoma" + species_traits = list( + NOTRANSSTING, + NO_DNA_COPY, + NOEYESPRITES, //teratomas already have eyes baked-in + NO_UNDERWEAR, + HAIR, + FACEHAIR, + LIPS, + ) + inherent_traits = list( + TRAIT_NOHUNGER, + TRAIT_RADIMMUNE, + TRAIT_BADDNA, //Made of mutated cells + TRAIT_NOGUNS, + TRAIT_NONECRODISEASE, + ) + use_skintones = FALSE + skinned_type = /obj/item/stack/sheet/animalhide/monkey + changesource_flags = MIRROR_BADMIN + mutantbrain = /obj/item/organ/brain/tumor + mutanttongue = /obj/item/organ/tongue/teratoma + + species_chest = /obj/item/bodypart/chest/monkey/teratoma + species_head = /obj/item/bodypart/head/monkey/teratoma + species_l_arm = /obj/item/bodypart/l_arm/monkey/teratoma + species_r_arm = /obj/item/bodypart/r_arm/monkey/teratoma + species_l_leg = /obj/item/bodypart/l_leg/monkey/teratoma + species_r_leg = /obj/item/bodypart/r_leg/monkey/teratoma + +/obj/item/organ/brain/tumor + name = "teratoma brain" + +/obj/item/organ/brain/tumor/Remove(mob/living/carbon/C, special, no_id_transfer, pref_load = FALSE) + . = ..() + //Removing it deletes it + if(!QDELETED(src)) + qdel(src) + +/mob/living/carbon/human/species/monkey/tumor/handle_mutations_and_radiation() + return + +/mob/living/carbon/human/species/monkey/tumor/has_dna() + return FALSE + +/mob/living/carbon/human/species/monkey/tumor/create_dna() + dna = new /datum/dna/tumor(src) + //Give us the juicy mutant organs + dna.species.on_species_gain(src, null, FALSE) + dna.species.regenerate_organs(src, replace_current = TRUE) + //Fix initial DNA not properly handling our height + dna.update_body_size(height = pick(dna.species.get_species_height())) diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 8dfbd2ac4a660..ee03f35780c22 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -140,7 +140,7 @@ var/obj/item/organ/wings/moth/W = H.getorgan(/obj/item/organ/wings/moth) if(W) W.flight_level = WINGS_FLIGHTLESS//The check for wings getting burned makes them cosmetic, so this allows the burned off effect to be applied again - if(locate(/datum/mutation/strongwings) in H.dna.mutations) + if(locate(/datum/mutation/human/strongwings) in H.dna.mutations) W.flight_level = WINGS_FLYING H.dna.species.handle_mutant_bodyparts(H) H.dna.species.handle_body(H) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 9cd3a1486c1ba..493fe74d0bb62 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -214,7 +214,7 @@ There are several things that need to be remembered: var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1] inv.update_icon() - if(!gloves && blood_in_hands) + if(!gloves && blood_in_hands && !(NOBLOODOVERLAY in dna.species.species_traits)) var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER) if(num_hands < 2) if(has_left_hand(FALSE)) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index e2c54e8c6499c..91152d353fdf6 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -35,7 +35,7 @@ BT.on_life() if(stat != DEAD && has_dna()) - for(var/datum/mutation/HM as() in dna.mutations) + for(var/datum/mutation/human/HM as() in dna.mutations) HM.on_life() else @@ -356,7 +356,7 @@ dna.previous.Remove("blood_type") dna.temporary_mutations.Remove(mut) continue - for(var/datum/mutation/HM as() in dna.mutations) + for(var/datum/mutation/human/HM as() in dna.mutations) if(HM?.timed) dna.remove_mutation(HM.type) diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm deleted file mode 100644 index b1fe94a97ccdf..0000000000000 --- a/code/modules/mob/living/carbon/monkey/death.dm +++ /dev/null @@ -1,9 +0,0 @@ -/mob/living/carbon/monkey/gib_animation() - new /obj/effect/temp_visual/gib_animation(loc, "gibbed-m") - -/mob/living/carbon/monkey/dust_animation() - new /obj/effect/temp_visual/dust_animation(loc, "dust-m") - -/mob/living/carbon/monkey/death(gibbed) - SSmove_manager.stop_looping(src) // Stops dead monkeys from fleeing their attacker or climbing out from inside His Grace - . = ..() diff --git a/code/modules/mob/living/carbon/monkey/inventory.dm b/code/modules/mob/living/carbon/monkey/inventory.dm deleted file mode 100644 index 53713c8008f6c..0000000000000 --- a/code/modules/mob/living/carbon/monkey/inventory.dm +++ /dev/null @@ -1,81 +0,0 @@ -/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) - switch(slot) - if(ITEM_SLOT_HANDS) - if(get_empty_held_indexes()) - return TRUE - return FALSE - if(ITEM_SLOT_MASK) - if(wear_mask) - return FALSE - if( !(I.slot_flags & ITEM_SLOT_MASK) ) - return FALSE - return TRUE - if(ITEM_SLOT_NECK) - if(wear_neck) - return FALSE - if( !(I.slot_flags & ITEM_SLOT_NECK) ) - return FALSE - return TRUE - if(ITEM_SLOT_HEAD) - if(head) - return FALSE - if( !(I.slot_flags & ITEM_SLOT_HEAD) ) - return FALSE - return TRUE - if(ITEM_SLOT_BACK) - if(back) - return FALSE - if( !(I.slot_flags & ITEM_SLOT_BACK) ) - return FALSE - return TRUE - if(ITEM_SLOT_ICLOTHING) - if(w_uniform) - return FALSE - if( !(I.slot_flags & ITEM_SLOT_ICLOTHING) ) - return FALSE - return TRUE - return FALSE //Unsupported slot - -/mob/living/carbon/monkey/equip_to_slot(obj/item/I, slot) - if(!..()) //a check failed or the item has already found its slot - return - - var/not_handled = FALSE //Added in case we make this type path deeper one day - switch(slot) - if(ITEM_SLOT_ICLOTHING) - w_uniform = I - update_suit_sensors() - update_inv_w_uniform() - else - to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") - - //Item is handled and in slot, valid to call callback, for this proc should always be true - if(!not_handled) - I.equipped(src, slot) - - return not_handled //For future deeper overrides - -/mob/living/carbon/monkey/get_equipped_items(include_pockets = FALSE) - var/list/items = ..() - if(ears) - items += ears - if(glasses) - items += glasses - if(gloves) - items += gloves - if(shoes) - items += shoes - if(w_uniform) - items += w_uniform - return items - -//Hopefully this doesn't fuck with anything -/mob/living/carbon/monkey/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, was_thrown = FALSE, silent = FALSE) - . = ..() - if(!. || !I) //We don't want to set anything to null if the parent returned 0. - return - - if(I == w_uniform) - w_uniform = null - if(!QDELETED(src)) - update_inv_w_uniform() diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm deleted file mode 100644 index 752f12d8cfb1c..0000000000000 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ /dev/null @@ -1,156 +0,0 @@ -/mob/living/carbon/monkey - -/mob/living/carbon/monkey/handle_mutations_and_radiation() - if(radiation) - if(radiation > RAD_MOB_KNOCKDOWN && prob(RAD_MOB_KNOCKDOWN_PROB)) - if(!IsParalyzed()) - emote("collapse") - Paralyze(RAD_MOB_KNOCKDOWN_AMOUNT) - to_chat(src, "You feel weak.") - if(radiation > RAD_MOB_MUTATE) - if(prob(2)) - to_chat(src, "You mutate!") - easy_randmut(NEGATIVE+MINOR_NEGATIVE) - emote("gasp") - domutcheck() - - if(radiation > RAD_MOB_MUTATE * 1.5) - switch(rand(1, 3)) - if(1) - gorillize() - if(2) - humanize(TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPDAMAGE | TR_KEEPORGANS) - if(3) - var/obj/item/bodypart/BP = pick(bodyparts) - if(BP.body_part != HEAD && BP.body_part != CHEST) - if(BP.dismemberable) - BP.dismember() - take_bodypart_damage(100, 0, 0) - return - if(radiation > RAD_MOB_VOMIT && prob(RAD_MOB_VOMIT_PROB)) - vomit(10, TRUE) - return ..() - -/mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath) - if(abs(get_body_temp_normal() - breath.return_temperature()) > 50) - switch(breath.return_temperature()) - if(-INFINITY to 120) - adjustFireLoss(3) - if(120 to 200) - adjustFireLoss(1.5) - if(200 to 260) - adjustFireLoss(0.5) - if(360 to 400) - adjustFireLoss(2) - if(400 to 1000) - adjustFireLoss(3) - if(1000 to INFINITY) - adjustFireLoss(8) - - . = ..() // interact with body heat after dealing with the hot air - -/mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment) - // Run base mob body temperature proc before taking damage - // this balances body temp to the enviroment and natural stabilization - . = ..() - - if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT)) - remove_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod) - switch(bodytemperature) - if(360 to 400) - throw_alert("temp", /atom/movable/screen/alert/hot, 1) - apply_damage(HEAT_DAMAGE_LEVEL_1, BURN) - if(400 to 460) - throw_alert("temp", /atom/movable/screen/alert/hot, 2) - apply_damage(HEAT_DAMAGE_LEVEL_2, BURN) - if(460 to INFINITY) - throw_alert("temp", /atom/movable/screen/alert/hot, 3) - if(on_fire) - apply_damage(HEAT_DAMAGE_LEVEL_3, BURN) - else - apply_damage(HEAT_DAMAGE_LEVEL_2, BURN) - - else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTCOLD)) - if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) - add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - bodytemperature) / COLD_SLOWDOWN_FACTOR)) - switch(bodytemperature) - if(200 to BODYTEMP_COLD_DAMAGE_LIMIT) - throw_alert("temp", /atom/movable/screen/alert/cold, 1) - apply_damage(COLD_DAMAGE_LEVEL_1, BURN) - if(120 to 200) - throw_alert("temp", /atom/movable/screen/alert/cold, 2) - apply_damage(COLD_DAMAGE_LEVEL_2, BURN) - if(-INFINITY to 120) - throw_alert("temp", /atom/movable/screen/alert/cold, 3) - apply_damage(COLD_DAMAGE_LEVEL_3, BURN) - else - clear_alert("temp") - - else - remove_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod) - clear_alert("temp") - - //Account for massive pressure differences - - var/pressure = environment.return_pressure() - var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob. - switch(adjusted_pressure) - if(HAZARD_HIGH_PRESSURE to INFINITY) - adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) ) - throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2) - if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE) - throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1) - if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE) - clear_alert("pressure") - if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE) - throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1) - else - if(HAS_TRAIT(src, TRAIT_RESISTLOWPRESSURE)) - clear_alert("pressure") - else - adjustBruteLoss( LOW_PRESSURE_DAMAGE ) - throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2) - - return - -/mob/living/carbon/monkey/calculate_affecting_pressure(pressure) - if (head && isclothing(head)) - var/obj/item/clothing/CH = head - if (CH.clothing_flags & STOPSPRESSUREDAMAGE) - return ONE_ATMOSPHERE - return pressure - -/mob/living/carbon/monkey/handle_random_events() - if (prob(1) && prob(2)) - emote("scratch") - -/mob/living/carbon/monkey/has_smoke_protection() - if(wear_mask) - if(wear_mask.clothing_flags & BLOCK_GAS_SMOKE_EFFECT) - return 1 - -/mob/living/carbon/monkey/handle_fire() - . = ..() - if(.) //if the mob isn't on fire anymore - return - - //the fire tries to damage the exposed clothes and items - var/list/burning_items = list() - //HEAD// - var/obscured = check_obscured_slots(TRUE) - if(wear_mask && !(obscured & ITEM_SLOT_MASK)) - burning_items += wear_mask - if(wear_neck && !(obscured & ITEM_SLOT_NECK)) - burning_items += wear_neck - if(head) - burning_items += head - - if(back) - burning_items += back - - for(var/obj/item/I as() in burning_items) - I.fire_act((fire_stacks * 50)) //damage taken is reduced to 2% of this value by fire_act() - - if(!head?.max_heat_protection_temperature || head.max_heat_protection_temperature < FIRE_IMMUNITY_MAX_TEMP_PROTECT) - adjust_bodytemperature(BODYTEMP_HEATING_MAX) - SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm deleted file mode 100644 index ce45170756a7e..0000000000000 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ /dev/null @@ -1,278 +0,0 @@ -/mob/living/carbon/monkey - name = "monkey" - verb_say = "chimpers" - initial_language_holder = /datum/language_holder/monkey - possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_HARM) - icon = 'icons/mob/monkey.dmi' - icon_state = null - gender = NEUTER - pass_flags = PASSTABLE - ventcrawler = VENTCRAWLER_NUDE - mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) - butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1) - type_of_meat = /obj/item/food/meat/slab/monkey - gib_type = /obj/effect/decal/cleanable/blood/gibs - unique_name = TRUE - blocks_emissive = EMISSIVE_BLOCK_UNIQUE - bodyparts = list( - /obj/item/bodypart/chest/monkey, - /obj/item/bodypart/head/monkey, - /obj/item/bodypart/l_arm/monkey, - /obj/item/bodypart/r_arm/monkey, - /obj/item/bodypart/r_leg/monkey, - /obj/item/bodypart/l_leg/monkey - ) - hud_type = /datum/hud/monkey - mobchatspan = "monkeyhive" - ai_controller = /datum/ai_controller/monkey - faction = list("neutral", "monkey") - /// Whether it can be made into a human with mutadone - var/natural = TRUE - ///Item reference for jumpsuit - var/obj/item/clothing/w_uniform = null - -GLOBAL_LIST_INIT(strippable_monkey_items, create_strippable_list(list( - /datum/strippable_item/hand/left, - /datum/strippable_item/hand/right, - /datum/strippable_item/mob_item_slot/handcuffs, - /datum/strippable_item/mob_item_slot/legcuffs, - /datum/strippable_item/mob_item_slot/head, - /datum/strippable_item/mob_item_slot/back, - /datum/strippable_item/mob_item_slot/jumpsuit, - /datum/strippable_item/mob_item_slot/mask, - /datum/strippable_item/mob_item_slot/neck -))) - -CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/monkey) - -/mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner) - add_verb(/mob/living/proc/mob_sleep) - add_verb(/mob/living/proc/toggle_resting) - - icon_state = null - - if(unique_name) //used to exclude pun pun - gender = pick(MALE, FEMALE) - real_name = name - - //initialize limbs - create_bodyparts() - create_internal_organs() - - . = ..() - - if (cubespawned) - var/cap = CONFIG_GET(number/max_cube_monkeys) - if (LAZYLEN(SSmobs.cubemonkeys) > cap) - if (spawner) - to_chat(spawner, "Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!") - return INITIALIZE_HINT_QDEL - SSmobs.cubemonkeys += src - - create_dna() - dna.initialize_dna(random_blood_type()) - AddComponent(/datum/component/bloodysoles/feet) - //Set offsets here, DONT mess with monkey species, we use human anyway. - dna.species.offset_features = list(OFFSET_UNIFORM = list(0,0), OFFSET_ID = list(0,0), OFFSET_GLOVES = list(0,0), OFFSET_GLASSES = list(0,0), OFFSET_EARS = list(0,0), OFFSET_SHOES = list(0,0), OFFSET_S_STORE = list(0,0), OFFSET_FACEMASK = list(0,-4), OFFSET_HEAD = list(0,-4), OFFSET_FACE = list(0,0), OFFSET_BELT = list(0,0), OFFSET_BACK = list(0,0), OFFSET_SUIT = list(0,0), OFFSET_NECK = list(0,0), OFFSET_RIGHT_HAND = list(0,0), OFFSET_LEFT_HAND = list(0,0)) - check_if_natural() - AddElement(/datum/element/strippable, GLOB.strippable_monkey_items) - AddElement(/datum/element/footstep, FOOTSTEP_MOB_BAREFOOT, 1, 2) - - // Give random dormant diseases to roundstart monkeys. - if(mapload) - give_random_dormant_disease(30, min_symptoms = 1, max_symptoms = 3) - -/mob/living/carbon/monkey/proc/check_if_natural() - for(var/datum/mutation/race/monke in dna.mutations) - if(natural) - monke.mutadone_proof = TRUE - else - monke.mutadone_proof = FALSE - -/mob/living/carbon/monkey/Destroy() - SSmobs.cubemonkeys -= src - return ..() - -/mob/living/carbon/monkey/create_internal_organs() - internal_organs += new /obj/item/organ/appendix - internal_organs += new /obj/item/organ/lungs - internal_organs += new /obj/item/organ/heart - internal_organs += new /obj/item/organ/brain - internal_organs += new /obj/item/organ/tongue - internal_organs += new /obj/item/organ/eyes - internal_organs += new /obj/item/organ/ears - internal_organs += new /obj/item/organ/liver - internal_organs += new /obj/item/organ/stomach - ..() - -/mob/living/carbon/monkey/on_reagent_change() - . = ..() - var/amount - if(reagents.has_reagent(/datum/reagent/medicine/morphine)) - amount = -1 - if(reagents.has_reagent(/datum/reagent/consumable/nuka_cola)) - amount = -1 - if(amount) - add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_reagent_speedmod, TRUE, amount) - -/mob/living/carbon/monkey/updatehealth() - . = ..() - var/slow = 0 - if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN)) - var/health_deficiency = (maxHealth - health) - if(health_deficiency >= 45) - slow += (health_deficiency / 25) - add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_health_speedmod, TRUE, slow) - -/mob/living/carbon/monkey/get_stat_tab_status() - var/list/tab_data = ..() - if(client && mind) - var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - tab_data["Chemical Storage"] = GENERATE_STAT_TEXT("[changeling.chem_charges]/[changeling.chem_storage]") - tab_data["Absorbed DNA"] = GENERATE_STAT_TEXT("[changeling.absorbedcount]") - return tab_data - - -/mob/living/carbon/monkey/verb/removeinternal() - set name = "Remove Internals" - set category = "IC" - internal = null - return - -/mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents - return FALSE - -/mob/living/carbon/monkey/canBeHandcuffed() - if(num_hands < 2) - return FALSE - return TRUE - -/mob/living/carbon/monkey/assess_threat(judgment_criteria, lasercolor = "", datum/callback/weaponcheck=null) - if(judgment_criteria & JUDGE_EMAGGED) - return 10 //Everyone is a criminal! - - var/threatcount = 0 - - //Securitrons can't identify monkeys - if( !(judgment_criteria & JUDGE_IGNOREMONKEYS) && (judgment_criteria & JUDGE_IDCHECK) ) - threatcount += 4 - - //Lasertag bullshit - if(lasercolor) - if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve - if(is_holding_item_of_type(/obj/item/gun/energy/laser/redtag)) - threatcount += 4 - - if(lasercolor == "r") - if(is_holding_item_of_type(/obj/item/gun/energy/laser/bluetag)) - threatcount += 4 - - return threatcount - - //Check for weapons - if( (judgment_criteria & JUDGE_WEAPONCHECK) && weaponcheck ) - for(var/obj/item/I in held_items) //if they're holding a gun - if(weaponcheck.Invoke(I)) - threatcount += 4 - if(weaponcheck.Invoke(back)) //if a weapon is present in the back slot - threatcount += 4 //trigger look_for_perp() since they're nonhuman and very likely hostile - - //mindshield implants imply trustworthyness - if(has_mindshield_hud_icon()) - threatcount -= 1 - - return threatcount - -/mob/living/carbon/monkey/IsVocal() - if(!getorganslot(ORGAN_SLOT_LUNGS)) - return 0 - return 1 - -/mob/living/carbon/monkey/can_use_guns(obj/item/G) - return TRUE - -/mob/living/carbon/monkey/IsAdvancedToolUser() - if(HAS_TRAIT(src, TRAIT_DISCOORDINATED)) //Obtainable with Brain trauma - return FALSE - return TRUE //Something about an infinite amount of monkeys on typewriters writing Shakespeare... - -/mob/living/carbon/monkey/angry - ai_controller = /datum/ai_controller/monkey/angry - -/mob/living/carbon/monkey/angry/Initialize(mapload) - . = ..() - if(prob(10)) - var/obj/item/clothing/head/helmet/toggleable/justice/escape/helmet = new(src) - equip_to_slot_or_del(helmet,ITEM_SLOT_HEAD) - helmet.attack_self(src) // todo encapsulate toggle - - -//Special monkeycube subtype to track the number of them and prevent spam -/mob/living/carbon/monkey/cube/Initialize(mapload) - . = ..() - GLOB.total_cube_monkeys++ - -/mob/living/carbon/monkey/cube/death(gibbed) - GLOB.total_cube_monkeys-- - ..() - -//In case admins delete them before they die -/mob/living/carbon/monkey/cube/Destroy() - if(stat != DEAD) - GLOB.total_cube_monkeys-- - return ..() - -/mob/living/carbon/monkey/tumor - name = "living teratoma" - verb_say = "blabbers" - initial_language_holder = /datum/language_holder/monkey - icon = 'icons/mob/monkey.dmi' - icon_state = null - butcher_results = list(/obj/effect/spawner/lootdrop/teratoma/minor = 5, /obj/effect/spawner/lootdrop/teratoma/major = 1) - type_of_meat = /obj/effect/spawner/lootdrop/teratoma/minor - bodyparts = list(/obj/item/bodypart/chest/monkey/teratoma, /obj/item/bodypart/head/monkey/teratoma, /obj/item/bodypart/l_arm/monkey/teratoma, - /obj/item/bodypart/r_arm/monkey/teratoma, /obj/item/bodypart/r_leg/monkey/teratoma, /obj/item/bodypart/l_leg/monkey/teratoma) - ai_controller = null - -/datum/dna/tumor - species = new /datum/species/teratoma - -/datum/species/teratoma - name = "Teratoma" - id = "teratoma" - species_traits = list(NOTRANSSTING, NO_DNA_COPY, EYECOLOR, HAIR, FACEHAIR, LIPS) - inherent_traits = list(TRAIT_NOHUNGER, TRAIT_RADIMMUNE, TRAIT_BADDNA, TRAIT_NOGUNS, TRAIT_NONECRODISEASE) //Made of mutated cells - use_skintones = FALSE - skinned_type = /obj/item/stack/sheet/animalhide/monkey - changesource_flags = MIRROR_BADMIN - mutantbrain = /obj/item/organ/brain/tumor - mutanttongue = /obj/item/organ/tongue/teratoma - - species_chest = /obj/item/bodypart/chest/monkey/teratoma - species_head = /obj/item/bodypart/head/monkey/teratoma - species_l_arm = /obj/item/bodypart/l_arm/monkey/teratoma - species_r_arm = /obj/item/bodypart/r_arm/monkey/teratoma - species_l_leg = /obj/item/bodypart/l_leg/monkey/teratoma - species_r_leg = /obj/item/bodypart/r_leg/monkey/teratoma - -/obj/item/organ/brain/tumor - name = "teratoma brain" - -/obj/item/organ/brain/tumor/Remove(mob/living/carbon/C, special, no_id_transfer, pref_load = FALSE) - . = ..() - //Removing it deletes it - if(!QDELETED(src)) - qdel(src) - -/mob/living/carbon/monkey/tumor/handle_mutations_and_radiation() - return - -/mob/living/carbon/monkey/tumor/has_dna() - return FALSE - -/mob/living/carbon/monkey/tumor/create_dna() - dna = new /datum/dna/tumor(src) - //Give us the juicy mutant organs - dna.species.on_species_gain(src, null, FALSE) - dna.species.regenerate_organs(src, replace_current = TRUE) diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm deleted file mode 100644 index 7355cac739930..0000000000000 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ /dev/null @@ -1,185 +0,0 @@ -/mob/living/carbon/monkey/help_shake_act(mob/living/carbon/M) - if(health < 0 && ishuman(M)) - var/mob/living/carbon/human/H = M - H.do_cpr(src) - else - ..() - -/mob/living/carbon/monkey/attack_paw(mob/living/M) - if(..()) //successful monkey bite. - var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone)) - if(!affecting) - affecting = get_bodypart(BODY_ZONE_CHEST) - if(M.limb_destroyer) - dismembering_strike(M, affecting.body_zone) - if(stat != DEAD) - var/dmg = rand(1, 5) - apply_damage(dmg, BRUTE, affecting) - -/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L) - if(..()) //successful larva bite. - var/damage = rand(1, 3) - if(stat != DEAD) - L.amount_grown = min(L.amount_grown + damage, L.max_grown) - var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.get_combat_bodyzone(src))) - if(!affecting) - affecting = get_bodypart(BODY_ZONE_CHEST) - apply_damage(damage, BRUTE, affecting) - -/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M) - if(..()) //To allow surgery to return properly. - return - - switch(M.a_intent) - if("help") - help_shake_act(M) - if("grab") - grabbedby(M) - if("harm") - M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - visible_message("[M] punches [name]!", \ - "[M] punches you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "You punch [name]!") - playsound(loc, "punch", 25, 1, -1) - var/damage = M.dna.species.punchdamage - var/obj/item/bodypart/affecting = get_bodypart(check_zone(M.get_combat_bodyzone(src))) - if(!affecting) - affecting = get_bodypart(BODY_ZONE_CHEST) - apply_damage(damage, BRUTE, affecting) - log_combat(M, src, "attacked", "harm") - if("disarm") - if(stat < UNCONSCIOUS) - M.disarm(src) - -/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M) - if(..()) //if harm or disarm intent. - if (M.a_intent == INTENT_HARM) - if ((prob(95) && health > 0)) - playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) - var/damage = rand(15, 30) - if (damage >= 25) - damage = rand(20, 40) - if(AmountUnconscious() < 300) - Unconscious(rand(200, 300)) - visible_message("[M] wounds [name]!", \ - "[M] wounds you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "You wound [name]!") - else - visible_message("[M] slashes [name]!", \ - "[M] slashes you!", "You hear a sickening sound of a slice!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "You slash [name]!") - - var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.get_combat_bodyzone(src))) - log_combat(M, src, "attacked", M) - if(!affecting) - affecting = get_bodypart(BODY_ZONE_CHEST) - if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful - return 1 - apply_damage(damage, BRUTE, affecting) - - else - playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - visible_message("[M]'s lunge misses [name]!", \ - "You avoid [M]'s lunge!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "Your lunge misses [name]!") - - if (M.a_intent == INTENT_DISARM) - var/obj/item/I = null - playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - if(prob(95)) - Paralyze(20) - visible_message("[M] tackles [name] down!", \ - "[M] tackles you down!", "You hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "You tackle [name] down!") - else - I = get_active_held_item() - if(dropItemToGround(I)) - visible_message("[M] disarms [name]!", \ - "[M] disarms you!", "You hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "You disarm [name]!") - else - I = null - log_combat(M, src, "disarmed", null, "[I ? " removing \the [I]" : ""]", important = FALSE) - updatehealth() - - -/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M) - . = ..() - if(.) - var/damage = M.melee_damage - var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - if(!dam_zone) //Dismemberment successful - return TRUE - var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone)) - if(!affecting) - affecting = get_bodypart(BODY_ZONE_CHEST) - apply_damage(damage, M.melee_damage_type, affecting) - -/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M) - if(..()) //successful slime attack - var/damage = 20 - if(M.is_adult) - damage = 30 - if(M.transformeffects & SLIME_EFFECT_RED) - damage *= 1.1 - var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - if(!dam_zone) //Dismemberment successful - return 1 - var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone)) - if(!affecting) - affecting = get_bodypart(BODY_ZONE_CHEST) - apply_damage(damage, BRUTE, affecting) - -/mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit) - . = 1 - if(!bodyzone_hit || bodyzone_hit == BODY_ZONE_HEAD) - if(wear_mask) - if(!(wear_mask.resistance_flags & (UNACIDABLE | INDESTRUCTIBLE))) - wear_mask.acid_act(acidpwr, acid_volume) - else - to_chat(src, "Your mask protects you from the acid.") - return - if(head) - if(!(head.resistance_flags & (UNACIDABLE | INDESTRUCTIBLE))) - head.acid_act(acidpwr, acid_volume) - else - to_chat(src, "Your hat protects you from the acid.") - return - take_bodypart_damage(acidpwr * min(0.6, acid_volume*0.1)) - - -/mob/living/carbon/monkey/ex_act(severity, target, origin) - if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src)) - return - ..() - if(QDELETED(src)) - return - switch (severity) - if (EXPLODE_DEVASTATE) - gib() - return - - if (EXPLODE_HEAVY) - take_overall_damage(60, 60) - damage_clothes(200, BRUTE, BOMB) - adjustEarDamage(30, 120) - Unconscious(200) - - if(EXPLODE_LIGHT) - take_overall_damage(30, 0) - damage_clothes(50, BRUTE, BOMB) - adjustEarDamage(15,60) - Unconscious(160) - - - //attempt to dismember bodyparts - if(severity <= 2) - var/max_limb_loss = round(4/severity) //so you don't lose four limbs at severity 3. - for(var/obj/item/bodypart/BP as() in bodyparts) - if(prob(50/severity) && BP.body_zone != BODY_ZONE_CHEST) - BP.brute_dam = BP.max_damage - BP.dismember() - max_limb_loss-- - if(!max_limb_loss) - break diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm deleted file mode 100644 index 04f3d6954a6a5..0000000000000 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ /dev/null @@ -1,139 +0,0 @@ - -/mob/living/carbon/monkey/regenerate_icons() - if(!..()) - update_body_parts(TRUE) - update_hair() - update_inv_wear_mask() - update_inv_head() - update_inv_back() - update_transform() - update_inv_w_uniform() - -//////// - - -/mob/living/carbon/monkey/update_hair() - remove_overlay(HAIR_LAYER) - - var/obj/item/bodypart/head/HD = get_bodypart(BODY_ZONE_HEAD) - if(!HD) //Decapitated - return - - if(HAS_TRAIT(src, TRAIT_HUSK)) - return - - var/hair_hidden = 0 - - if(head) - var/obj/item/I = head - if(I.flags_inv & HIDEHAIR) - hair_hidden = 1 - if(wear_mask) - var/obj/item/clothing/mask/M = wear_mask - if(M.flags_inv & HIDEHAIR) - hair_hidden = 1 - if(!hair_hidden) - if(!getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain - overlays_standing[HAIR_LAYER] = mutable_appearance('icons/mob/human_face.dmi', "debrained", CALCULATE_MOB_OVERLAY_LAYER(HAIR_LAYER)) - apply_overlay(HAIR_LAYER) - - -/mob/living/carbon/monkey/update_fire() - ..("Monkey_burning") - -/mob/living/carbon/monkey/update_inv_legcuffed() - remove_overlay(LEGCUFF_LAYER) - if(legcuffed) - var/mutable_appearance/legcuff_overlay = mutable_appearance('icons/mob/mob.dmi', "legcuff1", CALCULATE_MOB_OVERLAY_LAYER(LEGCUFF_LAYER)) - legcuff_overlay.pixel_y = 8 - overlays_standing[LEGCUFF_LAYER] = legcuff_overlay - apply_overlay(LEGCUFF_LAYER) - - -//monkey HUD updates for items in our inventory - -//update whether our head item appears on our hud. -/mob/living/carbon/monkey/update_hud_head(obj/item/I) - if(client && hud_used && hud_used.hud_shown) - I.screen_loc = ui_monkey_head - client.screen += I - -//update whether our mask item appears on our hud. -/mob/living/carbon/monkey/update_hud_wear_mask(obj/item/I) - if(client && hud_used && hud_used.hud_shown) - I.screen_loc = ui_monkey_mask - client.screen += I - -//update whether our neck item appears on our hud. -/mob/living/carbon/monkey/update_hud_neck(obj/item/I) - if(client && hud_used && hud_used.hud_shown) - I.screen_loc = ui_monkey_neck - client.screen += I - -//update whether our back item appears on our hud. -/mob/living/carbon/monkey/update_hud_back(obj/item/I) - if(client && hud_used && hud_used.hud_shown) - I.screen_loc = ui_monkey_back - client.screen += I - -//Update uniform in compliance with monkey icons -/mob/living/carbon/monkey/update_inv_w_uniform() - update_clothing_icons(UNIFORM_LAYER) - -/mob/living/carbon/monkey/update_inv_head() - update_clothing_icons(HEAD_LAYER) - -/mob/living/carbon/monkey/update_inv_back() - update_clothing_icons(BACK_LAYER) - -/mob/living/carbon/monkey/update_inv_wear_mask() - update_clothing_icons(FACEMASK_LAYER) - -//used to handle monkey clothing -/mob/living/carbon/monkey/proc/update_clothing_icons(c_layer) - ///Item slot - var/slot - ///Species offset feature - var/offset - ///Actual item being worn - var/obj/item/U - //UI location - var/ui - switch(c_layer) - if(FACEMASK_LAYER) - slot = ITEM_SLOT_MASK - offset = OFFSET_FACEMASK - U = wear_mask - ui = ui_monkey_mask - if(BACK_LAYER) - slot = ITEM_SLOT_BACK - offset = OFFSET_BACK - U = back - ui = ui_monkey_back - if(HEAD_LAYER) - slot = ITEM_SLOT_HEAD - offset = OFFSET_HEAD - U = head - ui = ui_monkey_head - if(UNIFORM_LAYER) - slot = ITEM_SLOT_ICLOTHING - offset = OFFSET_UNIFORM - U = w_uniform - ui = ui_monkey_body - - remove_overlay(c_layer) - - if(client && hud_used.hud_shown) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(slot) + 1] - inv.update_icon() - client.screen += U - - if(U) - U.screen_loc = ui - var/mutable_appearance/cloth_overlay = mutable_appearance(U.monkey_icon, layer = -c_layer) - if(offset in dna.species.offset_features) - cloth_overlay.pixel_x += dna.species.offset_features[offset][1] - cloth_overlay.pixel_y += dna.species.offset_features[offset][2] - overlays_standing[c_layer] = cloth_overlay - - apply_overlay(c_layer) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 58f66906a0bb1..0bf8603954d39 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1118,7 +1118,7 @@ /mob/living/proc/can_use_guns(obj/item/G)//actually used for more than guns! if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser()) - to_chat(src, "You don't have the dexterity to do this!") + to_chat(src, "You try to fire [G], but can't use the trigger!") return FALSE return TRUE diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 3e02d5a4e4875..76da4e73d6e46 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -274,7 +274,7 @@ return TRUE -/mob/living/attack_paw(mob/living/carbon/monkey/M) +/mob/living/attack_paw(mob/living/carbon/human/M) if(isturf(loc) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") return FALSE diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 7e5917bde22ba..f0f705c28bd67 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -63,7 +63,6 @@ var/bloodcrawl = 0 //0 No blood crawling, BLOODCRAWL for bloodcrawling, BLOODCRAWL_EAT for crawling+mob devour var/holder = null //The holder for blood crawling - var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always var/limb_destroyer = FALSE //1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack. var/mob_size = MOB_SIZE_HUMAN @@ -93,7 +92,7 @@ var/bubble_icon = "default" //what icon the mob uses for speechbubbles var/last_bumped = 0 - var/unique_name = 0 //if a mob's name should be appended with an id when created e.g. Mob (666) + var/unique_name = FALSE//if a mob's name should be appended with an id when created e.g. Mob (666) var/list/butcher_results = null //these will be yielded from butchering with a probability chance equal to the butcher item's effectiveness var/list/guaranteed_butcher_results = null //these will always be yielded from butchering diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index a38d479c67ed0..c2967ae961140 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -16,6 +16,7 @@ update_z(T.z) //Vents + var/ventcrawler = HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE) if(ventcrawler) to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.") diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 659ad5d21bac9..f100aa9974d73 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -594,8 +594,8 @@ //if they are holding or wearing a card that has access, that works if(check_access(H.get_active_held_item()) || check_access(H.wear_id)) return 1 - else if(ismonkey(M)) - var/mob/living/carbon/monkey/george = M + else if(isalien(M)) + var/mob/living/carbon/george = M //they can only hold things :( if(isitem(george.get_active_held_item())) return check_access(george.get_active_held_item()) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index b396e9d2508b2..6bd63ad1f690f 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -56,7 +56,7 @@ adjustBruteLoss(15) return TRUE -/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M) +/mob/living/simple_animal/attack_paw(mob/living/carbon/human/M) if(..()) //successful monkey bite. if(stat != DEAD) var/damage = rand(1, 3) diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm index 841c87de1c948..e9946788c4b2d 100644 --- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm +++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm @@ -19,7 +19,6 @@ density = FALSE is_flying_animal = TRUE pass_flags = PASSTABLE | PASSMOB - ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY mob_biotypes = list(MOB_ORGANIC, MOB_BUG) gold_core_spawnable = FRIENDLY_SPAWN @@ -30,6 +29,7 @@ /mob/living/simple_animal/butterfly/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) chat_color = newcolor add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 629b172c153a5..7f5b9393b5131 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -15,7 +15,6 @@ speak_chance = 1 turns_per_move = 5 see_in_dark = 6 - ventcrawler = VENTCRAWLER_ALWAYS pass_flags = PASSTABLE mob_size = MOB_SIZE_SMALL mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) @@ -44,6 +43,7 @@ /mob/living/simple_animal/pet/cat/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) add_verb(/mob/living/proc/toggle_resting) /mob/living/simple_animal/pet/cat/space diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index adf05dac71918..ebf9138c78747 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -20,7 +20,6 @@ stop_automated_movement = 1 friendly_verb_continuous = "pinches" friendly_verb_simple = "pinch" - ventcrawler = VENTCRAWLER_ALWAYS var/obj/item/inventory_head var/obj/item/inventory_mask gold_core_spawnable = FRIENDLY_SPAWN @@ -32,6 +31,10 @@ head_icon = 'icons/mob/pets_held.dmi' held_state = "crab" +/mob/living/simple_animal/crab/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/crab/Life() ..() //CRAB movement diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 56faa85c449d3..be86bc94c1cc4 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -27,7 +27,6 @@ unsuitable_atmos_damage = 0 wander = FALSE speed = 0 - ventcrawler = VENTCRAWLER_ALWAYS healable = 0 density = FALSE pass_flags = PASSTABLE | PASSMOB @@ -85,6 +84,7 @@ /mob/living/simple_animal/drone/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) GLOB.drones_list += src access_card = new /obj/item/card/id(src) access_card.access = get_all_accesses() diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index 65ff5920b29f5..10f690da08a7c 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -134,7 +134,7 @@ to_chat(src, "Your onboard antivirus has initiated lockdown. Motor servos are impaired, ventilation access is denied, and your display reports that you are hacked to all nearby.") hacked = TRUE mind.special_role = "hacked drone" - ventcrawler = VENTCRAWLER_NONE //Again, balance + REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) //Again, balance speed = 1 //gotta go slow message_admins("[ADMIN_LOOKUPFLW(src)] became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!") else @@ -149,7 +149,7 @@ to_chat(src, "Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.") hacked = FALSE mind.special_role = null - ventcrawler = initial(ventcrawler) + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) speed = initial(speed) message_admins("[ADMIN_LOOKUPFLW(src)], a hacked drone, was restored to factory defaults!") update_drone_icon() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index dbd3850d2c8f1..e5f3c5de4f46e 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -198,7 +198,6 @@ attack_verb_simple = "kick" health = 3 maxHealth = 3 - ventcrawler = VENTCRAWLER_ALWAYS var/amount_grown = 0 pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_TINY @@ -209,6 +208,7 @@ /mob/living/simple_animal/chick/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) pixel_x = base_pixel_x + rand(-6, 6) pixel_y = base_pixel_y + rand(0, 10) GLOB.total_chickens++ @@ -265,7 +265,6 @@ attack_verb_simple = "kick" health = 15 maxHealth = 15 - ventcrawler = VENTCRAWLER_ALWAYS var/eggsleft = 0 var/eggsFertile = TRUE var/body_color @@ -286,6 +285,7 @@ /mob/living/simple_animal/chicken/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) if(!body_color) body_color = pick(validColors) icon_state = "[icon_prefix]_[body_color]" @@ -362,13 +362,17 @@ attack_verb_continuous = "pecks" attack_verb_simple = "peck" attack_sound = 'sound/creatures/turkey.ogg' - ventcrawler = VENTCRAWLER_ALWAYS icon_prefix = "turkey" feedMessages = list("It gobbles up the food voraciously.","It clucks happily.") validColors = list("plain") gold_core_spawnable = FRIENDLY_SPAWN chat_color = "#FFDC9B" +/mob/living/simple_animal/chicken/turkey/Initialize(mapload) + . = ..() + + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/chicken/rabbit name = "\improper rabbit" desc = "It's a rabbit, everyone knows what a rabbit is." diff --git a/code/modules/mob/living/simple_animal/friendly/hamster.dm b/code/modules/mob/living/simple_animal/friendly/hamster.dm index 6c6518794121a..034ce477a1376 100644 --- a/code/modules/mob/living/simple_animal/friendly/hamster.dm +++ b/code/modules/mob/living/simple_animal/friendly/hamster.dm @@ -20,7 +20,6 @@ density = FALSE pass_flags = PASSMOB mob_size = MOB_SIZE_SMALL - ventcrawler = VENTCRAWLER_ALWAYS name = "\improper hamster" real_name = "hamster" @@ -37,6 +36,10 @@ worn_slot_flags = ITEM_SLOT_HEAD chat_color = "#D3B277" +/mob/living/simple_animal/pet/hamster/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/pet/hamster/vector //now also viro's source of a solitary, shitty starter disease name = "Vector" desc = "It's Vector the hamster. Definitely not a source of deadly diseases." diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 5cf72cd461693..9bf23491fefd4 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -17,7 +17,6 @@ response_disarm_simple = "shoo" response_harm_continuous = "stomps on" response_harm_simple = "stomp on" - ventcrawler = VENTCRAWLER_ALWAYS density = FALSE pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL @@ -28,6 +27,10 @@ var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/basic/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption. chat_color = "#64F88A" +/mob/living/simple_animal/hostile/lizard/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target? if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it return FALSE diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index f00050181adf6..6c09c18d492e8 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -22,7 +22,6 @@ response_harm_continuous = "stomps on" response_harm_simple = "stomp on" density = FALSE - ventcrawler = VENTCRAWLER_ALWAYS pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_TINY mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) @@ -37,6 +36,7 @@ /mob/living/simple_animal/mouse/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100) if(!body_color) body_color = pick( list("brown","gray","white") ) diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm index f5661462301aa..f678b54727968 100644 --- a/code/modules/mob/living/simple_animal/friendly/snake.dm +++ b/code/modules/mob/living/simple_animal/friendly/snake.dm @@ -28,7 +28,6 @@ response_harm_continuous = "steps on" response_harm_simple = "step on" faction = list("hostile") - ventcrawler = VENTCRAWLER_ALWAYS density = FALSE pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL @@ -47,6 +46,7 @@ /mob/living/simple_animal/hostile/retaliate/poison/snake/Initialize(mapload) AddComponent(/datum/component/udder, /obj/item/udder/venom, reagent_produced_typepath = /datum/reagent/toxin/venom) + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index e1c2063a3d0c1..24943061af423 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -37,7 +37,6 @@ faction = list("hostile") move_to_delay = 0 obj_damage = 0 - ventcrawler = VENTCRAWLER_ALWAYS environment_smash = ENVIRONMENT_SMASH_NONE mouse_opacity = MOUSE_OPACITY_OPAQUE pass_flags = PASSTABLE | PASSMOB @@ -48,7 +47,6 @@ no_flying_animation = TRUE gold_core_spawnable = HOSTILE_SPAWN search_objects = 1 //have to find those plant trays! - ventcrawler = VENTCRAWLER_ALWAYS //Spaceborn beings don't get hurt by space atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) @@ -65,6 +63,7 @@ /mob/living/simple_animal/hostile/poison/bees/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) generate_bee_visuals() AddComponent(/datum/component/swarming) diff --git a/code/modules/mob/living/simple_animal/hostile/bread.dm b/code/modules/mob/living/simple_animal/hostile/bread.dm index 7e62adfd45951..a6892ef09a612 100644 --- a/code/modules/mob/living/simple_animal/hostile/bread.dm +++ b/code/modules/mob/living/simple_animal/hostile/bread.dm @@ -14,7 +14,6 @@ butcher_results = list(/obj/item/food/breadslice/plain = 2) melee_damage = 10 attack_sound = 'sound/weapons/bite.ogg' - ventcrawler = VENTCRAWLER_ALWAYS atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 150 maxbodytemp = 500 @@ -26,6 +25,10 @@ chat_color = "#CAA25B" mobchatspan = "blob" +/mob/living/simple_animal/hostile/breadloaf/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/hostile/breadloaf/teleport_act() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index bb6896759e69c..12944ba43d41c 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -45,7 +45,6 @@ faction = list("spiders") pass_flags = PASSTABLE move_to_delay = 4 - ventcrawler = VENTCRAWLER_ALWAYS attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' @@ -76,6 +75,7 @@ /mob/living/simple_animal/hostile/poison/giant_spider/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) lay_web = new lay_web.Grant(src) lesserwrap = new diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index 7afed8464c16c..5cced8068feb8 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -80,7 +80,7 @@ /mob/living/simple_animal/hostile/gorilla/CanAttack(atom/the_target) var/list/parts = target_bodyparts(target) - return ..() && !istype(the_target, /mob/living/carbon/monkey) && (!parts || parts.len > 3) + return ..() && !ismonkey(the_target) && (!parts || parts.len > 3) /mob/living/simple_animal/hostile/gorilla/CanSmashTurfs(turf/T) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 55bd35b8cb3b1..d583df943d9f3 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -19,11 +19,14 @@ obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE speak_emote = list("squeaks") - ventcrawler = VENTCRAWLER_ALWAYS var/datum/mind/origin var/egg_lain = 0 discovery_points = 2000 +/mob/living/simple_animal/hostile/headcrab/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim) var/obj/item/organ/body_egg/changeling_egg/egg = new(victim) egg.Insert(victim) @@ -65,7 +68,7 @@ qdel(src) /obj/item/organ/body_egg/changeling_egg/proc/Pop() - var/mob/living/carbon/monkey/M = new(owner) + var/mob/living/carbon/human/species/monkey/M = new(owner) for(var/obj/item/organ/I in src) I.Insert(M, 1) diff --git a/code/modules/mob/living/simple_animal/hostile/heart.dm b/code/modules/mob/living/simple_animal/hostile/heart.dm index 2dcfe10d9db45..e9fb605fe0db7 100644 --- a/code/modules/mob/living/simple_animal/hostile/heart.dm +++ b/code/modules/mob/living/simple_animal/hostile/heart.dm @@ -23,7 +23,6 @@ density = FALSE attack_verb_continuous = "beats" attack_verb_simple = "beat" - ventcrawler = VENTCRAWLER_ALWAYS attack_sound = 'sound/effects/singlebeat.ogg' stat_attack = HARD_CRIT attack_same = 1 @@ -35,3 +34,7 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 150 maxbodytemp = 500 + +/mob/living/simple_animal/hostile/heart/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm index dcf63397fbf69..c21da7e670c2d 100644 --- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm +++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm @@ -21,7 +21,6 @@ attack_verb_continuous = "slams" attack_verb_simple = "slam" attack_sound = 'sound/weapons/punch1.ogg' - ventcrawler = VENTCRAWLER_ALWAYS faction = list("plants") mobchatspan = "headofsecurity" @@ -33,6 +32,10 @@ gold_core_spawnable = HOSTILE_SPAWN var/frenzythreshold = 5 //how many tomatoes can this tomato see on screen before going berserk +/mob/living/simple_animal/hostile/killertomato/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/hostile/killertomato/CanAttack(atom/the_target) var/tomatosseen = 0 for(var/mob/living/simple_animal/hostile/killertomato/T in oview(7, src)) diff --git a/code/modules/mob/living/simple_animal/hostile/macrophage.dm b/code/modules/mob/living/simple_animal/hostile/macrophage.dm index 5fc9c9abb0239..2b60d822151a0 100644 --- a/code/modules/mob/living/simple_animal/hostile/macrophage.dm +++ b/code/modules/mob/living/simple_animal/hostile/macrophage.dm @@ -24,7 +24,6 @@ density = FALSE mob_size = MOB_SIZE_TINY mob_biotypes = list(MOB_ORGANIC, MOB_BUG) - ventcrawler = VENTCRAWLER_ALWAYS atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 del_on_death = TRUE @@ -33,6 +32,10 @@ var/list/infections = list() discovery_points = 2000 +/mob/living/simple_animal/hostile/macrophage/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/hostile/macrophage/CanAttack(atom/the_target) . = ..() if(!.) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 225bf40f36e9c..8527b03702d8b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -580,7 +580,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box) NewTerrainChairs = /obj/structure/chair/wood NewTerrainTables = /obj/structure/table/wood NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush, - /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/monkey) + /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/species/monkey) florachance = 20 if("ayy lmao") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos. NewTerrainFloors = /turf/open/floor/plating/abductor @@ -718,7 +718,6 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box) density = FALSE is_flying_animal = TRUE pass_flags = PASSTABLE | PASSGRILLE | PASSMOB - ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY gold_core_spawnable = HOSTILE_SPAWN verb_say = "warps" @@ -741,6 +740,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box) /mob/living/simple_animal/hostile/lightgeist/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) remove_verb(/mob/living/verb/pulled) remove_verb(/mob/verb/me_verb) var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] diff --git a/code/modules/mob/living/simple_animal/hostile/mimite.dm b/code/modules/mob/living/simple_animal/hostile/mimite.dm index 32cdcec0884fc..5ec5da1b48555 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimite.dm @@ -9,7 +9,6 @@ icon_state = "mimite" icon_living = "mimite" pass_flags = PASSTABLE - ventcrawler = VENTCRAWLER_ALWAYS a_intent = INTENT_HARM melee_damage = 10 see_in_dark = 8 @@ -72,6 +71,7 @@ /mob/living/simple_animal/hostile/mimite/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) AddElement(/datum/element/point_of_interest) GLOB.all_mimites += src var/image/I = image(icon = 'icons/mob/hud.dmi', icon_state = "hudcultist", layer = DATA_HUD_PLANE, loc = src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index 8dab57a6c1b09..b95dc70dfc7aa 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -27,7 +27,6 @@ friendly_verb_continuous = "pinches" friendly_verb_simple = "pinch" a_intent = INTENT_HELP - ventcrawler = VENTCRAWLER_ALWAYS gold_core_spawnable = FRIENDLY_SPAWN stat_attack = HARD_CRIT gender = NEUTER @@ -47,6 +46,7 @@ /mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) if(wanted_objects.len) AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, PROC_REF(regenerate_icons)), CALLBACK(src, PROC_REF(regenerate_icons))) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 3fee8d2e257d3..8094ed0fa26d9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -26,7 +26,6 @@ stat_attack = DEAD mouse_opacity = MOUSE_OPACITY_ICON speed = 1 - ventcrawler = VENTCRAWLER_ALWAYS robust_searching = 1 unique_name = 1 speak_emote = list("squeaks") @@ -52,6 +51,7 @@ adjustBruteLoss(-2) /mob/living/simple_animal/hostile/mushroom/Initialize(mapload)//Makes every shroom a little unique + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) melee_damage += rand(1,15) maxHealth += rand(40,60) move_to_delay = rand(3,11) diff --git a/code/modules/mob/living/simple_animal/hostile/redgrub.dm b/code/modules/mob/living/simple_animal/hostile/redgrub.dm index 837522b0f9c59..ff65302c86556 100644 --- a/code/modules/mob/living/simple_animal/hostile/redgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/redgrub.dm @@ -21,7 +21,6 @@ response_harm_continuous = "squishes" response_harm_simple = "squish" density = FALSE - ventcrawler = VENTCRAWLER_ALWAYS faction = list("hostile") attack_sound = 'sound/effects/blobattack.ogg' pass_flags = PASSTABLE | PASSMOB @@ -51,6 +50,7 @@ /mob/living/simple_animal/hostile/redgrub/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) grub_diseases += new /datum/disease/advance/random(rand(3, 6), 9, rand(3, 4), guaranteed_symptoms = list(/datum/symptom/parasite)) food = rand(15, 50) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm index eb9b4b54450d8..27693e43f184a 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm @@ -25,7 +25,6 @@ attack_sound = 'sound/weapons/bite.ogg' obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE - ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY is_flying_animal = TRUE no_flying_animation = TRUE @@ -34,6 +33,10 @@ var/min_oxy = 0 var/max_tox = 0 +/mob/living/simple_animal/hostile/retaliate/bat/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + //Space bats need no air to fly in. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 22ee2359b6f9c..e45ca98c13e67 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -134,7 +134,6 @@ emote_see = list("honks", "sweats", "jiggles", "contemplates its existence") speak_chance = 5 dextrous = TRUE - ventcrawler = VENTCRAWLER_ALWAYS maxHealth = 140 health = 140 speed = -5 @@ -144,6 +143,10 @@ obj_damage = 5 loot = list(/obj/item/clothing/suit/hooded/bloated_human, /obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap) +/mob/living/simple_animal/hostile/retaliate/clown/fleshclown/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/hostile/retaliate/clown/longface name = "Longface" desc = "Often found walking into the bar." diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 718e394d85a9b..2a6d984aa4a2e 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -22,7 +22,6 @@ response_harm_continuous = "splats" response_harm_simple = "splat" density = FALSE - ventcrawler = VENTCRAWLER_ALWAYS faction = list("hostile") attack_sound = 'sound/effects/reee.ogg' butcher_results = list(/obj/item/food/nugget = 1) @@ -33,6 +32,7 @@ /mob/living/simple_animal/hostile/retaliate/frog/Initialize(mapload) . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) if(prob(1)) name = "rare frog" desc = "It seems a little smug." diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm index 6ed5076220c3b..e738f1debfb87 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm @@ -10,7 +10,6 @@ faction = list("diona") gender = NEUTER gold_core_spawnable = FRIENDLY_SPAWN - ventcrawler = VENTCRAWLER_ALWAYS pass_flags = PASSTABLE | PASSMOB density = FALSE mob_size = MOB_SIZE_SMALL @@ -60,6 +59,7 @@ name = "[initial(name)] ([instance_num])" real_name = name regenerate_icons() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) ADD_TRAIT(src, TRAIT_MUTE, "nymph") var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_entered), diff --git a/code/modules/mob/living/simple_animal/kalo.dm b/code/modules/mob/living/simple_animal/kalo.dm index 945c947ffc3b9..7733a70703980 100644 --- a/code/modules/mob/living/simple_animal/kalo.dm +++ b/code/modules/mob/living/simple_animal/kalo.dm @@ -12,7 +12,6 @@ mob_biotypes = list(MOB_ORGANIC, MOB_BEAST, MOB_REPTILE) mob_size = MOB_SIZE_SMALL pass_flags = PASSTABLE | PASSMOB - ventcrawler = VENTCRAWLER_ALWAYS density = FALSE see_in_dark = 5 speak_chance = 1 @@ -37,11 +36,15 @@ var/obj/item/food/movement_target mobchatspan = "centcom" +/mob/living/simple_animal/kalo/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) + /mob/living/simple_animal/kalo/Destroy() movement_target = null return ..() -/mob/living/simple_animal/kalo/Life() //This code is absolute trash but I'm too sleepy to rewrite it. +/mob/living/simple_animal/kalo/Life() //This code is absolute trash but I'm too sleepy to rewrite it. ///Uhhh its literally a copy of ian. Why didnt you just make him a corgi subtype at this point lmfao ..() if(!stat && !resting && !buckled) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 7d967c82e4946..c405706ccc722 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -311,7 +311,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( handle_automated_speech(1) //assured speak/emote return -/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/monkey/M) +/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/human/M) return attack_hand(M) /mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/alien/M) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index ac1d6abcc3476..53de1616d8fe4 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -4,7 +4,6 @@ icon = 'icons/mob/slimes.dmi' icon_state = "grey baby slime" pass_flags = PASSTABLE | PASSGRILLE - ventcrawler = VENTCRAWLER_ALWAYS gender = NEUTER var/is_adult = 0 var/docile = 0 @@ -99,6 +98,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/slime) /mob/living/simple_animal/slime/Initialize(mapload, new_colour="grey", new_is_adult=FALSE) + ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) GLOB.total_slimes++ var/datum/action/innate/slime/feed/F = new F.Grant(src) @@ -321,7 +321,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/slime) attacked += 10 -/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M) +/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/human/M) if(..()) //successful monkey bite. attacked += 10 diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 34a30f59b160a..45ec022128729 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -7,7 +7,11 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( //VENTCRAWLING /mob/living/proc/handle_ventcrawl(atom/A) - if(!ventcrawler || !Adjacent(A)) + // Being able to always ventcrawl trumps being only able to ventcrawl when wearing nothing + var/required_nudity = HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE) && !HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS) + if(!Adjacent(A)) + return + if(!HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE) && !HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS)) return if(stat) to_chat(src, "You must be conscious to do this!") @@ -57,15 +61,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( if(!client) return - if(iscarbon(src) && ventcrawler < 2)//It must have atleast been 1 to get this far - var/failed = 0 - var/list/items_list = get_equipped_items(include_pockets = TRUE) - if(items_list.len) - failed = 1 - for(var/obj/item/I in held_items) - failed = 1 - break - if(failed) + if(iscarbon(src) && required_nudity) + if(length(get_equipped_items(include_pockets = TRUE)) || get_num_held_items()) to_chat(src, "You can't crawl around in the ventilation ducts with items!") return @@ -78,7 +75,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( if(buckled) to_chat(src, "I can't vent crawl while feeding...") return - ..() + return ..() /mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 69bd4086c1916..c8643f70722f0 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -1,178 +1,11 @@ #define TRANSFORMATION_DURATION 22 -/mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPAI), skip_animation = FALSE, keep_original_species = FALSE) +/mob/living/carbon/proc/monkeyize() if (notransform || transformation_timer) return - var/list/missing_bodyparts_zones = get_missing_limbs() - var/list/int_organs = list() - var/obj/item/cavity_object - - var/obj/item/bodypart/chest/CH = get_bodypart(BODY_ZONE_CHEST) - if(CH.cavity_item) - cavity_object = CH.cavity_item - CH.cavity_item = null - - if(tr_flags & TR_KEEPITEMS) - unequip_everything() - - //Make mob invisible and spawn animation - notransform = TRUE - Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE) - icon = null - cut_overlays() - invisibility = INVISIBILITY_MAXIMUM - - if(!skip_animation) - new /obj/effect/temp_visual/monkeyify(loc) - - transformation_timer = TRUE - sleep(TRANSFORMATION_DURATION) - transformation_timer = FALSE - - var/mob/living/carbon/monkey/O = new /mob/living/carbon/monkey( loc ) - - // Make it be able to be turned back into a human with mutadone - O.natural = FALSE - O.check_if_natural() - // hash the original name? - if(tr_flags & TR_HASHNAME) - O.name = "monkey ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])" - O.real_name = "monkey ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])" - - //handle DNA and other attributes - dna.transfer_identity(O, tr_flags & TR_KEEPSE) - O.set_species(/datum/species/monkey) - O.dna.set_se(TRUE, GET_INITIALIZED_MUTATION(RACEMUT)) - O.updateappearance(icon_update=0) - - //store original species - if(keep_original_species) - for(var/datum/mutation/race/M in O.dna.mutations) - if(!isnull(dna.species)) - M.original_species = dna.species.type - break //Can't be more than one monkified in a DNA set so, no need to continue the loop - - if(suiciding) - O.set_suicide(suiciding) - O.a_intent = INTENT_HARM - - //keep viruses? - if (tr_flags & TR_KEEPVIRUS) - O.diseases = diseases - diseases = list() - for(var/thing in O.diseases) - var/datum/disease/D = thing - D.affected_mob = O - - //keep damage? - if (tr_flags & TR_KEEPDAMAGE) - O.setToxLoss(getToxLoss(), 0) - O.adjustBruteLoss(getBruteLoss(), 0) - O.setOxyLoss(getOxyLoss(), 0) - O.setCloneLoss(getCloneLoss(), 0) - O.adjustFireLoss(getFireLoss(), 0) - O.setOrganLoss(ORGAN_SLOT_BRAIN, getOrganLoss(ORGAN_SLOT_BRAIN)) - O.updatehealth() - O.radiation = radiation - - //move implants to new mob - if(tr_flags & TR_KEEPIMPLANTS) - for(var/obj/item/implant/IMP as anything in implants) - IMP.transfer_implant(src, O) - - //re-add organs to new mob. this order prevents moving the mind to a brain at any point - if(tr_flags & TR_KEEPORGANS) - for(var/X in O.internal_organs) - var/obj/item/organ/I = X - I.Remove(O, 1) - - if(mind) - mind.transfer_to(O) - var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - var/datum/action/changeling/humanform/hf = new - changeling.purchasedpowers += hf - changeling.regain_powers() - - for(var/X in internal_organs) - var/obj/item/organ/I = X - int_organs += I - I.Remove(src, 1) - - for(var/X in int_organs) - var/obj/item/organ/I = X - I.Insert(O, 1) - - var/obj/item/bodypart/chest/torso = O.get_bodypart(BODY_ZONE_CHEST) - if(cavity_object) - torso.cavity_item = cavity_object //cavity item is given to the new chest - cavity_object.forceMove(O) - - for(var/missing_zone in missing_bodyparts_zones) - var/obj/item/bodypart/BP = O.get_bodypart(missing_zone) - BP.drop_limb(1) - if(!(tr_flags & TR_KEEPORGANS)) //we didn't already get rid of the organs of the newly spawned mob - for(var/X in O.internal_organs) - var/obj/item/organ/G = X - if(BP.body_zone == check_zone(G.zone)) - if(mind && mind.has_antag_datum(/datum/antagonist/changeling) && istype(G, /obj/item/organ/brain)) - continue //so headless changelings don't lose their brain when transforming - qdel(G) //we lose the organs in the missing limbs - qdel(BP) - - //transfer mind if we didn't yet - if(mind) - mind.transfer_to(O) - var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - var/datum/action/changeling/humanform/hf = new - changeling.purchasedpowers += hf - changeling.regain_powers() - - - //if we have an AI, transfer it; if we don't, make sure the new thing doesn't either - if(tr_flags & TR_KEEPAI) - if(ai_controller) - ai_controller.PossessPawn(O) - else if(O.ai_controller) - QDEL_NULL(O.ai_controller) - - if (tr_flags & TR_DEFAULTMSG) - to_chat(O, "You are now a monkey.") - SEND_SIGNAL(src, COMSIG_CARBON_TRANSFORMED, O) - - for(var/A in loc.vars) - if(loc.vars[A] == src) - loc.vars[A] = O - - O.update_sight() - transfer_observers_to(O, TRUE) - - . = O - - qdel(src) - -//Mostly same as monkey but turns target into teratoma - -/mob/living/carbon/proc/teratomize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG)) - if (notransform || transformation_timer) + if(ismonkey(src)) return - //Handle items on mob - - //first organs - var/list/int_organs = list() - var/list/missing_bodyparts_zones = get_missing_limbs() - - var/obj/item/cavity_object - - var/obj/item/bodypart/chest/CH = get_bodypart(BODY_ZONE_CHEST) - if(CH.cavity_item) - cavity_object = CH.cavity_item - CH.cavity_item = null - - if(tr_flags & TR_KEEPITEMS) - unequip_everything() //Make mob invisible and spawn animation notransform = TRUE @@ -182,289 +15,49 @@ invisibility = INVISIBILITY_MAXIMUM new /obj/effect/temp_visual/monkeyify(loc) - - transformation_timer = TRUE - sleep(TRANSFORMATION_DURATION) - transformation_timer = FALSE - - var/mob/living/carbon/monkey/tumor/O = new /mob/living/carbon/monkey/tumor( loc ) - - // hash the original name? - if(tr_flags & TR_HASHNAME) - O.name = "living teratoma ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])" - O.real_name = "living teratoma ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])" - - //handle DNA and other attributes - dna.transfer_identity(O) - O.dna.species.species_traits += NOTRANSSTING - O.updateappearance(icon_update=0) - - if(tr_flags & TR_KEEPSE) - O.dna.mutation_index = dna.mutation_index - O.dna.set_se(1, GET_INITIALIZED_MUTATION(RACEMUT)) - - if(suiciding) - O.set_suicide(suiciding) - O.a_intent = INTENT_HARM - - //keep viruses? - if (tr_flags & TR_KEEPVIRUS) - O.diseases = diseases - diseases = list() - for(var/thing in O.diseases) - var/datum/disease/D = thing - D.affected_mob = O - - //keep damage? - if (tr_flags & TR_KEEPDAMAGE) - O.setToxLoss(getToxLoss(), 0) - O.adjustBruteLoss(getBruteLoss(), 0) - O.setOxyLoss(getOxyLoss(), 0) - O.setCloneLoss(getCloneLoss(), 0) - O.adjustFireLoss(getFireLoss(), 0) - O.setOrganLoss(ORGAN_SLOT_BRAIN, getOrganLoss(ORGAN_SLOT_BRAIN)) - O.updatehealth() - O.radiation = radiation - - //move implants to new mob - if(tr_flags & TR_KEEPIMPLANTS) - for(var/obj/item/implant/IMP as anything in implants) - IMP.transfer_implant(src, O) - - //re-add organs to new mob. this order prevents moving the mind to a brain at any point - if(tr_flags & TR_KEEPORGANS) - for(var/X in O.internal_organs) - var/obj/item/organ/I = X - I.Remove(O, 1) - - if(mind) - mind.transfer_to(O) - var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - var/datum/action/changeling/humanform/hf = new - changeling.purchasedpowers += hf - changeling.regain_powers() - - for(var/X in internal_organs) - var/obj/item/organ/I = X - int_organs += I - I.Remove(src, 1) - - for(var/X in int_organs) - var/obj/item/organ/I = X - I.Insert(O, 1) - - var/obj/item/bodypart/chest/torso = O.get_bodypart(BODY_ZONE_CHEST) - if(cavity_object) - torso.cavity_item = cavity_object //cavity item is given to the new chest - cavity_object.forceMove(O) - - for(var/missing_zone in missing_bodyparts_zones) - var/obj/item/bodypart/BP = O.get_bodypart(missing_zone) - BP.drop_limb(1) - if(!(tr_flags & TR_KEEPORGANS)) //we didn't already get rid of the organs of the newly spawned mob - for(var/X in O.internal_organs) - var/obj/item/organ/G = X - if(BP.body_zone == check_zone(G.zone)) - if(mind && mind.has_antag_datum(/datum/antagonist/changeling) && istype(G, /obj/item/organ/brain)) - continue //so headless changelings don't lose their brain when transforming - qdel(G) //we lose the organs in the missing limbs - qdel(BP) - - //transfer mind if we didn't yet - if(mind) - mind.transfer_to(O) - var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - var/datum/action/changeling/humanform/hf = new - changeling.purchasedpowers += hf - changeling.regain_powers() - - - if (tr_flags & TR_DEFAULTMSG) - to_chat(O, "You are now a living teratoma.") - - SEND_SIGNAL(src, COMSIG_CARBON_TRANSFORMED, O) - - for(var/A in loc.vars) - if(loc.vars[A] == src) - loc.vars[A] = O - - transfer_observers_to(O, TRUE) - - . = O - - qdel(src) + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_monkeyize)), TRANSFORMATION_DURATION, TIMER_UNIQUE) + +/mob/living/carbon/proc/finish_monkeyize() + transformation_timer = null + to_chat(src, "You are now a monkey.") + notransform = FALSE + icon = initial(icon) + invisibility = 0 + set_species(/datum/species/monkey) + uncuff() + regenerate_icons() + return src ////////////////////////// Humanize ////////////////////////////// //Could probably be merged with monkeyize but other transformations got their own procs, too -/mob/living/carbon/proc/humanize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPAI), keep_original_species = FALSE, var/datum/species/original_species) +/mob/living/carbon/proc/humanize(species = /datum/species/human) if (notransform || transformation_timer) return - var/list/int_organs = list() - - var/list/missing_bodyparts_zones = get_missing_limbs() - - var/obj/item/cavity_object - - var/obj/item/bodypart/chest/CH = get_bodypart(BODY_ZONE_CHEST) - if(CH.cavity_item) - cavity_object = CH.cavity_item - CH.cavity_item = null - - //now the rest - if (tr_flags & TR_KEEPITEMS) - unequip_everything() + if(!ismonkey(src)) + return //Make mob invisible and spawn animation notransform = TRUE Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE) - icon = null cut_overlays() invisibility = INVISIBILITY_MAXIMUM - new /obj/effect/temp_visual/monkeyify/humanify(loc) - - transformation_timer = TRUE - sleep(TRANSFORMATION_DURATION) - transformation_timer = FALSE - - var/mob/living/carbon/human/O = new( loc ) - for(var/obj/item/C in O.loc) - if(C.anchored) - continue - O.equip_to_appropriate_slot(C) - - dna.transfer_identity(O, tr_flags & TR_KEEPSE) - O.dna.set_se(FALSE, GET_INITIALIZED_MUTATION(RACEMUT)) - //Reset offsets to match human settings, in-case they have been changed - O.dna.species.offset_features = list(OFFSET_UNIFORM = list(0,0), OFFSET_ID = list(0,0), OFFSET_GLOVES = list(0,0), OFFSET_GLASSES = list(0,0), OFFSET_EARS = list(0,0), OFFSET_SHOES = list(0,0), OFFSET_S_STORE = list(0,0), OFFSET_FACEMASK = list(0,0), OFFSET_HEAD = list(0,0), OFFSET_FACE = list(0,0), OFFSET_BELT = list(0,0), OFFSET_BACK = list(0,0), OFFSET_SUIT = list(0,0), OFFSET_NECK = list(0,0), OFFSET_RIGHT_HAND = list(0,0), OFFSET_LEFT_HAND = list(0,0)) - O.updateappearance(mutcolor_update=1) - - if(findtext(O.dna.real_name, "monkey", 1, 7)) //7 == length("monkey") + 1 - O.real_name = random_unique_name(O.gender) - O.dna.generate_unique_enzymes(O) - else - O.real_name = O.dna.real_name - O.name = O.real_name - - if(suiciding) - O.set_suicide(suiciding) - - //keep viruses? - if (tr_flags & TR_KEEPVIRUS) - O.diseases = diseases - diseases = list() - for(var/thing in O.diseases) - var/datum/disease/D = thing - D.affected_mob = O - O.med_hud_set_status() - - //keep damage? - if (tr_flags & TR_KEEPDAMAGE) - O.setToxLoss(getToxLoss(), 0) - O.adjustBruteLoss(getBruteLoss(), 0) - O.setOxyLoss(getOxyLoss(), 0) - O.setCloneLoss(getCloneLoss(), 0) - O.adjustFireLoss(getFireLoss(), 0) - O.adjustOrganLoss(ORGAN_SLOT_BRAIN, getOrganLoss(ORGAN_SLOT_BRAIN)) - O.updatehealth() - O.radiation = radiation - - //move implants to new mob - if(tr_flags & TR_KEEPIMPLANTS) - for(var/obj/item/implant/IMP as anything in implants) - IMP.transfer_implant(src, O) - - if(tr_flags & TR_KEEPORGANS) - for(var/X in O.internal_organs) - var/obj/item/organ/I = X - I.Remove(O, 1) - - if(mind) - mind.transfer_to(O) - var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - for(var/datum/action/changeling/humanform/HF in changeling.purchasedpowers) - changeling.purchasedpowers -= HF - changeling.regain_powers() - - for(var/X in internal_organs) - var/obj/item/organ/I = X - int_organs += I - I.Remove(src, 1) - - for(var/X in int_organs) - var/obj/item/organ/I = X - I.Insert(O, 1) - - - var/obj/item/bodypart/chest/torso = get_bodypart(BODY_ZONE_CHEST) - if(cavity_object) - torso.cavity_item = cavity_object //cavity item is given to the new chest - cavity_object.forceMove(O) - - for(var/missing_zone in missing_bodyparts_zones) - var/obj/item/bodypart/BP = O.get_bodypart(missing_zone) - BP.drop_limb(1) - if(!(tr_flags & TR_KEEPORGANS)) //we didn't already get rid of the organs of the newly spawned mob - for(var/X in O.internal_organs) - var/obj/item/organ/G = X - if(BP.body_zone == check_zone(G.zone)) - if(mind && mind.has_antag_datum(/datum/antagonist/changeling) && istype(G, /obj/item/organ/brain)) - continue //so headless changelings don't lose their brain when transforming - qdel(G) //we lose the organs in the missing limbs - qdel(BP) - - if(mind) - mind.transfer_to(O) - var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling) - for(var/datum/action/changeling/humanform/HF in changeling.purchasedpowers) - changeling.purchasedpowers -= HF - changeling.regain_powers() - - //if we have an AI, transfer it; if we don't, make sure the new thing doesn't either - if(tr_flags & TR_KEEPAI) - if(ai_controller) - ai_controller.PossessPawn(O) - else if(O.ai_controller) - QDEL_NULL(O.ai_controller) - - if(keep_original_species && isnull(original_species)) - original_species = /datum/species/human - - if(O.dna.species && !istype(O.dna.species, /datum/species/monkey)) - if(isnull(O.dna.species)) - O.set_species(/datum/species/human) - else - O.set_species(O.dna.species) - else - if(keep_original_species) - if(isnull(original_species) || !ispath(original_species, /datum/species)) - O.set_species(/datum/species/human) - else - O.set_species(original_species) - else - O.set_species(/datum/species/human) - - O.a_intent = INTENT_HELP - if (tr_flags & TR_DEFAULTMSG) - to_chat(O, "You are now \a [O.dna.species]].") - - SEND_SIGNAL(src, COMSIG_CARBON_TRANSFORMED, O) - - transfer_observers_to(O, TRUE) - - . = O - - for(var/A in loc.vars) - if(loc.vars[A] == src) - loc.vars[A] = O - qdel(src) + new /obj/effect/temp_visual/monkeyify/humanify(loc) + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_humanize), species), TRANSFORMATION_DURATION, TIMER_UNIQUE) + +/mob/living/carbon/proc/finish_humanize(species = /datum/species/human) + transformation_timer = null + to_chat(src, "You are now a human.") + notransform = FALSE + icon = initial(icon) + invisibility = 0 + set_species(species) + dna.update_body_size(TRUE, height = dna.species?.get_species_height()) + regenerate_icons() + return src //A common proc to start an -ize transformation /mob/living/carbon/proc/pre_transform(delete_items = FALSE) @@ -484,6 +77,35 @@ icon = null invisibility = INVISIBILITY_MAXIMUM +/mob/living/carbon/proc/teratomize() + if (notransform || transformation_timer) + return + + if(isteratoma(src)) + return + + //Make mob invisible and spawn animation + notransform = TRUE + Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE) + icon = null + cut_overlays() + invisibility = INVISIBILITY_MAXIMUM + + new /obj/effect/temp_visual/monkeyify(loc) + + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_teratomize)), TRANSFORMATION_DURATION, TIMER_UNIQUE) + +/mob/living/carbon/proc/finish_teratomize() + transformation_timer = null + to_chat(src, "You are now a disgusting little cancer baby.") + notransform = FALSE + icon = initial(icon) + invisibility = 0 + set_species(/datum/species/monkey/teratoma) + uncuff() + regenerate_icons() + return src + /mob/living/carbon/AIize(transfer_after = TRUE, client/preference_source) return pre_transform() ? null : ..() diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 1556116350ace..27c4a76406c3c 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -187,7 +187,7 @@ var/randomize = pick("monkey","robot","slime","xeno","humanoid","animal") switch(randomize) if("monkey") - new_mob = new /mob/living/carbon/monkey(M.loc) + new_mob = new /mob/living/carbon/human/species/monkey(M.loc) if("robot") var/robot = pick(200;/mob/living/silicon/robot, diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 7f77bce0a5215..34136073e8a22 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -309,7 +309,7 @@ taste_description = "scorching agony" /datum/reagent/consumable/condensedcapsaicin/reaction_mob(mob/living/M, method=TOUCH, reac_volume) - if(!ishuman(M) && !ismonkey(M)) + if(!ishuman(M)) return var/mob/living/carbon/victim = M diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index add12c80b80ba..311786ee14658 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1965,7 +1965,7 @@ /datum/reagent/magillitis/on_mob_life(mob/living/carbon/M) ..() - if((ismonkey(M) || ishuman(M)) && current_cycle >= 10) + if(ishuman(M) && current_cycle >= 10) M.gorillize() /datum/reagent/growthserum diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 41809a81de167..cbad751f7baaf 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -111,7 +111,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/disposal) stuff_mob_in(target, user) /obj/machinery/disposal/proc/stuff_mob_in(mob/living/target, mob/living/user) - if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves. + var/ventcrawler = HAS_TRAIT(user, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(user, TRAIT_VENTCRAWLER_NUDE) + if(!iscarbon(user) && !ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves. if (iscyborg(user)) var/mob/living/silicon/robot/borg = user if (!borg.module || !borg.module.canDispose) diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm index f54a072c32e76..3141638979dea 100644 --- a/code/modules/research/xenobiology/crossbreeding/_structures.dm +++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm @@ -488,7 +488,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal) /obj/structure/slime_crystal/green colour = "green" - var/datum/mutation/stored_mutation + var/datum/mutation/human/stored_mutation /obj/structure/slime_crystal/green/examine(mob/user) . = ..() @@ -521,10 +521,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal) for(var/X in mut_list) if(istype(X,stored_mutation)) continue - var/datum/mutation/t_mutation = X + var/datum/mutation/human/t_mutation = X secondary_list += t_mutation.type - var/datum/mutation/mutation = pick(secondary_list) + var/datum/mutation/human/mutation = pick(secondary_list) carbon_mob.dna.remove_mutation(mutation) /obj/structure/slime_crystal/green/on_mob_leave(mob/living/affected_mob) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 4d8bbe72d3fb4..8e739e9b86c3e 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -118,12 +118,10 @@ hotkey_help.Grant(user) actions += hotkey_help - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl)) + RegisterSignal(user, COMSIG_MOB_CTRL_CLICKED, PROC_REF(on_ctrl_click)) RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt)) RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift)) RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift)) - RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl)) - RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl)) //Checks for recycler on every interact, prevents issues with load order on certain maps. if(!connected_recycler) @@ -133,12 +131,10 @@ connected_recycler.connected += src /obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user) - UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL) + UnregisterSignal(user, COMSIG_MOB_CTRL_CLICKED) UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT) UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT) UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT) - UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL) - UnregisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL) ..() /obj/machinery/computer/camera_advanced/xenobio/proc/on_contents_del(datum/source, atom/deleted) @@ -248,7 +244,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) if(X.monkeys >= 1) - var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc, TRUE, owner) + var/mob/living/carbon/human/species/monkey/food = new /mob/living/carbon/human/species/monkey(remote_eye.loc, TRUE, owner) if (!QDELETED(food)) X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors @@ -276,7 +272,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) to_chat(owner, "There is no connected monkey recycler. Use a multitool to link one.") return if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) - for(var/mob/living/carbon/monkey/M in remote_eye.loc) + for(var/mob/living/carbon/human/species/monkey/M in remote_eye.loc) if(M.stat) M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!") recycler.use_power(500) @@ -345,11 +341,6 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) // // Alternate clicks for slime, monkey and open turf if using a xenobio console -// Scans slime -/mob/living/simple_animal/slime/CtrlClick(mob/user) - SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_CTRL, src) - ..() - //Feeds a potion to slime /mob/living/simple_animal/slime/AltClick(mob/user) SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src) @@ -365,15 +356,14 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_SHIFT, src) ..() -//Place monkey -/turf/open/CtrlClick(mob/user) - SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_CTRL, src) - ..() - -//Pick up monkey -/mob/living/carbon/monkey/CtrlClick(mob/user) - SEND_SIGNAL(user, COMSIG_XENO_MONKEY_CLICK_CTRL, src) - ..() +/obj/machinery/computer/camera_advanced/xenobio/proc/on_ctrl_click(datum/source, atom/clicked_atom) + SIGNAL_HANDLER + if(ismonkey(clicked_atom)) + XenoMonkeyClickCtrl(source, clicked_atom) + if(isopenturf(clicked_atom)) + XenoTurfClickCtrl(source, clicked_atom) + if(isslime(clicked_atom)) + XenoSlimeClickCtrl(source, clicked_atom) // Scans slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S) @@ -459,7 +449,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) var/area/turfarea = get_area(T) if(turfarea.name == E.allowed_area || (turfarea.area_flags & XENOBIOLOGY_COMPATIBLE)) if(X.monkeys >= 1) - var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C) + var/mob/living/carbon/human/species/monkey/food = new /mob/living/carbon/human/species/monkey(T, TRUE, C) if (!QDELETED(food)) X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors @@ -468,10 +458,12 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") //Pick up monkey -/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M) +/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/human/M) SIGNAL_HANDLER - if(!GLOB.cameranet.checkTurfVis(M.loc)) + if(!ismonkey(M)) + return + if(!isturf(M.loc) || !GLOB.cameranet.checkTurfVis(M.loc)) to_chat(user, "Target is not near a camera. Cannot proceed.") return var/mob/living/C = user diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm index b9b8605517ea4..cee1809378e5e 100644 --- a/code/modules/spells/spell_types/barnyard.dm +++ b/code/modules/spells/spell_types/barnyard.dm @@ -11,7 +11,7 @@ range = 7 cooldown_min = 30 selection_type = "range" - var/static/list/compatible_mobs_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/carbon/monkey)) + var/static/list/compatible_mobs_typecache = typecacheof(list(/mob/living/carbon/human)) action_icon_state = "barn" diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index e796bdc959a81..aeaf2f75a7e50 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -197,7 +197,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/melee/touch_attack) /obj/item/melee/touch_attack/mutation catchphrase = null - var/datum/mutation/parent_mutation + var/datum/mutation/human/parent_mutation CREATION_TEST_IGNORE_SUBTYPES(/obj/item/melee/touch_attack/mutation) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index 1fb384d21c070..0ceaa6c9203f2 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -87,7 +87,7 @@ /obj/effect/proc_holder/spell/targeted/touch/mutation clothes_req = FALSE - var/datum/mutation/parent_mutation + var/datum/mutation/human/parent_mutation CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/proc_holder/spell/targeted/touch/mutation) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 90dffe1eb6a6d..b4d5c2cdd9e47 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -98,8 +98,8 @@ to_chat(user, "Plant data added to local storage.") //animals - var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey, /mob/living/carbon/alien)) - if(isanimal(target) || is_type_in_typecache(target,non_simple_animals)) + var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/alien)) + if(isanimal(target) || is_type_in_typecache(target,non_simple_animals) || ismonkey(target)) if(isanimal(target)) var/mob/living/simple_animal/A = target if(!A.healable || (A.flags_1 & HOLOGRAM_1)) //simple approximation of being animal not a robot or similar. Also checking if holographic diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index cb041d55f3413..471c6c02a5a36 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -9,7 +9,7 @@ /datum/surgery_step/lobotomize, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_HEAD) requires_bodypart_type = 0 diff --git a/code/modules/surgery/advanced/pacification.dm b/code/modules/surgery/advanced/pacification.dm index 5a98e32083430..7130e59027be5 100644 --- a/code/modules/surgery/advanced/pacification.dm +++ b/code/modules/surgery/advanced/pacification.dm @@ -8,7 +8,7 @@ /datum/surgery_step/pacify, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_HEAD) requires_bodypart_type = 0 diff --git a/code/modules/surgery/advanced/revival.dm b/code/modules/surgery/advanced/revival.dm index b5ae8bce78b33..d61cfc1da161a 100644 --- a/code/modules/surgery/advanced/revival.dm +++ b/code/modules/surgery/advanced/revival.dm @@ -9,7 +9,7 @@ /datum/surgery_step/revive, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_HEAD) requires_bodypart_type = 0 diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm index 53017cf892618..83dbe552f1572 100644 --- a/code/modules/surgery/advanced/viral_bonding.dm +++ b/code/modules/surgery/advanced/viral_bonding.dm @@ -8,7 +8,7 @@ /datum/surgery_step/viral_bond, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) self_operable = TRUE diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm index fbf0caf06ce78..9ffc93497f8ee 100644 --- a/code/modules/surgery/amputation.dm +++ b/code/modules/surgery/amputation.dm @@ -2,7 +2,7 @@ /datum/surgery/amputation name = "amputation" steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/sever_limb) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD) requires_bodypart_type = 0 self_operable = TRUE diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm index 0027a851bfc1a..b920734350fae 100644 --- a/code/modules/surgery/blood_filter.dm +++ b/code/modules/surgery/blood_filter.dm @@ -7,7 +7,7 @@ /datum/surgery_step/filter_blood, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) requires_bodypart_type = TRUE ignore_clothes = FALSE diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index b82dbeebeafca..26a43ebca5ed0 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -677,9 +677,8 @@ /obj/item/bodypart/chest/monkey icon = 'icons/mob/animal_parts.dmi' - icon_state = "default_monkey_chest" limb_id = SPECIES_MONKEY - animal_origin = MONKEY_BODYPART + is_dimorphic = TRUE /obj/item/bodypart/chest/monkey/teratoma icon_state = "teratoma_chest" @@ -1113,3 +1112,11 @@ can_be_disabled = FALSE max_damage = 5000 animal_origin = DEVIL_BODYPART + +///Proc to turn bodypart into another. +/obj/item/bodypart/proc/change_bodypart(obj/item/bodypart/new_type) + var/mob/living/carbon/our_owner = owner //dropping nulls the limb + drop_limb(TRUE) + var/obj/item/bodypart/new_part = new new_type() + new_part.attach_limb(our_owner, TRUE) + qdel(src) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 3f8bdf4d2e7ac..1cf7fdc83e664 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -107,7 +107,7 @@ if(!special) if(C.dna) - for(var/datum/mutation/MT as() in C.dna.mutations) //some mutations require having specific limbs to be kept. + for(var/datum/mutation/human/MT as() in C.dna.mutations) //some mutations require having specific limbs to be kept. if(MT.limb_req && MT.limb_req == body_zone) C.dna.force_lose(MT) diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 7dc048255c424..ac6032ee14201 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -136,27 +136,6 @@ L = new dna.species.species_chest() . = L -/mob/living/carbon/monkey/newBodyPart(zone, robotic, fixed_icon) - var/obj/item/bodypart/L - switch(zone) - if(BODY_ZONE_L_ARM) - L = new /obj/item/bodypart/l_arm/monkey() - if(BODY_ZONE_R_ARM) - L = new /obj/item/bodypart/r_arm/monkey() - if(BODY_ZONE_HEAD) - L = new /obj/item/bodypart/head/monkey() - if(BODY_ZONE_L_LEG) - L = new /obj/item/bodypart/l_leg/monkey() - if(BODY_ZONE_R_LEG) - L = new /obj/item/bodypart/r_leg/monkey() - if(BODY_ZONE_CHEST) - L = new /obj/item/bodypart/chest/monkey() - if(L) - L.update_limb(fixed_icon, src) - if(robotic) - L.change_bodypart_status(BODYTYPE_ROBOTIC) - . = L - /mob/living/carbon/alien/larva/newBodyPart(zone, robotic, fixed_icon) var/obj/item/bodypart/L switch(zone) diff --git a/code/modules/surgery/brain_recalibration.dm b/code/modules/surgery/brain_recalibration.dm index 46cb89dc73c0d..d48ea8e8e2233 100644 --- a/code/modules/surgery/brain_recalibration.dm +++ b/code/modules/surgery/brain_recalibration.dm @@ -8,7 +8,7 @@ /datum/surgery_step/fix_brain, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_HEAD) requires_bodypart_type = 0 diff --git a/code/modules/surgery/cauterize.dm b/code/modules/surgery/cauterize.dm index b5ff8d7d3a854..94885f1788b8b 100644 --- a/code/modules/surgery/cauterize.dm +++ b/code/modules/surgery/cauterize.dm @@ -3,7 +3,7 @@ /datum/surgery_step/retract_skin, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD) requires_bodypart_type = FALSE replaced_by = /datum/surgery diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index 4a9350a9061d8..34da51fd8d666 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -1,7 +1,7 @@ /datum/surgery/cavity_implant name = "cavity implant" steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/handle_cavity, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) self_operable = TRUE diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index 3a29baf23acb1..4025f60451472 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -1,7 +1,7 @@ /datum/surgery/eye_surgery name = "eye surgery" steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_PRECISE_EYES) requires_bodypart_type = 0 diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm index e766b30cd1e81..b66e96844bcd6 100644 --- a/code/modules/surgery/gastrectomy.dm +++ b/code/modules/surgery/gastrectomy.dm @@ -1,6 +1,6 @@ /datum/surgery/gastrectomy name = "Gastrectomy" - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) requires_real_bodypart = TRUE steps = list(/datum/surgery_step/incise, diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index d6cfaf7b0cb47..fcd39498439de 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -6,7 +6,7 @@ /datum/surgery_step/heal, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) requires_bodypart_type = FALSE replaced_by = /datum/surgery diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm index 87ab3c1444246..fc28ded64f99c 100644 --- a/code/modules/surgery/hepatectomy.dm +++ b/code/modules/surgery/hepatectomy.dm @@ -1,6 +1,6 @@ /datum/surgery/hepatectomy name = "Hepatectomy" - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) requires_real_bodypart = TRUE steps = list(/datum/surgery_step/incise, diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 8d72ceac92a01..2ce47ed4bee49 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -1,7 +1,7 @@ /datum/surgery/implant_removal name = "Implant removal" steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/extract_implant, /datum/surgery_step/close) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST) //extract implant diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 20430836f2ac9..df406f8d8d8fb 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -12,6 +12,9 @@ /datum/surgery_step/replace_limb/preop(mob/user, mob/living/carbon/target, obj/item/tool, datum/surgery/surgery) + if(NOAUGMENTS in target.dna.species.species_traits) + to_chat(user, "[target] cannot be augmented!") + return -1 if(istype(tool, /obj/item/organ_storage) && istype(tool.contents[1], /obj/item/bodypart)) tool = tool.contents[1] var/obj/item/bodypart/aug = tool diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index f4ecca1455928..538ec3726e8cc 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -1,6 +1,6 @@ /datum/surgery/organ_manipulation name = "organ manipulation" - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD) requires_real_bodypart = 1 steps = list( diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 60f3fb6d6146d..5a325db9c23c2 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -5,8 +5,10 @@ desc = "A severed tail. What did you cut this off of?" visual = TRUE icon_state = "severedtail" + zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_TAIL + var/tail_type = "None" /obj/item/organ/tail/proc/is_wagging(mob/living/carbon/human/H) @@ -151,3 +153,24 @@ "spines" = species.mutant_bodyparts["waggingspines"]) species.mutant_bodyparts -= list("waggingtail_lizard", "waggingspines") H.update_body() + +/obj/item/organ/tail/monkey + name = "monkey tail" + desc = "A severed monkey tail. Does not look like a banana." + tail_type = "Monkey" + icon_state = "severedmonkeytail" + +/obj/item/organ/tail/monkey/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE, pref_load = FALSE) + ..() + if(istype(H)) + if(!("tail_human" in H.dna.species.mutant_bodyparts)) + H.dna.species.mutant_bodyparts |= "tail_human" + H.dna.features["tail_human"] = tail_type + H.update_body() + +/obj/item/organ/tail/monkey/Remove(mob/living/carbon/human/H, special = 0, pref_load = FALSE) + ..() + if(istype(H)) + H.dna.features["tail_human"] = "None" + H.dna.species.mutant_bodyparts -= "tail_human" + H.update_body() diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 29b39806745f5..1b339357f25f5 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -398,3 +398,10 @@ color = "#1b1b1b" liked_food = RAW | GROSS disliked_food = DAIRY + +/obj/item/organ/tongue/monkey + name = "primitive tongue" + desc = "For aggressively chimpering. And consuming bananas." + say_mod = "chimpers" + liked_food = MEAT | FRUIT + disliked_food = CLOTH diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index b6ba55fb11304..b9e9a9212a3c5 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -1,7 +1,7 @@ /datum/surgery/prosthetic_replacement name = "prosthetic replacement" steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/add_prosthetic) - target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + target_mobtypes = list(/mob/living/carbon/human) possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD) requires_bodypart = FALSE //need a missing limb requires_bodypart_type = 0 diff --git a/code/modules/unit_tests/heretic_rituals.dm b/code/modules/unit_tests/heretic_rituals.dm index dfdcc7d2ecba2..d721444b72ee6 100644 --- a/code/modules/unit_tests/heretic_rituals.dm +++ b/code/modules/unit_tests/heretic_rituals.dm @@ -104,7 +104,7 @@ for(var/atom/thing as anything in nearby_atoms) if(!ismovable(thing)) continue - if(istype(thing, /atom/movable/lighting_object)) // Ignore lighting objects + if(istype(thing, /atom/movable/lighting_object) || istype(thing, /atom/movable/height_displacement_holder)) // Ignore lighting objects continue // There are atoms around the rune still, and there shouldn't be. diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 601b44e634860..606869623711a 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -905,6 +905,9 @@ /obj/vehicle/sealed/mecha/mob_try_enter(mob/M) if(!ishuman(M)) // no silicons or drones in mechas. return + if(HAS_TRAIT(M, TRAIT_PRIMITIVE)) //lavalanders & monkeys beware + to_chat(M, "The knowledge to use this device eludes you!") + return log_message("[M] tries to move into [src].", LOG_MECHA) if(!operation_allowed(M)) to_chat(M, "Access denied. Insufficient operation keycodes.") diff --git a/config/dbconfig.txt b/config/dbconfig.txt index ffcbe885689dd..b95ba63bb7e3c 100644 --- a/config/dbconfig.txt +++ b/config/dbconfig.txt @@ -3,11 +3,11 @@ ## administration, and the in game library. ## Should SQL be enabled? Uncomment to enable -#SQL_ENABLED +SQL_ENABLED ## Server the MySQL database can be found at. ## Examples: localhost, 200.135.5.43, www.mysqldb.com, etc. -ADDRESS localhost +ADDRESS 127.0.0.1 ## MySQL server port (default is 3306). PORT 3306 diff --git a/config/game_options.txt b/config/game_options.txt index d6640f5e05b08..4ff016987a2e7 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -49,7 +49,6 @@ WALK_DELAY 3.5 ## /mob/living/carbon/human on the last entry, the last entry will override the first. ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0 -##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal/slime 0 MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 1 diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi index 133de0dbe46b5..5588c2636e2c5 100644 Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ diff --git a/icons/mob/animal_parts.dmi b/icons/mob/animal_parts.dmi index 3d338868f7d31..019d5e203c241 100644 Binary files a/icons/mob/animal_parts.dmi and b/icons/mob/animal_parts.dmi differ diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi index aebaace8d8fe8..4f83aabdfbaa6 100644 Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 95ee4cdd84204..3809ee2b26e2a 100755 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/tools/Runtime Condenser/Output.txt b/tools/Runtime Condenser/Output.txt index e349edb7db7ab..c53cf20c1d367 100644 --- a/tools/Runtime Condenser/Output.txt +++ b/tools/Runtime Condenser/Output.txt @@ -87,7 +87,7 @@ The following runtime has occurred 9 time(s). runtime error: Cannot read null.thrownby proc name: hitby (/mob/living/carbon/human/hitby) source file: human_defense.dm,353 - usr: the monkey (662) (/mob/living/carbon/monkey) + usr: the monkey (662) (/mob/living/carbon/human/species/monkey) src: Sydney Hujsak (/mob/living/carbon/human) @@ -190,7 +190,7 @@ runtime error: Cannot read null.pipe_vision_img proc name: add ventcrawl (/mob/living/proc/add_ventcrawl) source file: ventcrawling.dm,94 usr: (src) - src: the monkey (809) (/mob/living/carbon/monkey) + src: the monkey (809) (/mob/living/carbon/human/species/monkey) src.loc: the Cloning Lab vent pump #1 (/obj/machinery/atmospherics/components/unary/vent_pump) diff --git a/tools/UpdatePaths/Scripts/10943_replacemonkeys.txt b/tools/UpdatePaths/Scripts/10943_replacemonkeys.txt new file mode 100644 index 0000000000000..630d446b9d363 --- /dev/null +++ b/tools/UpdatePaths/Scripts/10943_replacemonkeys.txt @@ -0,0 +1,5 @@ +#comment This replaces the monkeys pre-species refactor to the monkeys post-species refactor + +/mob/living/carbon/monkey : /mob/living/carbon/human/species/monkey +/mob/living/carbon/monkey/angry : /mob/living/carbon/human/species/monkey/angry +/mob/living/carbon/monkey/punpun : /mob/living/carbon/human/species/monkey/punpun