From 0fcb1266586f95ec4a549c2104d96bc70d1c0ebb Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 3 Feb 2017 11:02:12 -0600 Subject: [PATCH] Wagging tails emote (#194) * wagging tails! * oh * also these two runtime things * some delta too * maybesorta --- .../map_files/Deltastation/DeltaStation2.dmm | 1386 ++++++++++++----- code/_onclick/ai.dm | 16 +- code/modules/mob/living/carbon/human/emote.dm | 10 +- code/modules/mob/login.dm | 3 +- config/maps.txt | 6 +- 5 files changed, 1013 insertions(+), 408 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 6f9f497d61..59ebb7db51 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -618,7 +618,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "abq" = ( /turf/closed/wall/mineral/plastitanium, @@ -851,7 +851,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/arrival) "abG" = ( /obj/machinery/status_display{ @@ -5429,6 +5429,11 @@ "alb" = ( /obj/structure/frame/computer, /obj/item/stack/cable_coil/white, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + tag = "icon-intact (SOUTHWEST)"; + icon_state = "intact"; + dir = 10 + }, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "alc" = ( @@ -5933,6 +5938,7 @@ "amb" = ( /obj/structure/frame/computer, /obj/item/weapon/circuitboard/computer/secure_data, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ tag = "icon-wood-broken2"; icon_state = "wood-broken2" @@ -6527,6 +6533,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "anm" = ( @@ -7061,6 +7068,7 @@ }, /obj/item/weapon/folder/red, /obj/item/weapon/lighter, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "aok" = ( @@ -7267,7 +7275,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/syndicate) "aoD" = ( /turf/open/space, @@ -7738,19 +7746,19 @@ icon_state = "propulsion_l" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/syndicate) "apB" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/syndicate) "apC" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/syndicate) "apD" = ( /obj/structure/cable{ @@ -9544,6 +9552,7 @@ /area/maintenance/fpmaint2/fore_port_maintenance) "asz" = ( /obj/structure/table_frame/wood, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/fpmaint2/fore_port_maintenance) "asA" = ( @@ -9610,7 +9619,7 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "asG" = ( /obj/vehicle/janicart, @@ -9621,7 +9630,7 @@ /obj/item/weapon/storage/bag/trash, /obj/item/key/janitor, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "asH" = ( /obj/structure/closet/jcloset, @@ -9639,7 +9648,7 @@ /obj/item/clothing/under/maid, /obj/item/clothing/shoes/laceup, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "asI" = ( /obj/structure/closet/l3closet/janitor, @@ -9657,7 +9666,7 @@ name = "service camera" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "asJ" = ( /obj/structure/table/reinforced, @@ -9666,7 +9675,7 @@ }, /obj/item/weapon/clipboard, /obj/item/toy/figure/janitor, -/turf/open/floor/plating, +/turf/open/floor/plasteel/neutral, /area/janitor) "asK" = ( /obj/structure/table/reinforced, @@ -9679,7 +9688,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/neutral, /area/janitor) "asL" = ( /obj/effect/decal/cleanable/dirt, @@ -10078,6 +10087,11 @@ "aty" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/melee/skateboard, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_Toxins = 0 + }, /turf/open/floor/plasteel/cafeteria, /area/maintenance/fpmaint2/fore_port_maintenance) "atz" = ( @@ -10163,7 +10177,7 @@ /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "atI" = ( /obj/effect/decal/cleanable/dirt, @@ -10190,9 +10204,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/purple/side{ - tag = "icon-purple (NORTH)"; - icon_state = "purple"; +/turf/open/floor/plasteel/whitepurple/side{ + tag = "icon-whitepurple (NORTH)"; + icon_state = "whitepurple"; dir = 1 }, /area/janitor) @@ -10206,10 +10220,10 @@ on = 1; scrub_Toxins = 0 }, -/turf/open/floor/plasteel/green/side{ - dir = 5; - initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" +/turf/open/floor/plasteel/whitegreen/side{ + tag = "icon-whitegreen (NORTHEAST)"; + icon_state = "whitegreen"; + dir = 5 }, /area/janitor) "atM" = ( @@ -10220,7 +10234,7 @@ /obj/item/weapon/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "atN" = ( /obj/effect/landmark{ @@ -10790,6 +10804,7 @@ "auT" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/cafeteria, /area/maintenance/fpmaint2/fore_port_maintenance) "auU" = ( @@ -10859,14 +10874,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel/neutral, /area/janitor) "avb" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, -/turf/open/floor/plasteel/green/side{ +/turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, /area/janitor) @@ -10877,7 +10892,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "avd" = ( /obj/effect/decal/cleanable/dirt, @@ -10886,12 +10901,10 @@ name = "Eats-The-Roaches"; real_name = "Wags-His-Tail" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "ave" = ( -/turf/open/floor/plasteel/purple/side{ - tag = "icon-purple (EAST)"; - icon_state = "purple"; +/turf/open/floor/plasteel/whitepurple/side{ dir = 4 }, /area/janitor) @@ -11460,6 +11473,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/cafeteria, /area/maintenance/fpmaint2/fore_port_maintenance) "awd" = ( @@ -11500,7 +11514,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/small, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "awf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -11508,7 +11522,7 @@ tag = "icon-2-4"; icon_state = "2-4" }, -/turf/open/floor/plasteel/purple/side{ +/turf/open/floor/plasteel/whitepurple/side{ dir = 10 }, /area/janitor) @@ -11521,11 +11535,13 @@ tag = "icon-1-8"; icon_state = "1-8" }, -/turf/open/floor/plasteel/green/side, +/turf/open/floor/plasteel/whitegreen/side{ + dir = 1 + }, /area/janitor) "awh" = ( /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "awi" = ( /obj/effect/decal/cleanable/dirt, @@ -11534,7 +11550,7 @@ icon_state = "pipe-c" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "awj" = ( /obj/machinery/disposal/bin, @@ -11547,7 +11563,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral, /area/janitor) "awk" = ( /obj/machinery/door/airlock{ @@ -14775,6 +14791,11 @@ pixel_y = -32 }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (NORTHEAST)"; + icon_state = "intact"; + dir = 5 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator{ name = "Atmospherics Engine" @@ -15012,6 +15033,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/hydroponics/Abandoned_Garden) "aCy" = ( @@ -16567,11 +16589,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating, /area/maintenance/auxsolarport) "aES" = ( /obj/machinery/door/firedoor, @@ -16585,12 +16603,14 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (SOUTHWEST)"; + icon_state = "intact"; + dir = 10 + }, /turf/open/floor/plasteel, /area/maintenance/auxsolarport) "aET" = ( @@ -17327,6 +17347,7 @@ /area/maintenance/auxsolarport) "aGi" = ( /obj/structure/sign/electricshock, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/maintenance/auxsolarport) "aGj" = ( @@ -17709,7 +17730,11 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + tag = "icon-manifold (EAST)"; + icon_state = "manifold"; + dir = 4 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, @@ -18010,7 +18035,7 @@ }, /obj/structure/shuttle/engine/heater, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/supply) "aHt" = ( /obj/structure/window/reinforced{ @@ -18019,7 +18044,7 @@ /obj/structure/shuttle/engine/heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/supply) "aHu" = ( /turf/closed/wall, @@ -18623,19 +18648,19 @@ icon_state = "burst_l" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/supply) "aIu" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/supply) "aIv" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/supply) "aIw" = ( /obj/machinery/shower{ @@ -19087,6 +19112,7 @@ pixel_x = 0; pixel_y = 25 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -19626,7 +19652,7 @@ pixel_y = 0 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/maintenance/incinerator) "aKl" = ( /obj/machinery/door/airlock/glass{ @@ -19645,9 +19671,7 @@ icon_state = "4-8"; pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/engine, /area/maintenance/incinerator) "aKm" = ( @@ -19875,6 +19899,11 @@ tag = "icon-1-2"; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + tag = "icon-manifold (EAST)"; + icon_state = "manifold"; + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "aKK" = ( @@ -20406,7 +20435,7 @@ dir = 8 }, /obj/machinery/light/small, -/turf/open/floor/engine/vacuum, +/turf/open/floor/engine, /area/maintenance/incinerator) "aLQ" = ( /obj/machinery/doorButtons/airlock_controller{ @@ -20779,6 +20808,7 @@ tag = "icon-1-2"; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "aMt" = ( @@ -21425,7 +21455,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/open/space, +/turf/open/floor/plating/airless, /area/space) "aND" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, @@ -21436,7 +21466,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "aNE" = ( /obj/machinery/door/poddoor{ @@ -21648,6 +21678,7 @@ tag = "icon-1-2"; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "aOc" = ( @@ -22722,6 +22753,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ icon_state = "wood-broken5" }, @@ -22750,6 +22782,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/abandoned_gambling_den) "aPJ" = ( @@ -23814,6 +23849,7 @@ }, /obj/item/weapon/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "aRv" = ( @@ -25634,6 +25670,11 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (SOUTHEAST)"; + icon_state = "intact"; + dir = 6 + }, /turf/open/floor/plasteel/neutral/side{ dir = 5 }, @@ -25650,6 +25691,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/fpmaint2/fore_port_maintenance) "aUG" = ( @@ -25673,6 +25718,9 @@ name = "Hydroponics Junction"; sortType = 21 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/fpmaint2/fore_port_maintenance) "aUI" = ( @@ -25688,16 +25736,12 @@ tag = "icon-1-8"; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - tag = "icon-manifold (WEST)"; - icon_state = "manifold"; - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel, /area/maintenance/fpmaint2/fore_port_maintenance) "aUJ" = ( @@ -26044,7 +26088,9 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 + tag = "icon-intact (NORTHWEST)"; + icon_state = "intact"; + dir = 9 }, /turf/open/floor/plating, /area/quartermaster/qm) @@ -26787,6 +26833,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/fpmaint2/fore_port_maintenance) "aWB" = ( @@ -28404,6 +28451,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -29219,6 +29267,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -29793,7 +29842,7 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter{ - dir = 1; + dir = 2; filter_type = "plasma"; name = "waste filter"; on = 1 @@ -29882,7 +29931,7 @@ /area/atmos) "bcn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -30565,6 +30614,10 @@ /area/atmos) "bdC" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/valve/open{ + name = "SM coolant loop"; + open = 0 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -31607,6 +31660,7 @@ icon_state = "intact"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -32223,7 +32277,7 @@ dir = 8 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/mining) "bgs" = ( /obj/structure/ore_box, @@ -32619,6 +32673,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -32646,6 +32701,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -33204,7 +33260,7 @@ layer = 2.9 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/mining) "bim" = ( /obj/structure/cable/white, @@ -33769,6 +33825,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/fpmaint2/fore_port_maintenance) "bjq" = ( @@ -33854,7 +33911,6 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/sleep{ @@ -35615,6 +35671,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/fpmaint2/fore_port_maintenance) "bmD" = ( @@ -38603,12 +38660,20 @@ /obj/structure/closet/crate{ name = "Silver Crate" }, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, /obj/machinery/light/small{ dir = 1 }, +/obj/item/weapon/coin/silver{ + pixel_x = -6 + }, +/obj/item/weapon/coin/silver{ + pixel_x = 6 + }, +/obj/item/weapon/coin/silver{ + pixel_x = 6 + }, +/obj/item/weapon/coin/silver, +/obj/item/weapon/coin/silver, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -42129,15 +42194,14 @@ name = "Gold Crate" }, /obj/item/weapon/storage/belt/champion, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, /obj/machinery/airalarm{ dir = 1; icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light/small, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -42186,7 +42250,7 @@ layer = 2.9 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/labor) "bxX" = ( /obj/structure/cable/white{ @@ -43391,10 +43455,10 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - tag = "icon-manifold (NORTH)"; - icon_state = "manifold"; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + tag = "icon-intact (WEST)"; + icon_state = "intact"; + dir = 8 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -43518,7 +43582,7 @@ "bzR" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/labor) "bzS" = ( /turf/closed/wall, @@ -49782,10 +49846,10 @@ name = "\improper Telecoms Control Room" }) "bKz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - tag = "icon-manifold (WEST)"; - icon_state = "manifold"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (NORTHEAST)"; + icon_state = "intact"; + dir = 5 }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer{ @@ -51868,7 +51932,6 @@ icon_state = "plant-21"; layer = 4.1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer{ name = "\improper Telecoms Control Room" @@ -53207,7 +53270,9 @@ /area/crew_quarters/heads) "bQr" = ( /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bQs" = ( @@ -54517,6 +54582,7 @@ icon_state = "plant-21"; layer = 4.1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/crew_quarters/heads) "bSC" = ( @@ -54526,6 +54592,7 @@ pixel_y = 3 }, /obj/item/weapon/storage/box/silver_ids, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads) "bSD" = ( @@ -54534,20 +54601,24 @@ dir = 8 }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bSE" = ( /turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "bSF" = ( /obj/machinery/telecomms/receiver/preset_right, /turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "bSG" = ( @@ -54564,8 +54635,9 @@ "bSH" = ( /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "bSI" = ( @@ -54574,7 +54646,9 @@ dir = 4 }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bSJ" = ( @@ -55132,6 +55206,11 @@ }) "bTz" = ( /obj/structure/sign/nosmoking_2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (EAST)"; + icon_state = "intact"; + dir = 4 + }, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) "bTA" = ( @@ -55809,6 +55888,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads) "bUJ" = ( @@ -55816,7 +55896,8 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 9; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-whiteblue (NORTHWEST)" + tag = "icon-whiteblue (NORTHWEST)"; + temperature = 80 }, /area/tcommsat/server) "bUK" = ( @@ -55824,11 +55905,15 @@ /turf/open/floor/plasteel/whitepurple/side{ dir = 5; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-whitehall (WEST)" + tag = "icon-whitehall (WEST)"; + temperature = 80 }, /area/tcommsat/server) "bUL" = ( -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault{ + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, /area/tcommsat/server) "bUM" = ( /obj/structure/cable/white{ @@ -55849,7 +55934,8 @@ /obj/machinery/telecomms/server/presets/command, /turf/open/floor/plasteel/darkblue/side{ dir = 9; - initial_gas_mix = "n2=100;TEMP=80" + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bUO" = ( @@ -55857,7 +55943,8 @@ /turf/open/floor/plasteel/darkred/side{ dir = 5; initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "bUP" = ( @@ -56740,6 +56827,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads) "bWv" = ( @@ -56747,7 +56835,8 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 10; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-whiteblue (SOUTHWEST)" + tag = "icon-whiteblue (SOUTHWEST)"; + temperature = 80 }, /area/tcommsat/server) "bWw" = ( @@ -56755,13 +56844,16 @@ /turf/open/floor/plasteel/whitepurple/side{ dir = 6; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-whitepurple (SOUTHEAST)" + tag = "icon-whitepurple (SOUTHEAST)"; + temperature = 80 }, /area/tcommsat/server) "bWx" = ( /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bWy" = ( @@ -56770,8 +56862,10 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bWz" = ( @@ -56780,25 +56874,29 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bWA" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bWB" = ( /obj/machinery/telecomms/processor/preset_three, /turf/open/floor/plasteel/darkblue/side{ dir = 10; - initial_gas_mix = "n2=100;TEMP=80" + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bWC" = ( @@ -56806,7 +56904,8 @@ /turf/open/floor/plasteel/darkred/side{ dir = 6; initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "bWD" = ( @@ -57188,7 +57287,7 @@ "bXo" = ( /obj/structure/grille, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXp" = ( /obj/structure/cable/white{ @@ -57197,7 +57296,7 @@ }, /obj/structure/grille, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXq" = ( /obj/structure/cable/white{ @@ -57206,7 +57305,7 @@ }, /obj/structure/grille, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXr" = ( /obj/structure/cable/white{ @@ -57217,7 +57316,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXs" = ( /obj/structure/cable/white{ @@ -57226,7 +57325,7 @@ }, /obj/structure/grille, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXt" = ( /obj/structure/cable/white{ @@ -57239,7 +57338,7 @@ }, /obj/structure/grille, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXu" = ( /obj/structure/cable/white{ @@ -57248,7 +57347,7 @@ }, /obj/structure/grille, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bXv" = ( /obj/structure/closet/emcloset{ @@ -57641,6 +57740,7 @@ /obj/machinery/light, /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads) "bYe" = ( @@ -57655,7 +57755,9 @@ network = list("SS13","tcomm") }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bYf" = ( @@ -57664,7 +57766,9 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ - dir = 10 + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bYg" = ( @@ -57680,8 +57784,10 @@ pressure_checks = 0 }, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bYh" = ( @@ -57690,8 +57796,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bYi" = ( @@ -57701,8 +57809,10 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bYj" = ( @@ -57712,16 +57822,15 @@ icon_state = "1-2" }, /obj/item/weapon/folder/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - tag = "icon-intact (SOUTHEAST)"; - icon_state = "intact"; - dir = 6 - }, /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, -/turf/open/floor/plasteel/circuit/gcircuit, +/turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; + name = "Mainframe Base"; + temperature = 80 + }, /area/tcommsat/server) "bYk" = ( /obj/structure/cable/white{ @@ -57750,8 +57859,10 @@ pump_direction = 0 }, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bYm" = ( @@ -57760,7 +57871,9 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ - dir = 6 + dir = 6; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bYn" = ( @@ -57769,7 +57882,9 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bYo" = ( @@ -58195,10 +58310,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "bZf" = ( -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bZg" = ( /obj/structure/cable/white, @@ -58209,7 +58324,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bZh" = ( /obj/structure/cable/white{ @@ -58220,7 +58335,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bZi" = ( /obj/structure/cable/white{ @@ -58231,7 +58346,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bZj" = ( /obj/structure/cable/white{ @@ -58239,7 +58354,7 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "bZk" = ( /obj/machinery/door/airlock/external{ @@ -58662,7 +58777,9 @@ }, /obj/structure/cable/white, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bZW" = ( @@ -58671,7 +58788,9 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/vault{ - dir = 10 + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "bZX" = ( @@ -58680,12 +58799,15 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (NORTHEAST)"; + icon_state = "intact"; dir = 5 }, /turf/open/floor/bluegrid{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "bZY" = ( @@ -58693,12 +58815,16 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (EAST)"; + icon_state = "intact"; dir = 4 }, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "bZZ" = ( @@ -58707,12 +58833,15 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/general/hidden{ + tag = "icon-manifold (NORTH)"; + icon_state = "manifold"; + dir = 1 }, /turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "caa" = ( @@ -58721,12 +58850,16 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (EAST)"; + icon_state = "intact"; dir = 4 }, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "cab" = ( @@ -58743,12 +58876,16 @@ tag = "icon-1-4"; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - tag = "icon-manifold (NORTH)"; - icon_state = "manifold"; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (EAST)"; + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; + name = "Mainframe Base"; + temperature = 80 }, -/turf/open/floor/plasteel/circuit/gcircuit, /area/tcommsat/server) "cac" = ( /obj/structure/cable/white{ @@ -58767,12 +58904,15 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/general/hidden{ + tag = "icon-manifold (NORTH)"; + icon_state = "manifold"; + dir = 1 }, /turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "cae" = ( @@ -58781,14 +58921,15 @@ tag = "icon-4-8"; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9 }, /turf/open/floor/bluegrid{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "caf" = ( @@ -58806,7 +58947,9 @@ icon_state = "0-8" }, /turf/open/floor/plasteel/vault{ - dir = 6 + dir = 6; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cag" = ( @@ -58815,7 +58958,9 @@ }, /obj/structure/cable/white, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cah" = ( @@ -59400,7 +59545,7 @@ /area/ai_monitored/turret_protected/ai_upload) "cbd" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cbe" = ( /obj/machinery/camera/emp_proof{ @@ -59410,7 +59555,7 @@ network = list("Singularity"); tag = "icon-camera (WEST)" }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cbf" = ( /obj/structure/sign/vacuum, @@ -59750,17 +59895,26 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ - dir = 10 + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cbK" = ( /turf/open/floor/plasteel/vault{ - dir = 10 + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cbL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; + tag = "icon-vault (NORTHEAST)"; + temperature = 80 + }, /area/tcommsat/server) "cbM" = ( /obj/machinery/ntnet_relay, @@ -59768,12 +59922,18 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/circuit/gcircuit, +/turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; + name = "Mainframe Base"; + temperature = 80 + }, /area/tcommsat/server) "cbN" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/plasteel/vault{ - dir = 6 + dir = 6; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cbO" = ( @@ -59782,7 +59942,9 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ - dir = 6 + dir = 6; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cbP" = ( @@ -59793,7 +59955,9 @@ network = list("SS13","tcomm") }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cbQ" = ( @@ -60777,8 +60941,9 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/circuit/gcircuit{ + initial_gas_mix = "n2=100;TEMP=80"; name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + temperature = 80 }, /area/tcommsat/server) "cdB" = ( @@ -60786,7 +60951,8 @@ /turf/open/floor/plasteel/brown{ dir = 9; initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "cdC" = ( @@ -60794,15 +60960,18 @@ /turf/open/floor/plasteel/green/side{ dir = 5; initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "cdD" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "cdE" = ( @@ -60819,16 +60988,19 @@ "cdF" = ( /obj/machinery/light/small, /turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=100;TEMP=80"; tag = "icon-vault (NORTHEAST)"; - dir = 5 + temperature = 80 }, /area/tcommsat/server) "cdG" = ( /obj/machinery/telecomms/processor/preset_two, -/turf/open/floor/plasteel/yellow/side{ +/turf/open/floor/plasteel/brown{ dir = 9; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-yellow (NORTHWEST)" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "cdH" = ( @@ -60836,7 +61008,8 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-neutral (NORTHEAST)" + tag = "icon-neutral (NORTHEAST)"; + temperature = 80 }, /area/tcommsat/server) "cdI" = ( @@ -61390,11 +61563,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating, /area/engine/engineering) "ceE" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -61611,9 +61780,10 @@ "cfd" = ( /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/plasteel/brown{ - dir = 10; + dir = 9; initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "cfe" = ( @@ -61621,7 +61791,8 @@ /turf/open/floor/plasteel/green/side{ dir = 6; initial_gas_mix = "n2=100;TEMP=80"; - tag = "SERVER" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "cff" = ( @@ -61635,25 +61806,26 @@ req_access = null; req_access_txt = "61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/tcommsat/server) "cfg" = ( /obj/machinery/telecomms/server/presets/engineering, -/turf/open/floor/plasteel/yellow/side{ - dir = 10; +/turf/open/floor/plasteel/brown{ + dir = 9; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-yellow (SOUTHWEST)" + tag = "SERVER"; + temperature = 80 }, /area/tcommsat/server) "cfh" = ( /obj/machinery/telecomms/server/presets/common, /turf/open/floor/plasteel/neutral/side{ - dir = 6; + dir = 5; initial_gas_mix = "n2=100;TEMP=80"; - tag = "icon-neutral (SOUTHEAST)" + tag = "icon-neutral (NORTHEAST)"; + temperature = 80 }, /area/tcommsat/server) "cfi" = ( @@ -62065,13 +62237,13 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cfV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cfW" = ( /obj/machinery/power/tesla_coil, @@ -62079,7 +62251,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cfX" = ( /obj/machinery/power/grounding_rod, @@ -62091,7 +62263,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cfY" = ( /obj/effect/decal/cleanable/oil, @@ -62331,7 +62503,9 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cgx" = ( @@ -62339,7 +62513,9 @@ pixel_y = -32 }, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/tcommsat/server) "cgy" = ( @@ -62766,7 +62942,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "chp" = ( /obj/machinery/field/generator{ @@ -62776,7 +62952,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "chq" = ( /obj/machinery/field/generator{ @@ -62786,7 +62962,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "chr" = ( /obj/machinery/field/generator{ @@ -62796,7 +62972,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "chs" = ( /obj/structure/cable{ @@ -62807,7 +62983,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cht" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -63155,7 +63331,6 @@ req_access = null; req_access_txt = "61" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -63818,7 +63993,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "ciZ" = ( /obj/structure/sign/radiation, @@ -64091,14 +64266,12 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - tag = "icon-manifold (WEST)"; - icon_state = "manifold"; - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel, /area/tcommsat/server) "cjF" = ( @@ -65195,26 +65368,26 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "clJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "clK" = ( /obj/machinery/the_singularitygen, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "clL" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "clM" = ( /obj/structure/cable{ @@ -65567,6 +65740,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ tag = "icon-plasteel_warn_side (WEST)" }, @@ -65862,13 +66036,13 @@ }) "cnd" = ( /obj/item/weapon/wrench, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cne" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cnf" = ( /obj/structure/cable{ @@ -65885,7 +66059,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cng" = ( /obj/structure/grille, @@ -66800,18 +66974,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "coJ" = ( /obj/machinery/the_singularitygen/tesla, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "coK" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "coL" = ( /obj/machinery/field/generator{ @@ -66821,11 +66995,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating/airless, /area/space) "coM" = ( /obj/structure/particle_accelerator/particle_emitter/right{ @@ -69191,7 +69361,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "csT" = ( /obj/machinery/field/generator{ @@ -69199,7 +69369,7 @@ state = 2 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "csU" = ( /obj/machinery/field/generator{ @@ -69209,7 +69379,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "csV" = ( /obj/machinery/power/rad_collector{ @@ -69225,11 +69395,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating, /area/engine/engineering) "csW" = ( /obj/effect/decal/cleanable/dirt, @@ -70247,11 +70413,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cuJ" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cuK" = ( /obj/machinery/power/tesla_coil, @@ -70260,7 +70426,7 @@ d2 = 2 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cuL" = ( /obj/machinery/power/grounding_rod, @@ -70270,7 +70436,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/space) "cuM" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -71022,11 +71188,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating, /area/engine/engineering) "cwd" = ( /obj/effect/decal/cleanable/dirt, @@ -72930,14 +73092,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "czk" = ( /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "czl" = ( /obj/machinery/camera/emp_proof{ @@ -72947,7 +73109,7 @@ network = list("Singularity"); tag = "icon-camera (NORTHWEST)" }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "czm" = ( /obj/machinery/light{ @@ -73986,7 +74148,7 @@ state = 2 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cAV" = ( /obj/structure/cable/white{ @@ -73997,7 +74159,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cAW" = ( /obj/structure/cable/white{ @@ -74008,7 +74170,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cAX" = ( /obj/structure/cable/white{ @@ -74019,14 +74181,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cAY" = ( /obj/structure/cable/white{ tag = "icon-2-4"; icon_state = "2-4" }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cAZ" = ( /obj/machinery/door/airlock/external{ @@ -74694,7 +74856,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cCn" = ( /obj/structure/cable/white{ @@ -74705,7 +74867,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cCo" = ( /obj/structure/cable/white{ @@ -74716,7 +74878,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cCp" = ( /obj/structure/cable/white{ @@ -74727,7 +74889,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cCq" = ( /obj/structure/cable/white{ @@ -74742,7 +74904,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cCr" = ( /obj/structure/cable/white{ @@ -74753,7 +74915,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/engine/engineering) "cCs" = ( /obj/structure/closet/emcloset{ @@ -75147,6 +75309,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ tag = "icon-plasteel_warn_side (WEST)" }, @@ -77269,12 +77432,12 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - tag = "icon-intact (WEST)"; - icon_state = "intact"; - dir = 8 - }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + tag = "icon-manifold (NORTH)"; + icon_state = "manifold"; + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/fpmaint2/port_maintenance) "cGy" = ( @@ -78102,7 +78265,9 @@ network = list("SS13","xeno","RD") }, /turf/open/floor/plasteel/vault{ - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/toxins/xenobiology) "cIc" = ( @@ -78915,8 +79080,8 @@ /area/toxins/xenobiology) "cJJ" = ( /turf/open/floor/bluegrid{ - name = "Mainframe Base"; - initial_gas_mix = "n2=100;TEMP=80" + initial_gas_mix = "n2=500;TEMP=80"; + name = "Mainframe Base" }, /area/toxins/xenobiology) "cJK" = ( @@ -79804,13 +79969,21 @@ dir = 8 }, /turf/open/floor/plasteel/vault{ - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/toxins/xenobiology) "cLp" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden, +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (EAST)"; + icon_state = "intact"; + dir = 4 + }, /turf/open/floor/plasteel/vault{ - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/toxins/xenobiology) "cLq" = ( @@ -79820,7 +79993,9 @@ dir = 9 }, /turf/open/floor/plasteel/vault{ - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/toxins/xenobiology) "cLr" = ( @@ -87239,8 +87414,10 @@ /area/maintenance/fpmaint2/port_maintenance) "cYw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + tag = "icon-manifold (NORTH)"; + icon_state = "manifold"; + dir = 1 }, /turf/open/floor/plating, /area/maintenance/fpmaint2/port_maintenance) @@ -90156,6 +90333,9 @@ "ddN" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "ddO" = ( @@ -90164,12 +90344,18 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "ddP" = ( /obj/structure/chair/wood/normal, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -90181,6 +90367,7 @@ /area/crew_quarters/abandoned_gambling_den) "ddR" = ( /obj/structure/chair/wood/normal, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "ddS" = ( @@ -90190,6 +90377,9 @@ icon_state = "1-2" }, /obj/item/weapon/storage/wallet/random, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "ddT" = ( @@ -90197,6 +90387,11 @@ /obj/item/weapon/storage/briefcase, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + tag = "icon-intact (SOUTHWEST)"; + icon_state = "intact"; + dir = 10 + }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "ddU" = ( @@ -91270,6 +91465,7 @@ "dfK" = ( /obj/structure/table/wood/poker, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dfL" = ( @@ -91865,6 +92061,7 @@ icon_state = "wooden_chair"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ icon_state = "wood-broken4" }, @@ -93204,12 +93401,14 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" }, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/toxins/misc_lab{ name = "\improper Research Testing Range" @@ -93828,6 +94027,7 @@ icon_state = "wooden_chair"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "dkB" = ( @@ -96026,6 +96226,7 @@ /area/crew_quarters/abandoned_gambling_den) "doJ" = ( /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "doK" = ( @@ -103788,10 +103989,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_end (NORTH)"; - icon_state = "plating_warn_end" - }, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dCl" = ( /obj/machinery/button/massdriver{ @@ -104067,6 +104265,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (EAST)"; + icon_state = "intact"; + dir = 4 + }, /turf/open/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -104145,7 +104348,9 @@ "dCI" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/toxins/server{ name = "\improper Research Division Server Room" @@ -104684,17 +104889,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dDH" = ( -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dDI" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dDJ" = ( /obj/machinery/doppler_array{ @@ -105003,7 +105208,9 @@ "dEf" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden, /turf/open/floor/plasteel/vault{ - dir = 8 + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 }, /area/toxins/server{ name = "\improper Research Division Server Room" @@ -105223,21 +105430,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dEx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dEy" = ( /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dEz" = ( /obj/structure/chair{ @@ -105246,7 +105453,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dEA" = ( /obj/structure/sign/vacuum, @@ -105887,42 +106094,36 @@ start_active = 1; use_power = 0 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dFF" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dFG" = ( /obj/item/device/radio/beacon, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dFH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (WEST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dFI" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_end (EAST)"; - icon_state = "plating_warn_end" - }, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dFJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -105930,11 +106131,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating/airless, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -106169,6 +106366,11 @@ tag = "icon-2-4"; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + tag = "icon-manifold (WEST)"; + icon_state = "manifold"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/fpmaint2/aft_port_maintenance) "dGj" = ( @@ -106794,24 +106996,24 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHp" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/remains/human, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHr" = ( /obj/structure/chair{ @@ -106821,7 +107023,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHs" = ( /obj/structure/rack, @@ -107025,7 +107227,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/fpmaint2/aft_port_maintenance) "dHK" = ( @@ -107153,7 +107354,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHW" = ( /obj/structure/chair{ @@ -107163,7 +107364,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dHX" = ( /obj/machinery/door/airlock/external{ @@ -107419,7 +107620,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 5 }, @@ -107591,7 +107791,7 @@ /obj/item/target, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/toxins/test_area) "dIJ" = ( /turf/closed/wall, @@ -107833,7 +108033,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/escape) "dJk" = ( /turf/closed/wall/mineral/plastitanium, @@ -108272,7 +108472,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/shuttle/escape) "dKe" = ( /obj/structure/sink{ @@ -109817,6 +110017,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + tag = "icon-manifold (EAST)"; + icon_state = "manifold"; + dir = 4 + }, /turf/open/floor/plasteel{ tag = "icon-plasteel_warn_side (WEST)" }, @@ -113061,6 +113266,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dTg" = ( @@ -114212,7 +114420,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/medical/virology) "dVn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -114224,7 +114432,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/medical/virology) "dVo" = ( /obj/structure/disposalpipe/segment{ @@ -114234,7 +114442,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/medical/virology) "dVp" = ( /obj/machinery/iv_drip, @@ -114395,11 +114603,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - luminosity = 2; - initial_gas_mix = "o2=0.01;n2=0.01"; - temperature = 2.7 - }, +/turf/open/floor/plating, /area/maintenance/portsolar) "dVC" = ( /obj/machinery/door/airlock/engineering{ @@ -114679,7 +114883,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/medical/virology) "dWe" = ( /obj/structure/disposalpipe/trunk{ @@ -114687,7 +114891,7 @@ }, /obj/structure/disposaloutlet, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/airless, /area/medical/virology) "dWf" = ( /obj/structure/table/glass, @@ -117765,6 +117969,400 @@ }, /turf/open/floor/plasteel, /area/maintenance/auxsolarport) +"ecb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_Toxins = 0 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/crew_quarters/electronic_marketing_den) +"ecc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/electronic_marketing_den) +"ecd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/maintenance/fpmaint2/fore_port_maintenance) +"ece" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + tag = "icon-manifold (EAST)"; + icon_state = "manifold"; + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fpmaint2/fore_port_maintenance) +"ecf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/hydroponics/Abandoned_Garden) +"ecg" = ( +/obj/item/weapon/twohanded/required/kirbyplants{ + icon_state = "plant-21"; + layer = 4.1; + pixel_x = -3; + pixel_y = 3 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/hydroponics/Abandoned_Garden) +"ech" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/hydrofloor, +/area/hydroponics/Abandoned_Garden) +"eci" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + tag = "icon-manifold (EAST)"; + icon_state = "manifold"; + dir = 4 + }, +/turf/open/floor/plasteel/hydrofloor, +/area/hydroponics/Abandoned_Garden) +"ecj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/hydrofloor, +/area/hydroponics/Abandoned_Garden) +"eck" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/hydrofloor, +/area/hydroponics/Abandoned_Garden) +"ecl" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/structure/barricade/wooden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/hydroponics/Abandoned_Garden) +"ecm" = ( +/obj/structure/cable/white{ + tag = "icon-4-8"; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/maintenance/fpmaint2/fore_port_maintenance) +"ecn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/neutral/side, +/area/maintenance/fpmaint2/fore_port_maintenance) +"eco" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall, +/area/maintenance/incinerator) +"ecp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/abandoned_gambling_den) +"ecq" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall, +/area/maintenance/incinerator) +"ecr" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/atmos) +"ecs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_Toxins = 0 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/crew_quarters/abandoned_gambling_den) +"ect" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/abandoned_gambling_den) +"ecu" = ( +/obj/structure/cable/white{ + tag = "icon-4-8"; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/fpmaint2/fore_port_maintenance) +"ecv" = ( +/obj/structure/cable/white{ + tag = "icon-4-8"; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + tag = "icon-manifold (NORTH)"; + icon_state = "manifold"; + dir = 1 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/hallway/primary/port) +"ecw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/port) +"ecx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 8 + }, +/area/hallway/primary/port) +"ecy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/heads) +"ecz" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plasteel/vault{ + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecA" = ( +/turf/open/floor/plasteel/vault{ + dir = 6; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecB" = ( +/turf/open/floor/plasteel/vault{ + dir = 6; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecC" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plasteel/vault{ + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecD" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plasteel/vault{ + dir = 10; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecE" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plasteel/vault{ + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecF" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plasteel/vault{ + dir = 8; + initial_gas_mix = "n2=100;TEMP=80"; + temperature = 80 + }, +/area/tcommsat/server) +"ecG" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plating, +/area/tcommsat/server) +"ecH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/open/floor/plating, +/area/tcommsat/server) +"ecI" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecJ" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecK" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecL" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecM" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecN" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecO" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecP" = ( +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/toxins/xenobiology) +"ecQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"ecR" = ( +/obj/structure/cable/white{ + tag = "icon-4-8"; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + tag = "icon-intact (WEST)"; + icon_state = "intact"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/crew_quarters/abandoned_gambling_den) +"ecS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_Toxins = 0 + }, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"ecT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"ecU" = ( +/obj/structure/chair/wood/normal, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"ecV" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/medical/research{ + name = "Research Division" + }) +"ecW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + name = "Surgery Observation"; + req_access_txt = "0" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + tag = "icon-plasteel_warn_side (WEST)" + }, +/area/medical/surgery) +"ecX" = ( +/obj/structure/chair/wood/normal{ + tag = "icon-wooden_chair (WEST)"; + icon_state = "wooden_chair"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"ecY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood{ + tag = "icon-wood-broken3"; + icon_state = "wood-broken3" + }, +/area/crew_quarters/abandoned_gambling_den) +"ecZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"eda" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1; + scrub_Toxins = 0 + }, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) (1,1,1) = {" aaa @@ -129267,7 +129865,7 @@ aaa aaa aaa aaa -dLn +aaa aaa aaa aaa @@ -137899,7 +138497,7 @@ aaf aaf aBX aBX -eca +aEN aBX aBZ aBZ @@ -138929,8 +139527,8 @@ aBY aBY aES aGi -aBZ -aIP +eco +ecq aKl aLO aBZ @@ -139453,7 +140051,7 @@ aNV aSK aIU aWc -aXL +aNV aSK aIU aWc @@ -139521,7 +140119,7 @@ cYt bWg daP dcv -aMr +ecS aKI aPD diI @@ -139959,7 +140557,7 @@ aEW aGm aHE aIU -aIU +ecr aIU aIZ aIZ @@ -140292,7 +140890,7 @@ cYu bWg daS dcy -aNZ +ecT dfH dgT dgT @@ -140806,7 +141404,7 @@ cJA bWg daU dcz -ddQ +ecU dfI dgU aPD @@ -141060,9 +141658,9 @@ cTr cVa cWL cYw -bWg -aPD -dcz +cuT +ecQ +ecR ddR dfI aPD @@ -141580,12 +142178,12 @@ dcB ddT dfK dgW -diK +ecX dkA -dma -aNZ +ecY +ecZ doJ -aMr +eda dfL dtw aHW @@ -145360,7 +145958,7 @@ aIZ aIZ aIZ aPw -aRm +aIU aPw aIZ aSM @@ -148731,9 +149329,9 @@ btY btY btY btY -bQe -bSn -bUr +ecv +ecw +ecx bWl bXR bZI @@ -148932,7 +149530,7 @@ aaa aaa aiX ajZ -ala +ecb ama ank aoi @@ -148945,7 +149543,7 @@ aic awb awX ayh -azn +ech azo azo aCw @@ -148954,7 +149552,7 @@ aqg aoT aHW aJm -aKI +ecs aMr aOa aPF @@ -149016,9 +149614,9 @@ cCK ceO cFo cGG -cHX -cHX -cHX +ecI +ecM +ecO cHW cOI cQy @@ -149193,42 +149791,42 @@ alb amb anl aoj -aiX -aqc -aib +ecc +aUJ +ecd asz -aic +ece auT awc -awX -ayb -azn -azo -azn +ecf +ecg +eci +ecj +eck aCx -aDQ -aqg -aGJ -aHW +ecl +ecm +ecn +ecp aJn aKJ aMs aOb aPG aRu -aHW +ect aUF -aWB -aWB -aWB -aWB -aWB -aWB -aWB -aWB -aWB -aWB -aWB +boy +boy +boy +boy +boy +boy +boy +boy +boy +boy +boy boy boy boy @@ -149273,7 +149871,7 @@ cCL ceO cFm cGG -cHX +ecJ cJI cLo cMY @@ -149474,7 +150072,7 @@ aNZ aPH aJm aHW -aUG +ecu aWB aYd aZC @@ -149787,7 +150385,7 @@ cCL ceO cFn cGG -cHX +ecK cJK cLq cNa @@ -149802,7 +150400,7 @@ cZU dbl dcK dew -cIi +ecV dht djm dlb @@ -150044,9 +150642,9 @@ cCK bZD cFn cGG -cHX -cHX -cHX +ecL +ecN +ecP cHW cOM cQI @@ -154647,7 +155245,7 @@ bSC bUI bWu bYd -bZU +ecy cbI cdz cfc @@ -156190,11 +156788,11 @@ bUL bWx bYh bZZ -cbK -cbK -cbK -bQr -bQu +ecz +ecC +ecD +ecE +ecG cjC clc cmt @@ -156705,9 +157303,9 @@ bWz bYj cab cbM -cdE +bWz cff -cgy +bSG cic cjE cle @@ -156953,15 +157551,15 @@ bEH bGx bIt bKz -bMz +bMw bOu -bQx -bQx -bQx +bQu +bQu +bQu bWA -bYk -cac -bUL +bYh +bZY +bWx cdF bQu bQu @@ -157221,8 +157819,8 @@ cad cbN cbN cbN -bQr -bQu +ecF +ecH cjG clg cmt @@ -157475,7 +158073,7 @@ bUN bWB bYh bZY -cbN +ecA cdG cfg bQr @@ -157732,7 +158330,7 @@ bUO bWC bYl cae -cbN +ecB cdH cfh cgx @@ -166507,7 +167105,7 @@ daA dbY ddk dfn -dgM +ecW dip dim dlS diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index d9c3f35e5e..d0a3e8f647 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -35,12 +35,14 @@ return var/turf/pixel_turf = get_turf_pixel(A) - var/turf_visible = cameranet.checkTurfVis(pixel_turf) - if(pixel_turf && !turf_visible) - log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])") - message_admins("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))") - send2admindiscord("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))") - return + var/turf_visible + if(pixel_turf) + turf_visible = cameranet.checkTurfVis(pixel_turf) + if(!turf_visible) + log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])") + message_admins("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))") + send2admindiscord("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))") + return var/list/modifiers = params2list(params) if(modifiers["shift"] && modifiers["ctrl"]) @@ -182,4 +184,4 @@ // /mob/living/silicon/ai/TurfAdjacent(var/turf/T) - return (cameranet && cameranet.checkTurfVis(T)) + return (cameranet && cameranet.checkTurfVis(T)) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 5322dee819..55447bce8c 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -84,13 +84,13 @@ if(!..()) return FALSE var/mob/living/carbon/human/H = user - if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || (H.dna.features["tail_human"] != "None"))) + if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || (H.dna.features["tail_human"] != "None") || ("mam_tail" in H.dna.species.mutant_bodyparts))) return TRUE /datum/emote/living/carbon/human/wag/select_message_type(mob/user) . = ..() var/mob/living/carbon/human/H = user - if(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts)) + if(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts) || ("mam_tail" in H.dna.species.mutant_bodyparts)) . = null /datum/emote/living/carbon/human/wing @@ -134,6 +134,9 @@ if("tail_human" in dna.species.mutant_bodyparts) dna.species.mutant_bodyparts -= "tail_human" dna.species.mutant_bodyparts |= "waggingtail_human" + if("mam_tail" in dna.species.mutant_bodyparts) + dna.species.mutant_bodyparts -= "mam_tail" + dna.species.mutant_bodyparts |= "mam_waggingtail" update_body() @@ -148,6 +151,9 @@ if("waggingtail_human" in dna.species.mutant_bodyparts) dna.species.mutant_bodyparts -= "waggingtail_human" dna.species.mutant_bodyparts |= "tail_human" + if("mam_waggingtail" in dna.species.mutant_bodyparts) + dna.species.mutant_bodyparts -= "mam_waggingtail" + dna.species.mutant_bodyparts |= "mam_tail" update_body() /mob/living/carbon/human/proc/OpenWings() diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index dd4f89b1c1..040b73ce53 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -71,5 +71,4 @@ update_client_colour() if(client) client.click_intercept = null - - client.view = world.view // Resets the client.view in case it was changed. \ No newline at end of file + client.view = world.view // Resets the client.view in case it was changed. \ No newline at end of file diff --git a/config/maps.txt b/config/maps.txt index be491b56cd..d186a61fc5 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -25,9 +25,9 @@ map metastation #voteweight 0.5 endmap -map birdstation - friendlyname Bird Boat Station - maxplayers 35 +map deltastation + friendlyname Delta Station + maxplayers 15 endmap map pubbystation