From 71cbd8a615fe288dca0fdc9ef5898b83505e68c1 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 26 Feb 2021 14:40:00 +0100 Subject: [PATCH 01/35] no more free esword --- code/modules/mining/lavaland/necropolis_chests.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 6af1c2118c..3966e2f771 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1282,8 +1282,8 @@ if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one! chaser_timer = world.time + chaser_cooldown var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check) - C.damage = 30 - C.monster_damage_boost = FALSE + C.damage = 15 + C.monster_damage_boost = TRUE log_combat(user, target, "fired a chaser at", src) else INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast @@ -1399,10 +1399,10 @@ new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user) for(var/t in RANGE_TURFS(1, T)) var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies - B.damage = 30 + B.damage = 15 for(var/t in RANGE_TURFS(1, source)) var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies - B.damage = 30 + B.damage = 15 for(var/mob/living/L in range(1, source)) INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along sleep(6) //at this point the blasts detonate @@ -1463,8 +1463,8 @@ if(!J) return var/obj/effect/temp_visual/hierophant/blast/B = new(J, user, friendly_fire_check) - B.damage = 30 - B.monster_damage_boost = FALSE + B.damage = 15 + B.monster_damage_boost = TRUE previousturf = J J = get_step(previousturf, dir) @@ -1476,7 +1476,7 @@ sleep(2) for(var/t in RANGE_TURFS(1, T)) var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check) - B.damage = 15 //keeps monster damage boost due to lower damage + B.damage = 15 //keeps monster damage boost due to lower damage (now added to all damage due to reduction to 15, 30dmg 50AP isn't cool) //Just some minor stuff From 69a054826b16a34105ce74c5e9a8b010089d3368 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Wed, 10 Mar 2021 16:34:37 +0800 Subject: [PATCH 02/35] add art areas on meta, and adds lapvend on box,delta,meta. Other map changes are cosmetic. --- .../LavaRuins/lavaland_biodome_beach.dmm | 8 +- .../lavaland_surface_ash_walker1.dmm | 12 +- .../LavaRuins/lavaland_surface_envy.dmm | 28 +- .../LavaRuins/lavaland_surface_hermit.dmm | 4 +- .../LavaRuins/lavaland_surface_sloth.dmm | 2 +- .../lavaland_surface_survivalpod.dmm | 28 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 4 +- _maps/RandomRuins/SpaceRuins/advancedlab.dmm | 24 +- _maps/RandomRuins/SpaceRuins/bigape.dmm | 4 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 216 +- .../SpaceRuins/cloning_facility.dmm | 4 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 8 +- _maps/RandomRuins/SpaceRuins/derelict6.dmm | 68 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +- _maps/RandomRuins/SpaceRuins/shuttlerelic.dmm | 12 +- _maps/RandomRuins/SpaceRuins/skelter.dmm | 944 ++-- _maps/RandomRuins/SpaceRuins/spacediner.dmm | 156 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 64 +- .../RandomRuins/SpaceRuins/whiteshipdock.dmm | 4 +- .../StationRuins/Box/Engine/budget.dmm | 42 +- .../StationRuins/Box/Engine/empty.dmm | 64 +- _maps/RandomZLevels/VR/snowdin_VR.dmm | 64 +- _maps/RandomZLevels/VR/syndicate_trainer.dmm | 12 +- _maps/RandomZLevels/away_mission/Academy.dmm | 48 +- _maps/RandomZLevels/away_mission/caves.dmm | 32 +- .../RandomZLevels/away_mission/challenge.dmm | 8 +- .../away_mission/moonoutpost19.dmm | 500 +- _maps/RandomZLevels/away_mission/research.dmm | 28 +- _maps/RandomZLevels/away_mission/snowdin.dmm | 16 +- .../away_mission/undergroundoutpost45.dmm | 106 +- _maps/RandomZLevels/away_mission/wildwest.dmm | 4061 ++++++++--------- _maps/map_files/BoxStation/BoxStation.dmm | 1 + .../map_files/Deltastation/DeltaStation2.dmm | 696 ++- _maps/map_files/LambdaStation/dorms.dmm | 60 +- _maps/map_files/Mafia/mafia_lavaland.dmm | 132 +- _maps/map_files/Mafia/mafia_reebe.dmm | 4 +- _maps/map_files/MetaStation/MetaStation.dmm | 164 +- _maps/map_files/debug/multiz.dmm | 60 +- _maps/map_files/debug/runtimestation.dmm | 12 +- _maps/map_files/generic/SpaceDock.dmm | 4 +- _maps/shuttles/arrival_kilo.dmm | 32 +- _maps/shuttles/emergency_birdboat.dmm | 4 +- _maps/shuttles/emergency_delta.dmm | 4 +- _maps/shuttles/escape_pod_default.dmm | 6 +- _maps/shuttles/labour_cog.dmm | 8 +- _maps/shuttles/mining_kilo.dmm | 8 +- 46 files changed, 3955 insertions(+), 3815 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 7e9ce9db68..0d1e740d13 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -158,8 +158,8 @@ /area/ruin/powered/beach) "aF" = ( /obj/machinery/vending/boozeomat{ - set_obj_flags = "EMAGGED"; - req_access_txt = "0" + req_access_txt = "0"; + set_obj_flags = "EMAGGED" }, /turf/open/floor/wood, /area/ruin/powered/beach) @@ -547,8 +547,8 @@ "rV" = ( /obj/effect/turf_decal/sand, /obj/item/reagent_containers/food/drinks/beer/light{ - pixel_y = -3; - pixel_x = -9 + pixel_x = -9; + pixel_y = -3 }, /turf/open/floor/plating, /area/ruin/powered/beach) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 39ecc54ec7..2d13b2743e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -326,8 +326,8 @@ /area/ruin/unpowered/ash_walkers) "aO" = ( /obj/structure/stone_tile/surrounding/cracked{ - icon_state = "cracked_surrounding1"; - dir = 1 + dir = 1; + icon_state = "cracked_surrounding1" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) @@ -510,9 +510,7 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/obj/item/construction/rcd/loaded/upgraded{ - - }, +/obj/item/construction/rcd/loaded/upgraded, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "bn" = ( @@ -1019,8 +1017,8 @@ /area/ruin/unpowered/ash_walkers) "cA" = ( /obj/structure/stone_tile/slab/cracked{ - icon_state = "cracked_slab1"; - dir = 4 + dir = 4; + icon_state = "cracked_slab1" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm index a14a8d3a13..c509fe8080 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm @@ -13,10 +13,10 @@ /area/ruin/unpowered) "f" = ( /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_x = -28; - broken = 1 + pixel_x = -28 }, /obj/item/clothing/suit/hooded/bloated_human, /obj/effect/decal/cleanable/blood, @@ -25,10 +25,10 @@ "g" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_x = -28; - broken = 1 + pixel_x = -28 }, /turf/open/floor/plating, /area/ruin/unpowered) @@ -45,10 +45,10 @@ /area/ruin/unpowered) "k" = ( /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_x = 28; - broken = 1 + pixel_x = 28 }, /turf/open/floor/plating{ icon_state = "panelscorched" @@ -56,19 +56,19 @@ /area/ruin/unpowered) "l" = ( /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_x = 28; - broken = 1 + pixel_x = 28 }, /turf/open/floor/plating, /area/ruin/unpowered) "m" = ( /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_x = -28; - broken = 1 + pixel_x = -28 }, /turf/open/floor/plating, /area/ruin/unpowered) @@ -79,10 +79,10 @@ /area/ruin/unpowered) "o" = ( /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_x = -28; - broken = 1 + pixel_x = -28 }, /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -98,10 +98,10 @@ /area/lavaland/surface/outdoors) "T" = ( /obj/structure/mirror{ + broken = 1; desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!"; icon_state = "mirror_broke"; - pixel_y = 28; - broken = 1 + pixel_y = 28 }, /obj/item/kitchen/knife/envy, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 39ad846170..4e16f9a174 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -137,8 +137,8 @@ /area/ruin/powered) "D" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 1 + dir = 1; + icon_state = "blood1" }, /obj/machinery/door/airlock/survival_pod/glass, /obj/structure/fans/tiny, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm index aa56cce5ca..3576cab5c7 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -641,4 +641,4 @@ a a a a -"} \ No newline at end of file +"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm index 7ea0145f94..47896ec886 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm @@ -87,8 +87,8 @@ /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 1 + dir = 1; + icon_state = "blood1" }, /turf/open/floor/pod/dark, /area/ruin/powered) @@ -106,24 +106,24 @@ /area/lavaland/surface/outdoors) "t" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 1 + dir = 1; + icon_state = "blood1" }, /obj/machinery/door/airlock/survival_pod/glass, /turf/open/floor/pod/dark, /area/ruin/powered) "u" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 8 + dir = 8; + icon_state = "blood1" }, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "v" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 8 + dir = 8; + icon_state = "blood1" }, /obj/effect/decal/cleanable/blood/footprints{ icon_state = "blood1" @@ -139,8 +139,8 @@ "x" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 1 + dir = 1; + icon_state = "blood1" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -149,15 +149,15 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 8 + dir = 8; + icon_state = "blood1" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "z" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; - dir = 8 + dir = 8; + icon_state = "blood1" }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index ac1d1ca4d8..948ff7ebc8 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -2268,9 +2268,9 @@ "hF" = ( /obj/structure/table, /obj/machinery/computer/pod/old{ + id = "derelict_gun"; name = "ProComp IIe"; - pixel_y = 7; - id = "derelict_gun" + pixel_y = 7 }, /turf/open/floor/plasteel/chapel, /area/ruin/space/derelict/medical/chapel) diff --git a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm index b553bb5c97..a27ad0a497 100644 --- a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm +++ b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm @@ -66,8 +66,8 @@ /area/ruin/space/has_grav/powered/advancedlab) "n" = ( /obj/structure/chair/comfy/beige{ - icon_state = "comfychair"; - dir = 8 + dir = 8; + icon_state = "comfychair" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/advancedlab) @@ -85,10 +85,10 @@ }, /obj/structure/table/glass, /obj/item/paper{ + info = "As of yet, our experiments have seen a fair bit of success. Unfortunately, our business partners have stopped funding us as they realised they utterly hate each other. To whoever finds this place, they are yours. Use them how you will. I leave you with the next generation of greytiding."; name = "Note to finder"; pixel_x = -1; - pixel_y = 3; - info = "As of yet, our experiments have seen a fair bit of success. Unfortunately, our business partners have stopped funding us as they realised they utterly hate each other. To whoever finds this place, they are yours. Use them how you will. I leave you with the next generation of greytiding." + pixel_y = 3 }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/advancedlab) @@ -112,8 +112,8 @@ /area/ruin/space/has_grav/powered/advancedlab) "s" = ( /obj/structure/chair/comfy/beige{ - icon_state = "comfychair"; - dir = 1 + dir = 1; + icon_state = "comfychair" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/advancedlab) @@ -123,8 +123,8 @@ /area/ruin/space/has_grav/powered/advancedlab) "u" = ( /obj/machinery/light/small{ - icon_state = "bulb"; - dir = 4 + dir = 4; + icon_state = "bulb" }, /obj/structure/closet, /obj/item/clothing/suit/hooded/wintercoat/miner, @@ -161,8 +161,8 @@ /area/ruin/space/has_grav/powered/advancedlab) "y" = ( /obj/machinery/light/small{ - icon_state = "bulb"; - dir = 1 + dir = 1; + icon_state = "bulb" }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/advancedlab) @@ -268,8 +268,8 @@ /area/ruin/space/has_grav/powered/advancedlab) "R" = ( /obj/machinery/light/small{ - icon_state = "bulb"; - dir = 1 + dir = 1; + icon_state = "bulb" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/advancedlab) diff --git a/_maps/RandomRuins/SpaceRuins/bigape.dmm b/_maps/RandomRuins/SpaceRuins/bigape.dmm index 602f1737e0..93583e8ebf 100644 --- a/_maps/RandomRuins/SpaceRuins/bigape.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigape.dmm @@ -57,8 +57,8 @@ dir = 4 }, /mob/living/simple_animal/hostile/gorilla/familiar{ - icon_state = "crawling"; - dir = 4 + dir = 4; + icon_state = "crawling" }, /turf/open/floor/plating/beach/sand, /area/ruin/powered) diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index 9c273f4d75..c8039c6c3c 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -65,10 +65,10 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "ao" = ( /obj/machinery/power/apc{ - start_charge = 0; dir = 4; name = "Cargo Bay APC"; - pixel_x = 24 + pixel_x = 24; + start_charge = 0 }, /obj/structure/cable{ icon_state = "0-8" @@ -385,9 +385,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 9; icon_state = "trails_1"; - dir = 9 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -398,9 +398,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -415,9 +415,9 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -428,9 +428,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -479,9 +479,9 @@ /area/ruin/space/has_grav/derelictoutpost/dockedship) "bw" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -598,9 +598,9 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 1; icon_state = "trails_1"; - dir = 1 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -755,9 +755,9 @@ /area/ruin/space/has_grav/derelictoutpost) "bU" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plating{ icon_state = "wall_thermite"; @@ -766,17 +766,17 @@ /area/ruin/space/has_grav/derelictoutpost) "bV" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) "bW" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 6; icon_state = "trails_1"; - dir = 6 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -787,9 +787,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 1; icon_state = "trails_1"; - dir = 1 + name = "dried blood trail" }, /obj/machinery/light{ dir = 4 @@ -813,11 +813,11 @@ /area/ruin/space/has_grav/derelictoutpost/powerstorage) "ca" = ( /obj/machinery/power/apc{ - start_charge = 0; dir = 4; name = "Power Storage APC"; pixel_x = 23; - pixel_y = 2 + pixel_y = 2; + start_charge = 0 }, /obj/structure/cable{ icon_state = "0-8" @@ -924,10 +924,10 @@ /area/ruin/space/has_grav/derelictoutpost) "ck" = ( /obj/machinery/power/apc{ - start_charge = 0; dir = 2; name = "Tradepost APC"; - pixel_y = -24 + pixel_y = -24; + start_charge = 0 }, /obj/structure/cable{ icon_state = "0-8" @@ -942,9 +942,9 @@ }, /obj/structure/glowshroom/single, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 1; icon_state = "trails_1"; - dir = 1 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -1106,9 +1106,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 10; icon_state = "trails_1"; - dir = 10 + name = "dried blood trail" }, /mob/living/simple_animal/hostile/netherworld{ desc = "Awh its so sm-OH GOD WHAT THE FUCK."; @@ -1126,9 +1126,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) @@ -1139,9 +1139,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) @@ -1182,9 +1182,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "cK" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 10; icon_state = "trails_1"; - dir = 10 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1198,9 +1198,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "cL" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1268,9 +1268,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 1; icon_state = "trails_1"; - dir = 1 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) @@ -1297,9 +1297,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "cX" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 1; icon_state = "trails_1"; - dir = 1 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1325,9 +1325,9 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 1; icon_state = "trails_1"; - dir = 1 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) @@ -1366,25 +1366,25 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "dd" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 10; icon_state = "trails_1"; - dir = 10 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargobay) "de" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargobay) "df" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1399,9 +1399,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "dg" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1415,9 +1415,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "dh" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1436,9 +1436,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "di" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -1499,9 +1499,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) @@ -1512,9 +1512,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 6; icon_state = "trails_1"; - dir = 6 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) @@ -1574,9 +1574,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dv" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 9; icon_state = "trails_1"; - dir = 9 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1587,9 +1587,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dw" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1605,9 +1605,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dx" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1618,9 +1618,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dy" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1632,9 +1632,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dz" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -1648,17 +1648,17 @@ /area/ruin/space/has_grav/derelictoutpost) "dA" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /turf/open/floor/plating/asteroid, /area/ruin/space/has_grav/derelictoutpost) "dB" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 6; icon_state = "trails_1"; - dir = 6 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1706,9 +1706,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dF" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 10; icon_state = "trails_1"; - dir = 10 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1719,9 +1719,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dG" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1732,9 +1732,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dH" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 6; icon_state = "trails_1"; - dir = 6 + name = "dried blood trail" }, /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -1779,9 +1779,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargobay) @@ -1795,9 +1795,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 9; icon_state = "trails_1"; - dir = 9 + name = "dried blood trail" }, /obj/structure/cable{ icon_state = "1-2" @@ -1806,9 +1806,9 @@ /area/ruin/space/has_grav/derelictoutpost) "dN" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /turf/open/floor/plating{ icon_state = "wall_thermite"; @@ -1823,9 +1823,9 @@ name = "gelatinous membrane" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /turf/open/floor/plating{ icon_state = "wall_thermite"; @@ -1840,9 +1840,9 @@ }, /obj/structure/glowshroom/single, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -1853,9 +1853,9 @@ name = "gelatinous floor" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 6; icon_state = "trails_1"; - dir = 6 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) @@ -2021,10 +2021,10 @@ /area/ruin/space/has_grav/derelictoutpost/cargostorage) "el" = ( /obj/machinery/power/apc{ - start_charge = 0; dir = 4; name = "Cargo Storage APC"; - pixel_x = 24 + pixel_x = 24; + start_charge = 0 }, /obj/structure/cable{ icon_state = "0-2" @@ -2099,35 +2099,35 @@ /area/ruin/space/has_grav/derelictoutpost) "ew" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargostorage) "ex" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargostorage) "ey" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 8; icon_state = "trails_1"; - dir = 8 + name = "dried blood trail" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargostorage) "ez" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 5; icon_state = "trails_1"; - dir = 5 + name = "dried blood trail" }, /obj/structure/cable{ icon_state = "1-2" @@ -2188,9 +2188,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargostorage) "eI" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 10; icon_state = "trails_1"; - dir = 10 + name = "dried blood trail" }, /obj/structure/cable{ icon_state = "1-4" @@ -2204,9 +2204,9 @@ name = "pried-open airlock" }, /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 4; icon_state = "trails_1"; - dir = 4 + name = "dried blood trail" }, /obj/structure/cable{ icon_state = "4-8" @@ -2215,9 +2215,9 @@ /area/ruin/space/has_grav/derelictoutpost/cargostorage) "eK" = ( /obj/effect/decal/cleanable/blood/old{ - name = "dried blood trail"; + dir = 6; icon_state = "trails_1"; - dir = 6 + name = "dried blood trail" }, /obj/structure/cable{ icon_state = "1-8" diff --git a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm index 1f258fad77..e9167a6a25 100644 --- a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm +++ b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm @@ -287,9 +287,9 @@ /area/space/nearstation) "M" = ( /obj/structure/fluff/broken_flooring{ - name = "broken plating"; + dir = 8; icon_state = "plating"; - dir = 8 + name = "broken plating" }, /turf/template_noop, /area/space/nearstation) diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index beb93b319e..337cb150f8 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -16,8 +16,8 @@ "ag" = ( /obj/machinery/porta_turret{ dir = 8; - set_obj_flags = "EMAGGED"; - installation = /obj/item/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon; + set_obj_flags = "EMAGGED" }, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) @@ -2110,8 +2110,8 @@ "gl" = ( /obj/machinery/porta_turret{ dir = 8; - set_obj_flags = "EMAGGED"; - installation = /obj/item/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon; + set_obj_flags = "EMAGGED" }, /turf/open/floor/engine, /area/awaymission/BMPship/Fore) diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index 12d3733dc4..0a53b517d6 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -5,8 +5,8 @@ "ab" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - icon_state = "singular"; - dir = 1 + dir = 1; + icon_state = "singular" }, /turf/template_noop, /area/space/nearstation) @@ -27,8 +27,8 @@ /area/space/nearstation) "af" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 8 + dir = 8; + icon_state = "pile" }, /turf/template_noop, /area/template_noop) @@ -45,8 +45,8 @@ /area/ruin/unpowered) "aj" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 4 + dir = 4; + icon_state = "pile" }, /turf/template_noop, /area/template_noop) @@ -58,8 +58,8 @@ /area/ruin/unpowered) "al" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "singular"; - dir = 4 + dir = 4; + icon_state = "singular" }, /obj/structure/lattice, /turf/template_noop, @@ -133,17 +133,17 @@ /area/ruin/unpowered) "az" = ( /obj/structure/fluff/broken_flooring{ - name = "broken plating"; + dir = 8; icon_state = "plating"; - dir = 8 + name = "broken plating" }, /obj/structure/lattice, /turf/template_noop, /area/ruin/unpowered) "aA" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 1 + dir = 1; + icon_state = "pile" }, /turf/template_noop, /area/template_noop) @@ -405,8 +405,8 @@ /area/ruin/unpowered) "bt" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "side"; - dir = 1 + dir = 1; + icon_state = "side" }, /obj/structure/lattice, /turf/template_noop, @@ -424,34 +424,34 @@ "bw" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - name = "broken plating"; + dir = 1; icon_state = "plating"; - dir = 1 + name = "broken plating" }, /turf/template_noop, /area/ruin/unpowered) "bx" = ( /obj/structure/fluff/broken_flooring{ - name = "broken plating"; + dir = 4; icon_state = "plating"; - dir = 4 + name = "broken plating" }, /obj/structure/lattice, /turf/template_noop, /area/ruin/unpowered) "by" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 4 + dir = 4; + icon_state = "pile" }, /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "bz" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - name = "broken plating"; + dir = 4; icon_state = "plating"; - dir = 4 + name = "broken plating" }, /turf/template_noop, /area/ruin/unpowered) @@ -464,38 +464,38 @@ "bC" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - icon_state = "corner"; - dir = 1 + dir = 1; + icon_state = "corner" }, /turf/template_noop, /area/ruin/unpowered) "bD" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "singular"; - dir = 4 + dir = 4; + icon_state = "singular" }, /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "bE" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - icon_state = "corner"; - dir = 8 + dir = 8; + icon_state = "corner" }, /turf/template_noop, /area/ruin/unpowered) "bF" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - icon_state = "side"; - dir = 4 + dir = 4; + icon_state = "side" }, /turf/template_noop, /area/ruin/unpowered) "bG" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "singular"; - dir = 4 + dir = 4; + icon_state = "singular" }, /turf/template_noop, /area/template_noop) @@ -510,9 +510,9 @@ "bI" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - name = "broken plating"; + dir = 8; icon_state = "plating"; - dir = 8 + name = "broken plating" }, /turf/template_noop, /area/ruin/unpowered) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 43aea1761a..808d239127 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -149,8 +149,8 @@ /area/ruin/space/has_grav/ancientstation/hivebot) "aF" = ( /obj/structure/shuttle/engine/large{ - icon_state = "large_engine"; - dir = 4 + dir = 4; + icon_state = "large_engine" }, /turf/closed/wall, /area/ruin/space/has_grav/ancientstation/hivebot) diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm index aebbdec92a..a0fc5fa8a7 100644 --- a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm +++ b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm @@ -54,15 +54,15 @@ /area/ruin/powered) "m" = ( /obj/structure/chair/old{ - icon_state = "chairold"; - dir = 1 + dir = 1; + icon_state = "chairold" }, /turf/open/floor/oldshuttle, /area/ruin/powered) "n" = ( /obj/structure/chair/old{ - icon_state = "chairold"; - dir = 1 + dir = 1; + icon_state = "chairold" }, /obj/item/crowbar/large{ desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big. It feels oddly heavy.."; @@ -73,8 +73,8 @@ /area/ruin/powered) "o" = ( /obj/structure/chair/old{ - icon_state = "chairold"; - dir = 1 + dir = 1; + icon_state = "chairold" }, /mob/living/simple_animal/hostile/retaliate/spaceman, /turf/open/floor/oldshuttle, diff --git a/_maps/RandomRuins/SpaceRuins/skelter.dmm b/_maps/RandomRuins/SpaceRuins/skelter.dmm index 77837392e4..e0de896480 100644 --- a/_maps/RandomRuins/SpaceRuins/skelter.dmm +++ b/_maps/RandomRuins/SpaceRuins/skelter.dmm @@ -13,8 +13,8 @@ "ad" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ - icon_state = "plating"; - dir = 4 + dir = 4; + icon_state = "plating" }, /turf/open/space/basic, /area/space/nearstation) @@ -45,8 +45,8 @@ /area/ruin/space/has_grav/skelter/crew) "am" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 6 + dir = 6; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -62,8 +62,8 @@ /obj/structure/bed, /obj/item/bedsheet/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/crew) @@ -71,8 +71,8 @@ /obj/structure/bed, /obj/item/bedsheet/black, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/crew) @@ -80,8 +80,8 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/crew) @@ -89,8 +89,8 @@ /obj/structure/bed, /obj/item/bedsheet/yellow, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/crew) @@ -98,8 +98,8 @@ /obj/structure/bed, /obj/item/bedsheet/brown, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 8 + dir = 8; + icon_state = "scrub_map_on-2" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/crew) @@ -133,8 +133,8 @@ /area/ruin/space/has_grav/skelter/crew) "ay" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 8 + dir = 8; + icon_state = "pile" }, /turf/template_noop, /area/template_noop) @@ -193,8 +193,8 @@ /area/ruin/space/has_grav/skelter/engine/upper) "aG" = ( /obj/machinery/light{ - icon_state = "tube"; - dir = 1 + dir = 1; + icon_state = "tube" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -202,8 +202,8 @@ /area/ruin/space/has_grav/skelter/engine/upper) "aH" = ( /obj/structure/shuttle/engine/large{ - icon_state = "large_engine"; - dir = 8 + dir = 8; + icon_state = "large_engine" }, /turf/open/space/basic, /area/space) @@ -237,8 +237,8 @@ /area/ruin/space/has_grav/skelter/engine/upper) "aN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 6 + dir = 6; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -250,8 +250,8 @@ /area/ruin/space/has_grav/skelter/engine/upper) "aO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -263,13 +263,13 @@ /area/ruin/space/has_grav/skelter/engine/upper) "aP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/corner{ - icon_state = "warninglinecorner"; - dir = 1 + dir = 1; + icon_state = "warninglinecorner" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -284,8 +284,8 @@ "aQ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -299,16 +299,16 @@ /area/ruin/space/has_grav/skelter/engine/upper) "aR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) @@ -331,36 +331,36 @@ icon_state = "1-2" }, /obj/machinery/light{ - icon_state = "tube"; - dir = 8 + dir = 8; + icon_state = "tube" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) "aV" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) "aW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/light{ - icon_state = "tube"; - dir = 1 + dir = 1; + icon_state = "tube" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) @@ -370,12 +370,12 @@ /area/crew_quarters/cafeteria) "aY" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -388,8 +388,8 @@ /area/space/nearstation) "ba" = ( /obj/structure/fluff/broken_flooring{ - icon_state = "pile"; - dir = 4 + dir = 4; + icon_state = "pile" }, /turf/template_noop, /area/template_noop) @@ -398,8 +398,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /obj/machinery/camera{ c_tag = "North Hall"; @@ -416,15 +416,15 @@ /area/crew_quarters/cafeteria) "bd" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) @@ -434,8 +434,8 @@ /area/ruin/unpowered/no_grav) "bf" = ( /obj/structure/chair{ - icon_state = "chair"; - dir = 1 + dir = 1; + icon_state = "chair" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -444,8 +444,8 @@ /area/crew_quarters/cafeteria) "bh" = ( /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 1 + dir = 1; + icon_state = "railing" }, /obj/structure/shuttle/engine/heater{ dir = 8 @@ -455,8 +455,8 @@ "bi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 1 + dir = 1; + icon_state = "railing" }, /obj/structure/shuttle/engine/heater{ dir = 8 @@ -465,8 +465,8 @@ /area/ruin/space/has_grav/skelter/engine/upper) "bj" = ( /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 5 + dir = 5; + icon_state = "railing" }, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/upper) @@ -502,12 +502,12 @@ /area/ruin/space/has_grav/skelter/engine/upper) "bn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) @@ -516,8 +516,8 @@ /area/ruin/space/has_grav/skelter/crew) "bp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) @@ -540,15 +540,15 @@ }, /obj/effect/turf_decal/trimline/blue/corner, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) "bt" = ( /obj/item/chair{ - icon_state = "chair_toppled"; - dir = 1 + dir = 1; + icon_state = "chair_toppled" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -568,12 +568,12 @@ /area/crew_quarters/cafeteria) "bw" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/blue/corner{ - icon_state = "trimline_corner"; - dir = 8 + dir = 8; + icon_state = "trimline_corner" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/crew) @@ -596,8 +596,8 @@ /area/crew_quarters/cafeteria) "bA" = ( /obj/item/chair{ - icon_state = "chair_toppled"; - dir = 1 + dir = 1; + icon_state = "chair_toppled" }, /turf/template_noop, /area/template_noop) @@ -609,8 +609,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -624,8 +624,8 @@ /area/ruin/space/has_grav/skelter/engine/upper) "bD" = ( /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 6 + dir = 6; + icon_state = "railing" }, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/upper) @@ -664,8 +664,8 @@ "bJ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/blue/filled/end{ - icon_state = "trimline_end_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_end_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/medical{ @@ -687,12 +687,12 @@ /area/ruin/space/has_grav/skelter) "bN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 4 + dir = 4; + icon_state = "scrub_map_on-2" }, /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -700,12 +700,12 @@ /area/ruin/space/has_grav/skelter/engine/upper) "bO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 4 + dir = 4; + icon_state = "manifold-2" }, /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -716,8 +716,8 @@ dir = 6 }, /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -728,12 +728,12 @@ /area/ruin/space/has_grav/skelter/engine/upper) "bQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/stripes/corner{ - icon_state = "warninglinecorner"; - dir = 4 + dir = 4; + icon_state = "warninglinecorner" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -771,16 +771,16 @@ /area/ruin/space/has_grav/skelter/med) "bV" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/med) @@ -788,8 +788,8 @@ /obj/structure/bed, /obj/item/bedsheet/blue, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 8 + dir = 8; + icon_state = "scrub_map_on-2" }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/skelter/med) @@ -868,8 +868,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -880,8 +880,8 @@ /area/ruin/space/has_grav/skelter/sec) "ck" = ( /obj/structure/chair/office/dark{ - icon_state = "officechair_dark"; - dir = 1 + dir = 1; + icon_state = "officechair_dark" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) @@ -907,12 +907,12 @@ /area/crew_quarters/cafeteria) "co" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/med) @@ -950,8 +950,8 @@ "cv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 8 + dir = 8; + icon_state = "trimline" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -965,8 +965,8 @@ /area/ruin/space/has_grav/skelter/nav) "cw" = ( /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 4 + dir = 4; + icon_state = "trimline" }, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/skelter/nav) @@ -984,8 +984,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -999,8 +999,8 @@ "cC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -1012,8 +1012,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -1028,8 +1028,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -1038,8 +1038,8 @@ /area/ruin/space/has_grav/skelter/sec) "cG" = ( /obj/machinery/light/broken{ - icon_state = "tube-broken"; - dir = 4 + dir = 4; + icon_state = "tube-broken" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1048,8 +1048,8 @@ /area/ruin/space/has_grav/skelter/sec) "cH" = ( /obj/machinery/light{ - icon_state = "tube"; - dir = 8 + dir = 8; + icon_state = "tube" }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/skelter/med) @@ -1069,8 +1069,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plating/airless{ icon_state = "platingdmg2" @@ -1078,8 +1078,8 @@ /area/crew_quarters/cafeteria) "cL" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /obj/machinery/light/small{ dir = 4 @@ -1104,33 +1104,33 @@ /area/ruin/space/has_grav/skelter/forehall) "cN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "cO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "cP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "cQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) @@ -1139,8 +1139,8 @@ /area/ruin/space/has_grav/skelter/forehall) "cS" = ( /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 8 + dir = 8; + icon_state = "trimline" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -1150,8 +1150,8 @@ /area/ruin/space/has_grav/skelter/nav) "cT" = ( /obj/structure/chair/comfy/shuttle{ - icon_state = "shuttle_chair"; - dir = 1 + dir = 1; + icon_state = "shuttle_chair" }, /turf/open/floor/mineral/titanium/blue, /area/ruin/space/has_grav/skelter/nav) @@ -1170,8 +1170,8 @@ /area/ruin/space/has_grav/skelter/engine) "cX" = ( /obj/machinery/light/broken{ - icon_state = "tube-broken"; - dir = 8 + dir = 8; + icon_state = "tube-broken" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ @@ -1208,16 +1208,16 @@ /area/ruin/space/has_grav/skelter/med) "dd" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - icon_state = "connector_map-2"; - dir = 4 + dir = 4; + icon_state = "connector_map-2" }, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/oxy) "de" = ( /obj/machinery/atmospherics/components/binary/valve{ - icon_state = "mvalve_map-2"; - dir = 4 + dir = 4; + icon_state = "mvalve_map-2" }, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/oxy) @@ -1259,8 +1259,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/light, /obj/structure/cable/yellow{ @@ -1270,8 +1270,8 @@ /area/ruin/space/has_grav/skelter/forehall) "dk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1293,8 +1293,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1310,8 +1310,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1336,8 +1336,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1349,12 +1349,12 @@ /area/ruin/space/has_grav/skelter/nav) "dq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -1363,26 +1363,26 @@ /area/ruin/space/has_grav/skelter/nav) "dr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/nav) "ds" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 5 + dir = 5; + icon_state = "trimline_fill" }, /obj/structure/chair/comfy/shuttle{ - icon_state = "shuttle_chair"; - dir = 4 + dir = 4; + icon_state = "shuttle_chair" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/nav) "dt" = ( /obj/machinery/computer{ - icon_state = "computer"; - dir = 8 + dir = 8; + icon_state = "computer" }, /turf/open/floor/mineral/titanium/blue, /area/ruin/space/has_grav/skelter/nav) @@ -1394,8 +1394,8 @@ /area/ruin/space/has_grav/skelter/engine) "dv" = ( /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 5 + dir = 5; + icon_state = "trimline" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/engine) @@ -1426,8 +1426,8 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/purple/corner{ - icon_state = "trimline_corner"; - dir = 8 + dir = 8; + icon_state = "trimline_corner" }, /obj/machinery/camera{ c_tag = "Reactor Hall"; @@ -1490,8 +1490,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -1507,8 +1507,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/airless/cafeteria, @@ -1516,8 +1516,8 @@ "dH" = ( /obj/machinery/clonepod, /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/med) @@ -1526,8 +1526,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /obj/item/paper/fluff/ruins/skelter/cloner, /turf/open/floor/plasteel, @@ -1535,8 +1535,8 @@ "dJ" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/med) @@ -1589,8 +1589,8 @@ "dT" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/item/stack/cable_coil/cut/yellow, /turf/template_noop, @@ -1606,8 +1606,8 @@ /area/ruin/space/has_grav/skelter/forehall) "dW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -1621,15 +1621,15 @@ /area/ruin/space/has_grav/skelter/forehall) "dY" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 8 + dir = 8; + icon_state = "manifold-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "dZ" = ( /obj/effect/decal/cleanable/glass{ - icon_state = "tiny"; - dir = 8 + dir = 8; + icon_state = "tiny" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, @@ -1656,20 +1656,20 @@ /area/crew_quarters/cafeteria) "ed" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "ee" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/door/airlock/maintenance/external{ @@ -1679,8 +1679,8 @@ /area/ruin/space/has_grav/skelter/nav) "ef" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/plasteel, @@ -1691,8 +1691,8 @@ /area/ruin/space/has_grav/skelter/nav) "eh" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 6 + dir = 6; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/nav) @@ -1709,8 +1709,8 @@ /area/ruin/space/has_grav/skelter/engine) "ek" = ( /obj/effect/turf_decal/trimline/purple/corner{ - icon_state = "trimline_corner"; - dir = 4 + dir = 4; + icon_state = "trimline_corner" }, /obj/effect/turf_decal/trimline/purple/corner, /obj/structure/cable{ @@ -1721,21 +1721,21 @@ "el" = ( /obj/structure/table, /obj/machinery/atmospherics/components/unary/vent_scrubber{ - icon_state = "scrub_map-2"; - dir = 4 + dir = 4; + icon_state = "scrub_map-2" }, /obj/item/trash/plate, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) "em" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/purple/line, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 1 + dir = 1; + icon_state = "trimline" }, /obj/structure/cable{ icon_state = "4-8" @@ -1754,13 +1754,13 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/purple/line, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 1 + dir = 1; + icon_state = "trimline" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/engine) @@ -1770,28 +1770,28 @@ /area/crew_quarters/cafeteria) "eq" = ( /obj/structure/chair{ - icon_state = "chair"; - dir = 8 + dir = 8; + icon_state = "chair" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) "er" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 4 + dir = 4; + icon_state = "manifold-2" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) "es" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable{ icon_state = "4-8" @@ -1800,8 +1800,8 @@ name = "Reactor" }, /obj/effect/turf_decal/trimline/purple/end{ - icon_state = "trimline_end"; - dir = 4 + dir = 4; + icon_state = "trimline_end" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/engine) @@ -1811,8 +1811,8 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 8 + dir = 8; + icon_state = "trimline" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -1820,12 +1820,12 @@ /area/ruin/space/has_grav/skelter/afthall) "eu" = ( /obj/effect/turf_decal/trimline/green/line{ - icon_state = "trimline"; - dir = 4 + dir = 4; + icon_state = "trimline" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ @@ -1844,8 +1844,8 @@ name = "Security" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable{ icon_state = "4-8" @@ -1857,23 +1857,23 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "ex" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "ey" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) @@ -1899,8 +1899,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "eC" = ( /obj/machinery/light{ - icon_state = "tube"; - dir = 8 + dir = 8; + icon_state = "tube" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/admin) @@ -1928,8 +1928,8 @@ /area/ruin/space/has_grav/skelter/admin) "eG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ - icon_state = "vent_map_on-2"; - dir = 4 + dir = 4; + icon_state = "vent_map_on-2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1938,8 +1938,8 @@ /area/ruin/space/has_grav/skelter/forehall) "eH" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) @@ -1948,19 +1948,19 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/light{ - icon_state = "tube"; - dir = 1 + dir = 1; + icon_state = "tube" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "eJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) @@ -1970,8 +1970,8 @@ /area/ruin/space/has_grav/skelter/forehall) "eL" = ( /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 8 + dir = 8; + icon_state = "trimline" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -1990,8 +1990,8 @@ /area/ruin/space/has_grav/skelter/engine) "eO" = ( /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 6 + dir = 6; + icon_state = "trimline" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/skelter/engine) @@ -2023,8 +2023,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/corner{ - icon_state = "trimline_corner"; - dir = 1 + dir = 1; + icon_state = "trimline_corner" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -2032,8 +2032,8 @@ /area/ruin/space/has_grav/skelter/afthall) "eT" = ( /obj/effect/turf_decal/trimline/green/corner{ - icon_state = "trimline_corner"; - dir = 4 + dir = 4; + icon_state = "trimline_corner" }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable/yellow{ @@ -2078,8 +2078,8 @@ /area/ruin/space/has_grav/skelter/sec) "eX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2195,8 +2195,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/camera{ c_tag = "Central Hall"; @@ -2216,8 +2216,8 @@ /area/ruin/space/has_grav/skelter/admin) "fk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2229,8 +2229,8 @@ dir = 4 }, /obj/structure/chair/comfy/brown{ - icon_state = "comfychair"; - dir = 1 + dir = 1; + icon_state = "comfychair" }, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) @@ -2239,22 +2239,22 @@ dir = 4 }, /obj/structure/chair/comfy/brown{ - icon_state = "comfychair"; - dir = 4 + dir = 4; + icon_state = "comfychair" }, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) "fn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) "fo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 6 + dir = 6; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2263,27 +2263,27 @@ /area/ruin/space/has_grav/skelter/forehall) "fp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "fq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/forehall) "fr" = ( /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 8 + dir = 8; + icon_state = "trimline" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 1 + dir = 1; + icon_state = "scrub_map_on-2" }, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/skelter/nav) @@ -2327,8 +2327,8 @@ icon_state = "1-2" }, /obj/machinery/light{ - icon_state = "tube"; - dir = 8 + dir = 8; + icon_state = "tube" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) @@ -2357,19 +2357,19 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 8 + dir = 8; + icon_state = "manifold-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/admin) "fC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2379,8 +2379,8 @@ "fD" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/door/airlock/security{ name = "Administration" @@ -2392,8 +2392,8 @@ /area/ruin/space/has_grav/skelter/admin) "fE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -2611,16 +2611,16 @@ /area/ruin/space/has_grav/skelter/engine/lower) "gj" = ( /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) "gk" = ( /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /obj/machinery/door/window/northleft{ name = "Armory" @@ -2649,8 +2649,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "go" = ( /obj/machinery/power/terminal{ - icon_state = "term"; - dir = 8 + dir = 8; + icon_state = "term" }, /obj/structure/cable, /obj/structure/cable{ @@ -2762,8 +2762,8 @@ "gD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 4 + dir = 4; + icon_state = "scrub_map_on-2" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -2780,8 +2780,8 @@ "gE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 4 + dir = 4; + icon_state = "manifold-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2792,8 +2792,8 @@ /area/ruin/space/has_grav/skelter/engine/lower) "gF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -2811,8 +2811,8 @@ dir = 10 }, /obj/effect/turf_decal/stripes/corner{ - icon_state = "warninglinecorner"; - dir = 1 + dir = 1; + icon_state = "warninglinecorner" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -2877,15 +2877,15 @@ "gQ" = ( /obj/machinery/shieldgen, /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 6 + dir = 6; + icon_state = "railing" }, /turf/open/floor/circuit, /area/ruin/space/has_grav/skelter/shields) "gR" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 8 + dir = 8; + icon_state = "manifold-2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2897,8 +2897,8 @@ /area/ruin/space/has_grav/skelter/shields) "gS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -2908,8 +2908,8 @@ /area/ruin/space/has_grav/skelter/shields) "gT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 8 + dir = 8; + icon_state = "scrub_map_on-2" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -2933,8 +2933,8 @@ /area/ruin/space/has_grav/skelter/forehall) "gW" = ( /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 1 + dir = 1; + icon_state = "railing" }, /obj/structure/shuttle/engine/heater{ dir = 8 @@ -2944,8 +2944,8 @@ "gX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 1 + dir = 1; + icon_state = "railing" }, /obj/structure/shuttle/engine/heater{ dir = 8 @@ -2954,8 +2954,8 @@ /area/ruin/space/has_grav/skelter/engine/lower) "gY" = ( /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 5 + dir = 5; + icon_state = "railing" }, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/lower) @@ -2992,8 +2992,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "hc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 6 + dir = 6; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -3002,8 +3002,8 @@ /area/ruin/space/has_grav/skelter/storage) "hd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/bot, /obj/structure/ore_box, @@ -3011,8 +3011,8 @@ /area/ruin/space/has_grav/skelter/storage) "he" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, @@ -3024,8 +3024,8 @@ /area/ruin/space/has_grav/skelter/storage) "hg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -3038,8 +3038,8 @@ name = "Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3048,12 +3048,12 @@ /area/ruin/space/has_grav/skelter/storage) "hi" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3062,12 +3062,12 @@ /area/ruin/space/has_grav/skelter/comms) "hj" = ( /obj/machinery/light{ - icon_state = "tube"; - dir = 1 + dir = 1; + icon_state = "tube" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3076,8 +3076,8 @@ /area/ruin/space/has_grav/skelter/comms) "hk" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 1 + dir = 1; + icon_state = "manifold-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3092,12 +3092,12 @@ /area/ruin/space/has_grav/skelter/comms) "hl" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3107,8 +3107,8 @@ "hm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3120,8 +3120,8 @@ /area/ruin/space/has_grav/skelter/shields) "hn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3130,8 +3130,8 @@ /area/ruin/space/has_grav/skelter/shields) "ho" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -3145,8 +3145,8 @@ "hq" = ( /obj/machinery/shieldgen, /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 9 + dir = 9; + icon_state = "railing" }, /turf/open/floor/circuit/airless, /area/ruin/space/has_grav/skelter/shields) @@ -3167,8 +3167,8 @@ /area/ruin/space/has_grav/skelter/engine/lower) "ht" = ( /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 6 + dir = 6; + icon_state = "railing" }, /turf/open/floor/plating, /area/ruin/space/has_grav/skelter/engine/lower) @@ -3195,12 +3195,12 @@ /area/ruin/space/has_grav/skelter/engine/lower) "hw" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/engine/powerstorage) @@ -3271,8 +3271,8 @@ /area/ruin/space/has_grav/skelter/storage) "hH" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -3293,12 +3293,12 @@ /area/ruin/space/has_grav/skelter/sec) "hK" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/blue/corner{ - icon_state = "trimline_corner"; - dir = 8 + dir = 8; + icon_state = "trimline_corner" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -3330,15 +3330,15 @@ "hO" = ( /obj/machinery/shieldgen, /obj/structure/fluff/railing{ - icon_state = "railing"; - dir = 8 + dir = 8; + icon_state = "railing" }, /turf/open/floor/circuit/airless, /area/ruin/space/has_grav/skelter/shields) "hP" = ( /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -3346,12 +3346,12 @@ /area/ruin/space/has_grav/skelter/engine/lower) "hQ" = ( /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -3359,12 +3359,12 @@ /area/ruin/space/has_grav/skelter/engine/lower) "hR" = ( /obj/effect/turf_decal/stripes/line{ - icon_state = "warningline"; - dir = 1 + dir = 1; + icon_state = "warningline" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel{ icon_state = "sepia" @@ -3372,12 +3372,12 @@ /area/ruin/space/has_grav/skelter/engine/lower) "hS" = ( /obj/effect/turf_decal/stripes/corner{ - icon_state = "warninglinecorner"; - dir = 4 + dir = 4; + icon_state = "warninglinecorner" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -3390,8 +3390,8 @@ "hT" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3405,26 +3405,26 @@ /area/ruin/space/has_grav/skelter/engine/lower) "hU" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/engine/powerstorage) "hV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -3471,8 +3471,8 @@ /area/ruin/space/has_grav/skelter/storage) "ic" = ( /obj/machinery/light{ - icon_state = "tube"; - dir = 8 + dir = 8; + icon_state = "tube" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -3485,8 +3485,8 @@ name = "dust" }, /obj/machinery/light/broken{ - icon_state = "tube-broken"; - dir = 4 + dir = 4; + icon_state = "tube-broken" }, /turf/open/floor/plasteel/airless/cafeteria, /area/crew_quarters/cafeteria) @@ -3560,8 +3560,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "ir" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - icon_state = "manifold-2"; - dir = 8 + dir = 8; + icon_state = "manifold-2" }, /obj/machinery/firealarm{ dir = 8; @@ -3574,8 +3574,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "is" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3584,20 +3584,20 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "it" = ( /obj/effect/turf_decal/trimline/yellow/corner{ - icon_state = "trimline_corner"; - dir = 4 + dir = 4; + icon_state = "trimline_corner" }, /obj/machinery/light{ - icon_state = "tube"; - dir = 1 + dir = 1; + icon_state = "tube" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3606,12 +3606,12 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "iu" = ( /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; - dir = 1 + dir = 1; + icon_state = "trimline" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -3626,16 +3626,16 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/yellow/corner{ - icon_state = "trimline_corner"; - dir = 1 + dir = 1; + icon_state = "trimline_corner" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3644,12 +3644,12 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "iw" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3658,8 +3658,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "ix" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3676,8 +3676,8 @@ "iz" = ( /obj/structure/closet/crate/freezer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 8 + dir = 8; + icon_state = "scrub_map_on-2" }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, @@ -3727,8 +3727,8 @@ pixel_y = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 4 + dir = 4; + icon_state = "scrub_map_on-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) @@ -3747,8 +3747,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/comms) @@ -3769,8 +3769,8 @@ /area/ruin/space/has_grav/skelter/comms) "iH" = ( /obj/machinery/computer{ - icon_state = "computer"; - dir = 4 + dir = 4; + icon_state = "computer" }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/skelter/shields) @@ -3780,8 +3780,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "iJ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/blue/corner, /turf/open/floor/plasteel/showroomfloor, @@ -3792,19 +3792,19 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "iL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/blue/corner{ - icon_state = "trimline_corner"; - dir = 8 + dir = 8; + icon_state = "trimline_corner" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/engine/powerstorage) "iM" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/skelter/engine/powerstorage) @@ -3858,8 +3858,8 @@ /area/ruin/space/has_grav/skelter/storage) "iT" = ( /obj/structure/disposalpipe/trunk{ - icon_state = "pipe-t"; - dir = 8 + dir = 8; + icon_state = "pipe-t" }, /obj/machinery/disposal/bin, /obj/machinery/button/massdriver{ @@ -3948,8 +3948,8 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "ja" = ( /obj/structure/toilet{ - icon_state = "toilet00"; - dir = 8 + dir = 8; + icon_state = "toilet00" }, /obj/machinery/light/small{ dir = 1 @@ -3958,37 +3958,37 @@ /area/ruin/space/has_grav/skelter/engine/powerstorage) "jb" = ( /obj/structure/disposalpipe/segment{ - icon_state = "pipe"; - dir = 6 + dir = 6; + icon_state = "pipe" }, /turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/skelter/storage) "jc" = ( /obj/structure/disposalpipe/segment{ - icon_state = "pipe"; - dir = 8 + dir = 8; + icon_state = "pipe" }, /turf/closed/wall/mineral/titanium, /area/ruin/space/has_grav/skelter/storage) "jd" = ( /obj/structure/disposalpipe/segment{ - icon_state = "pipe"; - dir = 8 + dir = 8; + icon_state = "pipe" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/storage) "je" = ( /obj/machinery/door/window/eastright, /obj/structure/disposalpipe/segment{ - icon_state = "pipe"; - dir = 9 + dir = 9; + icon_state = "pipe" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/storage) "jf" = ( /obj/effect/turf_decal/stripes/end{ - icon_state = "warn_end"; - dir = 1 + dir = 1; + icon_state = "warn_end" }, /obj/machinery/mass_driver, /obj/structure/window/reinforced/spawner/north, @@ -4027,8 +4027,8 @@ /area/ruin/space/has_grav/skelter/comms) "ji" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ - icon_state = "inje_map-2"; - dir = 1 + dir = 1; + icon_state = "inje_map-2" }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/skelter/oxy) @@ -4087,8 +4087,8 @@ /area/ruin/unpowered/no_grav) "jp" = ( /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 4 + dir = 4; + icon_state = "trimline" }, /obj/machinery/light{ dir = 1 @@ -4097,16 +4097,16 @@ /area/ruin/space/has_grav/skelter/nav) "jq" = ( /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 4 + dir = 4; + icon_state = "trimline" }, /obj/machinery/light, /turf/open/floor/mineral/titanium, /area/ruin/space/has_grav/skelter/nav) "jr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) @@ -4118,8 +4118,8 @@ /area/ruin/space/has_grav/skelter/admin) "jt" = ( /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; - dir = 4 + dir = 4; + icon_state = "bulb-broken" }, /obj/item/stack/cable_coil/blue, /turf/open/floor/plating, @@ -4127,8 +4127,8 @@ "ju" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - icon_state = "scrub_map_on-2"; - dir = 1 + dir = 1; + icon_state = "scrub_map_on-2" }, /turf/open/floor/carpet, /area/ruin/space/has_grav/skelter/admin) diff --git a/_maps/RandomRuins/SpaceRuins/spacediner.dmm b/_maps/RandomRuins/SpaceRuins/spacediner.dmm index 16a6850130..755e5531bb 100644 --- a/_maps/RandomRuins/SpaceRuins/spacediner.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacediner.dmm @@ -40,8 +40,8 @@ /area/ruin/space/diner/interior) "ai" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 1 + dir = 1; + icon_state = "hrwindow_spawner_end" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) @@ -116,8 +116,8 @@ /area/ruin/space/diner) "aw" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 4 + dir = 4; + icon_state = "hrwindow_spawner_end" }, /turf/open/floor/plating/airless, /area/ruin/space/diner) @@ -253,8 +253,8 @@ /area/ruin/space/diner/interior) "aQ" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) @@ -438,8 +438,8 @@ }, /obj/machinery/grill, /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; - dir = 1 + dir = 1; + icon_state = "bulb-broken" }, /obj/machinery/power/apc/highcap/five_k{ name = "Space Diner APC"; @@ -468,8 +468,8 @@ /area/ruin/space/diner/interior) "bx" = ( /obj/structure/toilet/secret/low_loot{ - icon_state = "toilet00"; - dir = 4 + dir = 4; + icon_state = "toilet00" }, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -509,8 +509,8 @@ /area/ruin/space/diner/interior) "bB" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 8 + dir = 8; + icon_state = "hrwindow_spawner_end" }, /obj/structure/cable{ icon_state = "0-4" @@ -529,8 +529,8 @@ /area/ruin/space/diner/interior) "bD" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 4 + dir = 4; + icon_state = "hrwindow_spawner_end" }, /obj/structure/cable{ icon_state = "0-8" @@ -568,8 +568,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) @@ -579,8 +579,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) @@ -594,8 +594,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) @@ -616,8 +616,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) @@ -662,8 +662,8 @@ /area/ruin/space/diner/interior) "bP" = ( /obj/structure/toilet/secret/low_loot{ - icon_state = "toilet00"; - dir = 4 + dir = 4; + icon_state = "toilet00" }, /obj/structure/window/reinforced/spawner/north, /obj/effect/decal/cleanable/dirt, @@ -673,8 +673,8 @@ "bQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 6 + dir = 6; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) @@ -727,8 +727,8 @@ /area/ruin/space/diner/interior) "bX" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 1 + dir = 1; + icon_state = "hrwindow_spawner_end" }, /obj/structure/cable{ icon_state = "0-2" @@ -756,24 +756,24 @@ "ca" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/general/hidden{ - icon_state = "manifold-2"; - dir = 8 + dir = 8; + icon_state = "manifold-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) "cb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) "cc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 10 + dir = 10; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel, /area/ruin/space/diner/interior) @@ -962,8 +962,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /obj/item/beacon, /turf/open/floor/plasteel/dark, @@ -973,8 +973,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/dark, /area/ruin/space/diner/interior) @@ -993,8 +993,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plasteel/dark, /area/ruin/space/diner/interior) @@ -1105,8 +1105,8 @@ /area/ruin/space/diner/interior) "cM" = ( /obj/machinery/light/broken{ - icon_state = "tube-broken"; - dir = 1 + dir = 1; + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -1146,8 +1146,8 @@ }, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/computer/arcade{ - icon_state = "arcade"; - dir = 8 + dir = 8; + icon_state = "arcade" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1161,8 +1161,8 @@ /area/ruin/space/diner/interior) "cS" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 1 + dir = 1; + icon_state = "hrwindow_spawner_end" }, /obj/structure/cable, /obj/structure/cable{ @@ -1242,8 +1242,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 5 + dir = 5; + icon_state = "pipe11-2" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1257,8 +1257,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1287,8 +1287,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1311,8 +1311,8 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 9 + dir = 9; + icon_state = "pipe11-2" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1351,8 +1351,8 @@ icon_state = "1-2" }, /obj/machinery/computer/teleporter{ - icon_state = "computer"; - dir = 1 + dir = 1; + icon_state = "computer" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -1414,8 +1414,8 @@ "ds" = ( /obj/structure/cable, /obj/machinery/power/solar_control{ - icon_state = "computer"; - dir = 4 + dir = 4; + icon_state = "computer" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) @@ -1427,8 +1427,8 @@ /area/ruin/space/diner/interior) "dv" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 4 + dir = 4; + icon_state = "hrwindow_spawner_end" }, /obj/structure/cable, /obj/structure/cable{ @@ -1449,8 +1449,8 @@ dir = 1 }, /obj/machinery/light/broken{ - icon_state = "tube-broken"; - dir = 8 + dir = 8; + icon_state = "tube-broken" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -1492,8 +1492,8 @@ name = "dust" }, /obj/item/chair{ - icon_state = "chair_toppled"; - dir = 1 + dir = 1; + icon_state = "chair_toppled" }, /turf/open/floor/carpet, /area/ruin/space/diner/interior) @@ -1508,8 +1508,8 @@ /area/ruin/space/diner/interior) "dE" = ( /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; - dir = 1 + dir = 1; + icon_state = "bulb-broken" }, /turf/open/floor/engine/airless, /area/ruin/space/diner) @@ -1663,8 +1663,8 @@ /area/ruin/space/diner/interior) "dV" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; - dir = 10 + dir = 10; + icon_state = "hrwindow_spawner_directional" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) @@ -1674,22 +1674,22 @@ /area/ruin/space/diner/interior) "dX" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 4 + dir = 4; + icon_state = "hrwindow_spawner_end" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) "dY" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 8 + dir = 8; + icon_state = "hrwindow_spawner_end" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) "dZ" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; - dir = 6 + dir = 6; + icon_state = "hrwindow_spawner_directional" }, /turf/open/floor/plating, /area/ruin/space/diner/interior) @@ -1728,8 +1728,8 @@ /area/ruin/space/diner) "ef" = ( /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; - dir = 1 + dir = 1; + icon_state = "bulb-broken" }, /obj/machinery/vending/snack, /obj/effect/turf_decal/bot, @@ -1737,8 +1737,8 @@ /area/ruin/space/diner) "eg" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ - icon_state = "hrwindow_spawner_end"; - dir = 1 + dir = 1; + icon_state = "hrwindow_spawner_end" }, /turf/open/floor/plating/airless, /area/ruin/space/diner) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 6e0c65f6aa..c2abea9a97 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -125,8 +125,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_3) "ay" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, @@ -166,8 +166,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_4) "aG" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, @@ -207,8 +207,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_5) "aO" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, @@ -248,8 +248,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_6) "aW" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, @@ -287,8 +287,8 @@ /area/ruin/unpowered/no_grav) "be" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_3) @@ -319,8 +319,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_3) "bk" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_4) @@ -351,8 +351,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_4) "bq" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_5) @@ -383,8 +383,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_5) "bw" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_6) @@ -1067,8 +1067,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_2) "dl" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, @@ -1131,8 +1131,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_1) "dt" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /obj/structure/toilet, /turf/open/floor/plasteel/showroomfloor, @@ -1230,8 +1230,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_2) "dI" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_2) @@ -1262,8 +1262,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_1) "dP" = ( /obj/structure/window{ - icon_state = "window"; - dir = 8 + dir = 8; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_1) @@ -2564,16 +2564,16 @@ /area/ruin/space/has_grav/hotel/workroom) "hG" = ( /obj/effect/mob_spawn/human/hotel_staff{ - icon_state = "sleeper_s"; - dir = 1 + dir = 1; + icon_state = "sleeper_s" }, /obj/machinery/light, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "hH" = ( /obj/effect/mob_spawn/human/hotel_staff{ - icon_state = "sleeper_s"; - dir = 1 + dir = 1; + icon_state = "sleeper_s" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) @@ -4283,8 +4283,8 @@ /area/ruin/space/has_grav/hotel/security) "lG" = ( /obj/structure/window{ - icon_state = "window"; - dir = 1 + dir = 1; + icon_state = "window" }, /obj/machinery/light{ dir = 8 @@ -4307,8 +4307,8 @@ /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, /obj/structure/window{ - icon_state = "window"; - dir = 1 + dir = 1; + icon_state = "window" }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/pool) diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm index 0bcfba908b..b5f2fb2237 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm @@ -9,9 +9,9 @@ dwidth = 11; height = 22; id = "whiteship_away"; + json_key = "whiteship"; name = "Deep Space"; - width = 35; - json_key = "whiteship" + width = 35 }, /turf/open/space, /area/space) diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm index e241b776e1..62c261e8a0 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm @@ -336,16 +336,6 @@ "yf" = ( /turf/open/space/basic, /area/space/nearstation) -"zw" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma{ - amount = 50 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "zS" = ( /turf/open/space/basic, /area/space) @@ -715,12 +705,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"WB" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "Ys" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -1164,15 +1148,15 @@ zS MP dw lG -WB +eP Jq -WB +eP UD Cx UD -WB +eP Jq -WB +eP UD MP tw @@ -1276,15 +1260,15 @@ zS MP Cb AC -WB +eP mW -WB +eP Kl Cx Kl -WB +eP mW -WB +eP Kl MP tw @@ -1505,11 +1489,11 @@ Ok CH GI Ok -zw -zw -zw -zw -zw +gF +gF +gF +gF +gF MP tw yf diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/empty.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/empty.dmm index 6116e6a3b6..6a8a6f9288 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/empty.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/empty.dmm @@ -111,26 +111,14 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"uC" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) "wt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/radiation, /turf/open/floor/plasteel, /area/engine/engineering) -"wS" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) "yf" = ( /turf/open/space/basic, /area/space/nearstation) -"yA" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) "zS" = ( /turf/open/space/basic, /area/space) @@ -224,10 +212,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"Le" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) "LS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plating/airless, @@ -397,17 +381,17 @@ ZT ZT ZT ZT -Le +hK tw -Le -Le +hK +hK tw -Le -Le +hK +hK tw -Le -Le -Le +hK +hK +hK YZ Oj YZ @@ -453,17 +437,17 @@ ZT ZT ZT ZT -Le +hK tw -Le -Le +hK +hK tw -Le -Le +hK +hK tw -Le -Le -Le +hK +hK +hK YZ Oj YZ @@ -509,17 +493,17 @@ Ke EL Tk MP -Le +hK tw -Le -Le +hK +hK tw -Le -Le +hK +hK tw -Le -Le -Le +hK +hK +hK YZ Oj YZ diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm index cbece3304a..c76ee3d574 100644 --- a/_maps/RandomZLevels/VR/snowdin_VR.dmm +++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm @@ -2411,8 +2411,8 @@ /area/awaymission/snowdin/post/dorm) "fw" = ( /obj/machinery/sleeper{ - icon_state = "sleeper"; - dir = 4 + dir = 4; + icon_state = "sleeper" }, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -6704,9 +6704,9 @@ "oo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4; + piping_layer = 3; pixel_x = 5; - pixel_y = 5; - piping_layer = 3 + pixel_y = 5 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -6714,9 +6714,9 @@ "op" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4; + piping_layer = 3; pixel_x = 5; - pixel_y = 5; - piping_layer = 3 + pixel_y = 5 }, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) @@ -9707,10 +9707,10 @@ /area/awaymission/snowdin/post/broken_shuttle) "wc" = ( /obj/machinery/computer{ - name = "Shuttle Transist Console"; desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; dir = 1; - icon_screen = null + icon_screen = null; + name = "Shuttle Transist Console" }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) @@ -9799,9 +9799,9 @@ "wm" = ( /obj/machinery/porta_turret/centcom_shuttle/weak{ desc = "A turret built with substandard parts and run down further with age."; - icon_state = "syndie_off"; dir = 9; - faction = list("pirate") + faction = list("pirate"); + icon_state = "syndie_off" }, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/cave) @@ -9926,8 +9926,8 @@ /area/awaymission/snowdin/outside) "wC" = ( /obj/vehicle/ridden/atv{ - icon_state = "atv"; - dir = 4 + dir = 4; + icon_state = "atv" }, /obj/effect/light_emitter{ name = "outdoor light"; @@ -10650,10 +10650,10 @@ /area/awaymission/snowdin/cave) "yu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - name = "toxin out"; dir = 8; + frequency = 1442; id_tag = "snowdin_toxins_mine_1"; - frequency = 1442 + name = "toxin out" }, /turf/open/floor/engine/vacuum, /area/awaymission/snowdin/cave) @@ -11025,8 +11025,8 @@ /area/awaymission/snowdin/post/minipost) "zq" = ( /obj/vehicle/ridden/atv{ - icon_state = "atv"; - dir = 8 + dir = 8; + icon_state = "atv" }, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) @@ -11939,8 +11939,8 @@ /area/awaymission/snowdin/cave) "BO" = ( /obj/effect/turf_decal/stripes/end{ - icon_state = "warn_end"; - dir = 1 + dir = 1; + icon_state = "warn_end" }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) @@ -11953,8 +11953,8 @@ /area/awaymission/snowdin/cave/cavern) "BQ" = ( /obj/effect/turf_decal/stripes/end{ - icon_state = "warn_end"; - dir = 8 + dir = 8; + icon_state = "warn_end" }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) @@ -12268,8 +12268,8 @@ /area/awaymission/snowdin/cave) "CP" = ( /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 4 + dir = 4; + icon_state = "heater" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -12803,8 +12803,8 @@ /area/awaymission/snowdin/cave) "DU" = ( /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 4 + dir = 4; + icon_state = "heater" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -13244,8 +13244,8 @@ /area/awaymission/snowdin/cave) "EN" = ( /obj/machinery/sleeper/syndie{ - icon_state = "sleeper_s"; - dir = 1 + dir = 1; + icon_state = "sleeper_s" }, /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, @@ -13257,8 +13257,8 @@ "EP" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/sleeper/syndie{ - icon_state = "sleeper_s"; - dir = 1 + dir = 1; + icon_state = "sleeper_s" }, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) @@ -14452,8 +14452,8 @@ /area/awaymission/snowdin/post/mining_main/mechbay) "In" = ( /obj/mecha/working/ripley/mining{ - icon_state = "ripley"; - dir = 1 + dir = 1; + icon_state = "ripley" }, /obj/effect/turf_decal/bot, /turf/open/floor/mech_bay_recharge_floor, @@ -14513,8 +14513,8 @@ /area/awaymission/snowdin/post/mining_main) "Ix" = ( /obj/vehicle/ridden/atv{ - icon_state = "atv"; - dir = 1 + dir = 1; + icon_state = "atv" }, /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm index 5b010e74d9..a939b8424e 100644 --- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm +++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm @@ -468,8 +468,8 @@ /area/awaymission/centcomAway/hangar) "cO" = ( /obj/machinery/sleep_console{ - icon_state = "console"; - dir = 8 + dir = 8; + icon_state = "console" }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) @@ -746,8 +746,8 @@ /area/awaymission/centcomAway/general) "eI" = ( /obj/machinery/sleep_console{ - icon_state = "console"; - dir = 8 + dir = 8; + icon_state = "console" }, /turf/open/indestructible, /area/awaymission/centcomAway/general) @@ -1787,8 +1787,8 @@ /area/awaymission/centcomAway/general) "kD" = ( /obj/machinery/door/window/northright{ - icon_state = "right"; - dir = 2 + dir = 2; + icon_state = "right" }, /turf/open/indestructible, /area/awaymission/centcomAway/general) diff --git a/_maps/RandomZLevels/away_mission/Academy.dmm b/_maps/RandomZLevels/away_mission/Academy.dmm index 9b61f50600..8bc4522ae0 100644 --- a/_maps/RandomZLevels/away_mission/Academy.dmm +++ b/_maps/RandomZLevels/away_mission/Academy.dmm @@ -3129,8 +3129,8 @@ /obj/structure/table, /obj/item/gun/ballistic/revolver/russian/soul, /turf/open/floor/plasteel/airless{ - icon_state = "whitered"; - dir = 4 + dir = 4; + icon_state = "whitered" }, /area/awaymission/academy/academyaft) "iY" = ( @@ -3197,8 +3197,8 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/airless{ - icon_state = "whitered"; - dir = 4 + dir = 4; + icon_state = "whitered" }, /area/awaymission/academy/academyaft) "jh" = ( @@ -3258,8 +3258,8 @@ name = "The preserved brain of Harry Houdini" }, /turf/open/floor/plasteel/airless{ - icon_state = "whitered"; - dir = 4 + dir = 4; + icon_state = "whitered" }, /area/awaymission/academy/academyaft) "jp" = ( @@ -3365,8 +3365,8 @@ /obj/structure/window/reinforced, /obj/item/batterer, /turf/open/floor/plasteel/airless{ - icon_state = "whitered"; - dir = 4 + dir = 4; + icon_state = "whitered" }, /area/awaymission/academy/academyaft) "jB" = ( @@ -3616,8 +3616,8 @@ /area/awaymission/academy/academygate) "kw" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows"; - dir = 8 + dir = 8; + icon_state = "fakewindows" }, /area/awaymission/academy/headmaster) "kx" = ( @@ -3671,8 +3671,8 @@ /area/awaymission/academy/academyaft) "kF" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows2"; - dir = 8 + dir = 8; + icon_state = "fakewindows2" }, /area/awaymission/academy/headmaster) "kG" = ( @@ -4270,8 +4270,8 @@ /area/awaymission/academy/academycellar) "mW" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows"; - dir = 4 + dir = 4; + icon_state = "fakewindows" }, /area/awaymission/academy/headmaster) "mX" = ( @@ -4284,14 +4284,14 @@ /area/space/nearstation) "mZ" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows"; - dir = 1 + dir = 1; + icon_state = "fakewindows" }, /area/awaymission/academy/headmaster) "na" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 + dir = 1; + icon_state = "fakewindows2" }, /area/awaymission/academy/headmaster) "nb" = ( @@ -4310,20 +4310,20 @@ /area/awaymission/academy/headmaster) "nd" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows"; - dir = 1 + dir = 1; + icon_state = "fakewindows" }, /area/awaymission/academy/academyengine) "ne" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows2"; - dir = 1 + dir = 1; + icon_state = "fakewindows2" }, /area/awaymission/academy/academyengine) "nf" = ( /turf/closed/indestructible/fakeglass{ - icon_state = "fakewindows2"; - dir = 6 + dir = 6; + icon_state = "fakewindows2" }, /area/awaymission/academy/headmaster) "ng" = ( diff --git a/_maps/RandomZLevels/away_mission/caves.dmm b/_maps/RandomZLevels/away_mission/caves.dmm index 33aca48f29..1576c144d8 100644 --- a/_maps/RandomZLevels/away_mission/caves.dmm +++ b/_maps/RandomZLevels/away_mission/caves.dmm @@ -11,8 +11,8 @@ "ad" = ( /turf/open/lava/smooth{ desc = "Looks hot."; - luminosity = 5; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + luminosity = 5 }, /area/awaymission/caves/BMP_asteroid/level_four) "ae" = ( @@ -35,8 +35,8 @@ "ah" = ( /turf/open/lava/smooth{ desc = "Looks hot."; - luminosity = 5; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + luminosity = 5 }, /area/awaymission/caves/BMP_asteroid/level_three) "ai" = ( @@ -305,8 +305,8 @@ /obj/effect/forcefield/cult, /turf/open/lava/smooth{ desc = "Looks hot."; - luminosity = 5; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + luminosity = 5 }, /area/awaymission/caves/BMP_asteroid/level_four) "aW" = ( @@ -540,8 +540,8 @@ "bM" = ( /turf/open/lava/smooth{ desc = "Looks hot."; - luminosity = 5; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + luminosity = 5 }, /area/awaymission/caves/BMP_asteroid) "bN" = ( @@ -550,8 +550,8 @@ "bO" = ( /turf/open/lava/smooth{ desc = "Looks hot."; - luminosity = 5; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + luminosity = 5 }, /area/awaymission/caves/BMP_asteroid/level_two) "bP" = ( @@ -1818,8 +1818,8 @@ /area/awaymission/caves/BMP_asteroid) "fQ" = ( /turf/open/floor/plasteel/elevatorshaft{ - name = "elevator flooring"; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + name = "elevator flooring" }, /area/awaymission/caves/BMP_asteroid) "fR" = ( @@ -1843,8 +1843,8 @@ "fU" = ( /obj/effect/landmark/awaystart, /turf/open/floor/plasteel/elevatorshaft{ - name = "elevator flooring"; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + name = "elevator flooring" }, /area/awaymission/caves/BMP_asteroid) "fW" = ( @@ -2169,8 +2169,8 @@ /obj/effect/baseturf_helper/lava, /turf/open/lava/smooth{ desc = "Looks hot."; - luminosity = 5; - initial_gas_mix = "n2=23;o2=14" + initial_gas_mix = "n2=23;o2=14"; + luminosity = 5 }, /area/awaymission/caves/BMP_asteroid/level_four) "gZ" = ( diff --git a/_maps/RandomZLevels/away_mission/challenge.dmm b/_maps/RandomZLevels/away_mission/challenge.dmm index 7342f7ffe6..5393f3b09a 100644 --- a/_maps/RandomZLevels/away_mission/challenge.dmm +++ b/_maps/RandomZLevels/away_mission/challenge.dmm @@ -208,8 +208,8 @@ "aX" = ( /obj/machinery/porta_turret{ dir = 8; - set_obj_flags = "EMAGGED"; - installation = /obj/item/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon; + set_obj_flags = "EMAGGED" }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -354,8 +354,8 @@ "bq" = ( /obj/machinery/porta_turret{ dir = 8; - set_obj_flags = "EMAGGED"; - installation = /obj/item/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon; + set_obj_flags = "EMAGGED" }, /turf/open/floor/plating, /area/awaymission/challenge/main) diff --git a/_maps/RandomZLevels/away_mission/moonoutpost19.dmm b/_maps/RandomZLevels/away_mission/moonoutpost19.dmm index ff2db79c83..acd6489504 100644 --- a/_maps/RandomZLevels/away_mission/moonoutpost19.dmm +++ b/_maps/RandomZLevels/away_mission/moonoutpost19.dmm @@ -12,8 +12,8 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "ae" = ( @@ -26,43 +26,43 @@ /obj/structure/alien/weeds, /obj/structure/alien/weeds{ desc = "A large mottled egg."; - obj_integrity = 100; icon_state = "egg_hatched"; - name = "egg" + name = "egg"; + obj_integrity = 100 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "ai" = ( /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aj" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "ak" = ( /obj/structure/alien/weeds, /mob/living/simple_animal/hostile/alien, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "am" = ( /obj/structure/alien/weeds/node, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "ap" = ( @@ -72,8 +72,8 @@ /obj/item/clothing/mask/facehugger/impregnated, /obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "as" = ( @@ -81,8 +81,8 @@ /obj/structure/alien/resin/wall, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "at" = ( @@ -92,24 +92,24 @@ /obj/structure/alien/weeds, /mob/living/simple_animal/hostile/alien/sentinel, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "av" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aw" = ( /obj/structure/alien/weeds/node, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "ay" = ( @@ -164,8 +164,8 @@ /obj/structure/alien/weeds/node, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aE" = ( @@ -178,8 +178,8 @@ /obj/item/melee/baton/loaded, /obj/item/clothing/head/helmet, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aF" = ( @@ -195,28 +195,28 @@ /obj/structure/alien/weeds, /obj/structure/alien/weeds{ desc = "A large mottled egg."; - obj_integrity = 100; icon_state = "egg_hatched"; - name = "egg" + name = "egg"; + obj_integrity = 100 }, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aK" = ( /obj/structure/alien/weeds, /obj/structure/alien/weeds{ desc = "A large mottled egg."; - obj_integrity = 100; icon_state = "egg_hatched"; - name = "egg" + name = "egg"; + obj_integrity = 100 }, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aM" = ( @@ -225,8 +225,8 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aN" = ( @@ -257,8 +257,8 @@ pixel_y = -6 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "aT" = ( @@ -269,8 +269,8 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "aU" = ( @@ -341,16 +341,16 @@ /area/awaymission/moonoutpost19/syndicate) "ba" = ( /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "bc" = ( /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "bd" = ( @@ -413,8 +413,8 @@ /obj/item/clothing/under/syndicate, /obj/item/clothing/glasses/night, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "bl" = ( @@ -848,8 +848,8 @@ /obj/structure/alien/weeds/node, /mob/living/simple_animal/hostile/alien, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "bX" = ( @@ -860,8 +860,8 @@ dir = 4 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -874,8 +874,8 @@ }, /obj/structure/alien/weeds, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "bZ" = ( @@ -887,16 +887,16 @@ }, /obj/structure/alien/weeds, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "ca" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -908,8 +908,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -922,8 +922,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -934,10 +934,10 @@ req_access_txt = "150" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -950,8 +950,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -964,8 +964,8 @@ dir = 1 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -977,8 +977,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -995,8 +995,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1073,15 +1073,15 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "cp" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "cq" = ( @@ -1090,8 +1090,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1099,17 +1099,17 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass{ density = 0; - set_obj_flags = "EMAGGED"; icon_state = "open"; - name = "Dormitories" + name = "Dormitories"; + set_obj_flags = "EMAGGED" }, /obj/item/stack/rods, /obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "cs" = ( @@ -1120,8 +1120,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1133,8 +1133,8 @@ icon_state = "1-2" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "cu" = ( @@ -1143,8 +1143,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1157,8 +1157,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1232,8 +1232,8 @@ dir = 4 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1249,8 +1249,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1261,8 +1261,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1273,8 +1273,8 @@ /obj/item/shard, /obj/structure/alien/weeds, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "cH" = ( @@ -1286,8 +1286,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1298,8 +1298,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1309,8 +1309,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1328,8 +1328,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1343,8 +1343,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1398,17 +1398,17 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "cR" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged4"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1430,8 +1430,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1439,16 +1439,16 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock{ density = 0; - set_obj_flags = "EMAGGED"; icon_state = "open"; id_tag = "awaydorm4"; name = "Dorm 1"; - opacity = 0 + opacity = 0; + set_obj_flags = "EMAGGED" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "cU" = ( @@ -1466,26 +1466,26 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "cW" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "cX" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged3"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1500,9 +1500,9 @@ dir = 1 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 1; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1517,15 +1517,15 @@ /obj/structure/bed, /obj/item/bedsheet/syndie, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "da" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "db" = ( @@ -1553,8 +1553,8 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "de" = ( @@ -1567,8 +1567,8 @@ dir = 4 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1588,9 +1588,9 @@ dir = 1 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 1; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1604,8 +1604,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "di" = ( @@ -1613,8 +1613,8 @@ dir = 4 }, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "dj" = ( @@ -1641,8 +1641,8 @@ /obj/effect/turf_decal/loading_area, /obj/structure/alien/weeds, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1652,8 +1652,8 @@ dir = 1 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1662,17 +1662,17 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "do" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1684,9 +1684,9 @@ /obj/item/shovel, /obj/item/pickaxe, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg3"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1698,8 +1698,8 @@ pixel_y = -32 }, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "dr" = ( @@ -1717,8 +1717,8 @@ }, /obj/item/suppressor, /turf/open/floor/wood{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "ds" = ( @@ -1746,15 +1746,15 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/external{ density = 0; - set_obj_flags = "EMAGGED"; icon_state = "open"; opacity = 0; - req_access_txt = "150" + req_access_txt = "150"; + set_obj_flags = "EMAGGED" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "dv" = ( @@ -1764,8 +1764,8 @@ pixel_y = -4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dw" = ( @@ -1782,16 +1782,16 @@ dir = 9 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "dx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "dy" = ( @@ -1804,8 +1804,8 @@ dir = 5 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1815,8 +1815,8 @@ pixel_y = 9 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dA" = ( @@ -1833,16 +1833,16 @@ dir = 10 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "dC" = ( /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1853,8 +1853,8 @@ dir = 6 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) @@ -1865,8 +1865,8 @@ icon_state = "ltrails_1" }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dF" = ( @@ -1876,8 +1876,8 @@ icon_state = "ltrails_2" }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dG" = ( @@ -1888,8 +1888,8 @@ }, /obj/item/mining_scanner, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dH" = ( @@ -1899,41 +1899,41 @@ }, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dI" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/external{ density = 0; - set_obj_flags = "EMAGGED"; icon_state = "open"; opacity = 0; - req_access_txt = "150" + req_access_txt = "150"; + set_obj_flags = "EMAGGED" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "dJ" = ( /obj/item/storage/bag/ore, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dK" = ( /obj/item/pickaxe/drill, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dL" = ( @@ -1941,8 +1941,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "dN" = ( @@ -1951,8 +1951,8 @@ pixel_y = -4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dO" = ( @@ -1965,23 +1965,23 @@ /obj/item/clothing/head/helmet/space/syndicate/orange, /obj/item/clothing/mask/facehugger/impregnated, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "dP" = ( /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dQ" = ( /obj/structure/alien/weeds/node, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dS" = ( @@ -1991,30 +1991,30 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "dT" = ( /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dV" = ( /obj/structure/alien/weeds/node, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dY" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/research) "dZ" = ( @@ -2143,9 +2143,9 @@ /obj/structure/alien/weeds, /obj/structure/alien/weeds{ desc = "A large mottled egg."; - obj_integrity = 100; icon_state = "egg_hatched"; - name = "egg" + name = "egg"; + obj_integrity = 100 }, /obj/machinery/camera{ c_tag = "Xenobiology Containment North"; @@ -2255,9 +2255,9 @@ /obj/structure/alien/weeds, /obj/structure/alien/weeds{ desc = "A large mottled egg."; - obj_integrity = 100; icon_state = "egg_hatched"; - name = "egg" + name = "egg"; + obj_integrity = 100 }, /turf/open/floor/engine, /area/awaymission/moonoutpost19/research) @@ -2675,11 +2675,11 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/research{ density = 0; - set_obj_flags = "EMAGGED"; icon_state = "open"; name = "Xenobiology Lab"; opacity = 0; - req_access_txt = "201" + req_access_txt = "201"; + set_obj_flags = "EMAGGED" }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -3666,8 +3666,8 @@ /obj/structure/alien/weeds, /obj/structure/alien/egg, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "hm" = ( @@ -3853,11 +3853,11 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/command{ density = 0; - set_obj_flags = "EMAGGED"; icon_state = "open"; name = "Research Director's Office"; opacity = 0; - req_access_txt = "201" + req_access_txt = "201"; + set_obj_flags = "EMAGGED" }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -4026,8 +4026,8 @@ "hV" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "hW" = ( @@ -4610,8 +4610,8 @@ /obj/item/stack/rods, /obj/item/shard, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "jb" = ( @@ -4850,24 +4850,24 @@ "jA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) "jB" = ( /obj/structure/grille, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "jC" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "jD" = ( @@ -5101,10 +5101,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5113,10 +5113,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5127,8 +5127,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5141,8 +5141,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5151,10 +5151,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5163,9 +5163,9 @@ icon_state = "4-8" }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5174,10 +5174,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged3"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5361,17 +5361,17 @@ /area/awaymission/moonoutpost19/arrivals) "kB" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) "kC" = ( /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "kD" = ( @@ -5380,27 +5380,27 @@ desc = "They look like human remains. The skeleton is curled up in fetal position with the hands placed near the throat." }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged4"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) "kE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) "kF" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged5"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5408,8 +5408,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5497,17 +5497,17 @@ icon_state = "medium" }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "kQ" = ( /obj/structure/grille/broken, /obj/item/stack/rods, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg3"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5674,8 +5674,8 @@ icon_state = "small" }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "lj" = ( @@ -5683,8 +5683,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "lk" = ( @@ -5695,8 +5695,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5707,8 +5707,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5866,8 +5866,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "lF" = ( @@ -5899,8 +5899,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -5909,8 +5909,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6040,8 +6040,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "mg" = ( @@ -6055,8 +6055,8 @@ "mh" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6202,8 +6202,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6349,8 +6349,8 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "mP" = ( @@ -6366,8 +6366,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6378,10 +6378,10 @@ icon_state = "ltrails_1" }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6457,8 +6457,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6511,10 +6511,10 @@ /area/awaymission/moonoutpost19/arrivals) "ni" = ( /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6524,10 +6524,10 @@ pixel_x = 24 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6568,8 +6568,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "nq" = ( @@ -6583,10 +6583,10 @@ network = list("mo19") }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6618,8 +6618,8 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6642,8 +6642,8 @@ dir = 8 }, /turf/open/floor/plasteel/cafeteria{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6655,8 +6655,8 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6693,8 +6693,8 @@ icon_state = "ltrails_1" }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "nD" = ( @@ -6707,9 +6707,9 @@ icon_state = "ltrails_2" }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6720,9 +6720,9 @@ icon_state = "ltrails_2" }, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; icon_state = "platingdmg3"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6734,8 +6734,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6747,8 +6747,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6809,8 +6809,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6820,8 +6820,8 @@ dir = 4 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6862,10 +6862,10 @@ /obj/structure/table, /obj/item/toy/cards/deck, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "damaged1"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6902,10 +6902,10 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; dir = 8; heat_capacity = 1e+006; icon_state = "floorscorched2"; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6916,23 +6916,23 @@ /obj/effect/decal/cleanable/generic, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) "nZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "oa" = ( /obj/structure/chair/comfy/black, /turf/open/floor/plating{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "ob" = ( @@ -6945,8 +6945,8 @@ dir = 8 }, /turf/open/floor/plasteel{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) @@ -6956,8 +6956,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "od" = ( @@ -6965,15 +6965,15 @@ icon_state = "small" }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "oe" = ( /obj/item/trash/candy, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 + heat_capacity = 1e+006; + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "oT" = ( diff --git a/_maps/RandomZLevels/away_mission/research.dmm b/_maps/RandomZLevels/away_mission/research.dmm index f1c0f989df..3bcae8299a 100644 --- a/_maps/RandomZLevels/away_mission/research.dmm +++ b/_maps/RandomZLevels/away_mission/research.dmm @@ -3162,10 +3162,10 @@ /obj/effect/mob_spawn/human/doctor{ brute_damage = 145; id_job = "Geneticist"; + name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist; - name = "Geneticist" + uniform = /obj/item/clothing/under/rank/medical/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/purple{ @@ -4276,10 +4276,10 @@ /obj/effect/mob_spawn/human/doctor{ brute_damage = 145; id_job = "Geneticist"; + name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist; - name = "Geneticist" + uniform = /obj/item/clothing/under/rank/medical/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/purple{ @@ -4724,11 +4724,11 @@ "jp" = ( /obj/structure/barricade/wooden{ desc = "A wooden table hastily flipped over for cover."; - obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; max_integrity = 55; - name = "flipped table" + name = "flipped table"; + obj_integrity = 55 }, /turf/open/floor/plasteel/yellowsiding{ dir = 1 @@ -4874,11 +4874,11 @@ "jG" = ( /obj/structure/barricade/wooden{ desc = "A wooden table hastily flipped over for cover."; - obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; max_integrity = 55; - name = "flipped table" + name = "flipped table"; + obj_integrity = 55 }, /turf/open/floor/plasteel, /area/awaymission/research/interior/dorm) @@ -5051,11 +5051,11 @@ "kb" = ( /obj/structure/barricade/wooden{ desc = "A wooden table hastily flipped over for cover."; - obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; max_integrity = 55; - name = "flipped table" + name = "flipped table"; + obj_integrity = 55 }, /turf/open/floor/plasteel/yellowsiding, /area/awaymission/research/interior/dorm) @@ -5126,10 +5126,10 @@ /obj/effect/mob_spawn/human/doctor{ brute_damage = 145; id_job = "Geneticist"; + name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist; - name = "Geneticist" + uniform = /obj/item/clothing/under/rank/medical/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/blue{ @@ -6000,10 +6000,10 @@ /obj/effect/mob_spawn/human/doctor{ brute_damage = 145; id_job = "Geneticist"; + name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist; - name = "Geneticist" + uniform = /obj/item/clothing/under/rank/medical/geneticist }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/research/exterior) diff --git a/_maps/RandomZLevels/away_mission/snowdin.dmm b/_maps/RandomZLevels/away_mission/snowdin.dmm index 00530695e9..e80689ddcd 100644 --- a/_maps/RandomZLevels/away_mission/snowdin.dmm +++ b/_maps/RandomZLevels/away_mission/snowdin.dmm @@ -6699,9 +6699,9 @@ "oo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4; + piping_layer = 3; pixel_x = 5; - pixel_y = 5; - piping_layer = 3 + pixel_y = 5 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -6709,9 +6709,9 @@ "op" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4; + piping_layer = 3; pixel_x = 5; - pixel_y = 5; - piping_layer = 3 + pixel_y = 5 }, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) @@ -9713,10 +9713,10 @@ /area/awaymission/snowdin/post/broken_shuttle) "wc" = ( /obj/machinery/computer{ - name = "Shuttle Transist Console"; desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; dir = 1; - icon_screen = null + icon_screen = null; + name = "Shuttle Transist Console" }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) @@ -10657,10 +10657,10 @@ /area/awaymission/snowdin/cave) "yu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - name = "toxin out"; dir = 8; + frequency = 1442; id_tag = "snowdin_toxins_mine_1"; - frequency = 1442 + name = "toxin out" }, /turf/open/floor/engine/vacuum, /area/awaymission/snowdin/cave) diff --git a/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm b/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm index 78a656128c..bcda31dc6c 100644 --- a/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm @@ -813,16 +813,16 @@ "bW" = ( /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 351.9 }, /area/awaymission/undergroundoutpost45/caves) "bX" = ( /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 351.9 }, @@ -2261,8 +2261,8 @@ /area/awaymission/undergroundoutpost45/central) "eJ" = ( /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -2632,8 +2632,8 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -2868,8 +2868,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -3047,8 +3047,8 @@ "gf" = ( /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -3195,8 +3195,8 @@ "gB" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -3409,8 +3409,8 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -3420,8 +3420,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -3452,8 +3452,8 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -4787,8 +4787,8 @@ "jL" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -4821,8 +4821,8 @@ "jP" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -6604,8 +6604,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8354,8 +8354,8 @@ dir = 6 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8365,8 +8365,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8377,8 +8377,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8470,8 +8470,8 @@ name = "air out" }, /turf/open/floor/engine{ - name = "air floor"; - initial_gas_mix = "n2=10580;o2=2644" + initial_gas_mix = "n2=10580;o2=2644"; + name = "air floor" }, /area/awaymission/undergroundoutpost45/engineering) "pF" = ( @@ -8668,8 +8668,8 @@ "qa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8743,8 +8743,8 @@ dir = 10 }, /turf/open/floor/plasteel/dark{ - name = "Server Walkway"; - initial_gas_mix = "n2=500,TEMP=80" + initial_gas_mix = "n2=500,TEMP=80"; + name = "Server Walkway" }, /area/awaymission/undergroundoutpost45/research) "qj" = ( @@ -8900,8 +8900,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8911,8 +8911,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -8922,8 +8922,8 @@ dir = 9 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -9126,8 +9126,8 @@ dir = 8 }, /turf/open/floor/plasteel/dark{ - name = "Server Walkway"; - initial_gas_mix = "n2=500,TEMP=80" + initial_gas_mix = "n2=500,TEMP=80"; + name = "Server Walkway" }, /area/awaymission/undergroundoutpost45/research) "qR" = ( @@ -9545,8 +9545,8 @@ dir = 9 }, /turf/open/floor/plasteel/dark{ - name = "Server Walkway"; - initial_gas_mix = "n2=500,TEMP=80" + initial_gas_mix = "n2=500,TEMP=80"; + name = "Server Walkway" }, /area/awaymission/undergroundoutpost45/research) "rA" = ( @@ -11104,8 +11104,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -11750,8 +11750,8 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -11976,8 +11976,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -12262,8 +12262,8 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13481,8 +13481,8 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13490,8 +13490,8 @@ "yh" = ( /obj/structure/ore_box, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13499,8 +13499,8 @@ "yi" = ( /obj/structure/closet/crate, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13510,8 +13510,8 @@ /obj/structure/bed/nest, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13520,8 +13520,8 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13531,8 +13531,8 @@ /obj/structure/glowshroom/single, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13541,8 +13541,8 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13550,8 +13550,8 @@ "yn" = ( /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13560,8 +13560,8 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13570,8 +13570,8 @@ /obj/structure/alien/weeds, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13579,8 +13579,8 @@ "yq" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13588,8 +13588,8 @@ "yr" = ( /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13598,8 +13598,8 @@ /obj/structure/alien/weeds, /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13608,8 +13608,8 @@ /obj/structure/alien/resin/wall, /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13618,8 +13618,8 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13627,8 +13627,8 @@ "yz" = ( /obj/structure/alien/resin/membrane, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13637,8 +13637,8 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13646,8 +13646,8 @@ "yB" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13656,8 +13656,8 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13667,8 +13667,8 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, @@ -13678,8 +13678,8 @@ /obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; heat_capacity = 1e+006; + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; name = "Cave Floor"; temperature = 363.9 }, diff --git a/_maps/RandomZLevels/away_mission/wildwest.dmm b/_maps/RandomZLevels/away_mission/wildwest.dmm index 77d11a4552..1fc7da1acd 100644 --- a/_maps/RandomZLevels/away_mission/wildwest.dmm +++ b/_maps/RandomZLevels/away_mission/wildwest.dmm @@ -143,11 +143,6 @@ icon_state = "ironsand1" }, /area/awaymission/wildwest/mines) -"aT" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) "aV" = ( /turf/closed/mineral, /area/awaymission/wildwest/refine) @@ -367,8 +362,8 @@ "bO" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) @@ -377,8 +372,8 @@ /area/awaymission/wildwest/gov) "bQ" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ icon_state = "fwindow" @@ -392,8 +387,8 @@ /area/awaymission/wildwest/gov) "bR" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ icon_state = "fwindow" @@ -405,16 +400,16 @@ /area/awaymission/wildwest/gov) "bS" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" @@ -422,8 +417,8 @@ /area/awaymission/wildwest/gov) "bT" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) @@ -445,24 +440,24 @@ /area/awaymission/wildwest/mines) "bW" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) "bX" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" @@ -480,12 +475,12 @@ /area/awaymission/wildwest/gov) "ca" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 1 @@ -508,12 +503,12 @@ /area/awaymission/wildwest/mines) "ce" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plating/ironsand{ @@ -522,12 +517,12 @@ /area/awaymission/wildwest/gov) "cf" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plating/ironsand{ @@ -598,8 +593,8 @@ "ct" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) @@ -713,12 +708,12 @@ /area/awaymission/wildwest/gov) "cQ" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -736,12 +731,12 @@ /area/awaymission/wildwest/gov) "cS" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -807,12 +802,12 @@ /area/awaymission/wildwest/mines) "dc" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 1 @@ -844,17 +839,17 @@ /area/awaymission/wildwest/gov) "dg" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" @@ -1054,13 +1049,13 @@ icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" @@ -1071,8 +1066,8 @@ icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plating/ironsand{ @@ -1084,13 +1079,13 @@ icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" @@ -1153,23 +1148,23 @@ /area/awaymission/wildwest/mines) "ed" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) "ee" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) "ef" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ dir = 4 @@ -1178,8 +1173,8 @@ /area/space/nearstation) "eg" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" @@ -1195,12 +1190,12 @@ /area/awaymission/wildwest/gov) "ei" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/space, /area/space/nearstation) @@ -1239,8 +1234,8 @@ /area/awaymission/wildwest/mines) "er" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand12" @@ -1272,8 +1267,8 @@ /area/awaymission/wildwest/mines) "ex" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand7" @@ -1361,8 +1356,8 @@ /area/awaymission/wildwest/mines) "eN" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plating/ironsand{ icon_state = "ironsand14" @@ -1371,12 +1366,12 @@ "eO" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, @@ -1384,16 +1379,16 @@ "eP" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "eQ" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ icon_state = "fwindow" @@ -1403,12 +1398,12 @@ /area/awaymission/wildwest/refine) "eR" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ icon_state = "fwindow" @@ -1548,12 +1543,12 @@ /area/awaymission/wildwest/mines) "fj" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, @@ -1584,12 +1579,12 @@ /area/awaymission/wildwest/mines) "fo" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, @@ -1669,8 +1664,8 @@ /area/space/nearstation) "fz" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ icon_state = "fwindow" @@ -1679,12 +1674,12 @@ /area/space/nearstation) "fA" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plasteel, @@ -1749,19 +1744,19 @@ /area/awaymission/wildwest/mines) "fJ" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/grass, /area/awaymission/wildwest/gov) "fK" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/floor/grass, /area/awaymission/wildwest/gov) @@ -1773,15 +1768,15 @@ dir = 4 }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/floor/grass, /area/awaymission/wildwest/gov) "fN" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/lattice, /turf/open/space, @@ -1827,8 +1822,8 @@ /area/awaymission/wildwest/mines) "fU" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/grass, /area/awaymission/wildwest/gov) @@ -1844,17 +1839,17 @@ /area/awaymission/wildwest/gov) "fX" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) @@ -1884,8 +1879,8 @@ /area/awaymission/wildwest/gov) "gc" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plasteel/airless, /area/space/nearstation) @@ -2006,24 +2001,24 @@ "gz" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "gA" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, @@ -2031,33 +2026,33 @@ "gB" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/grille, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "gC" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 1 + dir = 1; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, /area/awaymission/wildwest/refine) "gD" = ( /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/window/reinforced, /turf/open/floor/grass, @@ -2076,12 +2071,12 @@ "gG" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 4 + dir = 4; + icon_state = "fwindow" }, /obj/structure/window/reinforced{ - icon_state = "fwindow"; - dir = 8 + dir = 8; + icon_state = "fwindow" }, /obj/structure/grille, /turf/open/floor/plasteel, @@ -31916,9 +31911,9 @@ aN aN aN aN -aT -aT -aT +az +az +az aN aN aG @@ -32157,11 +32152,11 @@ aN aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN aN @@ -32171,10 +32166,10 @@ aN aN aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN @@ -32406,34 +32401,34 @@ aN aN aN aN -aT -aT +az +az aN aN aN aN aN aR -aT -aT -aT -aT -aT +az +az +az +az +az aN aN aN aN -aT +az aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN -aT +az aN aG aG @@ -32663,34 +32658,34 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az aN aN aN -aT -aT -aT +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aN aG aG @@ -32918,36 +32913,36 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aN aN aG @@ -33174,37 +33169,37 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN -aT -aT +az +az aw az -aT -aT -aT -aT +az +az +az +az aN aN aG @@ -33431,37 +33426,37 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aN aN aG @@ -33686,36 +33681,36 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az gV gV gV @@ -33941,38 +33936,38 @@ aW aW aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aP aN aN -aT -aT -aT +az +az +az gV gV gV @@ -34197,42 +34192,42 @@ aN aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT +az +az aN aN -aT -aT -aT +az +az +az aN aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aG aG @@ -34425,71 +34420,71 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT +az +az aN aN -aT -aT -aT +az +az +az aN aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aG aG @@ -34682,71 +34677,71 @@ aG aN aN aR -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aY -aT -aT -aT -aT -aT +az +az +az +az +az ba -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aY -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az bf -aT -aT -aT +az +az +az aR aN aN -aT +az gx aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN aN aN -aT -aT -aT +az +az +az aP aG aG @@ -34939,71 +34934,71 @@ aG aN aN aI -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT +az +az aP aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN aN aP aN -aT -aT +az +az aN aG aG @@ -35194,73 +35189,73 @@ aG aG aG aH -aT +az aI -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN aN -aT -aT -aT +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN -aT -aT -aT -aT +az +az +az +az aN aG aG @@ -35451,72 +35446,72 @@ aG aG aG aM -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bf -aT -aT -aT -aT -aT +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN -aT -aT -aT +az +az +az aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN -aT -aT -aT +az +az +az gY aN aN @@ -35708,15 +35703,15 @@ aG aG aG aI -aT -aT -aT -aT -aT +az +az +az +az +az aZ -aT -aT -aT +az +az +az bj bl bj @@ -35740,42 +35735,42 @@ bj bj bk bs -aT +az aY -aT -aT +az +az ej -aT -aT -aT -aT -aT +az +az +az +az +az aN aN aN -aT -aT -aT +az +az +az aN aN aN dw -aT -aT +az +az aN aN -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN aG aG @@ -35965,15 +35960,15 @@ aG aG aN aI -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj @@ -35997,42 +35992,42 @@ bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az aN aN aN -aT -aT +az +az aN aN aN -aT -aT -aT -aT +az +az +az +az aN aP -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aN aN -aT -aT -aT +az +az +az aN aG aG @@ -36222,15 +36217,15 @@ aG aG aN aR -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az be -aT -aT +az +az bj bj bj @@ -36254,42 +36249,42 @@ bk dy bj bj -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aZ -aT -aT -aT -aT +az +az +az +az aN aN aN -aT +az aN aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN -aT -aT -aT +az +az +az aN aG aG @@ -36479,15 +36474,15 @@ aG aG aN aM -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bp @@ -36511,42 +36506,42 @@ bj bj bj bj -aT -aT -aT -aT +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aN aN aN aN aN aP -aT +az ej -aT -aT +az +az aN aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aN aN -aT -aT -aT +az +az +az aN aG aG @@ -36736,74 +36731,74 @@ aG aG aM aM -aT -aT -aT -aT +az +az +az +az aY -aT -aT -aT -aT +az +az +az +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN aN aN aN aN -aT -aT +az +az ej -aT +az aN aN aN -aT -aT -aT -aT +az +az +az +az aN aN -aT -aT -aT +az +az +az aP aG aG @@ -36993,20 +36988,20 @@ aG aG aG aH -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bu bu @@ -37020,47 +37015,47 @@ bu bu bu bu -aT +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN aN -aT -aT +az +az aN aN -aT -aT -aT +az +az +az aN aG aG @@ -37251,19 +37246,19 @@ aG aG aN aH -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bx by @@ -37277,47 +37272,47 @@ cI cI cI bu -aT +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN aN -aT -aT +az +az aP aN -aT -aT -aT +az +az +az aN aG aG @@ -37508,19 +37503,19 @@ aG aG aN aH -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu by bU @@ -37534,12 +37529,12 @@ bE bj bj bu -aT +az bj bj bj bp -aT +az bu bu bu @@ -37553,28 +37548,28 @@ bu bu bu bu -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN aN aN -aT -aT +az +az aN aN aN -aT -aT +az +az aN aG aG @@ -37765,19 +37760,19 @@ aG aG aN aH -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu by bM @@ -37791,12 +37786,12 @@ bj bj bj bu -aT +az bj bj bj bj -aT +az bu by dV @@ -37810,28 +37805,28 @@ bj bj fp bu -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aN aN -aT +az ej -aT -aT +az +az aN aN aN -aT -aT +az +az aN aN -aT -aT +az +az aN aG aG @@ -38022,19 +38017,19 @@ aG aG aG aM -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bz bM @@ -38048,12 +38043,12 @@ cI cI cI bu -aT +az bj bj bj bj -aT +az bu by by @@ -38067,28 +38062,28 @@ bj bj bu bu -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aN aP -aT -aT -aT -aT +az +az +az +az aN aN -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aN aG aG @@ -38279,19 +38274,19 @@ aG aG aN aH -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bk bk bj bj -aT +az bu by bM @@ -38305,12 +38300,12 @@ bu bu bu bu -aT +az bj bj bj bj -aT +az bu by by @@ -38324,28 +38319,28 @@ bj bj fp bu -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aN aN -aT -aT +az +az aY -aT -aT +az +az aN aN aN -aT -aT -aT -aT +az +az +az +az aN aG aG @@ -38535,20 +38530,20 @@ aG aG aG aM -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bm bj bj -aT +az bu by bV @@ -38567,7 +38562,7 @@ du du bj bj -aT +az bu by by @@ -38581,7 +38576,7 @@ bj bj bu bu -aT +az bu bu bu @@ -38594,15 +38589,15 @@ aN aN aQ ej -aT +az aY aQ aN aN aN aP -aT -aT +az +az aN aG aG @@ -38792,20 +38787,20 @@ aG aG aG aM -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu by by @@ -38819,12 +38814,12 @@ bj bj bj ci -aT +az bm bj bj bj -aT +az bu by by @@ -38838,7 +38833,7 @@ bj dy fp bu -aT +az bu gf bj @@ -38847,14 +38842,14 @@ bj bj bj bu -aT -aT -aT -aT +az +az +az +az ej -aT -aT -aT +az +az +az aN aN aN @@ -39049,20 +39044,20 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bu bu @@ -39076,12 +39071,12 @@ bu bu bu bu -aT +az bj bj bj bj -aT +az bu by dW @@ -39095,7 +39090,7 @@ fe bk bu bu -aT +az bu bj bj @@ -39104,14 +39099,14 @@ dy bj bj bu -aT -aT +az +az aY -aT -aT -aT -aT -aT +az +az +az +az +az aN aN aG @@ -39307,19 +39302,19 @@ aG aG aN aR -aT -aT -aT -aT -aT +az +az +az +az +az bf -aT -aT +az +az bj bj bj bj -aT +az bu bA bj @@ -39333,12 +39328,12 @@ bj cY cY bu -aT +az bj bj bj bj -aT +az bu bu bu @@ -39352,7 +39347,7 @@ fe bj fp bu -aT +az bu bj bj @@ -39361,10 +39356,10 @@ bj bl bj bu -aT +az ej -aT -aT +az +az aQ aN aN @@ -39564,19 +39559,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bB bj @@ -39590,7 +39585,7 @@ bj bj bj dj -aT +az bj bj bk @@ -39609,7 +39604,7 @@ fe bj bu bu -aT +az bu bj bj @@ -39618,10 +39613,10 @@ bj bj bj bu -aT -aT -aT -aT +az +az +az +az aN aG aG @@ -39821,19 +39816,19 @@ aa aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bD bj @@ -39847,12 +39842,12 @@ bj bj bj dj -aT +az bj bj bj bj -aT +az bu bu bu @@ -39866,7 +39861,7 @@ fe bj bu bu -aT +az bu bj bl @@ -39875,7 +39870,7 @@ bj bp bj fs -aT +az aN aP aN @@ -40078,19 +40073,19 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aY -aT +az bj bj bj bj -aT +az bu bB bj @@ -40104,12 +40099,12 @@ bj bj bj bu -aT +az bj bj bj bm -aT +az bu dG dG @@ -40123,7 +40118,7 @@ bj bj fp bu -aT +az bu bj bj @@ -40132,7 +40127,7 @@ bj bj bj en -aT +az aN aN aG @@ -40335,19 +40330,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bD bj @@ -40361,12 +40356,12 @@ bj cZ cZ bu -aT +az bj bj bj bj -aT +az bu by by @@ -40380,7 +40375,7 @@ bj bj bu fs -aT +az bu bj gj @@ -40591,20 +40586,20 @@ aa aa aG aN -aT -aT -aT -aT +az +az +az +az aZ -aT -aT -aT -aT +az +az +az +az bj bj bj bj -aT +az bu bu bu @@ -40618,12 +40613,12 @@ bu bu bu bu -aT +az bj bj bj bj -aT +az bu by by @@ -40637,7 +40632,7 @@ bj bj fp bu -aT +az bu bj bj @@ -40849,38 +40844,38 @@ aa aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu by by @@ -40894,7 +40889,7 @@ bj bj bu bu -aT +az bu bj bl @@ -41106,14 +41101,14 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj @@ -41137,7 +41132,7 @@ bj bj bj bj -aT +az bu by by @@ -41151,7 +41146,7 @@ bj bj fp bu -aT +az bu bj dP @@ -41160,7 +41155,7 @@ bj bj bj bu -aT +az aN aN aG @@ -41362,14 +41357,14 @@ aa aa aG aG -aT -aT -aT -aT +az +az +az +az aY -aT -aT -aT +az +az +az bi bl bj @@ -41394,7 +41389,7 @@ bj bj bj bj -aT +az bu bu bu @@ -41417,7 +41412,7 @@ bj bj bj bu -aT +az aN aN aG @@ -41620,14 +41615,14 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj @@ -41651,20 +41646,20 @@ bj bj bj bj -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aY dt dt dt dt fr -aT +az aY fs bu @@ -41674,7 +41669,7 @@ eM bu bu bu -aT +az aN aN aG @@ -41877,14 +41872,14 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj @@ -41908,31 +41903,31 @@ bj cA bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az aY -aT +az fk aZ -aT +az fQ dt dt fC -aT -aT +az +az aY -aT -aT -aT -aT +az +az +az +az aN aG aG @@ -42133,39 +42128,39 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bu bu @@ -42188,8 +42183,8 @@ bu bu bu bu -aT -aT +az +az aN aG aG @@ -42390,20 +42385,20 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bu bu @@ -42417,12 +42412,12 @@ bu bu bu bu -aT +az bj bj bj bj -aT +az bu bj bj @@ -42435,7 +42430,7 @@ bj bj bj bu -aT +az bu fY bj @@ -42445,7 +42440,7 @@ bj bj bj bu -aT +az aN aN aG @@ -42648,19 +42643,19 @@ aa aG aN aN -aT -aT -aT -aT -aT +az +az +az +az +az aZ -aT -aT +az +az bj bj bj bj -aT +az bu bF bF @@ -42674,12 +42669,12 @@ bj da bj bu -aT +az bj bj bj bj -aT +az bu dH bj @@ -42702,7 +42697,7 @@ bj bj bj bu -aT +az aN aN aG @@ -42905,19 +42900,19 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bm bj bj -aT +az bu bF bF @@ -42931,12 +42926,12 @@ bj bD bj bu -aT +az bj bj bj bj -aT +az bu bj bj @@ -42949,7 +42944,7 @@ bj bj bj bu -aT +az bu bj bj @@ -42959,7 +42954,7 @@ bj cA bj bu -aT +az aN aN aG @@ -43162,19 +43157,19 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bF bF @@ -43188,12 +43183,12 @@ bj db bj bu -aT +az bj bj bm bj -aT +az bu dH bj @@ -43206,7 +43201,7 @@ eF bj bj eM -aT +az bu bj bj @@ -43216,7 +43211,7 @@ bj bj bj eM -aT +az aN aN aG @@ -43419,19 +43414,19 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bF bF @@ -43445,12 +43440,12 @@ bj bj bj dj -aT +az bj bj bj bj -aT +az bu bj bj @@ -43463,7 +43458,7 @@ bj bj bj bu -aT +az bu bj dy @@ -43473,7 +43468,7 @@ gw bj bj dj -aT +az aN aN aG @@ -43677,18 +43672,18 @@ aG aG aN aN -aT -aT -aT +az +az +az aZ -aT -aT -aT +az +az +az bj bj bj bj -aT +az bu bF bF @@ -43702,12 +43697,12 @@ bj da bj dj -aT +az bj bj bj bj -aT +az bu dH bj @@ -43720,7 +43715,7 @@ dH bj bj bu -aT +az eM bj cA @@ -43730,8 +43725,8 @@ bj bj bj dj -aT -aT +az +az aN aG aG @@ -43933,19 +43928,19 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bF bF @@ -43959,12 +43954,12 @@ bj bD bj dj -aT +az bj bj bj bj -aT +az bu bj bj @@ -43987,8 +43982,8 @@ dy bk bj bu -aT -aT +az +az aN aG aG @@ -44190,19 +44185,19 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bm -aT +az bu bF bF @@ -44216,12 +44211,12 @@ bj db bj bu -aT +az bj bj bj bj -aT +az bu dH bj @@ -44244,7 +44239,7 @@ bj bj bj bu -aT +az aN aN aN @@ -44448,18 +44443,18 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bD bj @@ -44473,12 +44468,12 @@ bj bj bj bu -aT +az bj bj bj bj -aT +az bu bj bj @@ -44501,7 +44496,7 @@ bj bj bj bu -aT +az aN aN aN @@ -44704,19 +44699,19 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az gH bD bj @@ -44730,12 +44725,12 @@ bj da bj bu -aT +az dv bj bj bj -aT +az bu dH bj @@ -44748,7 +44743,7 @@ dH bj bj bu -aT +az bu bj bj @@ -44758,8 +44753,8 @@ dP bj bj bu -aT -aT +az +az aN aN aG @@ -44961,19 +44956,19 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bk bj bj bj -aT +az bu bD bj @@ -44987,12 +44982,12 @@ bj bD bj bu -aT +az bj bk bj bj -aT +az bu bj bj @@ -45005,7 +45000,7 @@ bj bj bj bu -aT +az bu bj bj @@ -45015,8 +45010,8 @@ bj bj bj bu -aT -aT +az +az aN aN aG @@ -45219,18 +45214,18 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bG bj @@ -45244,12 +45239,12 @@ bj db bj gH -aT +az bj bj bj bj -aT +az bu bu bu @@ -45262,7 +45257,7 @@ bu bu bu bu -aT +az bu bu dm @@ -45475,19 +45470,19 @@ aG aG aN aN -aT -aT -aT +az +az +az ba -aT -aT +az +az bf -aT +az bj bj bj bj -aT +az bu bD bj @@ -45501,37 +45496,37 @@ bj bj bj bu -aT +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az eK -aT -aT -aT +az +az +az fr -aT -aT -aT -aT -aT +az +az +az +az +az dw -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aN aG aG @@ -45731,20 +45726,20 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bH bj @@ -45758,7 +45753,7 @@ bj da bj bu -aT +az bj bj bj @@ -45783,11 +45778,11 @@ bj bj bj bj -aT +az aZ -aT -aT -aT +az +az +az aN aN aG @@ -45989,19 +45984,19 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bk -aT +az bu bI bj @@ -46040,11 +46035,11 @@ bl gk bj bj -aT -aT -aT -aT -aT +az +az +az +az +az aN aG aG @@ -46246,19 +46241,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bD bj @@ -46297,11 +46292,11 @@ bj bj bj bj -aT -aT -aT -aT -aT +az +az +az +az +az aN aG aG @@ -46502,20 +46497,20 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bD bj @@ -46529,7 +46524,7 @@ bj bj bj bu -aT +az bj bj bj @@ -46554,10 +46549,10 @@ bj bj bj bj -aT -aT -aT -aT +az +az +az +az aN aN aG @@ -46760,19 +46755,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bp bj bj -aT +az bu bj bj @@ -46786,7 +46781,7 @@ bj da bj bu -aT +az bj bj bj @@ -47018,18 +47013,18 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bj bj @@ -47043,7 +47038,7 @@ bj bD bj bu -aT +az bj bj bj @@ -47274,19 +47269,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bj bj @@ -47300,7 +47295,7 @@ bj db bj bu -aT +az bm bj bj @@ -47531,19 +47526,19 @@ aG aG aN aN -aT -aT -aT -aT +az +az +az +az aY -aT -aT -aT +az +az +az bj bj bj bj -aT +az bu bj bj @@ -47557,7 +47552,7 @@ bj bj bj bu -aT +az bj bj bl @@ -47787,20 +47782,20 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bj bj @@ -47814,7 +47809,7 @@ bj da bj bu -aT +az bj bj bj @@ -48046,18 +48041,18 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az bj bj bj bj -aT +az bu by by @@ -48071,7 +48066,7 @@ bj bD bj bu -aT +az bj bj bj @@ -48303,18 +48298,18 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az bm bj bj bj -aT +az bu by by @@ -48328,7 +48323,7 @@ bj db bj dj -aT +az bj bj cA @@ -48560,18 +48555,18 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az bm bj bj bj -aT +az bu bJ by @@ -48585,7 +48580,7 @@ bj bj bj dj -aT +az bj bj bj @@ -48816,19 +48811,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bK by @@ -48842,7 +48837,7 @@ bj da bj dj -aT +az bj bj bm @@ -49073,19 +49068,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bL by @@ -49099,7 +49094,7 @@ bj bD bj bu -aT +az bj bj bj @@ -49330,19 +49325,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bM by @@ -49356,7 +49351,7 @@ bj db bj bu -aT +az bj bj bj @@ -49587,19 +49582,19 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bN by @@ -49613,7 +49608,7 @@ bj bj bj bu -aT +az bj bj bj @@ -49843,20 +49838,20 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT +az bu bu bu @@ -49870,7 +49865,7 @@ bu bu bu bu -aT +az bj bj bj @@ -50100,34 +50095,34 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj bj -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bj bj bj @@ -50357,15 +50352,15 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bj bj bj @@ -50615,14 +50610,14 @@ aG aG aN aN -aT -aT -aT -aT +az +az +az +az aZ -aT -aT -aT +az +az +az bj bj bj @@ -50872,14 +50867,14 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bm @@ -51129,14 +51124,14 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az bj bj bj @@ -51385,38 +51380,38 @@ aG aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bu dE bj @@ -51642,38 +51637,38 @@ aa aG aG aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bf -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bu bu bu @@ -51901,36 +51896,36 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az aY -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az cB -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az bu bj dM @@ -52158,36 +52153,36 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aZ -aT -aT +az +az ba -aT -aT -aT -aT -aT +az +az +az +az +az bu bj cA @@ -52415,36 +52410,36 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az dw -aT -aT -aT +az +az +az bu bj bj @@ -52672,36 +52667,36 @@ aG aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az dj bj bj @@ -52929,36 +52924,36 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az dj bj bl @@ -53189,33 +53184,33 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az aZ -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az aZ -aT -aT +az +az bu bj bj @@ -53446,33 +53441,33 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aY -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az bu bj bj @@ -53702,34 +53697,34 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bu bj dP @@ -53959,34 +53954,34 @@ aN aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az bu bj bj @@ -54216,34 +54211,34 @@ aG aG aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az +az +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az +az bu bu dQ @@ -54476,31 +54471,31 @@ aG aG aN aN -aT -aT -aT +az +az +az aN aN -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az aN aN aN -aT -aT -aT -aT -aT -aT -aT -aT -aT -aT +az +az +az +az +az +az +az +az +az +az aN aN aN @@ -54738,25 +54733,25 @@ aN aN aN aN -aT -aT +az +az aN aN aN -aT -aT -aT +az +az +az aN aN -aT -aT -aT -aT +az +az +az +az aN -aT +az aN aN -aT +az aN aN aN diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f7245ef535..404444532e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -24223,6 +24223,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/lapvend, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bgb" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 4e2b009c79..045910cf0a 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -65455,10 +65455,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/kirbyplants/random, -/obj/structure/sign/plaques/kiddie/library{ - pixel_x = -32 - }, /turf/open/floor/wood, /area/library) "cfW" = ( @@ -78882,20 +78878,20 @@ /turf/open/floor/plating, /area/maintenance/port) "cCN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/structure/table, +/obj/item/stack/sheet/metal/five, +/obj/item/circuitboard/machine/paystand, +/obj/item/radio/intercom{ + pixel_y = 26 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/brown{ dir = 4 }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/maintenance/port) +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "cCO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -78908,10 +78904,6 @@ heat_capacity = 1e+006 }, /area/maintenance/port) -"cCP" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/port) "cCQ" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -79915,12 +79907,6 @@ /turf/open/floor/plasteel/dark, /area/library) "cEv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -79931,78 +79917,62 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/library) -"cEw" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/port) "cEx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/structure/table, +/obj/item/storage/secure/briefcase, +/obj/structure/sign/poster/random, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "cEy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/blobstart, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, -/area/maintenance/port) +/area/vacant_room/commissary) "cEz" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/chair/stool, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) +"cEA" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, -/area/maintenance/port) -"cEA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutters"; + name = "Vacant Commissary Shutters" }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel, -/area/maintenance/port) +/area/vacant_room/commissary) "cEB" = ( /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, @@ -80890,16 +80860,18 @@ /turf/open/floor/plasteel/dark/corner, /area/maintenance/port) "cGd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel, -/area/maintenance/port) +/area/vacant_room/commissary) "cGe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -81639,9 +81611,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -81654,88 +81623,86 @@ /turf/open/floor/plasteel, /area/maintenance/port) "cHA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/vacant_room/commissary) "cHB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) -"cHC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/maintenance/port) -"cHD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/maintenance/port) "cHE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - name = "Library Junction"; - sortType = 16 +/obj/structure/closet/secure_closet/personal, +/obj/structure/extinguisher_cabinet{ + pixel_x = -26 }, -/turf/open/floor/plating, -/area/maintenance/port) -"cHF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ - dir = 4 + dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/plasteel, -/area/maintenance/port) +/area/vacant_room/commissary) +"cHF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Vacant Commissary"; + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_y = -24 + }, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "cHG" = ( -/obj/structure/girder, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ +/turf/open/floor/plasteel, +/area/vacant_room/commissary) +"cHH" = ( +/obj/structure/rack, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/machinery/button/door{ + id = "commissarydoor"; + name = "Commissary Door Lock"; + normaldoorcontrol = 1; + pixel_x = -5; + pixel_y = -26; + specialfunctions = 4 + }, +/obj/item/stack/cable_coil/yellow, +/obj/item/wrench, +/obj/item/screwdriver, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) -"cHH" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "cHI" = ( /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; @@ -82102,43 +82069,25 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) -"cIt" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/port) "cIu" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/maintenance/port) "cIv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/maintenance/port) -"cIw" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/closed/wall, +/area/vacant_room/commissary) "cIx" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/maintenance/port) +/turf/closed/wall, +/area/vacant_room/commissary) "cIy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/maintenance/port) +/area/vacant_room/commissary) "cIA" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -83232,7 +83181,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 4 }, /turf/open/floor/plating, /area/maintenance/port) @@ -83281,6 +83230,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cKn" = ( @@ -83289,7 +83241,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -83297,6 +83248,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -83308,10 +83266,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cKp" = ( @@ -83321,6 +83281,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/maintenance/port) "cKq" = ( @@ -83334,7 +83303,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "2-4" }, /turf/open/floor/plating, /area/maintenance/port) @@ -83351,10 +83323,6 @@ /turf/open/floor/plating, /area/maintenance/port) "cKs" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" @@ -83368,6 +83336,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Miscellaneous Storage" + }, /turf/open/floor/plasteel, /area/maintenance/port) "cKt" = ( @@ -84246,7 +84217,12 @@ /area/maintenance/port) "cLL" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port) "cLM" = ( @@ -84254,6 +84230,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/item/radio, /turf/open/floor/plating, /area/maintenance/port) "cLN" = ( @@ -85105,6 +85082,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/space_heater, /turf/open/floor/plasteel, /area/maintenance/port) "cNl" = ( @@ -91104,9 +91082,6 @@ /turf/open/floor/plasteel/white, /area/science/research) "cXw" = ( -/obj/structure/table, -/obj/item/gps, -/obj/item/assembly/flash/handheld, /obj/machinery/status_display/evac{ pixel_y = -32 }, @@ -91114,6 +91089,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/lapvend, /turf/open/floor/plasteel/white, /area/science/research) "cXx" = ( @@ -100440,6 +100416,13 @@ }, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) +"dnV" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "dnZ" = ( /obj/machinery/light/small{ dir = 8 @@ -125453,7 +125436,7 @@ /turf/open/floor/plasteel, /area/medical/medbay/central) "fmW" = ( -/obj/structure/sign/painting/library_secure{ +/obj/structure/sign/painting/library{ pixel_y = 32 }, /turf/open/floor/wood, @@ -125725,10 +125708,31 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/aft) +"hBD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "hCj" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/maintenance/starboard/fore) +"hEK" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/item/flashlight, +/turf/open/floor/plating, +/area/maintenance/port) "hFo" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -125786,6 +125790,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/medbay/central) +"hVv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hZh" = ( /turf/open/space/basic, /area/space/station_ruins) @@ -125866,6 +125880,16 @@ }, /turf/open/floor/engine/vacuum, /area/science/mixing) +"iAP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "iBf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -125991,6 +126015,16 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"iWB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "jdx" = ( /obj/structure/lattice, /obj/structure/grille, @@ -126156,6 +126190,15 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plating, /area/engine/atmos) +"jIP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "jNQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -126178,6 +126221,17 @@ /obj/machinery/chem_master, /turf/open/floor/plasteel/dark, /area/medical/medbay/central) +"jQw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "jRy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -126266,6 +126320,29 @@ /obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/dark, /area/chapel/office) +"kuj" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "commissaryshutters"; + name = "Commissary Shutters Control"; + pixel_x = 26; + pixel_y = -5; + req_access_txt = null + }, +/obj/item/storage/secure/safe{ + pixel_y = 32 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "kvf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -126730,6 +126807,23 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/aft) +"nxi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/port) "nyN" = ( /obj/machinery/vending/kink, /turf/open/floor/plating, @@ -126803,6 +126897,15 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"nZO" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "odz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -126860,6 +126963,15 @@ /obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, /turf/open/floor/engine, /area/science/mixing) +"oLk" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/library) "oMw" = ( /obj/docking_port/stationary/public_mining_dock{ dir = 4 @@ -126975,6 +127087,11 @@ dir = 1 }, /area/science/circuit) +"pnh" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "pok" = ( /mob/living/simple_animal/opossum/poppy, /turf/open/floor/plasteel/grimy, @@ -127045,6 +127162,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"pLE" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "pQm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -127140,6 +127264,25 @@ dir = 5 }, /area/science/circuit) +"qzY" = ( +/obj/structure/table, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/item/stack/packageWrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "qBG" = ( /obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, @@ -127173,6 +127316,11 @@ dir = 9 }, /area/science/circuit) +"rkW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/vacant_room/commissary) "rCv" = ( /turf/open/floor/plasteel/white/side{ dir = 6 @@ -127261,6 +127409,25 @@ /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing) +"svJ" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "sAr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown{ @@ -127276,6 +127443,11 @@ /obj/structure/sign/warning/nosmoking, /turf/closed/wall, /area/medical/surgery) +"sGr" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/vending/snack/random, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "sPd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -127444,6 +127616,14 @@ /obj/structure/sign/warning/vacuum, /turf/closed/wall/r_wall, /area/chapel/office) +"ueh" = ( +/obj/structure/girder, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/port) "upk" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -127519,6 +127699,11 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"uEc" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "uNP" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line{ @@ -127571,6 +127756,18 @@ /obj/item/clothing/under/color/grey, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"vkk" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4; + name = "Library Junction"; + sortType = 20 + }, +/turf/open/floor/plating, +/area/maintenance/port) "voA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -127619,6 +127816,24 @@ /obj/effect/landmark/start/cyborg, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"vza" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutters"; + name = "Vacant Commissary Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/vacant_room/commissary) "vAb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -127723,6 +127938,17 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/circuit) +"wiA" = ( +/obj/machinery/door/airlock{ + id_tag = "commissarydoor"; + name = "Commissary" + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/structure/barricade/wooden, +/turf/open/floor/plating, +/area/maintenance/port) "wlT" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -127909,6 +128135,12 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) +"xzz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/closed/wall, +/area/library) "xDZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -157781,7 +158013,7 @@ cCG cEo cwp cHz -cIt +cqL cKi cLI cNd @@ -158037,9 +158269,9 @@ caG caG caG caG -cHA +cea ceb -cKj +nxi cLI cNc cNc @@ -158294,9 +158526,9 @@ cBa cCH cEp caG -cHB +ceb cjp -cKk +cJZ cLI cNd cNd @@ -158551,9 +158783,9 @@ cBb cxV cEq caG -cHC +cCO cea -cKk +cJZ cLI cNg cOM @@ -158808,9 +159040,9 @@ cBc cCI ehP caG -cHA +cea ceb -cKk +cJZ cLI cNd cNd @@ -159065,9 +159297,9 @@ cBd cCJ cEr caG -cHA +cea cIu -cKl +cKa cLI cNc cNc @@ -159322,9 +159554,9 @@ cBe ckR cEs caG -cHA +cea cjp -cKl +cKa cLI cNh cNh @@ -159579,9 +159811,9 @@ cBf cCK cEt caG -cHB +ceb cjp -cKj +nxi cLI cNh cOO @@ -159836,7 +160068,7 @@ cBg cCL cEu caG -cHD +cJK caE cKm cLI @@ -160092,10 +160324,10 @@ czJ cBh cCK cEv -caG +oLk cHB -cjp -cKk +ueh +vkk cLI cNh cOQ @@ -160347,13 +160579,13 @@ caG caG caG caG -cnL -cEw -caG +xzz +cvl +cvl cHA -ceb -cKk -cLI +rkW +cKh +cLJ cNh cNh cNh @@ -160604,7 +160836,7 @@ cwv cyc czK caG -cCM +qzY cEx cGd cHE @@ -160862,10 +161094,10 @@ cyd czL caG cCN -ccl -ccl +uEc +iWB cHF -ccl +cIv cKo cLL cNj @@ -161118,11 +161350,11 @@ cwx cye czM caG -cCO +hBD cEy -cGe +iAP cHG -cIu +wiA cKp cLM cNk @@ -161375,11 +161607,11 @@ cwy cyf czN caG -cea +kuj cEz -ceb +jQw cHH -cIw +cIv cKq cLN cAV @@ -161632,13 +161864,13 @@ cwz cyg czO caG -cCP -cEA -cjp +cIv cEA +vza +cIv cIx cKr -cLO +hEK cNl cOU cQC @@ -161889,10 +162121,10 @@ caG caG caG caG -caE -caE -caE -caE +sGr +pLE +dnV +pnh cIy cKs cLP @@ -162147,8 +162379,8 @@ cyh bvL bvL bvL -bvL -bvL +hVv +nZO bvL cjw cKt @@ -162404,7 +162636,7 @@ bvM bMP bvM bvM -bvM +svJ bvM bvM bFE @@ -162661,7 +162893,7 @@ brb czP brb brb -brb +jIP brb brb cIA diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm index 0ed1b0203c..6fe0bb5268 100644 --- a/_maps/map_files/LambdaStation/dorms.dmm +++ b/_maps/map_files/LambdaStation/dorms.dmm @@ -2425,8 +2425,8 @@ "go" = ( /obj/machinery/camera/autoname, /obj/structure/railing{ - icon_state = "railing"; - dir = 8 + dir = 8; + icon_state = "railing" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -2572,8 +2572,8 @@ "gO" = ( /obj/machinery/space_heater, /obj/structure/railing/corner{ - icon_state = "railing_corner"; - dir = 8 + dir = 8; + icon_state = "railing_corner" }, /turf/open/floor/plating, /area/maintenance/central) @@ -5594,8 +5594,8 @@ /area/maintenance/solars/starboard) "oy" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 4 + dir = 4; + icon_state = "railing" }, /turf/open/floor/plating, /area/maintenance/central) @@ -7058,8 +7058,8 @@ /area/hydroponics) "sn" = ( /obj/structure/railing/corner{ - icon_state = "railing_corner"; - dir = 8 + dir = 8; + icon_state = "railing_corner" }, /turf/open/floor/plating, /area/maintenance/central) @@ -7083,8 +7083,8 @@ /area/asteroid/nearstation) "sr" = ( /obj/structure/railing/corner{ - icon_state = "railing_corner"; - dir = 4 + dir = 4; + icon_state = "railing_corner" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -12130,8 +12130,8 @@ /area/hallway/secondary/service) "Fw" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 8 + dir = 8; + icon_state = "railing" }, /turf/open/floor/plating, /area/maintenance/central) @@ -13656,8 +13656,8 @@ /area/janitor) "IY" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 8 + dir = 8; + icon_state = "railing" }, /obj/structure/cable{ icon_state = "1-2" @@ -14004,8 +14004,8 @@ /area/vacant_room/commissary) "JT" = ( /obj/docking_port/stationary/public_mining_dock{ - icon_state = "pinonfar"; - dir = 2 + dir = 2; + icon_state = "pinonfar" }, /turf/open/floor/plating, /area/construction/mining/aux_base) @@ -14423,8 +14423,8 @@ /area/crew_quarters/kitchen) "KX" = ( /obj/structure/railing/corner{ - icon_state = "railing_corner"; - dir = 1 + dir = 1; + icon_state = "railing_corner" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -14469,8 +14469,8 @@ /area/hallway/secondary/service) "Le" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 5 + dir = 5; + icon_state = "railing" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -14493,8 +14493,8 @@ /area/crew_quarters/fitness/recreation) "Lg" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 8 + dir = 8; + icon_state = "railing" }, /obj/machinery/power/apc{ areastring = "/area/hallway/secondary/construction"; @@ -15478,8 +15478,8 @@ /area/maintenance/department/crew_quarters/dorms) "NG" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 9 + dir = 9; + icon_state = "railing" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -16723,8 +16723,8 @@ /area/crew_quarters/fitness/recreation) "QT" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 8 + dir = 8; + icon_state = "railing" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -16896,8 +16896,8 @@ /area/gateway) "Rx" = ( /obj/structure/railing/corner{ - icon_state = "railing_corner"; - dir = 8 + dir = 8; + icon_state = "railing_corner" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -16929,8 +16929,8 @@ /area/gateway) "RA" = ( /obj/structure/railing{ - icon_state = "railing"; - dir = 4 + dir = 4; + icon_state = "railing" }, /turf/open/floor/grass, /area/hydroponics/garden/monastery) diff --git a/_maps/map_files/Mafia/mafia_lavaland.dmm b/_maps/map_files/Mafia/mafia_lavaland.dmm index 8c58fb9054..72d2934b4f 100644 --- a/_maps/map_files/Mafia/mafia_lavaland.dmm +++ b/_maps/map_files/Mafia/mafia_lavaland.dmm @@ -61,16 +61,16 @@ "n" = ( /obj/effect/landmark/mafia, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 9 + dir = 9; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/corner, /turf/open/floor/plasteel, /area/mafia) "o" = ( /obj/effect/turf_decal/trimline/brown/filled/end{ - icon_state = "trimline_end_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_end_fill" }, /obj/structure/closet{ desc = "It's a storage unit. For mining stuff. Y'know."; @@ -94,8 +94,8 @@ /area/mafia) "r" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 9 + dir = 9; + icon_state = "trimline_fill" }, /obj/structure/closet{ desc = "It's a storage unit. For mining stuff. Y'know."; @@ -107,8 +107,8 @@ /area/mafia) "s" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 9 + dir = 9; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) @@ -134,31 +134,31 @@ /area/mafia) "w" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/corner, /turf/open/floor/plasteel, /area/mafia) "x" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/plasteel, /area/mafia) "y" = ( /obj/effect/turf_decal/trimline/brown/filled/end{ - icon_state = "trimline_end_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_end_fill" }, /turf/open/floor/plasteel, /area/mafia) "z" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 5 + dir = 5; + icon_state = "trimline_fill" }, /obj/structure/closet{ desc = "It's a storage unit. For mining stuff. Y'know."; @@ -171,70 +171,70 @@ "A" = ( /obj/effect/landmark/mafia, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 6 + dir = 6; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "B" = ( /obj/effect/turf_decal/trimline/brown/filled/end{ - icon_state = "trimline_end_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_end_fill" }, /turf/open/floor/plasteel, /area/mafia) "C" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "D" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 10 + dir = 10; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_corner_fill" }, /turf/open/floor/plasteel, /area/mafia) "E" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_corner_fill" }, /turf/open/floor/plasteel, /area/mafia) "F" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 5 + dir = 5; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "G" = ( /obj/effect/landmark/mafia, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 10 + dir = 10; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "H" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 10 + dir = 10; + icon_state = "trimline_fill" }, /obj/structure/closet{ desc = "It's a storage unit. For mining stuff. Y'know."; @@ -246,8 +246,8 @@ /area/mafia) "I" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 6 + dir = 6; + icon_state = "trimline_fill" }, /obj/structure/closet{ desc = "It's a storage unit. For mining stuff. Y'know."; @@ -260,19 +260,19 @@ "J" = ( /obj/effect/landmark/mafia, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 6 + dir = 6; + icon_state = "trimline_fill" }, /obj/effect/turf_decal/trimline/brown/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_corner_fill" }, /turf/open/floor/plasteel, /area/mafia) "K" = ( /obj/effect/turf_decal/trimline/brown/filled/end{ - icon_state = "trimline_end_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_end_fill" }, /obj/structure/closet{ desc = "It's a storage unit. For mining stuff. Y'know."; @@ -285,34 +285,34 @@ "L" = ( /obj/effect/landmark/mafia, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 5 + dir = 5; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "M" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 10 + dir = 10; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "N" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/trimline/brown/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 4 + dir = 4; + icon_state = "trimline_corner_fill" }, /turf/open/floor/plasteel, /area/mafia) "O" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_corner_fill" }, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 5 + dir = 5; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) @@ -323,8 +323,8 @@ "Q" = ( /obj/effect/landmark/mafia, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 9 + dir = 9; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) @@ -345,31 +345,31 @@ /area/mafia) "S" = ( /obj/effect/turf_decal/trimline/brown/filled/end{ - icon_state = "trimline_end_fill"; - dir = 8 + dir = 8; + icon_state = "trimline_end_fill" }, /turf/open/floor/plasteel, /area/mafia) "T" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) "U" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/trimline/brown/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 1 + dir = 1; + icon_state = "trimline_corner_fill" }, /turf/open/floor/plasteel, /area/mafia) "V" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ - icon_state = "trimline_fill"; - dir = 6 + dir = 6; + icon_state = "trimline_fill" }, /turf/open/floor/plasteel, /area/mafia) diff --git a/_maps/map_files/Mafia/mafia_reebe.dmm b/_maps/map_files/Mafia/mafia_reebe.dmm index e82174ff93..c8f7e0a1ae 100644 --- a/_maps/map_files/Mafia/mafia_reebe.dmm +++ b/_maps/map_files/Mafia/mafia_reebe.dmm @@ -62,8 +62,8 @@ /area/mafia) "n" = ( /obj/structure/chair/brass{ - icon_state = "brass_chair"; - dir = 1 + dir = 1; + icon_state = "brass_chair" }, /turf/open/floor/clockwork/reebe, /area/mafia) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c2a0e5c353..95ef7fb5f0 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13304,13 +13304,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -"aze" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/wood, -/area/library) "azg" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/airless, @@ -14062,18 +14055,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/engine/engineering) -"aAz" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plasteel/cult, -/area/library) "aAA" = ( /obj/docking_port/stationary{ dir = 8; @@ -14907,6 +14888,12 @@ }, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) +"aCi" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/library) "aCj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -16576,14 +16563,17 @@ /turf/open/floor/engine, /area/engine/engineering) "aFE" = ( -/obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/structure/table/wood/fancy/blue, +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 }, -/obj/item/folder, -/obj/item/folder, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/cult, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/turf/open/floor/wood, /area/library) "aFF" = ( /obj/structure/table, @@ -36523,16 +36513,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"bsI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "bsJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -38069,32 +38049,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/library) -"bwe" = ( -/obj/structure/chair/comfy/black{ - dir = 8 +"bwf" = ( +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/wood, /area/library) -"bwf" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30 - }, -/turf/open/floor/plasteel/cult, -/area/library) -"bwg" = ( -/obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/item/folder, -/obj/item/folder, -/turf/open/floor/plasteel/cult, -/area/library) "bwh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/extinguisher_cabinet{ @@ -38943,14 +38903,19 @@ /obj/effect/landmark/start/librarian, /turf/open/floor/wood, /area/library) -"bxW" = ( -/turf/open/floor/plasteel/cult, -/area/library) "bxX" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 +/obj/structure/table/wood/fancy/blue, +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 }, -/turf/open/floor/plasteel/cult, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/wood, /area/library) "bxY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -39797,18 +39762,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/library) -"bzG" = ( -/obj/machinery/door/morgue{ - name = "Study #1" - }, -/turf/open/floor/plasteel/cult, -/area/library) -"bzH" = ( -/obj/machinery/door/morgue{ - name = "Study #2" - }, -/turf/open/floor/plasteel/cult, -/area/library) "bzI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -40511,9 +40464,6 @@ /area/engine/atmos) "bBu" = ( /obj/machinery/vending/coffee, -/obj/machinery/newscaster{ - pixel_y = 32 - }, /turf/open/floor/wood, /area/library) "bBv" = ( @@ -40525,12 +40475,6 @@ /obj/machinery/bookbinder, /turf/open/floor/wood, /area/library) -"bBx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, -/turf/open/floor/wood, -/area/library) "bBy" = ( /obj/structure/sign/directions/command{ dir = 4; @@ -75899,9 +75843,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/status_display/evac{ - pixel_y = 30 - }, /obj/machinery/photocopier{ pixel_y = 3 }, @@ -81614,6 +81555,12 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"iAG" = ( +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/turf/open/floor/wood, +/area/library) "iCn" = ( /obj/machinery/vr_sleeper, /turf/open/floor/plasteel, @@ -82628,12 +82575,11 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) "qBh" = ( -/obj/structure/table, -/obj/item/paicard, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/lapvend, /turf/open/floor/plasteel/white, /area/science/research) "qBq" = ( @@ -103714,8 +103660,8 @@ bnV bql awL bue -aze -bwe +bzE +bzE bGv bHT bwc @@ -103971,8 +103917,8 @@ bod bql bsG bue -bue -bue +aCi +iAG bue bBu bwc @@ -104228,9 +104174,9 @@ boe bql bsH bue -aAz -bxW -bzG +aCi +iAG +bue bzE bwc bEA @@ -104485,8 +104431,8 @@ bof bqu bsz bue -bwg -bxX +aCi +iAG bue bBv bwc @@ -104740,10 +104686,10 @@ bku bml bog bqv -bsI -bue -bue +bsz bue +aCi +iAG bue cUT bwc @@ -105000,8 +104946,8 @@ bqw bsx bue bwf -bxW -bzH +bzE +bzE bzE dCX bwc @@ -105258,11 +105204,11 @@ bsx bue aFE bxX -bue +bzE +bzE +bwc +bwc bBw -bwc -bwc -bBx bue bue bue diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index 5a18682129..d5d116d418 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -435,8 +435,8 @@ /area/engine/atmos) "bm" = ( /obj/machinery/atmospherics/components/binary/valve/on{ - icon_state = "mvalve_map-2"; - dir = 4 + dir = 4; + icon_state = "mvalve_map-2" }, /turf/open/floor/plating, /area/engine/atmos) @@ -1502,8 +1502,8 @@ /area/engine/storage) "gK" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - icon_state = "connector_map-2"; - dir = 8 + dir = 8; + icon_state = "connector_map-2" }, /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating, @@ -1514,8 +1514,8 @@ /area/hallway/secondary/service) "hi" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ - icon_state = "inje_map-2"; - dir = 4 + dir = 4; + icon_state = "inje_map-2" }, /turf/open/floor/plating, /area/construction) @@ -1555,8 +1555,8 @@ /area/hallway/secondary/service) "jA" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 8 + dir = 8; + icon_state = "warningline_white" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1567,8 +1567,8 @@ /area/construction) "jV" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 6 + dir = 6; + icon_state = "warningline_white" }, /turf/open/floor/plating, /area/engine/storage) @@ -1637,8 +1637,8 @@ /area/engine/storage) "qR" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 9 + dir = 9; + icon_state = "warningline_white" }, /turf/open/floor/plating, /area/engine/storage) @@ -1659,15 +1659,15 @@ /area/construction) "sE" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 4 + dir = 4; + icon_state = "warningline_white" }, /turf/open/floor/plating, /area/engine/storage) "td" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 8 + dir = 8; + icon_state = "warningline_white" }, /turf/open/floor/plating, /area/engine/storage) @@ -1704,8 +1704,8 @@ /area/construction) "xB" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 1 + dir = 1; + icon_state = "warningline_white" }, /turf/open/floor/plating, /area/engine/storage) @@ -1720,8 +1720,8 @@ /area/construction) "zZ" = ( /obj/structure/disposalpipe/trunk{ - icon_state = "pipe-t"; - dir = 1 + dir = 1; + icon_state = "pipe-t" }, /obj/machinery/disposal/bin, /turf/open/floor/plating, @@ -1788,12 +1788,12 @@ /area/construction) "EH" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 1 + dir = 1; + icon_state = "warningline_white" }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 4 + dir = 4; + icon_state = "warningline_white" }, /turf/open/floor/plating, /area/engine/storage) @@ -1804,8 +1804,8 @@ "FL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/hidden{ - icon_state = "pipe11-2"; - dir = 4 + dir = 4; + icon_state = "pipe11-2" }, /turf/open/floor/plating, /area/construction) @@ -1896,8 +1896,8 @@ /area/engine/storage) "Qo" = ( /obj/structure/disposalpipe/trunk/multiz/down{ - icon_state = "pipe-down"; - dir = 1 + dir = 1; + icon_state = "pipe-down" }, /turf/open/floor/plating, /area/hallway/secondary/service) @@ -1966,8 +1966,8 @@ /area/construction) "ZQ" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; - dir = 5 + dir = 5; + icon_state = "warningline_white" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 0a73818ab3..895f21e630 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -1407,8 +1407,8 @@ height = 5; id = "laborcamp_home"; name = "fore bay 1"; - width = 9; - roundstart_template = /datum/map_template/shuttle/labour/box + roundstart_template = /datum/map_template/shuttle/labour/box; + width = 9 }, /turf/open/space/basic, /area/space) @@ -1419,8 +1419,8 @@ height = 15; id = "arrivals_stationary"; name = "arrivals"; - width = 7; - roundstart_template = /datum/map_template/shuttle/arrival/box + roundstart_template = /datum/map_template/shuttle/arrival/box; + width = 7 }, /turf/open/space/basic, /area/space) @@ -2325,8 +2325,8 @@ height = 5; id = "mining_home"; name = "mining shuttle bay"; - width = 7; - roundstart_template = /datum/map_template/shuttle/mining/box + roundstart_template = /datum/map_template/shuttle/mining/box; + width = 7 }, /turf/open/space/basic, /area/space) diff --git a/_maps/map_files/generic/SpaceDock.dmm b/_maps/map_files/generic/SpaceDock.dmm index 286ca3e97d..1188aa25fb 100644 --- a/_maps/map_files/generic/SpaceDock.dmm +++ b/_maps/map_files/generic/SpaceDock.dmm @@ -9,9 +9,9 @@ dwidth = 11; height = 22; id = "whiteship_away"; + json_key = "whiteship"; name = "Deep Space"; - width = 35; - json_key = "whiteship" + width = 35 }, /turf/open/space, /area/space) diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm index 125f017a2b..6596539d55 100644 --- a/_maps/shuttles/arrival_kilo.dmm +++ b/_maps/shuttles/arrival_kilo.dmm @@ -75,8 +75,8 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/arrows{ - icon_state = "arrows"; - dir = 1 + dir = 1; + icon_state = "arrows" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -112,8 +112,8 @@ /area/shuttle/arrival) "n" = ( /obj/structure/shuttle/engine/propulsion/left{ - icon_state = "propulsion_l"; - dir = 8 + dir = 8; + icon_state = "propulsion_l" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -124,8 +124,8 @@ /obj/structure/window/shuttle, /obj/structure/grille, /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 8 + dir = 8; + icon_state = "heater" }, /turf/open/floor/plating, /area/shuttle/arrival) @@ -143,8 +143,8 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/arrows{ - icon_state = "arrows"; - dir = 1 + dir = 1; + icon_state = "arrows" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -157,8 +157,8 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/arrows{ - icon_state = "arrows"; - dir = 1 + dir = 1; + icon_state = "arrows" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -194,8 +194,8 @@ /area/shuttle/arrival) "u" = ( /obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion"; - dir = 8 + dir = 8; + icon_state = "propulsion" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -237,8 +237,8 @@ pixel_x = 28 }, /obj/effect/turf_decal/arrows{ - icon_state = "arrows"; - dir = 1 + dir = 1; + icon_state = "arrows" }, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -327,8 +327,8 @@ /area/shuttle/arrival) "G" = ( /obj/structure/shuttle/engine/propulsion/right{ - icon_state = "propulsion_r"; - dir = 8 + dir = 8; + icon_state = "propulsion_r" }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index dcffda7ba2..21bacaedb0 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -198,9 +198,9 @@ dir = 8; dwidth = 6; height = 18; + name = "Birdboat emergency escape shuttle"; port_direction = 4; - width = 14; - name = "Birdboat emergency escape shuttle" + width = 14 }, /obj/structure/fans/tiny, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index b4b22b2ff6..a0b9d63e94 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -545,9 +545,9 @@ dwidth = 11; height = 18; name = "Delta emergency shuttle"; - width = 30; + port_direction = 4; preferred_direction = 2; - port_direction = 4 + width = 30 }, /obj/structure/fans/tiny, /turf/open/floor/plating, diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod_default.dmm index ea0882d0b7..498a4cf764 100644 --- a/_maps/shuttles/escape_pod_default.dmm +++ b/_maps/shuttles/escape_pod_default.dmm @@ -19,10 +19,10 @@ name = "Escape Pod Airlock" }, /obj/docking_port/mobile/pod{ - port_direction = 2; dwidth = 1; - width = 3; - height = 4 + height = 4; + port_direction = 2; + width = 3 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) diff --git a/_maps/shuttles/labour_cog.dmm b/_maps/shuttles/labour_cog.dmm index 10f6561ed3..b98d52f10f 100644 --- a/_maps/shuttles/labour_cog.dmm +++ b/_maps/shuttles/labour_cog.dmm @@ -4,8 +4,8 @@ /area/shuttle/labor) "b" = ( /obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion"; - dir = 1 + dir = 1; + icon_state = "propulsion" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14,8 +14,8 @@ /area/shuttle/labor) "c" = ( /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; - dir = 1 + dir = 1; + icon_state = "heater" }, /obj/structure/window/reinforced, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm index 5609ecfc06..404c9a3666 100644 --- a/_maps/shuttles/mining_kilo.dmm +++ b/_maps/shuttles/mining_kilo.dmm @@ -86,8 +86,8 @@ width = 7 }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /turf/open/floor/mineral/plastitanium, /area/shuttle/mining) @@ -115,8 +115,8 @@ "p" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/general/hidden{ - icon_state = "pipe11-2"; - dir = 8 + dir = 8; + icon_state = "pipe11-2" }, /obj/effect/turf_decal/stripes/corner{ dir = 8 From d646b7535c46919083c1a524c57a07ad9d0cfdf5 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 10 Mar 2021 22:31:53 +0200 Subject: [PATCH 03/35] Makes vampries dust when they can't pay the blood cost, not before --- .../mob/living/carbon/human/species_types/vampire.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 5e07150ce6..5b415196b8 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -53,10 +53,11 @@ C.adjustOxyLoss(-4) C.adjustCloneLoss(-4) return - C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. - if(C.blood_volume <= (BLOOD_VOLUME_SURVIVE*C.blood_ratio)) - to_chat(C, "You ran out of blood!") - C.dust() + if(C.blood_volume < 0.75) + C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. + else + C.dust(FALSE, TRUE) + var/area/A = get_area(C) if(istype(A, /area/chapel)) to_chat(C, "You don't belong here!") From 0f9754840c9a55fb7ede280f55b50d19ede8fd64 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 10 Mar 2021 23:04:16 +0200 Subject: [PATCH 04/35] wrong way, whoops --- code/modules/mob/living/carbon/human/species_types/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 5b415196b8..136ad1ff1a 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -53,7 +53,7 @@ C.adjustOxyLoss(-4) C.adjustCloneLoss(-4) return - if(C.blood_volume < 0.75) + if(C.blood_volume > 0.75) C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. else C.dust(FALSE, TRUE) From afee43789074dbbab707253a87ceea1e0b47bca5 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 10 Mar 2021 23:18:45 +0200 Subject: [PATCH 05/35] Fixes statpanel spans too --- code/modules/mob/living/carbon/human/species_types/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 136ad1ff1a..9a151118ef 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -126,7 +126,7 @@ . = ..() var/obj/item/organ/heart/vampire/darkheart = getorgan(/obj/item/organ/heart/vampire) if(darkheart) - . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." + . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." /obj/item/organ/heart/vampire From c8c33207891b3ba23ff6745fd86514747df5d46a Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 14 Mar 2021 15:17:47 -0700 Subject: [PATCH 06/35] Buffed supermatter surge 50x. --- code/modules/events/supermatter_surge.dm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm index d54fc4dcd2..6b0a093440 100644 --- a/code/modules/events/supermatter_surge.dm +++ b/code/modules/events/supermatter_surge.dm @@ -13,11 +13,27 @@ var/power = 2000 /datum/round_event/supermatter_surge/setup() - power = rand(200,4000) + if(prob(70)) + power = rand(200,100000) + else + power = rand(200,200000) /datum/round_event/supermatter_surge/announce() - if(power > 800 || prob(round(power/8))) - priority_announce("Class [round(power/500) + 1] supermatter surge detected. Intervention may be required.", "Anomaly Alert") + var/severity = "" + switch(power) + if(-INFINITY to 100000) + var/low_threat_perc = 100-round(100*((power-200)/(100000-200))) + if(prob(low_threat_perc)) + if(prob(low_threat_perc)) + severity = "low; the supermatter should return to normal operation shortly." + else + severity = "medium; the supermatter should return to normal operation, but check NT CIMS to ensure this." + else + severity = "high; if the supermatter's cooling is not fortified, coolant may need to be added." + if(100000 to INFINITY) + severity = "extreme; emergency action is likely to be required even if coolant loop is fine." + if(power > 20000 || prob(round(power/200))) + priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert") /datum/round_event/supermatter_surge/start() GLOB.main_supermatter_engine.matter_power += power From 6f6eedb92ca08f2921448c9804b79303073c8e8e Mon Sep 17 00:00:00 2001 From: Artur Date: Tue, 16 Mar 2021 06:47:39 +0200 Subject: [PATCH 07/35] tweaks vampires not to die from bloodloss --- .../mob/living/carbon/human/species_types/vampire.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 9a151118ef..26750ea774 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -3,7 +3,7 @@ id = SPECIES_VAMPIRE default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD,HAS_FLESH,HAS_BONE) - inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) + inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH,TRAIT_NOMARROW) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("mcolor" = "FFFFFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None") exotic_bloodtype = "U" @@ -53,8 +53,8 @@ C.adjustOxyLoss(-4) C.adjustCloneLoss(-4) return - if(C.blood_volume > 0.75) - C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. + if(C.blood_volume > 0.5) + C.blood_volume -= 0.5 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume. else C.dust(FALSE, TRUE) From b4969c4770804d14cc8f75d2ec96eb157cda8532 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 12:40:25 -0400 Subject: [PATCH 08/35] Fixes auto-calling for non-heads and adds secure holopads --- _maps/map_files/BoxStation/BoxStation.dmm | 36 ++++++++--------- .../map_files/Deltastation/DeltaStation2.dmm | 32 +++++++-------- _maps/map_files/MetaStation/MetaStation.dmm | 39 +++++++++---------- _maps/map_files/PubbyStation/PubbyStation.dmm | 10 ++--- code/game/machinery/hologram.dm | 6 +-- .../circuitboards/machine_circuitboards.dm | 2 +- 6 files changed, 62 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index eb194cf5cf..d99e42beb7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1000,7 +1000,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "act" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acu" = ( @@ -3551,7 +3551,7 @@ /turf/open/floor/plasteel, /area/security/brig) "agU" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agV" = ( @@ -19903,7 +19903,6 @@ /turf/open/floor/plasteel, /area/bridge) "aVk" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "4-8" }, @@ -19913,6 +19912,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/plasteel, /area/bridge) "aVl" = ( @@ -22726,10 +22726,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bcf" = ( -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "bcg" = ( @@ -23322,10 +23322,10 @@ /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet/locker) "bdK" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/bridge/meeting_room) "bdL" = ( @@ -24557,10 +24557,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bgX" = ( @@ -28662,7 +28662,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bqB" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "bqC" = ( @@ -32045,7 +32045,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "byr" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "bys" = ( @@ -32135,13 +32135,13 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "byC" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "byD" = ( @@ -35876,13 +35876,13 @@ /turf/open/floor/engine, /area/science/storage) "bGZ" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bHa" = ( @@ -40809,8 +40809,8 @@ /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bTI" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/tcommsat/computer) "bTJ" = ( @@ -45387,7 +45387,6 @@ name = "Privacy Shutters Control"; pixel_y = 26 }, -/obj/machinery/holopad, /obj/machinery/light{ dir = 1 }, @@ -45401,6 +45400,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "cfI" = ( @@ -49628,12 +49628,12 @@ /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ctJ" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "2-8" }, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "ctK" = ( @@ -50018,9 +50018,9 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cuC" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cuD" = ( @@ -50075,12 +50075,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cyborg, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cuH" = ( @@ -50106,10 +50106,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cuJ" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cuK" = ( @@ -50676,8 +50676,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/hallway) "cvU" = ( @@ -50932,10 +50932,10 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "cwB" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 94699a7a00..6965d3d0af 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -25899,7 +25899,6 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "aVU" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -25907,6 +25906,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "aVV" = ( @@ -36419,7 +36419,6 @@ /turf/open/floor/plasteel/dark, /area/aisat) "boh" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -36430,6 +36429,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "boi" = ( @@ -37166,13 +37166,13 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bpv" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bpw" = ( @@ -46877,7 +46877,6 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "bEg" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -46888,6 +46887,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bEh" = ( @@ -48308,12 +48308,12 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "bFZ" = ( -/obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bGa" = ( @@ -54052,10 +54052,10 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "2-8" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOL" = ( @@ -54114,7 +54114,6 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bOR" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-4" }, @@ -54123,6 +54122,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bOS" = ( @@ -56069,8 +56069,8 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bRZ" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bSa" = ( @@ -58451,7 +58451,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/effect/landmark/start/cyborg, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -58463,6 +58462,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bVy" = ( @@ -58795,7 +58795,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58806,6 +58805,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "bVT" = ( @@ -64575,7 +64575,6 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ceH" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -64586,6 +64585,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ceI" = ( @@ -66125,11 +66125,11 @@ /turf/open/floor/plasteel, /area/security/brig) "chd" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/effect/turf_decal/bot, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/security/brig) "che" = ( @@ -66303,7 +66303,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -66317,6 +66316,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "cho" = ( @@ -67663,10 +67663,10 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cjC" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cjD" = ( @@ -102510,10 +102510,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "drY" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "drZ" = ( @@ -107086,7 +107086,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -107094,6 +107093,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "dAd" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c2a0e5c353..7f8e7c1d8a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3710,7 +3710,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agS" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3721,6 +3720,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agT" = ( @@ -3795,11 +3795,11 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "agZ" = ( -/obj/machinery/holopad, /obj/structure/chair{ dir = 1 }, /obj/effect/landmark/start/head_of_security, +/obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "aha" = ( @@ -9617,8 +9617,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/engine/gravity_generator) "arR" = ( @@ -20575,7 +20575,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aOc" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aOd" = ( @@ -21700,7 +21700,7 @@ /area/quartermaster/qm) "aQs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/quartermaster/qm) "aQt" = ( @@ -25578,7 +25578,7 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "aYe" = ( @@ -27503,7 +27503,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bbv" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -27514,6 +27513,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bbw" = ( @@ -30698,7 +30698,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/holopad, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bhz" = ( @@ -31161,8 +31160,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bip" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "biq" = ( @@ -33899,12 +33898,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bnC" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bnD" = ( @@ -34887,11 +34886,11 @@ /turf/open/floor/plasteel/dark, /area/aisat) "bpF" = ( -/obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "bpG" = ( @@ -34937,8 +34936,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/item/beacon, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "bpL" = ( @@ -37489,9 +37488,9 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "buG" = ( -/obj/machinery/holopad{ - pixel_x = 9; - pixel_y = -9 +/obj/machinery/holopad/secure{ + pixel_x = 15; + pixel_y = -15 }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -39670,7 +39669,6 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bzq" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -39681,6 +39679,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bzr" = ( @@ -43456,13 +43455,13 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "bHE" = ( -/obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "bHF" = ( @@ -58787,7 +58786,7 @@ /area/science/explab) "cmX" = ( /obj/structure/window/reinforced, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/aisat) "cmY" = ( @@ -61251,13 +61250,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/holopad, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "crA" = ( @@ -63638,7 +63637,7 @@ }, /area/crew_quarters/heads/hor) "cvU" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 8e23df2e5f..aef188164e 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3,9 +3,9 @@ /turf/open/space/basic, /area/space) "aab" = ( -/obj/machinery/holopad, /obj/effect/landmark/start/cyborg, /mob/living/simple_animal/bot/secbot/pingsky, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "aac" = ( @@ -999,7 +999,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/white, /area/ai_monitored/turret_protected/ai) "acs" = ( @@ -11793,7 +11793,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "aBn" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "aBo" = ( @@ -12592,7 +12592,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCR" = ( -/obj/machinery/holopad, +/obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCS" = ( @@ -12995,7 +12995,6 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aDM" = ( -/obj/machinery/holopad, /obj/machinery/camera/motion{ c_tag = "AI Upload Center"; dir = 1; @@ -13008,6 +13007,7 @@ name = "Station Intercom (AI Private)"; pixel_y = -28 }, +/obj/machinery/holopad/secure, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aDN" = ( diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 4a576c5a6e..853bd73eac 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(network_holopads) var/secure = FALSE /// If we are currently calling another holopad var/calling = FALSE -/* + /obj/machinery/holopad/secure name = "secure holopad" desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls." @@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(network_holopads) var/obj/item/circuitboard/machine/holopad/board = circuit board.secure = TRUE board.build_path = /obj/machinery/holopad/secure -*/ + /obj/machinery/holopad/tutorial resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_1 = NODECONSTRUCT_1 @@ -372,7 +372,7 @@ GLOBAL_LIST_EMPTY(network_holopads) if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2))) HC.Answer(src) break - if(!secure) //HC.head_call && + if(HC.head_call && !secure) HC.Answer(src) break if(outgoing_call) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index dcd0cda233..286506a7d1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -472,7 +472,7 @@ build_path = /obj/machinery/holopad secure = FALSE else - build_path = /obj/machinery/holopad //secure + build_path = /obj/machinery/holopad/secure //secure secure = TRUE to_chat(user, "You [secure? "en" : "dis"]able the security on the [src]") . = ..() From 508210e3ec2431e88c9a0e84221e4b511d4af6e4 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 13:01:49 -0400 Subject: [PATCH 09/35] buffs particle defender --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index d7212f61d2..5934cfdc03 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -107,7 +107,7 @@ /obj/item/stock_parts/cell/pumpaction //nice number to achieve the amount of shots wanted name = "pump action particle blaster power supply" - maxcharge = 1200 + maxcharge = 1500 //PUMP ACTION DISABLER @@ -153,7 +153,7 @@ /obj/item/ammo_casing/energy/laser/pump projectile_type = /obj/item/projectile/beam/pump - e_cost = 350 + e_cost = 300 select_name = "kill" pellets = 6 variance = 15 @@ -189,5 +189,5 @@ name = "disabling blast" icon_state = "disablerslug" color = null - stamina = 13 + stamina = 16 range = 6 From 679d00f7871936fcdcec723a886fca0c49da927b Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 13:48:21 -0400 Subject: [PATCH 10/35] rebalances after further testing --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index 5934cfdc03..efd43eb839 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -189,5 +189,5 @@ name = "disabling blast" icon_state = "disablerslug" color = null - stamina = 16 + stamina = 15 range = 6 From 1f668a047326eff918cb5771e41738f6d109c174 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 14:11:50 -0400 Subject: [PATCH 11/35] lowers number of shots back to 8 from 10 --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index efd43eb839..e5b81806e6 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -107,7 +107,7 @@ /obj/item/stock_parts/cell/pumpaction //nice number to achieve the amount of shots wanted name = "pump action particle blaster power supply" - maxcharge = 1500 + maxcharge = 1200 //PUMP ACTION DISABLER From 5fa06109ac6df76e455a34a51e048c1d89f76042 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 17 Mar 2021 15:49:57 -0500 Subject: [PATCH 12/35] lemme get uh --- code/modules/research/designs/mining_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 53fa5b21ea..b0d213969e 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -9,7 +9,7 @@ build_type = IMPRINTER materials = list(/datum/material/glass = 1000) build_path = /obj/item/circuitboard/computer/cargo/express - category = list("Mining Designs") + category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_CARGO /datum/design/bluespace_pod @@ -19,7 +19,7 @@ build_type = PROTOLATHE materials = list(/datum/material/glass = 1000) build_path = /obj/item/disk/cargo/bluespace_pod - category = list("Mining Designs") + category = list("Electronics") departmental_flags = DEPARTMENTAL_FLAG_CARGO /datum/design/drill From dd44ebae465b6e6132f58cc7cf7fea2864342104 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 17 Mar 2021 16:10:32 -0500 Subject: [PATCH 13/35] peak funny --- code/game/objects/structures/ghost_role_spawners.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index fadf33cb85..b8d14a6555 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -676,7 +676,6 @@ ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT) ADD_TRAIT(new_spawn, TRAIT_EXEMPT_HEALTH_EVENTS, GHOSTROLE_TRAIT) ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still eligible for ghost roles popups. - ADD_TRAIT(new_spawn, TRAIT_PACIFISM, GHOSTROLE_TRAIT) to_chat(new_spawn,"Ghosting is free!") var/datum/action/toggle_dead_chat_mob/D = new(new_spawn) D.Grant(new_spawn) From 361acfd904f4131420f86ebba447c14ca94fa65d Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 17 Mar 2021 16:15:38 -0500 Subject: [PATCH 14/35] beaker fix --- icons/obj/reagentfillings.dmi | Bin 4991 -> 5028 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 1ac941bae39a554845a653eb9b1ce074a365e991..0010f08f3beb51956313852e8655150beb5d4c9b 100644 GIT binary patch delta 4340 zcmX|Ddpy(o|KH55Fsl@uTsxiODAzP0&xRsXsEtM{=F>{;G=%Q0fHI+=}a-=3C zF*Y_)DRL><+-4-kMsu6X?DGB8q$ z!I6D}X!2EIHPXN4`8LvBKixFh&d``z=xepS`AwaxS2Qo*`{R>&-xx2+4NJT}~ZX!ukQ8U99gcd8IT&t&+d9*T90*raN@$K?7|>=w;8 zE#?2HoEqyqZRlA>6quwYZFZ)9l=C~S;kmN}58tkE;{CaQ6z6W(su+600t3QR(@o}V z20yPklY-umv}2^yv2Ba3uDpcYzu0P)&xoPB=WoOtfBg6Rl}BH0nGvY!x7+!Lnmmgw z7ce$>2Vh7Ek;{V0D_W5@xosF?J9Z6YPiUqV-8PumGLLi$C|K;p>A~AoKjfx)fp(>4zzdmqn$k$rIE6R?2z-U-? zx8B%DyGTC*rj>hA&)I8MqP#t#WM^l>d_=?EQ^p_bGH9Rn?QSbN$BW)Y-??Vzp#OKV z(4tP<+tKQ@a4HEPL8eBqpNt`9C+{hk0q=v0y&Z9Sp`fa-w^kdMrGY6~4zi)Nf#Dvx{1?1K3U-rB!-V1ay)}OrNv;<>u zZqQ*%A>{dvFeU3{QGT`)M@25tgKMUk3k)37$rV)#+b$e?z^F?3-UE*h=4UM1_N@FN zkXzNZX%0Y$gaa_={PNhr{0(Y+@`PV#Gug}Zq=_Ns-JYu z#pARH+SkiAzN^&Uho@lPmThCFA7%o%u9L@zdFq4@cBS8um^dy0wMu;&EU3#Pik;YB zxUZJsqZr2_v{IwV6qV;t!l(Qr9?vE}wk4SWOkq^VNqE}}ETn1&>^m72MA=eV4&P6; zH`BHmMHKWYT^k2)S+5BWDfxE9ngB%@6Po3I0e0e{8OkBn&ESE-WmCapdNoO(taG1t z^GB?pst9L@-Vvo&K_r$Abr;w*e-|F(02vD0D-e{hiXMU&&&YF+UW{B4_3UHF=KWZn zx(oJ*W=M+lS;!8UqVmGSsjZOyw${@YrZ-MaRFlb{J0qAMJU!9qXSGsj)o*Zo`p7f# z1%&Vx6ee%3NN`luC%k}d0b=b#Mz3am__p@aHt_LOYF56wR=@9|+=m?#i{qM_n%%*y zs%>K#rNn7``YoPj(evQzT$F6hBUvI6wo62_>J0Ivp+PMzT*$gtM~sP*3=Lenr((0b!{UDO?G3L>LhUtcokhf(t8h37Zf6fcTjwD?F*w?RL z8@ABv>j9q~Z;UpK&lEzIovwzShadVDnwfJvS;*^K92Xj$P1@!RAJc9Y8lCSHG&D8_ zBt^}%ZdS^MvVf;XIJOuf;+CoFoy?f)6$%^a;}xBJ(^iDgJDP*c62k6g}>vZ;x#@i*ar9}(sJJLYU1k`-es}tTgfUrSVuw#7r*LCuhQ< zw2C;$k%$*v*0Fl5;=K>SXPUxE`x_-*=s@;87bN~&`|H4s2LtdQ4J1G&4yV%TX}YjV znX8GZX)jpNs#H#YTQX}?^GrnV{?Z(Gy$mAHwEfZuS{Vu3laic#)TlJR@3l=TmF7=x zXms`P@R;r-BBy)V?1dgg8ptfo>F&@sq7yH3=u&q8w-Qy5o%Umxu;kl9cd`AiJ4DgfErG~~H^cM0#%#*on?b^xg0Stj&)yl;~QVQ zSHk={FN7-stj-(-t__{pmkO-U zQtr=HWPYm>jO<%c8}qE?EmNVM5VRmWE#GgUzO5}!Rllf+|@oc#sF%WL3EWI<0^!(NbSQ_sS%4Fl8?6=E1E z@}ZHyzv$E(?&&e^ zB*;zNyu3XBO<)sJh#ague766x0$+lBeX}@m-l+eK<}ZPy*qhpyb^IhjiZMs$(=C@p@q)eY99VV_ou+dZ zV={eYh32D~A5PN^JMIJOgulYQ90uQoFmH7{?eUd$Rc=g@WY<9H>| zK5tnr=ngd$OdOpyxCu0Tr)Q?16It*0#R2itpkVTwnhCa>bpeQD{_V{nH^GxMbYQd? z`S*mUSgfth%>ya9t`CeN=~|KW{+Pzwc9ivR(Dw)(jpoRdb@%}62%zj>ZSRCQWB>_Ggcn@f9RsD` zGPtgD$aQx|BzpqX!=#qgYBajGmKK;Zv2cQ+Bm~dB`lIfP2qH^-@rEbuauj&S1 z1K=Y}u~PXOYT-NS{%Usl1Uvj_c_wnwLKeMP*N`vbl~+l3D=EzN#U~F9Z@^kTE)eTy ziAf!Q=I@X85Vm>;#CMI|Jm4jhm5jmr8FYeauRR^C5xo4XH> zIAH4w`F=un;w@4u<;Qn*=S-dc6{Av_A~V`*SritZWq>~?mk8(=+rA)^>FSj-u~3WO z>miq@zT6W1TvlxSy*};q+MH;~t4c1h*S)Y3#H^$U(+7R*C}9@Pl416jWxzQ}oW&Jz zA~470Fa`2FGVB;bMBjIX#>01y%Jlq5p##QvOd*et?=FKe)0a7K7o_&dI*`L326`Z1 z^uZJQ6m}EX3YtI@&2W!%dGO7OF3do`cNMJPWkb5Xr92ezFH6U4eE*~YUbeo@k$p;? z0i?nz*)1PUIvc6*!T>Vm?!P+Ob~OgIJp*6hqxrIh!ccX5K`~c{I&Z0KEe2!IkCdgA z0qH+=>_JE1!=^lU(}cj2kd-^;K3a-U)%+$9vc7&AZR@vBT5Y226&}2uBZyOm_tJ z;=#eJ!Kgk?HbhbRlrF(^^Y8yfVFaK#aYe^D`2NGt&CN@HNHVVT^F=LLLndyzxV|9K zpO6}Yi?4~-(di2|fjgpTd*hyJrxJr`tH)&;#e7TGcleZ3)#G|Al^r^#{9hF8OzaDP zFK-4Cv9Tm>${{^;+6@AFa>Ksi1m8)2)|h_*h_NkwCPjfDvl}B9*ZqT{NeFE( zNt4a!)UUWN-T?4XNXtPs)My_Owh^-{XjRf=TQE7H`r`KVG)9_WU4IV0JJ|B4WW4|4 zo`AHt314{UkQZYO9Q;xEtLi~3x@f;SCU$|V+6I}lTlTzy!P%)Qc+9Vd9_i{S6Gsr9=O-E0LJV* z$oGU^s-p(IQ-{5(n(9 zKWHM}H~wab=Z(gE7HPlJ(w~VIn2%yQShUZR5}Yj)_W;zf#;1MfXe6f;lFW-U1t|jj z!W|=cr+EfL%ZWphvu)H)dtud+-l3nHkQ5ubk8I^b(s6-%{Y`FA&WkCtqgiKH&IN@^v4%@6lOFJ6Og$s`B6&hF6=+~WBgsc~qmyWm4Ad}{147s B+^zrs delta 4291 zcmX|^dpwi<|Hn5oBd3-7j)duaayxV<=iyfARt}LIGTcd`9FiGht|eJFq3)H)xk6bE zp*hY*Y1MA#G>2wJAD-9CL(+o}_e0el9k2jW zlYUP0J7n*aVV#2H~OVQN_#uEFRMJ((>*nrcB3bv_mIO) z>cj*i>PJjnGyV0>e&)!{j%x4tGa<3{o2T1GLtu%!Pki6^Y*E2L?!dk00X_$crs^Lg zi*}@>|J9xJJiybeXi6h<-n%$`mET>Upk;8u#X79>zV)N2LZEaI{&o%jEpc$KhOd(k zQgQyE{{4F%YU&@_az48hI+^e>YfJm@M`gonKOHVSbq1<^+}l;7xvo=Yo5QKP?p=N^ zdd&gUD0FwJ`r;u(E{ZzdwKlhuep~GVsWgOVPP+p@XiL0 zryl%_RMGAF4=M{xU?F#GJAzKRwdq7Z{C!oM1E=Q&oQ;*8T?ml9xf~!nDc{dvmvVodHFj~>bGry@o>&TFQ9z4}8&KcLtmP0=`e zZM(2M31KVP)$wxtZWpH^qwu`u&M>DS^FS9*a&Khcy}GLXws(=;`t9qdliCP zcdUPJ`zUAVJrJV1REy#1dyHC^xB=1*2#H)o}E< zjS}Jtgxm_#CnJ#ufQR!hJPMsBPA}rTGLNvT(^!~vrge0!gH49$DA5G&@0H1_tUN^S zghdo547Bfh47!n%!SMsI1LV&gpFIvUnh%$_@AOG$+DolF!B9vWIyRWq9uPo*fvVQq zm@gUMYt9J8Og9V!nSM?5zmF1w8y&f%ZleiJ?3G$gwVq=B!7pH&x&+QzK22X|NccMudmM&lps#NoOH5W}0W?|O>s1owWe&`#R%wSk;eN(D0$@iIh`%0u`%j>Wg1EjF^4b_3h z&@(j$;n?)BDc!ul6B!~z_)k?L#@Wr&o{c1qL!!nXc-E#pdgm7y!Aw*HPbTv1}b-s zB^KvQ6Yr$Ws29EQyFXb;-*hnWYw>CDqf6F#O*s>AJ^0d5ZNr5R^Wh`s{pbm_X6dG6 zab*t5M*0&E(03%EDk@4u+To$T3A>VC;XXgX>zuG#Wm`-8-VkoNKuq4_ zcmXy*Uuiz=jnyS9>9_XOmFeEnNcM*I6Ko-t>L|1W0C|9v2HMRZQ=i8hB^I@KXKfbtOl_t>LjEHNxKAWZ4k$UA( z&w%3`7?9AuO&-(OAf>&%{j_*(F+dESQ+Syde=#$}zB=%?8f|@j{T>wX^HBv*QIQ$I z5b-~6Sx(MzpUm$Td(NB7WaWiED|y^AZ5QDt0c*5r+t{_yi#jNjo5K-Ibd?G!EL^=3 z)cF2A056(x7lWT*dLjv|D(zzS`}?BTSC0@RIh&gk9ku4-xy3~zPR2i!1a;A_?MI4N zW;m1;UO1iibNRoy6`-Ilyfh;tgX*a%YpCTP+j6&dQ@+aWb>jk)$-IbVfQe>lnnbB8 zXNQG!M&U15UCLxhte$>f{L-LP7PiKrc(CRvC}MXz!i}%>3nOqY!v*+vR2jg&3ZUSSy`WC9QqbCy2BM`?X<x>7$FR$dK539LU4k?frIQ@TdfO4BT>|@c(CM?&x9c%|ZL8mz z8OO#htA6J5o4satw}Ig)?J#RDKocD3K0Yr=B+|;lLe)|XH#7%K=Spp~Cf;yWc(#7( zE@0D#ik4KoyBBW!DwDc1eGTfo^b@kRl?-u@r%6x``P6`FyT;bN(&@8=*>uLKNCxFskq3x$U;$;%WIV- z@#2->q0sOE`R92Mx%{m0^%eZ_2GDm4-iiFn@MY1}$X?4L=i6TSI~ZMVOkw0PLAw6U zbOIGqGBqfO6v`SdB&n6*>>#jnf|7Ojq=j1w{)O(wDq1w1$@37HyzII@9u7%%AQ!jgu9RG6q55bq}S>AdImSGcq)r%T^&Ok6`S_KgnRqGY_=rrrG zqO@z#UB%Qr^%cqdlgd)<X>`hQL64Omzb$&`-kE`*!M#j> zc6ovU%(Qrou?tUVT-Ez%Ghpd)ujk0*Sbl)y?nfe6F?s6kU+7->xRdagK&a9+Ui|}c zZt86fRINAr(IwhL+?wal zgN)=Tn_e88uH0;qc=SfxzUW)}G9or5Aw0;|Ch7L>yBDpgEszqAbb{XI+y0`;fQR5V zb;fL9uc@bc4l(qgJ+x#+G@9#%QhwDUX1)nm%A%F$Eb}<&HX@GoQ?ZPO?){n~C^+no z0w1OiL#bdkTzM)mOfWkjxIR#DjCdy~JaaPj@kzf2)JE4eG_*bgJ1G;^&nH3TsNe+K zTl`p``TgA(m35p{mKfg4?riC^zURgV{K{E&Vvwq>v%12V-0M-6LgwO(Cx-STtK+?n~p7V!*Z3WQ`YaXM{s_)au7FrqURGNE@02Xe*q2*?VY0g~^pzL1)l zEoNgy+RfU$5cE3B)Z3p7O{|RaCx8Ad6HzKIJ=)URwY9!>K5FoeRMs z8eV8=jAR0Ht13r?^66w5oY-BUT?+x*qxvZlFv zyMMN3?w*39=SSrW&UPSEe>^< z-p>mX-R4*)NV>lXg=;qyb3cG`?i#hcGJfU%iUVc@`G3|^1L_YSq9FKzfLpi z`+X++)Xxk@2QN%fCfZtLBb-4L1m(eD_BDbVm~H3YS~ndO~ z_Wh;Tz)jh?+U;iMWUt;kQp7tnNR&F179)TEaFJ8h(60&Sp2k>Z4`1w60O_qGbk?Mv(P01iJ3c<8QMtF7f?MHRM)Z;9&et#^W? zQt^D|)U&#d@pMpOpTIsOZkYn;h*rNUc+l!8vD6N(8+~odtAr%rwhBt5ngzc=`!vAI ze@1O5!AZ3WJ*)mc>bVAxH_GA+NV{G*T1LpUf7w7F@=o>9XRGx>Q1S@N3gCy;RfyoWA-MX*Q)$RI( z&a&-=lHbCNfC$;;=UHbkw5OXpKm%_!qFG4(33iL@|M5I}2tGfG${M@t>o>Sqe9#L14hHBJX#t$MPdk>cfC9E z0)y%}baZfrZH(eZ0rD8bS=MPYQfO)L_0TazM%|DmqfLGE#7ViT1-NP6yJaHf^>sm8 zotb+mmjJnBl?{KJJN__Q5TC=UC1hwvK%C!oCJvUE72o6%3iG^>@1tEHhhfY;L{i64 j7g!ftzc?DYpQNxIs>POS9}QL^;PvNer&ASw_$U4!uPnNf From fca5ede923f97035aa644734820155da5bfaaf2c Mon Sep 17 00:00:00 2001 From: Ludox Date: Thu, 18 Mar 2021 02:32:54 +0100 Subject: [PATCH 15/35] Shitcode has arrived --- code/modules/antagonists/changeling/powers/revive.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/changeling/powers/revive.dm b/code/modules/antagonists/changeling/powers/revive.dm index f193fb6736..3b78960ff1 100644 --- a/code/modules/antagonists/changeling/powers/revive.dm +++ b/code/modules/antagonists/changeling/powers/revive.dm @@ -11,6 +11,14 @@ //Revive from revival stasis /obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user) + var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) + if(!changeling) + return + if(changeling.hostile_absorbed) + to_chat(user, "We cannot muster up the strength to revive ourselves!") + changeling.purchasedpowers -= src + src.action.Remove(user) + return user.cure_fakedeath("changeling") user.revive(full_heal = 1) var/list/missing = user.get_missing_limbs() @@ -27,7 +35,6 @@ user.regenerate_limbs(0, list(BODY_ZONE_HEAD)) user.regenerate_organs() to_chat(user, "We have revived ourselves.") - var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.purchasedpowers -= src src.action.Remove(user) return TRUE From 5201cf6ac5a55522bb6012c803e35b7277e6b7d8 Mon Sep 17 00:00:00 2001 From: GrayRachnid Date: Wed, 17 Mar 2021 21:58:41 -0400 Subject: [PATCH 16/35] stops racism --- code/__DEFINES/say.dm | 5 ++++- code/controllers/configuration/configuration.dm | 8 ++++---- code/modules/mob/living/say.dm | 9 +++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 9403eca2da..d04004c659 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -87,12 +87,15 @@ //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam #define MAX_MESSAGE_LEN 4096 //Citadel edit: What's the WORST that could happen? -#define MAX_FLAVOR_LEN 4096 +#define MAX_FLAVOR_LEN 4096 #define MAX_TASTE_LEN 40 //lick... vore... ew... #define MAX_NAME_LEN 42 #define MAX_BROADCAST_LEN 512 #define MAX_CHARTER_LEN 80 +// Is something in the IC chat filter? This is config dependent. +#define CHAT_FILTER_CHECK(T) (config.ic_filter_regex && findtext(T, config.ic_filter_regex)) + // Audio/Visual Flags. Used to determine what sense are required to notice a message. #define MSG_VISUAL (1<<0) #define MSG_AUDIBLE (1<<1) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 32da3b5938..5d7de05598 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -22,7 +22,7 @@ var/motd // var/policy - // var/static/regex/ic_filter_regex + var/static/regex/ic_filter_regex /datum/controller/configuration/proc/admin_reload() if(IsAdminAdvancedProcCall()) @@ -53,7 +53,7 @@ loadmaplist(CONFIG_MAPS_FILE) LoadMOTD() // LoadPolicy() - // LoadChatFilter() + LoadChatFilter() if (Master) Master.OnConfigLoad() @@ -486,7 +486,7 @@ Example config: continue runnable_modes[M] = probabilities[M.config_tag] return runnable_modes -/* + /datum/controller/configuration/proc/LoadChatFilter() var/list/in_character_filter = list() if(!fexists("[directory]/in_character_filter.txt")) @@ -499,7 +499,7 @@ Example config: continue in_character_filter += REGEX_QUOTE(line) ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null -*/ + //Message admins when you can. /datum/controller/configuration/proc/DelayedMessageAdmins(text) addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 9646796802..7ca2234081 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -90,11 +90,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE) var/ic_blocked = FALSE - /* - if(client && !forced && config.ic_filter_regex && findtext(message, config.ic_filter_regex)) + + if(client && !forced && CHAT_FILTER_CHECK(message)) //The filter doesn't act on the sanitized message, but the raw message. ic_blocked = TRUE - */ + if(sanitize) message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) if(!message || message == "") @@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(ic_blocked) //The filter warning message shows the sanitized message though. to_chat(src, "That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n\"[message]\"") + SSblackbox.record_feedback("tally", "ic_blocked_words", 1, lowertext(config.ic_filter_regex.match)) return var/datum/saymode/saymode = SSradio.saymodes[talk_key] @@ -333,7 +334,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/obj/item/bodypart/rightarm = get_bodypart(BODY_ZONE_R_ARM) if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage) return 0 - + if (get_selected_language() == /datum/language/signlanguage) var/left_disabled = FALSE var/right_disabled = FALSE From 828cfaf58afe150b8a64777e3417ff8641db56e1 Mon Sep 17 00:00:00 2001 From: Ludox Date: Thu, 18 Mar 2021 04:32:33 +0100 Subject: [PATCH 17/35] Cellular Emporium is gone :crab: Prevents you from seeing cellular emporium despite not being able to use it (Post-absorb) --- code/modules/antagonists/changeling/changeling.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 9c0b19cd83..843e5c6db2 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -125,6 +125,8 @@ /datum/antagonist/changeling/proc/remove_changeling_powers() if(ishuman(owner.current) || ismonkey(owner.current)) reset_properties() + QDEL_NULL(cellular_emporium) + QDEL_NULL(emporium_action) for(var/obj/effect/proc_holder/changeling/p in purchasedpowers) if(p.always_keep) continue @@ -139,6 +141,7 @@ /datum/antagonist/changeling/proc/reset_powers() if(purchasedpowers) remove_changeling_powers() + create_actions() //Repurchase free powers. for(var/path in all_powers) var/obj/effect/proc_holder/changeling/S = new path() @@ -225,7 +228,8 @@ /datum/antagonist/changeling/proc/regenerate() var/mob/living/carbon/the_ling = owner.current if(istype(the_ling)) - emporium_action.Grant(the_ling) + if(emporium_action) + emporium_action.Grant(the_ling) if(the_ling.stat == DEAD) chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5)) geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1) From cbaad4bde7ac50e1456308c2b5c450312ea661cd Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Thu, 18 Mar 2021 22:39:05 +0800 Subject: [PATCH 18/35] Update generate_documentation.yml --- .github/workflows/generate_documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index c1b7a2d5e1..0fa3f315be 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -20,7 +20,7 @@ jobs: run: | ~/dmdoc touch dmdoc/.nojekyll - echo codedocs.tgstation13.org > dmdoc/CNAME + echo codedocs.citadel-station.net > dmdoc/CNAME - name: Deploy uses: JamesIves/github-pages-deploy-action@3.7.1 with: From 71d55289592605c70f8d9581de5ff24d7cb8a91c Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 18 Mar 2021 21:50:03 +0000 Subject: [PATCH 19/35] fix --- .../mob/living/carbon/human/innate_abilities/blobform.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm index ed3c7e21d4..1aac2fd02e 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/blobform.dm @@ -37,11 +37,11 @@ to_chat(owner, "There's something stuck to your hand, stopping you from transforming!") return if(IsAvailable()) - transforming = TRUE UpdateButtonIcon() var/mutcolor = owner.get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOBFORM_COLOR) || ("#" + H.dna.features["mcolor"]) if(!is_puddle) if(CHECK_MOBILITY(H, MOBILITY_USE)) //if we can use items, we can turn into a puddle + transforming = TRUE is_puddle = TRUE //so we know which transformation to use when its used ADD_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT) owner.cut_overlays() //we dont show our normal sprite, we show a puddle sprite From d434f60cb38b7dfc7ed68fa2538541002c45a067 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:59:03 -0700 Subject: [PATCH 20/35] Update closets.dm --- code/game/objects/structures/crates_lockers/closets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index be7a457c7d..ed0f6b7012 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -626,4 +626,4 @@ T1.visible_message("[user] dives into [src]!") /obj/structure/closet/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool) - return ..() && opened + return (user in src) From 1f58e1823eec333f4258653aff0341bc0f2073e6 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 18 Mar 2021 17:00:16 -0700 Subject: [PATCH 21/35] Update bodybag.dm --- code/game/objects/items/bodybag.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 428efe4abe..5dc9a3580c 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -16,6 +16,9 @@ if(isopenturf(target)) deploy_bodybag(user, target) +/obj/item/bodybag/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool) + return (user in src) + /obj/item/bodybag/proc/deploy_bodybag(mob/user, atom/location) var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location) R.open(user) From 8432f095f8347d06a90b778f212e58f226ee8934 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 16:09:09 +0000 Subject: [PATCH 22/35] Bump pillow from 7.2.0 to 8.1.1 in /tools Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.2.0 to 8.1.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/7.2.0...8.1.1) Signed-off-by: dependabot[bot] --- tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index cf8552635d..20f350ca46 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,6 @@ pygit2==1.0.1 bidict==0.13.1 -Pillow==7.2.0 +Pillow==8.1.1 # changelogs PyYaml==5.3.1 From 4d1d3837cdbb38f65a3ec5647faab56da0fce433 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Mar 2021 18:52:19 -0500 Subject: [PATCH 23/35] Automatic changelog generation for PR #14462 [ci skip] --- html/changelogs/AutoChangeLog-pr-14462.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14462.yml diff --git a/html/changelogs/AutoChangeLog-pr-14462.yml b/html/changelogs/AutoChangeLog-pr-14462.yml new file mode 100644 index 0000000000..f86f2407bd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14462.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - bugfix: "Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist." From d1cf054a0efb2624c2f8873f8163c1f8e8933926 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 20 Mar 2021 00:14:29 +0000 Subject: [PATCH 24/35] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-14462.yml | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14462.yml diff --git a/html/changelog.html b/html/changelog.html index 96e114e456..db25a1a928 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

20 March 2021

+

Hatterhat updated:

+
    +
  • Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist.
    • +
+

19 March 2021

DeltaFire15 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 419559a9c5..e7dbe52efd 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28782,3 +28782,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. someone. zeroisthebiggay: - bugfix: fixes spriteless heretic book +2021-03-20: + Hatterhat: + - bugfix: Bluespace beaker filling icons for that narrow band between 90 and 80% + full now actually exist. diff --git a/html/changelogs/AutoChangeLog-pr-14462.yml b/html/changelogs/AutoChangeLog-pr-14462.yml deleted file mode 100644 index f86f2407bd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14462.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - bugfix: "Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist." From d49f6e48ace2a203176959a97d0f15b7e3988fcc Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 02:08:50 -0500 Subject: [PATCH 25/35] Automatic changelog generation for PR #14400 [ci skip] --- html/changelogs/AutoChangeLog-pr-14400.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14400.yml diff --git a/html/changelogs/AutoChangeLog-pr-14400.yml b/html/changelogs/AutoChangeLog-pr-14400.yml new file mode 100644 index 0000000000..311aaeddca --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14400.yml @@ -0,0 +1,5 @@ +author: "LetterN" +delete-after: True +changes: + - rscadd: "Art gallery (meta)" + - rscadd: "Laptop vendor (meta, delta, box)" From cd20cb85dcba706f34afd46239fed8e7d1490b57 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 02:30:39 -0500 Subject: [PATCH 26/35] Automatic changelog generation for PR #14465 [ci skip] --- html/changelogs/AutoChangeLog-pr-14465.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14465.yml diff --git a/html/changelogs/AutoChangeLog-pr-14465.yml b/html/changelogs/AutoChangeLog-pr-14465.yml new file mode 100644 index 0000000000..2a46092e67 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14465.yml @@ -0,0 +1,4 @@ +author: "The-Sun-In-Splendour" +delete-after: True +changes: + - bugfix: "You cannot revive yourself (as a changeling) if you've been absorbed anymore" From e4f2e437014807723c5a9d4648e8d526a4c26aa6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:10 -0500 Subject: [PATCH 27/35] Automatic changelog generation for PR #14457 [ci skip] --- html/changelogs/AutoChangeLog-pr-14457.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14457.yml diff --git a/html/changelogs/AutoChangeLog-pr-14457.yml b/html/changelogs/AutoChangeLog-pr-14457.yml new file mode 100644 index 0000000000..fce2e15ce2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14457.yml @@ -0,0 +1,5 @@ +author: "GrayRachnid" +delete-after: True +changes: + - bugfix: "fixed the holopad autocall bug" + - bugfix: "properly incorporated the secure holopad that was commented out in the code." From a94f304b523b99592a879828136ac6645b63da46 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:28 -0500 Subject: [PATCH 28/35] Automatic changelog generation for PR #14458 [ci skip] --- html/changelogs/AutoChangeLog-pr-14458.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14458.yml diff --git a/html/changelogs/AutoChangeLog-pr-14458.yml b/html/changelogs/AutoChangeLog-pr-14458.yml new file mode 100644 index 0000000000..79810f22e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14458.yml @@ -0,0 +1,5 @@ +author: "GrayRachnid" +delete-after: True +changes: + - balance: "buffed particle defender disabler shots from 13->15 stamina (15*6=90)" + - balance: "buffed particle defender laser ammo to 4 shots" From 6fa99c22e6569a939f51146d585f146dfc05aa8d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:35 -0500 Subject: [PATCH 29/35] Automatic changelog generation for PR #14461 [ci skip] --- html/changelogs/AutoChangeLog-pr-14461.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14461.yml diff --git a/html/changelogs/AutoChangeLog-pr-14461.yml b/html/changelogs/AutoChangeLog-pr-14461.yml new file mode 100644 index 0000000000..29f326d24c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14461.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscdel: "removes pacifism from ghost cafe. have fun beating up your coworkers" From f41f69ccfa9e33c615e2f940c6eb1b683db232b1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:28:43 -0500 Subject: [PATCH 30/35] Automatic changelog generation for PR #14464 [ci skip] --- html/changelogs/AutoChangeLog-pr-14464.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14464.yml diff --git a/html/changelogs/AutoChangeLog-pr-14464.yml b/html/changelogs/AutoChangeLog-pr-14464.yml new file mode 100644 index 0000000000..a6f9fe668b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14464.yml @@ -0,0 +1,6 @@ +author: "GrayRachnid" +delete-after: True +changes: + - config: "the in_character_filter.txt is now usable" + - admin: "headmins should edit the in_character_filter.txt" + - server: "someone with box access should delete racism with the in_character_filter.txt" From 1d9f0745076e068dd32a9fd806fe789704ccd5ea Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:29:43 -0500 Subject: [PATCH 31/35] Automatic changelog generation for PR #14436 [ci skip] --- html/changelogs/AutoChangeLog-pr-14436.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14436.yml diff --git a/html/changelogs/AutoChangeLog-pr-14436.yml b/html/changelogs/AutoChangeLog-pr-14436.yml new file mode 100644 index 0000000000..5768d8dc16 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14436.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Buffed supermatter surge massively." From c1e41567624231bc7c96df79a75dbfbb9215e48b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:30:12 -0500 Subject: [PATCH 32/35] Automatic changelog generation for PR #14469 [ci skip] --- html/changelogs/AutoChangeLog-pr-14469.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14469.yml diff --git a/html/changelogs/AutoChangeLog-pr-14469.yml b/html/changelogs/AutoChangeLog-pr-14469.yml new file mode 100644 index 0000000000..71d16a17ee --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14469.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "using the puddle ability when stunned wont break it" From fb340ed36899927062e4bd9e2bc7cd8f1666e071 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:31:17 -0500 Subject: [PATCH 33/35] Automatic changelog generation for PR #14405 [ci skip] --- html/changelogs/AutoChangeLog-pr-14405.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14405.yml diff --git a/html/changelogs/AutoChangeLog-pr-14405.yml b/html/changelogs/AutoChangeLog-pr-14405.yml new file mode 100644 index 0000000000..e7b92bdce5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14405.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - bugfix: "Vampire statpanel no longer shows spans unnecesary" From a970c739603494ad0fd893e1039de2274b62f749 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 20 Mar 2021 15:32:16 -0500 Subject: [PATCH 34/35] Automatic changelog generation for PR #14323 [ci skip] --- html/changelogs/AutoChangeLog-pr-14323.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14323.yml diff --git a/html/changelogs/AutoChangeLog-pr-14323.yml b/html/changelogs/AutoChangeLog-pr-14323.yml new file mode 100644 index 0000000000..4a1fbcb14b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14323.yml @@ -0,0 +1,4 @@ +author: "dzahlus" +delete-after: True +changes: + - balance: "rebalanced hierophant STAFF to do 15 damage on all attacks" From 2977784a259644f2be15df1fac7f0ef600065c44 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 21 Mar 2021 00:15:30 +0000 Subject: [PATCH 35/35] Automatic changelog compile [ci skip] --- html/changelog.html | 41 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 25 +++++++++++++ html/changelogs/AutoChangeLog-pr-14323.yml | 4 --- html/changelogs/AutoChangeLog-pr-14400.yml | 5 --- html/changelogs/AutoChangeLog-pr-14405.yml | 4 --- html/changelogs/AutoChangeLog-pr-14436.yml | 4 --- html/changelogs/AutoChangeLog-pr-14457.yml | 5 --- html/changelogs/AutoChangeLog-pr-14458.yml | 5 --- html/changelogs/AutoChangeLog-pr-14461.yml | 4 --- html/changelogs/AutoChangeLog-pr-14464.yml | 6 ---- html/changelogs/AutoChangeLog-pr-14465.yml | 4 --- html/changelogs/AutoChangeLog-pr-14469.yml | 4 --- 12 files changed, 66 insertions(+), 45 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14323.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14400.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14405.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14436.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14457.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14458.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14461.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14464.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14465.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14469.yml diff --git a/html/changelog.html b/html/changelog.html index db25a1a928..fcae534cd2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,47 @@ -->
    +

    21 March 2021

    +

    Arturlang updated:

    +
      +
    • Vampire statpanel no longer shows spans unnecesary
      • +
    +

    GrayRachnid updated:

    +
      +
    • fixed the holopad autocall bug
      • +
    • properly incorporated the secure holopad that was commented out in the code.
      • +
    • the in_character_filter.txt is now usable
      • +
    • headmins should edit the in_character_filter.txt
      • +
    • someone with box access should delete racism with the in_character_filter.txt
      • +
    • buffed particle defender disabler shots from 13->15 stamina (15*6=90)
      • +
    • buffed particle defender laser ammo to 4 shots
      • +
    +

    Hatterhat updated:

    +
      +
    • removes pacifism from ghost cafe. have fun beating up your coworkers
      • +
    +

    LetterN updated:

    +
      +
    • Art gallery (meta)
      • +
    • Laptop vendor (meta, delta, box)
      • +
    +

    Putnam3145 updated:

    +
      +
    • Buffed supermatter surge massively.
      • +
    +

    The-Sun-In-Splendour updated:

    +
      +
    • You cannot revive yourself (as a changeling) if you've been absorbed anymore
      • +
    +

    dzahlus updated:

    +
      +
    • rebalanced hierophant STAFF to do 15 damage on all attacks
      • +
    +

    timothyteakettle updated:

    +
      +
    • using the puddle ability when stunned wont break it
      • +
    +

    20 March 2021

    Hatterhat updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index e7dbe52efd..c56ed45b9f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28786,3 +28786,28 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Hatterhat: - bugfix: Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist. +2021-03-21: + Arturlang: + - bugfix: Vampire statpanel no longer shows spans unnecesary + GrayRachnid: + - bugfix: fixed the holopad autocall bug + - bugfix: properly incorporated the secure holopad that was commented out in the + code. + - config: the in_character_filter.txt is now usable + - admin: headmins should edit the in_character_filter.txt + - server: someone with box access should delete racism with the in_character_filter.txt + - balance: buffed particle defender disabler shots from 13->15 stamina (15*6=90) + - balance: buffed particle defender laser ammo to 4 shots + Hatterhat: + - rscdel: removes pacifism from ghost cafe. have fun beating up your coworkers + LetterN: + - rscadd: Art gallery (meta) + - rscadd: Laptop vendor (meta, delta, box) + Putnam3145: + - balance: Buffed supermatter surge massively. + The-Sun-In-Splendour: + - bugfix: You cannot revive yourself (as a changeling) if you've been absorbed anymore + dzahlus: + - balance: rebalanced hierophant STAFF to do 15 damage on all attacks + timothyteakettle: + - bugfix: using the puddle ability when stunned wont break it diff --git a/html/changelogs/AutoChangeLog-pr-14323.yml b/html/changelogs/AutoChangeLog-pr-14323.yml deleted file mode 100644 index 4a1fbcb14b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14323.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "dzahlus" -delete-after: True -changes: - - balance: "rebalanced hierophant STAFF to do 15 damage on all attacks" diff --git a/html/changelogs/AutoChangeLog-pr-14400.yml b/html/changelogs/AutoChangeLog-pr-14400.yml deleted file mode 100644 index 311aaeddca..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14400.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "LetterN" -delete-after: True -changes: - - rscadd: "Art gallery (meta)" - - rscadd: "Laptop vendor (meta, delta, box)" diff --git a/html/changelogs/AutoChangeLog-pr-14405.yml b/html/changelogs/AutoChangeLog-pr-14405.yml deleted file mode 100644 index e7b92bdce5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14405.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Arturlang" -delete-after: True -changes: - - bugfix: "Vampire statpanel no longer shows spans unnecesary" diff --git a/html/changelogs/AutoChangeLog-pr-14436.yml b/html/changelogs/AutoChangeLog-pr-14436.yml deleted file mode 100644 index 5768d8dc16..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14436.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Buffed supermatter surge massively." diff --git a/html/changelogs/AutoChangeLog-pr-14457.yml b/html/changelogs/AutoChangeLog-pr-14457.yml deleted file mode 100644 index fce2e15ce2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14457.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "GrayRachnid" -delete-after: True -changes: - - bugfix: "fixed the holopad autocall bug" - - bugfix: "properly incorporated the secure holopad that was commented out in the code." diff --git a/html/changelogs/AutoChangeLog-pr-14458.yml b/html/changelogs/AutoChangeLog-pr-14458.yml deleted file mode 100644 index 79810f22e0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14458.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "GrayRachnid" -delete-after: True -changes: - - balance: "buffed particle defender disabler shots from 13->15 stamina (15*6=90)" - - balance: "buffed particle defender laser ammo to 4 shots" diff --git a/html/changelogs/AutoChangeLog-pr-14461.yml b/html/changelogs/AutoChangeLog-pr-14461.yml deleted file mode 100644 index 29f326d24c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14461.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - rscdel: "removes pacifism from ghost cafe. have fun beating up your coworkers" diff --git a/html/changelogs/AutoChangeLog-pr-14464.yml b/html/changelogs/AutoChangeLog-pr-14464.yml deleted file mode 100644 index a6f9fe668b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14464.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "GrayRachnid" -delete-after: True -changes: - - config: "the in_character_filter.txt is now usable" - - admin: "headmins should edit the in_character_filter.txt" - - server: "someone with box access should delete racism with the in_character_filter.txt" diff --git a/html/changelogs/AutoChangeLog-pr-14465.yml b/html/changelogs/AutoChangeLog-pr-14465.yml deleted file mode 100644 index 2a46092e67..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14465.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "The-Sun-In-Splendour" -delete-after: True -changes: - - bugfix: "You cannot revive yourself (as a changeling) if you've been absorbed anymore" diff --git a/html/changelogs/AutoChangeLog-pr-14469.yml b/html/changelogs/AutoChangeLog-pr-14469.yml deleted file mode 100644 index 71d16a17ee..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14469.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "using the puddle ability when stunned wont break it"