diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..47b56355999 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "tools/tgstation-server"] + path = tools/tgstation-server + url = https://github.com/tgstation/tgstation-server + branch = master diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt index 9ec3a1faff9..0c36eb059f8 100644 --- a/SQL/database_changelog.txt +++ b/SQL/database_changelog.txt @@ -1,3 +1,11 @@ +30 May 2017, by MrStonedOne + +Z levels changed, this query allows you to convert old ss13 death records: + +UPDATE death SET coord = CONCAT(SUBSTRING_INDEX(coord, ',', 2), ', ', CASE TRIM(SUBSTRING_INDEX(coord, ',', -1)) WHEN 1 THEN 2 WHEN 2 THEN 1 ELSE TRIMSUBSTRING_INDEX(coord, ',', -1) END) + +--------------------------------------------------- + 26 May 2017, by Jordie0608 Modified table 'ban', adding the column 'round_id'. diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index bd7b343a396..1a4f7aacbbb 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -13,7 +13,7 @@ "ad" = ( /obj/structure/flora/ausbushes/leafybush, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "ae" = ( /obj/structure/table, /obj/item/weapon/storage/toolbox/mechanical, @@ -21,44 +21,47 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "af" = ( /obj/structure/table, /obj/item/clothing/mask/gas, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "ag" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "ah" = ( /obj/machinery/power/smes, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "ai" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "aj" = ( /turf/closed/wall/mineral/sandstone{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "ak" = ( /obj/structure/toilet, /obj/effect/decal/sandeffect, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "al" = ( /obj/structure/urinal{ pixel_y = 32 @@ -66,7 +69,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "am" = ( /obj/structure/urinal{ pixel_y = 32 @@ -75,13 +78,16 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "an" = ( /obj/item/device/flashlight/lantern, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "ao" = ( /obj/structure/sink{ dir = 4; @@ -96,181 +102,187 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "ap" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "aq" = ( /obj/structure/flora/ausbushes/sunnybush, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "ar" = ( /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "as" = ( /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "at" = ( /obj/item/weapon/tank/internals/oxygen, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "au" = ( /obj/effect/decal/sandeffect, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "av" = ( /obj/machinery/door/airlock/hatch, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "aw" = ( /obj/machinery/door/airlock/sandstone, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "ax" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/mineral/sandstone{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "ay" = ( /obj/machinery/door/airlock/hatch, /obj/effect/decal/sandeffect, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/beach) "az" = ( /obj/item/clothing/neck/necklace/dope, /obj/item/weapon/reagent_containers/spray/spraytan, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "aA" = ( /obj/effect/decal/sandeffect, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "aB" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand; tag = "icon-asteroidwarning (NORTH)" }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/area/ruin/powered) +/area/ruin/powered/beach) "aC" = ( /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aD" = ( /obj/structure/table, /obj/item/weapon/storage/box/drinkingglasses, /obj/item/weapon/storage/box/drinkingglasses, /obj/item/weapon/reagent_containers/food/drinks/shaker, /obj/item/weapon/storage/box/beakers, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aE" = ( /obj/structure/table, /obj/machinery/reagentgrinder, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aF" = ( /obj/machinery/vending/boozeomat{ emagged = 1; req_access_txt = "0" }, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aG" = ( /obj/structure/table, /obj/item/weapon/book/manual/barman_recipes, /obj/item/weapon/reagent_containers/glass/rag, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aH" = ( /obj/structure/table, /obj/item/weapon/storage/box/donkpockets, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aI" = ( /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aJ" = ( /obj/structure/closet/crate/bin, /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/trash/candy, /obj/item/toy/talking/owl, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand; tag = "icon-asteroidwarning (NORTH)" }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/area/ruin/powered) +/area/ruin/powered/beach) "aK" = ( /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "aL" = ( /obj/effect/mob_spawn/human/bartender/alive{ name = "beach bum sleeper" }, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aM" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aN" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "aO" = ( /obj/structure/stacklifter, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "aP" = ( /obj/structure/table/wood, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aQ" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aR" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/drinks/bottle/tequila, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aS" = ( /obj/machinery/processor, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aT" = ( /obj/machinery/vending/cola, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "aU" = ( /obj/effect/overlay/palmtree_l, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "aV" = ( /obj/effect/mob_spawn/human/beach/alive{ flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?"; @@ -278,31 +290,31 @@ uniform = /obj/item/clothing/under/pants/youngfolksjeans }, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "aW" = ( /obj/structure/chair/stool, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand; tag = "icon-asteroidwarning (NORTH)" }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/area/ruin/powered) +/area/ruin/powered/beach) "aX" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "aY" = ( /obj/machinery/vending/snack, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "aZ" = ( /obj/effect/overlay/coconut, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "ba" = ( /obj/machinery/light{ dir = 4; @@ -316,24 +328,24 @@ "bb" = ( /obj/structure/weightlifter, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bc" = ( /obj/machinery/door/airlock/sandstone, /obj/effect/decal/sandeffect, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "bd" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "be" = ( /obj/vehicle/scooter/skateboard{ dir = 4 }, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bf" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -347,10 +359,10 @@ "bg" = ( /obj/structure/sign/barsign, /turf/closed/wall/mineral/sandstone, -/area/ruin/powered) +/area/ruin/powered/beach) "bh" = ( /turf/closed/wall/mineral/sandstone, -/area/ruin/powered) +/area/ruin/powered/beach) "bi" = ( /turf/open/floor/plating/beach/sand{ density = 1; @@ -365,14 +377,14 @@ /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "bk" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/snacks/pastatomato, /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "bl" = ( /obj/structure/chair/wood/normal{ icon_state = "wooden_chair"; @@ -381,7 +393,7 @@ /turf/open/floor/plasteel/asteroid{ baseturf = /turf/open/floor/plating/beach/sand }, -/area/ruin/powered) +/area/ruin/powered/beach) "bm" = ( /mob/living/simple_animal/crab, /turf/open/floor/plating/beach/sand{ @@ -456,7 +468,7 @@ "bx" = ( /obj/structure/flora/rock, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "by" = ( /obj/machinery/door/airlock/sandstone, /obj/effect/decal/sandeffect, @@ -467,7 +479,7 @@ "bz" = ( /mob/living/simple_animal/crab, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bA" = ( /obj/structure/window/reinforced{ dir = 1 @@ -480,7 +492,7 @@ /obj/item/weapon/storage/firstaid, /obj/item/weapon/storage/firstaid/brute, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "bB" = ( /obj/structure/window/reinforced{ dir = 4; @@ -492,7 +504,7 @@ }, /obj/structure/chair/stool, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "bC" = ( /obj/structure/table/wood, /obj/item/weapon/tank/internals/oxygen, @@ -512,11 +524,11 @@ "bE" = ( /obj/item/weapon/reagent_containers/spray/spraytan, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bF" = ( /obj/item/toy/beach_ball, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bG" = ( /obj/structure/window/reinforced{ dir = 8 @@ -524,7 +536,7 @@ /obj/structure/window/reinforced, /obj/item/device/megaphone, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "bH" = ( /obj/structure/window/reinforced{ dir = 4; @@ -538,7 +550,7 @@ mob_gender = "female" }, /turf/open/floor/wood, -/area/ruin/powered) +/area/ruin/powered/beach) "bI" = ( /obj/structure/dresser, /turf/open/floor/pod/dark{ @@ -548,11 +560,11 @@ "bJ" = ( /obj/structure/chair, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bK" = ( /obj/item/weapon/storage/backpack/dufflebag, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bL" = ( /obj/effect/decal/sandeffect{ density = 1 @@ -562,43 +574,227 @@ baseturf = /turf/open/floor/plating/lava/smooth; density = 1 }, -/area/ruin/powered) +/area/ruin/powered/beach) "bM" = ( /turf/open/floor/plasteel/stairs/old, -/area/ruin/powered) +/area/ruin/powered/beach) "bN" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bO" = ( /obj/item/device/camera, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bP" = ( /obj/item/weapon/reagent_containers/food/drinks/beer, /turf/open/floor/plating/beach/sand, -/area/ruin/powered) +/area/ruin/powered/beach) "bQ" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/floor/plating/beach/coastline_t, -/area/ruin/powered) +/area/ruin/powered/beach) "bR" = ( /turf/open/floor/plating/beach/coastline_t, -/area/ruin/powered) +/area/ruin/powered/beach) "bS" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/beach/coastline_t, -/area/ruin/powered) +/area/ruin/powered/beach) "bT" = ( /turf/open/floor/plating/beach/coastline_b, -/area/ruin/powered) +/area/ruin/powered/beach) "bU" = ( /turf/open/floor/plating/beach/water, -/area/ruin/powered) +/area/ruin/powered/beach) "bV" = ( /obj/structure/flora/ausbushes/stalkybush, /turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) +"bW" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"bX" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"bY" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"bZ" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"ca" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"cb" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"cc" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/beach) +"cd" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/closed/wall/mineral/sandstone{ + baseturf = /turf/open/floor/plating/beach/sand + }, +/area/ruin/powered/beach) +"ce" = ( +/obj/effect/decal/sandeffect, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"cf" = ( +/obj/effect/decal/sandeffect, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"cg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"ch" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"ci" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"cj" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/asteroid{ + baseturf = /turf/open/floor/plating/beach/sand; + tag = "icon-asteroidwarning (NORTH)" + }, +/area/ruin/powered/beach) +"ck" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/asteroid{ + baseturf = /turf/open/floor/plating/beach/sand; + tag = "icon-asteroidwarning (NORTH)" + }, +/area/ruin/powered/beach) +"cl" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"cm" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/pod/dark{ + baseturf = /turf/open/floor/plating/asteroid/basalt + }, /area/ruin/powered) +"cn" = ( +/obj/effect/decal/sandeffect, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/pod/dark{ + baseturf = /turf/open/floor/plating/asteroid/basalt + }, +/area/ruin/powered) +"co" = ( +/obj/effect/decal/sandeffect, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/pod/dark{ + baseturf = /turf/open/floor/plating/asteroid/basalt + }, +/area/ruin/powered) +"cp" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/pod/dark{ + baseturf = /turf/open/floor/plating/asteroid/basalt + }, +/area/ruin/powered) +"cq" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"cr" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"cs" = ( +/obj/effect/overlay/palmtree_l, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered/beach) +"ct" = ( +/obj/machinery/light, +/turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) +"cu" = ( +/obj/machinery/light, +/turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) +"cv" = ( +/obj/machinery/light, +/turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) +"cw" = ( +/obj/machinery/light, +/turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) +"cx" = ( +/obj/machinery/light, +/turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) +"cy" = ( +/obj/machinery/light, +/turf/open/floor/plating/beach/water, +/area/ruin/powered/beach) (1,1,1) = {" aa @@ -646,11 +842,11 @@ ab ab ab bn -br +cm bu bv bu -bs +co bC ab ab @@ -673,7 +869,7 @@ ab ab ab ap -ar +cg ar ar ab @@ -721,7 +917,7 @@ ap bR bT bU -bU +ct ab ab aa @@ -740,7 +936,7 @@ aO ar bb ar -ar +ci ar ar aA @@ -748,7 +944,7 @@ aA aA ar ar -ar +cr bN bR bT @@ -819,7 +1015,7 @@ bT bU bU bU -bU +cv ab ab aa @@ -859,10 +1055,10 @@ aa (9,1,1) = {" aa ab -ab -ab -ab -aA +bW +bW +bW +ce aA aA aA @@ -893,7 +1089,7 @@ aa ac ae as -ab +bW aB aK aK @@ -980,7 +1176,7 @@ bU bU bU bU -bU +cx ab aa "} @@ -1051,7 +1247,7 @@ aa (15,1,1) = {" aa ac -aj +cd aj aj aF @@ -1092,7 +1288,7 @@ aj aj bc aj -aB +cj aK aA ar @@ -1172,7 +1368,7 @@ bU bU bU bU -bU +cy ab aa "} @@ -1188,14 +1384,14 @@ aj aj aj aj -aB +ck aK aA ar ar ar ar -ar +cq ar ar bR @@ -1275,10 +1471,10 @@ aa (22,1,1) = {" aa ab -ab -ab -ab -aA +bW +bW +bW +cf aA aA aA @@ -1363,7 +1559,7 @@ bT bU bU bU -bU +cw ab ab aa @@ -1412,7 +1608,7 @@ aq ar be ar -ar +cl ar ar aA @@ -1420,7 +1616,7 @@ aA aA ar ar -aU +cs ar bR bT @@ -1457,7 +1653,7 @@ ap bR bT bU -bU +cu ab ab aa @@ -1473,7 +1669,7 @@ ab ab ab ap -ar +ch ap ar ab @@ -1510,11 +1706,11 @@ ab ab ab bo -bs +cn bu bu bv -br +cp bC ab ab diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 3c67c89821b..423d2e424e9 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -83,7 +83,7 @@ /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "an" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -93,7 +93,7 @@ /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ao" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -103,7 +103,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ap" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -113,7 +113,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aq" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ @@ -122,7 +122,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ar" = ( /obj/structure/disposalpipe/segment{ invisibility = 101 @@ -131,7 +131,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "as" = ( /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood/old, @@ -142,7 +142,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "at" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -153,7 +153,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "au" = ( /obj/structure/disposalpipe/segment{ invisibility = 101 @@ -161,7 +161,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "av" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; @@ -172,7 +172,7 @@ /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aw" = ( /obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -181,7 +181,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ax" = ( /obj/effect/decal/cleanable/pie_smudge, /obj/structure/disposalpipe/segment{ @@ -191,7 +191,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ay" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -203,7 +203,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "az" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -214,7 +214,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aA" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -224,7 +224,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aB" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -235,20 +235,20 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aC" = ( /turf/open/indestructible{ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible{ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aE" = ( /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -257,7 +257,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aF" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -268,7 +268,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aG" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -279,7 +279,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aH" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -291,7 +291,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aI" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -303,7 +303,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aJ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -313,7 +313,7 @@ /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aK" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -324,7 +324,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aL" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -333,7 +333,7 @@ /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aM" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -344,13 +344,13 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aN" = ( /obj/structure/disposalpipe/segment{ invisibility = 101 }, /turf/open/floor/plating, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aO" = ( /obj/item/weapon/bikehorn, /obj/structure/disposalpipe/segment{ @@ -361,7 +361,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aP" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -370,7 +370,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aQ" = ( /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth @@ -383,7 +383,7 @@ invisibility = 101 }, /turf/open/floor/plating, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aS" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -393,7 +393,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -403,14 +403,14 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aU" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aV" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -422,7 +422,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aW" = ( /obj/item/weapon/bikehorn, /obj/effect/decal/cleanable/dirt, @@ -433,7 +433,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aX" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -444,7 +444,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aY" = ( /obj/item/weapon/bikehorn, /obj/structure/disposalpipe/segment{ @@ -454,7 +454,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "aZ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -463,14 +463,14 @@ /turf/open/indestructible{ icon_state = "darkredfull" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ba" = ( /obj/effect/decal/cleanable/pie_smudge, /turf/open/indestructible{ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bb" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -479,7 +479,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bc" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -491,7 +491,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -505,7 +505,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "be" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -516,7 +516,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bf" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -528,7 +528,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -538,7 +538,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bh" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -548,7 +548,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bi" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -558,7 +558,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bj" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -567,20 +567,24 @@ /turf/open/indestructible{ icon_state = "light_on" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bk" = ( /obj/structure/disposalpipe/segment{ invisibility = 101 }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bl" = ( /turf/open/indestructible{ icon_state = "light_on" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bm" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -590,7 +594,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bn" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -600,7 +604,7 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bo" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -610,18 +614,18 @@ /area/ruin/powered) "bp" = ( /turf/closed/mineral/clown, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bq" = ( /obj/item/weapon/pickaxe, /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "br" = ( /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bs" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -631,7 +635,7 @@ /turf/open/indestructible{ icon_state = "darkredfull" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bt" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -641,7 +645,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bu" = ( /obj/item/weapon/bikehorn, /obj/structure/disposalpipe/segment{ @@ -653,7 +657,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bv" = ( /obj/machinery/light{ dir = 8 @@ -669,14 +673,14 @@ icon_state = "darkredfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "by" = ( /obj/structure/disposalpipe/segment, /turf/open/indestructible{ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bz" = ( /obj/machinery/disposal/deliveryChute{ dir = 1 @@ -685,13 +689,13 @@ /turf/open/indestructible{ icon_state = "white" }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bA" = ( /turf/open/indestructible{ icon_state = "darkredfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bB" = ( /turf/open/indestructible/sound{ icon_state = "bananium"; @@ -699,7 +703,7 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bC" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -711,7 +715,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bD" = ( /obj/structure/mecha_wreckage/honker, /obj/structure/disposalpipe/segment{ @@ -721,7 +725,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bE" = ( /obj/effect/decal/cleanable/oil, /obj/structure/disposalpipe/segment{ @@ -732,7 +736,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bF" = ( /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -743,7 +747,7 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bG" = ( /obj/item/weapon/grown/bananapeel{ color = "#2F3000"; @@ -759,7 +763,7 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bI" = ( /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood/old, @@ -767,7 +771,7 @@ icon_state = "darkyellowfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bJ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -777,7 +781,7 @@ icon_state = "darkredfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bK" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -788,19 +792,19 @@ icon_state = "darkredfull"; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bL" = ( /obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup, /obj/structure/table/glass, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bM" = ( /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bN" = ( /obj/machinery/disposal/deliveryChute, /obj/structure/disposalpipe/trunk{ @@ -809,7 +813,7 @@ /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bO" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/indestructible/sound{ @@ -818,56 +822,59 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bP" = ( /obj/structure/statue/bananium/clown, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bQ" = ( /obj/structure/table/glass, /obj/item/weapon/grown/bananapeel/bluespace, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bR" = ( /obj/structure/table/glass, /obj/item/clothing/shoes/clown_shoes/banana_shoes, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bS" = ( /obj/item/weapon/coin/clown, /obj/item/weapon/coin/clown, /obj/item/weapon/coin/clown, /obj/item/weapon/coin/clown, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bT" = ( /obj/item/slime_extract/rainbow, /obj/structure/table/glass, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bU" = ( /obj/item/weapon/bikehorn/airhorn, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bV" = ( /obj/structure/table/glass, /obj/item/weapon/gun/magic/staff/honk, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bW" = ( /obj/item/weapon/bikehorn, /turf/open/indestructible/sound{ @@ -876,7 +883,7 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bX" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -891,7 +898,7 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "bZ" = ( /obj/machinery/door/airlock/clown, /turf/open/indestructible/sound{ @@ -900,7 +907,7 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "ca" = ( /obj/item/weapon/bikehorn, /obj/effect/decal/cleanable/dirt, @@ -910,13 +917,588 @@ sound = 'sound/effects/clownstep1.ogg'; wet = 5 }, -/area/ruin/powered) +/area/ruin/powered/clownplanet) "cb" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/powered) +"cc" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cd" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"ce" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cf" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cg" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"ch" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"ci" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cj" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"ck" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cl" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cm" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cn" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"co" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cp" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cq" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cr" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cs" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"ct" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cu" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cv" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cw" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cx" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cy" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cz" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cA" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cB" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cC" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cD" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cE" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cF" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cG" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cH" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cI" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cJ" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cK" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cL" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cM" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cN" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cO" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cP" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cQ" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cR" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cS" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cT" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cU" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cV" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cW" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cX" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cY" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"cZ" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"da" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"db" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dc" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dd" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"de" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"df" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dg" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dh" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"di" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dj" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dk" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dl" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dm" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dn" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"do" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dp" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dq" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dr" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"ds" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dt" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"du" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dv" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dw" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dx" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dy" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dz" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dA" = ( +/obj/machinery/light/small, +/turf/open/floor/noslip{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/ruin/powered) +"dB" = ( +/obj/structure/disposalpipe/segment{ + invisibility = 101 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/indestructible{ + icon_state = "darkyellowfull"; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/indestructible{ + icon_state = "darkyellowfull"; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dD" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c"; + invisibility = 101 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/indestructible{ + icon_state = "darkyellowfull"; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dE" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c"; + invisibility = 101 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/indestructible{ + icon_state = "darkyellowfull"; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/indestructible{ + icon_state = "white" + }, +/area/ruin/powered/clownplanet) +"dG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/indestructible{ + icon_state = "white" + }, +/area/ruin/powered/clownplanet) +"dH" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c"; + invisibility = 101 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/indestructible{ + icon_state = "white" + }, +/area/ruin/powered/clownplanet) +"dI" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible{ + icon_state = "darkredfull"; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dJ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible{ + icon_state = "darkredfull"; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dK" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dL" = ( +/obj/item/weapon/coin/clown, +/obj/item/weapon/coin/clown, +/obj/item/weapon/coin/clown, +/obj/item/weapon/coin/clown, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/clownplanet) +"dM" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/sound{ + icon_state = "bananium"; + name = "bananium floor"; + sound = 'sound/effects/clownstep1.ogg'; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dN" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/sound{ + icon_state = "bananium"; + name = "bananium floor"; + sound = 'sound/effects/clownstep1.ogg'; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dO" = ( +/obj/machinery/light, +/turf/open/indestructible/sound{ + icon_state = "bananium"; + name = "bananium floor"; + sound = 'sound/effects/clownstep1.ogg'; + wet = 5 + }, +/area/ruin/powered/clownplanet) +"dP" = ( +/obj/machinery/light, +/turf/open/indestructible/sound{ + icon_state = "bananium"; + name = "bananium floor"; + sound = 'sound/effects/clownstep1.ogg'; + wet = 5 + }, +/area/ruin/powered/clownplanet) (1,1,1) = {" aa @@ -1065,7 +1647,7 @@ ak am aN aS -aV +dE aH bf aJ @@ -1095,7 +1677,7 @@ aa ah ak ak -ah +cc aF at ar @@ -1137,7 +1719,7 @@ ar aJ aL aL -ah +cc bx bA bB @@ -1170,16 +1752,16 @@ aL aX aL bb -bb +dF bp -ah -bA +cc +dI bA bB -ah -ah +cc +cc bH -ah +cc bB bB bB @@ -1207,8 +1789,8 @@ bb bb bq bp -ah -ah +cc +cc bA bB bB @@ -1217,7 +1799,7 @@ bB bB ca bH -bB +dO ah ak ak @@ -1245,7 +1827,7 @@ bA bA bA bB -ah +cc bB bB bH @@ -1264,8 +1846,8 @@ ae ah ak ao -al -ar +ch +dB aH az az @@ -1275,12 +1857,12 @@ bg bj bl bp -ah +cc bA bA bB bB -ah +cc bB bB bB @@ -1306,18 +1888,18 @@ an aB aL bb -bb +dG br -ah -ah +cc +cc bA bB bB -ah -ah +cc +cc bB bB -ah +cc bB bH ak @@ -1331,7 +1913,7 @@ ab ad ah ak -ah +cc at ar aB @@ -1342,15 +1924,15 @@ aB aL aL bs -al +ch aJ -ah -ah -ah +cc +cc +cc bP bS -ah -bB +cc +dM bB bH ca @@ -1378,13 +1960,13 @@ aA aV ay az -ah -ah +cc +cc bL bM bM bM -ah +cc bB bH bH @@ -1402,10 +1984,10 @@ al al au ar -al +ch ar aT -al +ch ax ar aH @@ -1413,13 +1995,13 @@ aD aA aM aG -ah -bM +cc +dK bQ bT bM -ah -ah +cc +cc bH bB bB @@ -1431,7 +2013,7 @@ ah (16,1,1) = {" ac ag -ac +dA ah ak ao @@ -1447,7 +2029,7 @@ bt aM aG aV -al +ch bN bM bU @@ -1456,7 +2038,7 @@ bZ bB bH bB -ah +cc ak bX ak @@ -1481,12 +2063,12 @@ bu by bC aD -ah +cc bM bR bV bM -ah +cc bB bB bB @@ -1502,7 +2084,7 @@ ac ah ah ak -ah +cc az az az @@ -1515,12 +2097,12 @@ aG ba aL bI -ah +cc bL bM bM bM -ah +cc bB bB bB @@ -1536,25 +2118,25 @@ ad ah ak ak -ah +cc az az aO aA aA aL -ah -ah +cc +cc aZ -ah +cc bD -ah +cc bB -ah +cc bP -bS -ah -bB +dL +cc +dN bB bH bH @@ -1569,8 +2151,8 @@ aa ad ah ak -ah -ah +cc +cc aA aA aA @@ -1580,13 +2162,13 @@ aL bh bk bn -ah +cc bE aJ bB bB -ah -ah +cc +cc bY bB bB @@ -1603,9 +2185,9 @@ aa ae ah ak -ah -ah -aA +cc +cc +dC aK aL az @@ -1615,12 +2197,12 @@ bb bl bl bp -ah +cc bJ bA bB bB -ah +cc bB bH bB @@ -1649,9 +2231,9 @@ bb bl bl bz -al +ch bK -ah +cc bB bB bH @@ -1659,7 +2241,7 @@ bH bH bB bW -bB +dP ah bX ak @@ -1671,8 +2253,8 @@ aa aa ah ak -ah -ah +cc +cc aC aA aA @@ -1683,7 +2265,7 @@ bi bm br bp -ah +cc bA bA bB @@ -1705,8 +2287,8 @@ aa aa ah ak -ah -ah +cc +cc aD aA aL @@ -1714,17 +2296,17 @@ aA aL aL bh -bn +dH bp -ah -bA +cc +dJ bA bB bB bB bB bB -ah +cc bB bB ak @@ -1740,7 +2322,7 @@ aa ah ak ak -ah +cc aE aA aA @@ -1748,8 +2330,8 @@ aA aM aB aL -ah -ah +cc +cc bA bA bB @@ -1774,15 +2356,15 @@ aa ah ah ak -ah -ah +cc +cc aM aB -aM +dD ar ar aS -ah +cc ak ah bF @@ -1791,7 +2373,7 @@ bB ah bB bB -ah +cc bB bB ak @@ -1810,13 +2392,13 @@ ah ah ak ak -ah -aQ -ah +cc +cu +cc ba aC -aQ -ah +cu +cc ak ah ah @@ -1849,7 +2431,7 @@ ak aU aU aU -ah +cc ak ah ah diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 79f1604d5d6..127d5b3d55e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -22,38 +22,38 @@ /turf/closed/wall/mineral/titanium/nodiagonal{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "af" = ( /obj/structure/grille, /obj/structure/window/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ag" = ( /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ah" = ( /obj/structure/toilet, /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ai" = ( /obj/machinery/vending/coffee, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aj" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ak" = ( /obj/structure/table/wood, /obj/item/device/taperecorder, @@ -61,34 +61,37 @@ /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "al" = ( /obj/structure/table/wood, /obj/item/toy/carpplushie, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "am" = ( /obj/machinery/vending/snack, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "an" = ( /obj/machinery/sleeper{ icon_state = "sleeper-open"; dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ao" = ( /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ap" = ( /obj/structure/table, /obj/item/weapon/circular_saw, @@ -98,7 +101,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aq" = ( /obj/structure/table, /obj/item/weapon/cautery{ @@ -108,7 +111,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ar" = ( /obj/structure/table, /obj/item/weapon/surgical_drapes, @@ -116,12 +119,12 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "as" = ( /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "at" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -129,7 +132,7 @@ /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "au" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -137,7 +140,7 @@ /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "av" = ( /obj/item/weapon/reagent_containers/glass/rag, /obj/item/weapon/reagent_containers/spray/cleaner, @@ -145,13 +148,16 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aw" = ( /obj/structure/bed/roller, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ax" = ( /obj/structure/closet/crate/trashcart, /obj/item/weapon/storage/bag/trash, @@ -177,7 +183,7 @@ /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "az" = ( /obj/structure/noticeboard{ dir = 1; @@ -190,25 +196,25 @@ /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aA" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aB" = ( /obj/machinery/computer/operating, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aC" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aD" = ( /obj/structure/table, /obj/item/weapon/retractor, @@ -216,7 +222,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aE" = ( /turf/closed/wall/mineral/titanium/nodiagonal{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface @@ -229,13 +235,13 @@ /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aG" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/mineral/titanium/nodiagonal{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aH" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/mineral/titanium/nodiagonal{ @@ -255,62 +261,65 @@ /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aL" = ( /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aM" = ( /obj/effect/mob_spawn/human/doctor/alive/lavaland, /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aN" = ( /obj/structure/closet/crate/freezer, /obj/item/weapon/reagent_containers/blood/random, /obj/item/weapon/reagent_containers/blood/random, /obj/item/weapon/reagent_containers/blood/random, /obj/item/weapon/reagent_containers/blood/random, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aO" = ( /obj/machinery/iv_drip, /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aP" = ( /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 0 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aQ" = ( /turf/open/floor/plasteel/blue/corner{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aR" = ( /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 4 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aS" = ( /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aT" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, @@ -321,21 +330,24 @@ }, /obj/item/ammo_casing/shotgun/buckshot, /obj/item/weapon/storage/box/bodybags, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aU" = ( /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aV" = ( /obj/structure/closet/secure_closet/medical1, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aW" = ( /obj/machinery/vending/wallmed{ pixel_y = 28 @@ -343,25 +355,25 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aX" = ( /obj/item/stack/cable_coil/random, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aY" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "aZ" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ba" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/beaker, @@ -369,21 +381,24 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bb" = ( /obj/structure/table/reinforced, /obj/item/device/laser_pointer, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bc" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/firstaid/regular, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bd" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/gloves, @@ -391,17 +406,20 @@ pixel_x = 3; pixel_y = 3 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "be" = ( /obj/effect/decal/cleanable/oil, /obj/item/weapon/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bf" = ( /obj/structure/table, /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, @@ -409,39 +427,39 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bg" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bh" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/brute, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bi" = ( /obj/item/toy/cattoy, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bj" = ( /obj/structure/table/glass, /obj/item/weapon/lazarus_injector, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bk" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bl" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/food/snacks/cookie{ @@ -462,11 +480,14 @@ /obj/item/weapon/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bm" = ( /obj/structure/chair/comfy/teal{ dir = 8 @@ -475,13 +496,16 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 1 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bn" = ( /obj/structure/bed/dogbed, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bo" = ( /obj/item/weapon/reagent_containers/glass/bowl, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, @@ -489,7 +513,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bp" = ( /obj/structure/closet/crate/bin, /obj/item/trash/pistachios, @@ -499,32 +523,32 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bq" = ( /obj/structure/filingcabinet/chestdrawer/wheeled, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "br" = ( /obj/structure/chair/office/dark, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bs" = ( /obj/structure/table/reinforced, /obj/item/weapon/phone, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bt" = ( /obj/item/weapon/twohanded/required/kirbyplants, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bu" = ( /obj/structure/chair/comfy/teal{ dir = 8 @@ -533,7 +557,7 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 4 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bv" = ( /obj/effect/mob_spawn/mouse{ dir = 4; @@ -543,13 +567,13 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bx" = ( /obj/machinery/door/airlock/medical{ name = "Patient Room"; @@ -558,7 +582,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "by" = ( /obj/structure/table/reinforced, /obj/item/device/flashlight/lamp, @@ -566,14 +590,14 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bz" = ( /obj/structure/table/reinforced, /obj/item/clothing/glasses/regular, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bA" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper_bin, @@ -581,14 +605,14 @@ /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bB" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/box/hug, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bC" = ( /obj/structure/chair/office/light{ dir = 1 @@ -596,7 +620,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bD" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/bottle/cyanide{ @@ -607,20 +631,20 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bE" = ( /obj/structure/closet/crate/critter, /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bF" = ( /turf/open/floor/plasteel/blue/side{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 10 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bG" = ( /obj/structure/chair/comfy/teal{ dir = 8 @@ -629,7 +653,7 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 6 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bH" = ( /obj/structure/table, /obj/item/weapon/tank/internals/oxygen, @@ -638,7 +662,7 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bI" = ( /obj/structure/sign/bluecross_2{ name = "animal hospital" @@ -646,7 +670,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bJ" = ( /obj/machinery/door/airlock/glass_large{ name = "Ian's Pet Care" @@ -655,7 +679,7 @@ /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bK" = ( /obj/item/weapon/reagent_containers/glass/bowl, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat, @@ -665,7 +689,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bL" = ( /obj/vehicle/scooter/skateboard{ dir = 4 @@ -691,7 +715,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bO" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass{ @@ -707,7 +731,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bQ" = ( /obj/structure/table/glass, /obj/item/clothing/neck/petcollar, @@ -715,7 +739,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bR" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -728,7 +752,7 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 10 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bS" = ( /obj/structure/closet, /obj/item/weapon/defibrillator/loaded, @@ -738,7 +762,7 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 6 }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bT" = ( /obj/item/weapon/pickaxe, /obj/effect/decal/cleanable/blood/old, @@ -757,7 +781,7 @@ /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "bX" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -806,7 +830,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "cd" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/latex, @@ -815,7 +839,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ce" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -824,13 +848,13 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "cf" = ( /obj/structure/closet/l3closet, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "cg" = ( /obj/machinery/door/unpowered/shuttle{ name = "Break Room" @@ -838,7 +862,7 @@ /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ch" = ( /obj/machinery/door/unpowered/shuttle{ name = "Emergency Care" @@ -846,7 +870,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ci" = ( /obj/machinery/door/unpowered/shuttle{ desc = "There's a note wedged in the seam saying something about directing pizza here."; @@ -856,7 +880,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "cj" = ( /obj/machinery/door/unpowered/shuttle{ name = "Morgue" @@ -864,7 +888,7 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "ck" = ( /obj/machinery/door/unpowered/shuttle{ name = "Medical Supplies" @@ -872,7 +896,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "cl" = ( /obj/machinery/door/unpowered/shuttle{ name = "Safety Supplies" @@ -880,7 +904,7 @@ /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) "cm" = ( /obj/machinery/door/unpowered/shuttle{ name = "Tool Storage" @@ -888,7 +912,157 @@ /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, -/area/ruin/powered) +/area/ruin/powered/animal_hospital) +"cn" = ( +/obj/machinery/light, +/turf/open/floor/grass{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"co" = ( +/obj/machinery/light, +/turf/open/floor/grass{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"cp" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"cq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/bar{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface + }, +/area/ruin/powered/animal_hospital) +"cr" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/cmo{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface + }, +/area/ruin/powered/animal_hospital) +"cs" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/cmo{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface + }, +/area/ruin/powered/animal_hospital) +"ct" = ( +/obj/effect/mob_spawn/human/doctor/alive/lavaland, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 1 + }, +/area/ruin/powered/animal_hospital) +"cu" = ( +/obj/effect/mob_spawn/human/doctor/alive/lavaland, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 1 + }, +/area/ruin/powered/animal_hospital) +"cv" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 1 + }, +/area/ruin/powered/animal_hospital) +"cw" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 0 + }, +/area/ruin/powered/animal_hospital) +"cx" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"cy" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 4 + }, +/area/ruin/powered/animal_hospital) +"cz" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 1 + }, +/area/ruin/powered/animal_hospital) +"cA" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 4 + }, +/area/ruin/powered/animal_hospital) +"cB" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + dir = 4 + }, +/area/ruin/powered/animal_hospital) +"cC" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"cD" = ( +/obj/structure/flora/ausbushes/sunnybush, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass{ + baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; + initial_gas_mix = "o2=14;n2=23;TEMP=300" + }, +/area/lavaland/surface/outdoors) +"cE" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) (1,1,1) = {" aa @@ -963,7 +1137,7 @@ ab aJ ab ab -ac +cx ab aa aa @@ -987,7 +1161,7 @@ aa aa aa ab -ab +cp ax ac aJ @@ -1047,7 +1221,7 @@ aa ab ae ag -ag +cq ay ae aK @@ -1062,7 +1236,7 @@ bp by bF ae -ac +cC ac ab ab @@ -1087,7 +1261,7 @@ ae ae ae ae -aL +cz bq bz aP @@ -1104,14 +1278,14 @@ ac aa ab ab -ac +cn ae ae ae ae aG aL -aP +cw ae aV ba @@ -1137,7 +1311,7 @@ ac ac ae ai -as +cr as cg aK @@ -1170,7 +1344,7 @@ aj at as ae -aM +ct aK ck ao @@ -1230,7 +1404,7 @@ al au as ae -aM +cu aK cl ao @@ -1242,7 +1416,7 @@ aK aK aP ae -bM +cD ac ac ab @@ -1257,7 +1431,7 @@ ac ac ae am -as +cs as cg aK @@ -1320,7 +1494,7 @@ cd an aA ae -aL +cv aP ae ae @@ -1335,7 +1509,7 @@ bn bN bP ae -ab +cE ab aa aa @@ -1374,7 +1548,7 @@ aa aa ab ab -ac +co ae ap ao @@ -1443,15 +1617,15 @@ ae aO aR aR +cy aR aR aR +cA aR aR aR -aR -aR -aR +cB aR bS ae diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 14cdf355149..d6a1a3567ae 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -6,7 +6,7 @@ /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "ac" = ( /obj/item/stack/medical/ointment, /obj/structure/table, @@ -19,6 +19,9 @@ /obj/structure/table, /obj/item/stack/medical/gauze, /obj/item/stack/medical/gauze, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, @@ -36,6 +39,9 @@ /area/ruin/powered/snow_biodome) "ag" = ( /obj/structure/reagent_dispensers/beerkeg, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, @@ -54,6 +60,9 @@ /area/ruin/powered/snow_biodome) "aj" = ( /obj/structure/sink, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, @@ -290,89 +299,92 @@ /obj/item/clothing/shoes/winterboots, /obj/item/clothing/gloves/fingerless, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aT" = ( /obj/structure/grille, /obj/structure/window/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aU" = ( /obj/machinery/vending/coffee, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aV" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aW" = ( /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aX" = ( /turf/open/floor/pod/light, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aY" = ( /obj/structure/chair/stool, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "aZ" = ( /obj/machinery/door/airlock/hatch, /obj/structure/fans/tiny, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "ba" = ( /obj/machinery/door/airlock/silver, /obj/structure/fans/tiny, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bb" = ( /obj/machinery/door/airlock/silver, /obj/structure/fans/tiny, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bc" = ( /obj/structure/table, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bd" = ( /obj/structure/table, /obj/item/weapon/pen, /obj/item/weapon/paper_bin, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "be" = ( /obj/structure/table, /obj/machinery/microwave, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bf" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bg" = ( /obj/item/weapon/twohanded/required/chainsaw, /obj/structure/closet, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bh" = ( /obj/structure/filingcabinet, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bi" = ( /obj/machinery/computer/monitor, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bj" = ( /obj/item/weapon/storage/toolbox/mechanical, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bk" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bl" = ( /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/lava/smooth; @@ -382,22 +394,22 @@ /area/ruin/powered/snow_biodome) "bm" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bn" = ( /obj/item/clothing/mask/balaclava, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bo" = ( /obj/structure/table, /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bp" = ( /obj/structure/table, /obj/item/weapon/pen, /obj/item/weapon/paper, /turf/open/floor/pod/dark, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "bq" = ( /obj/machinery/light/built{ dir = 1 @@ -406,12 +418,202 @@ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/ruin/powered/snow_biodome) +/area/ruin/powered) "br" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/glass_large, /turf/open/floor/pod/dark, +/area/ruin/powered) +"bs" = ( +/obj/machinery/door/airlock/glass_large, +/obj/structure/fans/tiny, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bt" = ( +/obj/structure/fans/tiny, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bu" = ( +/obj/structure/fans/tiny, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bv" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ice{ + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, /area/ruin/powered/snow_biodome) +"bw" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/lava/smooth; + name = "floor" + }, +/area/ruin/powered/snow_biodome) +"bx" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/lava/smooth; + name = "floor" + }, +/area/ruin/powered/snow_biodome) +"by" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bz" = ( +/obj/machinery/light, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/lava/smooth; + name = "floor" + }, +/area/ruin/powered/snow_biodome) +"bA" = ( +/obj/machinery/light, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/lava/smooth; + name = "floor" + }, +/area/ruin/powered/snow_biodome) +"bB" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bC" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bD" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bE" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bF" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bG" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bH" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bI" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bK" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bM" = ( +/obj/machinery/light, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bN" = ( +/obj/machinery/light, +/turf/open/floor/plating/ice{ + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bO" = ( +/obj/machinery/light, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bP" = ( +/obj/machinery/light, +/turf/open/floor/plating/asteroid/snow{ + baseturf = /turf/open/floor/plating/lava/smooth; + initial_gas_mix = "o2=22;n2=82;TEMP=180" + }, +/area/ruin/powered/snow_biodome) +"bQ" = ( +/obj/machinery/light/small, +/turf/open/floor/pod/dark, +/area/ruin/powered) +"bR" = ( +/obj/machinery/light/small, +/turf/open/floor/pod/dark, +/area/ruin/powered) (1,1,1) = {" aa @@ -458,10 +660,10 @@ ab ab ab aS -aW +bG aW aX -aW +bI aW bh ab @@ -486,7 +688,7 @@ ab ab ab ak -ak +by ak ab aS @@ -552,7 +754,7 @@ ak aI ak ak -ak +bC az ak aB @@ -560,7 +762,7 @@ ak ak ak aI -ak +bJ ak ak ak @@ -577,7 +779,7 @@ aa aa aa ab -ao +bv ao ao ao @@ -631,7 +833,7 @@ ak ak ak ak -ak +bO ab ab bm @@ -744,7 +946,7 @@ aq aq aK aq -ak +bD ao ao ao @@ -770,7 +972,7 @@ ab ad af ar -at +bw at aD at @@ -790,7 +992,7 @@ ak ak ak az -ak +bM ab aS aS @@ -806,7 +1008,7 @@ au au aq at -at +bz aq ak ak @@ -825,7 +1027,7 @@ ak aI ab bn -aW +bQ ab bm "} @@ -887,7 +1089,7 @@ ao ak ak ak -aO +bs aX aX br @@ -919,10 +1121,10 @@ ao ao ak ak -aP +bt aX aX -aP +bt bm "} (17,1,1) = {" @@ -966,7 +1168,7 @@ av at aG at -at +bA aq aR ak @@ -985,7 +1187,7 @@ ao ao ab aW -aW +bR ab bm "} @@ -995,7 +1197,7 @@ ai af aq av -at +bx aH at aN @@ -1014,7 +1216,7 @@ ak ak ak ao -ao +bN ab bo bp @@ -1032,7 +1234,7 @@ aq aq aq aq -ak +bE ak ak ak @@ -1175,7 +1377,7 @@ ak aI aI ak -ak +bP ab ab bm @@ -1224,7 +1426,7 @@ az ak ak ak -ak +bF ak ak ak @@ -1232,7 +1434,7 @@ ak ak az ak -ak +bK ak ak az @@ -1286,7 +1488,7 @@ ab ab ab ak -ak +bB ak ab aU @@ -1298,7 +1500,7 @@ bf bj ab ak -ak +bL ak ab ab @@ -1322,7 +1524,7 @@ ab ab ab aV -aW +bH aY bc be diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index 9de95170a9f..e59667aae4c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -15,36 +15,36 @@ /area/ruin/powered) "e" = ( /turf/open/floor/plating/lava/smooth, -/area/ruin/powered) +/area/ruin/powered/gluttony) "f" = ( /obj/item/weapon/reagent_containers/syringe/gluttony, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "g" = ( /obj/effect/gluttony, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "h" = ( /obj/item/weapon/veilrender/vealrender, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "i" = ( /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "j" = ( /obj/item/trash/plate, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "k" = ( /obj/machinery/door/airlock/uranium, /obj/structure/fans/tiny/invisible, @@ -57,37 +57,113 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "m" = ( /obj/item/trash/raisins, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "n" = ( /obj/item/trash/pistachios, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "o" = ( /obj/item/trash/popcorn, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "p" = ( /obj/item/trash/semki, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) "q" = ( /obj/item/trash/syndi_cakes, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/gluttony) +"r" = ( +/obj/effect/gluttony, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"s" = ( +/obj/effect/gluttony, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"t" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"u" = ( +/obj/effect/gluttony, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"v" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"w" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"x" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"y" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"z" = ( +/obj/item/trash/plate, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) +"A" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/gluttony) (1,1,1) = {" a @@ -211,7 +287,7 @@ c d i i -i +v d c b @@ -253,7 +329,7 @@ c c c d -i +t i m d @@ -277,7 +353,7 @@ d d g m -i +w d d d @@ -294,7 +370,7 @@ c d e d -g +r g g g @@ -302,7 +378,7 @@ g i p i -j +z l i d @@ -338,7 +414,7 @@ c d e d -g +s g g g @@ -346,7 +422,7 @@ i g i l -i +A i q d @@ -365,7 +441,7 @@ d d g i -i +x d d d @@ -385,7 +461,7 @@ c c c d -g +u i i d @@ -431,7 +507,7 @@ c d j i -i +y d c b diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 1c47260f2c4..7f0cfced704 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -122,6 +122,9 @@ name = "shrine of the liberator"; pixel_x = 0 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/mineral/titanium/purple{ baseturf = /turf/open/floor/plating/lava/smooth }, @@ -215,6 +218,7 @@ /obj/item/weapon/storage/firstaid/fire, /obj/structure/table/wood, /obj/item/weapon/storage/firstaid/fire, +/obj/machinery/light, /turf/open/floor/mineral/titanium/purple{ baseturf = /turf/open/floor/plating/lava/smooth }, @@ -262,6 +266,122 @@ baseturf = /turf/open/floor/plating/lava/smooth }, /area/ruin/powered/golem_ship) +"I" = ( +/obj/machinery/light/small, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"J" = ( +/obj/machinery/light/small, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"K" = ( +/obj/machinery/light/small, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"L" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"M" = ( +/obj/effect/mob_spawn/human/golem/adamantine, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"N" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"O" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"P" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"Q" = ( +/obj/machinery/light/small, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"R" = ( +/obj/machinery/light/small, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"S" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"T" = ( +/obj/machinery/light/small, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"U" = ( +/obj/effect/mob_spawn/human/golem/adamantine, +/obj/machinery/light/small, +/turf/open/floor/mineral/titanium/purple{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"V" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"W" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) +"X" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/golem_ship) (1,1,1) = {" a @@ -358,7 +478,7 @@ a a a b -l +L l j l @@ -384,10 +504,10 @@ l l b l -l +Q G l -l +T b b b @@ -427,7 +547,7 @@ j l l b -l +P l G l @@ -444,18 +564,18 @@ a a b c -f +I b -m +M o b l l G o -m +U b -f +V F b a @@ -510,18 +630,18 @@ a a b c -f +J b l l +O l l -l -l +S l z b -f +W F b a @@ -598,9 +718,9 @@ a a b e -f +K b -l +N l l l @@ -609,7 +729,7 @@ v l B b -f +X f b a @@ -670,7 +790,7 @@ h h b t -l +R b h h diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm index d63971dafbd..4b71e65a80e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm @@ -16,26 +16,32 @@ "e" = ( /obj/structure/table/wood/poker, /obj/item/weapon/gun/ballistic/revolver/russian/soul, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth; icon_state = "carpetsymbol" }, -/area/ruin/powered) +/area/ruin/powered/greed) "f" = ( /obj/structure/cursed_slot_machine, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth; icon_state = "carpetsymbol" }, -/area/ruin/powered) +/area/ruin/powered/greed) "g" = ( /obj/structure/table/wood/poker, /obj/item/weapon/coin/mythril, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth; icon_state = "carpetsymbol" }, -/area/ruin/powered) +/area/ruin/powered/greed) "h" = ( /obj/structure/table/wood/poker, /obj/item/weapon/coin/diamond, @@ -43,13 +49,13 @@ baseturf = /turf/open/floor/plating/lava/smooth; icon_state = "carpetsymbol" }, -/area/ruin/powered) +/area/ruin/powered/greed) "i" = ( /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/lava/smooth; icon_state = "carpetsymbol" }, -/area/ruin/powered) +/area/ruin/powered/greed) "j" = ( /obj/structure/table/wood/poker, /obj/item/weapon/coin/adamantine, @@ -57,7 +63,7 @@ baseturf = /turf/open/floor/plating/lava/smooth; icon_state = "carpetsymbol" }, -/area/ruin/powered) +/area/ruin/powered/greed) "k" = ( /obj/machinery/computer/arcade/battle{ emagged = 1 @@ -65,46 +71,50 @@ /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "l" = ( /obj/item/weapon/coin/gold, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "m" = ( /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "n" = ( /obj/structure/table/wood/poker, /obj/item/stack/spacecash/c1000, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "o" = ( /obj/item/weapon/storage/bag/money, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "p" = ( /obj/structure/table/wood/poker, /obj/item/weapon/ore/gold, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "q" = ( /obj/structure/table/wood/poker, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c50, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "r" = ( /obj/structure/table/wood/poker, /obj/item/stack/spacecash/c500, @@ -113,21 +123,47 @@ /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "s" = ( /obj/structure/table/wood/poker, /obj/item/stack/spacecash/c200, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/greed) "t" = ( /obj/machinery/door/airlock/gold, +/obj/structure/fans/tiny/invisible, /turf/open/floor/engine/cult{ baseturf = /turf/open/floor/plating/lava/smooth }, -/obj/structure/fans/tiny/invisible, /area/ruin/powered) +"u" = ( +/obj/structure/table/wood/poker, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c1000, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/engine/cult{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/greed) +"v" = ( +/obj/item/weapon/coin/gold, +/obj/machinery/light/small, +/turf/open/floor/engine/cult{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/greed) +"w" = ( +/obj/item/weapon/storage/bag/money, +/obj/machinery/light/small, +/turf/open/floor/engine/cult{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/greed) (1,1,1) = {" a @@ -320,7 +356,7 @@ m m l m -l +v d d a @@ -364,7 +400,7 @@ m l m l -o +w d d a @@ -404,7 +440,7 @@ c d d p -r +u r d c diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm index 9a86d48b66d..c341460d978 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm @@ -20,7 +20,7 @@ /turf/open/floor/mineral/silver{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/pride) "f" = ( /obj/structure/mirror{ pixel_x = 32 @@ -28,12 +28,12 @@ /turf/open/floor/mineral/silver{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/pride) "g" = ( /turf/open/floor/mineral/silver{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/pride) "h" = ( /obj/structure/mirror/magic/pride, /turf/closed/wall/mineral/diamond{ @@ -47,6 +47,109 @@ blocks_air = 1 }, /area/ruin/powered) +"j" = ( +/obj/structure/mirror{ + pixel_x = -32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"k" = ( +/obj/structure/mirror{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"l" = ( +/obj/structure/mirror{ + pixel_x = -32 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"m" = ( +/obj/structure/mirror{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"n" = ( +/obj/structure/mirror{ + pixel_x = -32 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"o" = ( +/obj/structure/mirror{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"p" = ( +/obj/structure/mirror{ + pixel_x = -32 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"q" = ( +/obj/structure/mirror{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"r" = ( +/obj/machinery/light/small, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) +"s" = ( +/obj/machinery/light/small, +/turf/open/floor/mineral/silver{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/pride) (1,1,1) = {" a @@ -120,16 +223,16 @@ c d d d +j e e +l e e +n e e -e -e -e -e +p e e d @@ -153,7 +256,7 @@ g g g g -g +r d a a @@ -197,7 +300,7 @@ g g g g -g +s d c a @@ -208,16 +311,16 @@ c d d d +k f f +m f f +o f f -f -f -f -f +q f f d diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 64c1a7cb26c..ac67c57d9bf 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -19,31 +19,31 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "e" = ( /obj/structure/table/wood, /obj/item/weapon/storage/box/disks_plantgene, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "f" = ( /obj/machinery/plantgenes/seedvault, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "g" = ( /obj/structure/table/wood, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "h" = ( /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "i" = ( /obj/structure/closet/crate/hydroponics, /obj/structure/beebox, @@ -57,7 +57,7 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "j" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; @@ -71,13 +71,13 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "l" = ( /obj/machinery/door/airlock, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "m" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; @@ -90,7 +90,7 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "o" = ( /obj/structure/closet/crate/hydroponics, /obj/item/weapon/cultivator, @@ -108,13 +108,13 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "p" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "q" = ( /obj/item/weapon/hatchet, /obj/item/weapon/storage/bag/plants, @@ -123,7 +123,7 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "r" = ( /obj/structure/table/wood, /obj/item/weapon/storage/bag/plants, @@ -133,7 +133,7 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "s" = ( /obj/structure/table/wood, /obj/item/weapon/gun/energy/floragun, @@ -144,13 +144,13 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "t" = ( /obj/effect/mob_spawn/human/seed_vault, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "u" = ( /obj/structure/sink{ icon_state = "sink"; @@ -161,19 +161,19 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "v" = ( /obj/machinery/vending/hydronutrients, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "w" = ( /obj/machinery/vending/hydroseeds, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "x" = ( /obj/machinery/reagentgrinder{ pixel_y = 5 @@ -186,7 +186,7 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "y" = ( /obj/structure/sink{ dir = 4; @@ -197,13 +197,13 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "z" = ( /obj/machinery/door/airlock/external, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "A" = ( /obj/machinery/door/airlock/external, /obj/structure/fans/tiny, @@ -217,31 +217,31 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "C" = ( /obj/machinery/seed_extractor, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "D" = ( /obj/machinery/biogenerator, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "E" = ( /obj/machinery/chem_dispenser/mutagensaltpeter, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "F" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "G" = ( /obj/structure/closet/crate/hydroponics, /obj/item/clothing/under/rank/hydroponics, @@ -251,13 +251,13 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "H" = ( /obj/machinery/chem_master/condimaster, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "I" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/glass/bucket, @@ -267,14 +267,14 @@ /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "J" = ( /obj/item/weapon/storage/toolbox/syndicate, /obj/structure/table/wood, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/lava/smooth }, -/area/ruin/powered) +/area/ruin/powered/seedvault) "K" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, @@ -292,6 +292,102 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"N" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/disks_plantgene, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"O" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"P" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"Q" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"R" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"S" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"T" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"U" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"V" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"W" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"X" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) +"Y" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light, +/turf/open/floor/plasteel/freezer{ + baseturf = /turf/open/floor/plating/lava/smooth + }, +/area/ruin/powered/seedvault) (1,1,1) = {" a @@ -346,10 +442,10 @@ a a c c +T h h -h -h +U c c a @@ -389,12 +485,12 @@ c k c n -h +R u h h u -h +V u c a @@ -429,17 +525,17 @@ a a a c -e +N h c -p +P h p h h p h -p +X c a a @@ -539,17 +635,17 @@ a b a c -h +O h c -p +Q h h h h h h -p +Y c a a @@ -587,12 +683,12 @@ c i c s -h +S y h h y -h +W J c a diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 0bc99060de4..afc0dfb1040 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -34,6 +34,9 @@ req_access = null; req_access_txt = "150" }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/podhatch, /area/ruin/powered/syndicate_lava_base) "ah" = ( @@ -52,6 +55,9 @@ name = "skeletal minibar" }, /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base) "aj" = ( @@ -152,6 +158,9 @@ /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, /obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/podhatch{ dir = 8 }, @@ -165,6 +174,10 @@ /obj/item/ammo_box/magazine/sniper_rounds, /obj/item/ammo_box/magazine/sniper_rounds, /obj/item/ammo_box/magazine/sniper_rounds, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base) "az" = ( @@ -179,6 +192,9 @@ /obj/item/ammo_box/magazine/sniper_rounds, /obj/item/ammo_box/magazine/sniper_rounds, /obj/item/ammo_box/magazine/sniper_rounds, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/ruin/powered/syndicate_lava_base) "aA" = ( @@ -338,6 +354,9 @@ /obj/item/weapon/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/podhatch{ tag = "icon-podhatch (EAST)"; icon_state = "podhatch"; @@ -421,6 +440,7 @@ icon_state = "plant-21"; layer = 4.1 }, +/obj/machinery/light/small, /turf/open/floor/plasteel/black, /area/ruin/powered/syndicate_lava_base) "be" = ( @@ -433,6 +453,9 @@ icon_state = "toilet00"; dir = 8 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -501,6 +524,9 @@ /obj/item/device/assembly/signaler, /obj/item/device/assembly/voice, /obj/item/device/assembly/voice, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -519,11 +545,17 @@ }, /area/ruin/powered/syndicate_lava_base) "bn" = ( +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plasteel/podhatch{ dir = 9 }, /area/ruin/powered/syndicate_lava_base) "bo" = ( +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/podhatch{ dir = 5 }, @@ -566,6 +598,9 @@ pixel_y = 3 }, /obj/item/weapon/storage/box/syringes, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/podhatch, /area/ruin/powered/syndicate_lava_base) "bt" = ( @@ -584,6 +619,9 @@ /turf/open/floor/plating, /area/ruin/powered/syndicate_lava_base) "bv" = ( +/obj/machinery/light/small{ + dir = 1 + }, /mob/living/carbon/monkey, /turf/open/floor/plasteel/vault{ dir = 8 @@ -737,6 +775,9 @@ /obj/machinery/vending/toyliberationstation{ req_access_txt = "150" }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -874,6 +915,7 @@ /obj/structure/table/reinforced, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, +/obj/machinery/light, /turf/open/floor/plasteel/podhatch{ tag = "icon-podhatch (NORTH)"; icon_state = "podhatch"; @@ -1117,6 +1159,9 @@ /obj/structure/noticeboard{ pixel_y = 32 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -1215,6 +1260,9 @@ /obj/item/weapon/retractor, /obj/item/weapon/hemostat, /obj/structure/table/reinforced, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1282,6 +1330,9 @@ /area/ruin/powered/syndicate_lava_base) "cZ" = ( /obj/structure/filingcabinet/security, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -1342,6 +1393,9 @@ amount = 50 }, /obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1429,6 +1483,10 @@ /obj/structure/sign/vacuum{ pixel_x = -32 }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1459,6 +1517,597 @@ }, /turf/open/floor/plating/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"dv" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dw" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dx" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dy" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dz" = ( +/obj/item/weapon/bombcore/large/underwall, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dA" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dB" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dC" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dD" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dE" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dF" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dG" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dH" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dI" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dJ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dK" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dL" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dM" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dN" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dO" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dP" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dQ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dR" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dS" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dT" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dU" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dV" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dW" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dX" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dY" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"dZ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ea" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eb" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ec" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ed" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ee" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ef" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eg" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eh" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ei" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ej" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ek" = ( +/obj/item/weapon/bombcore/large/underwall, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"el" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"em" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"en" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eo" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ep" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eq" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"er" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"es" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"et" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eu" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ev" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ew" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ex" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ey" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ez" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eA" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eB" = ( +/obj/item/weapon/bombcore/large/underwall, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eC" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eD" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eE" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eF" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eG" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eH" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eI" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eJ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eK" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eL" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eM" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eN" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eO" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eP" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eQ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eR" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eS" = ( +/obj/item/weapon/bombcore/large/underwall, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eT" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eU" = ( +/obj/item/weapon/bombcore/large/underwall, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eV" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eW" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eX" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eY" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"eZ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fa" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fb" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fc" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fd" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fe" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ff" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fg" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fh" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fi" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fj" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fk" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fl" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fm" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fn" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fo" = ( +/obj/item/weapon/bombcore/large/underwall, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fp" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fq" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fr" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fs" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"ft" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fu" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fv" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fw" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fx" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fy" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fz" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fA" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fB" = ( +/obj/machinery/door/airlock/hatch{ + name = "Syndicate Recon Outpost"; + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/powered) +"fC" = ( +/obj/machinery/door/airlock/hatch{ + name = "Syndicate Recon Outpost"; + req_access_txt = "150" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/powered) +"fD" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fE" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fF" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fG" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fH" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fI" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ruin/powered) +"fJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ruin/powered/syndicate_lava_base) +"fK" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ruin/powered/syndicate_lava_base) +"fL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"fM" = ( +/obj/item/weapon/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"fN" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"fO" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"fP" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"fQ" = ( +/obj/structure/bed/roller, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/powered/syndicate_lava_base) +"fR" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/black, +/area/ruin/powered/syndicate_lava_base) +"fS" = ( +/obj/machinery/iv_drip, +/obj/item/weapon/reagent_containers/blood/random, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"fT" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/podhatch{ + dir = 8 + }, +/area/ruin/powered/syndicate_lava_base) +"fU" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/podhatch{ + tag = "icon-podhatch (EAST)"; + icon_state = "podhatch"; + dir = 4 + }, +/area/ruin/powered/syndicate_lava_base) +"fV" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/powered/syndicate_lava_base) +"fW" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ruin/powered/syndicate_lava_base) +"fX" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/podhatch{ + tag = "icon-podhatch (NORTH)"; + icon_state = "podhatch"; + dir = 1 + }, +/area/ruin/powered/syndicate_lava_base) +"fY" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/podhatch{ + tag = "icon-podhatch (NORTH)"; + icon_state = "podhatch"; + dir = 1 + }, +/area/ruin/powered/syndicate_lava_base) +"fZ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"ga" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/podhatch, +/area/ruin/powered/syndicate_lava_base) +"gb" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/podhatch, +/area/ruin/powered/syndicate_lava_base) +"gc" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/podhatch{ + dir = 8 + }, +/area/ruin/powered/syndicate_lava_base) +"gd" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/podhatch{ + tag = "icon-podhatch (EAST)"; + icon_state = "podhatch"; + dir = 4 + }, +/area/ruin/powered/syndicate_lava_base) +"ge" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/engine, +/area/ruin/powered/syndicate_lava_base) +"gf" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/ruin/powered/syndicate_lava_base) +"gg" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/podhatch{ + dir = 8 + }, +/area/ruin/powered/syndicate_lava_base) +"gh" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/podhatch{ + tag = "icon-podhatch (EAST)"; + icon_state = "podhatch"; + dir = 4 + }, +/area/ruin/powered/syndicate_lava_base) +"gi" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/circuit/green, +/area/ruin/powered/syndicate_lava_base) +"gj" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/engine, +/area/ruin/powered/syndicate_lava_base) +"gk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/circuit/red, +/area/ruin/powered/syndicate_lava_base) +"gl" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/circuit/red, +/area/ruin/powered/syndicate_lava_base) (1,1,1) = {" aa @@ -1764,15 +2413,15 @@ ac ab ab ac -ad -ad -ad -ad -ad -ad -ae -ad -ad +dv +dv +dv +dv +dv +dv +dz +dv +dv ac ab ab @@ -1790,29 +2439,29 @@ ab ab ab ac -ad -ad -ad -ad -ad -ae -ad -ad -ad -ad -ad -ad -ae -ad -ad -cG +dv +dv +dv +dv +dv +dz +dv +dv +dv +dv +dv +dv +dz +dv +dv cG +ge cG cW cG +gj cG -cG -ad +dv ac ab ab @@ -1830,12 +2479,12 @@ ab ab ab ab -ad +dv aq aq aq aY -aq +fP aY bz bJ @@ -1852,7 +2501,7 @@ cG cG cG cG -ad +dv ab ab ab @@ -1870,7 +2519,7 @@ ac ab ab ab -ad +dv aq aQ aO @@ -1892,7 +2541,7 @@ cG cG cG cG -ad +dv ab ab ab @@ -1910,9 +2559,9 @@ ab ab ac ac -ad -aq +dv aq +fL aq aZ aq @@ -1932,7 +2581,7 @@ cG cG cG cG -ad +dv ab ab ab @@ -1947,10 +2596,10 @@ ab ab ab ab -ad -ad -ad -ad +dv +dv +dv +dv ad ad ad @@ -1972,7 +2621,7 @@ cG cG cG cG -ad +dv ac ab ab @@ -1987,7 +2636,7 @@ ab ab ab ab -ad +dv ao aw aA @@ -1999,7 +2648,7 @@ ad bh bB aS -bO +fS bO cf cm @@ -2012,7 +2661,7 @@ cG cG cG cG -ad +dv ac ab ab @@ -2027,7 +2676,7 @@ ab ab ab ab -ad +dv ap aq ap @@ -2052,7 +2701,7 @@ cG de cG cG -ad +dv ac ac ab @@ -2067,7 +2716,7 @@ ab ab ab ac -ad +dv aq ap aq @@ -2092,9 +2741,9 @@ cD ad dj ad -ae -ad -ad +dz +dv +dv ab ab ab @@ -2107,7 +2756,7 @@ ab ab ab ac -ad +dv ar ax aB @@ -2122,8 +2771,8 @@ aq bP bX ad -cn -cw +fX +ga ae aS cL @@ -2134,7 +2783,7 @@ aq cU bu dt -ad +dv ab ab ab @@ -2146,8 +2795,8 @@ ab ab ab ab -ad -ad +dv +dv ad ad ad @@ -2174,7 +2823,7 @@ aq aq dp aO -ad +dv ab ab ab @@ -2186,10 +2835,10 @@ ab ab ab ab -ad +dv af as -as +fJ aC aK aq @@ -2206,7 +2855,7 @@ cn cw cf aq -aq +gf cT cY dg @@ -2214,7 +2863,7 @@ dk aS bu dt -ad +dv ab ab ab @@ -2226,7 +2875,7 @@ ab ab ab ab -ad +dv ag as as @@ -2254,7 +2903,7 @@ ad ad ad ad -ad +dv du ab ab @@ -2266,7 +2915,7 @@ ab ab ab ab -ad +dv ah as as @@ -2280,21 +2929,21 @@ bn aY aY aY -aY +fT aY co cy aY +gc aY aY -aY -aY +gg aY cv dn dq aO -dn +fB ab ab ab @@ -2306,7 +2955,7 @@ ab ab ab ab -ae +dz ad as as @@ -2320,21 +2969,21 @@ bo aZ aZ aZ -aZ +fU aZ cp cz aZ +gd aZ aZ -aZ -aZ +gh aZ cA dn dr aO -dn +fB ab ab ab @@ -2346,7 +2995,7 @@ ab ab ab ab -ad +dv ai as as @@ -2354,7 +3003,7 @@ aG ap aq ap -bb +fM ad ad bu @@ -2370,11 +3019,11 @@ ad ad ad ad -ad -ad -ad -ad -ad +dv +dv +dv +dv +dv du ab ab @@ -2386,10 +3035,10 @@ ab ab ab ab -ad +dv aj as -as +fK aH aq ap @@ -2410,7 +3059,7 @@ aq cU cZ dh -ae +dz ac ac ac @@ -2426,7 +3075,7 @@ ab ab ab ab -ad +dv ad ad ad @@ -2450,7 +3099,7 @@ ap ap ap aq -ad +dv ac ac ab @@ -2466,7 +3115,7 @@ ab ab ab ab -ad +dv ak at ay @@ -2482,19 +3131,19 @@ ap aq bP ad -cn -cw +fY +gb cf aq cM cV da aq -ad -ad -ad -ad -ad +dv +dv +dv +dv +dv ab ab ab @@ -2506,7 +3155,7 @@ ab ab ab ab -ad +dv al au au @@ -2514,7 +3163,7 @@ au aO aT aq -aq +fN ad bs aq @@ -2532,9 +3181,9 @@ db aq ad aq -do +gk aq -ad +dv ab ab ab @@ -2546,7 +3195,7 @@ ab ab ab ab -ad +dv ad ad ae @@ -2574,7 +3223,7 @@ dl do ds do -ad +dv ab ab ab @@ -2586,7 +3235,7 @@ ab ab ab ab -ad +dv am au au @@ -2594,7 +3243,7 @@ au aO aT aq -aq +fO ae bu bu @@ -2612,9 +3261,9 @@ aO bK ad aq -do +gl aq -ad +dv ab ab ab @@ -2626,7 +3275,7 @@ ab ab ab ab -ad +dv an av az @@ -2640,7 +3289,7 @@ bv bI ap bI -aO +fV ad cr cB @@ -2651,10 +3300,10 @@ ad cF ad ad -ad -ad -ad -ad +dv +dv +dv +dv ab ab ab @@ -2666,13 +3315,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +dv +dv +dv +dv +dv +dv +dv aW ad ad @@ -2691,7 +3340,7 @@ ad dc di di -ad +dv ab ab ab @@ -2712,7 +3361,7 @@ ac ac ab ac -ad +dv aX bf ad @@ -2722,7 +3371,7 @@ ap bx bx ad -aq +fZ aq aq aq @@ -2731,7 +3380,7 @@ ad dd di dm -ad +dv ab ab ab @@ -2752,15 +3401,15 @@ ab ab ab ab -ad -ad -ad -ad -bw +dv +dv +dv +dv +fQ bI ap bU -aO +fW ad ct cC @@ -2769,9 +3418,9 @@ cK cS ad dc +gi di -di -ad +dv ac ab ab @@ -2795,23 +3444,23 @@ ac ab ab ac -ad +dv by bx -ap +fR bx ce -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +dv +dv +dv +dv +dv +dv +dv +dv +dv +dv +dv ac ab ab @@ -2835,13 +3484,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +dv +dv +dv +dv +dv +dv +dv ab ab ab diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ueg_crash1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ueg_crash1.dmm deleted file mode 100644 index b4d1cd955a0..00000000000 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ueg_crash1.dmm +++ /dev/null @@ -1,93 +0,0 @@ -"aa" = (/turf/template_noop,/area/template_noop) -"ab" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"ac" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) -"ad" = (/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/lavaland/surface/outdoors) -"ae" = (/turf/open/floor/plating,/area/lavaland/surface/outdoors) -"af" = (/turf/open/floor/plating/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) -"ag" = (/obj/machinery/door/airlock/hatch{name = "Assault Pods"; req_access_txt = "101"},/obj/machinery/door/poddoor/preopen{desc = "A anti-breach blast door that has been forced open."; name = "anti-breach blast door"},/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"ah" = (/obj/machinery/door/poddoor{name = "anti-breach blast door"},/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"ai" = (/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) -"aj" = (/obj/structure/sign/poster/official/safety_internals,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) -"ak" = (/obj/effect/decal/cleanable/blood/gibs/body,/obj/item/weapon/pickaxe/drill,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"al" = (/obj/item/stack/sheet/metal,/turf/open/floor/plasteel/black,/area/ruin/powered) -"am" = (/obj/effect/decal/cleanable/blood,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"an" = (/obj/item/weapon/rack_parts,/obj/item/weapon/survivalcapsule,/turf/open/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/ruin/powered) -"ao" = (/obj/effect/decal/cleanable/robot_debris,/turf/open/floor/plating,/area/ruin/powered) -"ap" = (/turf/open/floor/plasteel/black,/area/ruin/powered) -"aq" = (/obj/effect/decal/cleanable/vomit,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"ar" = (/obj/machinery/portable_atmospherics/canister/oxygen{maximum_pressure = 1019.25},/turf/open/floor/plasteel/black,/area/ruin/powered) -"as" = (/turf/open/floor/plating,/area/ruin/powered) -"at" = (/obj/item/ammo_box/magazine/carbine,/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) -"au" = (/obj/item/clothing/mask/breath,/turf/open/floor/plasteel/black,/area/ruin/powered) -"av" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aw" = (/obj/machinery/door/airlock/hatch{name = "Delta Squad Armoury"; req_access_txt = "101"},/turf/open/floor/plasteel/vault{dir = 8},/area/ruin/powered) -"ax" = (/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"ay" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/ruin/powered) -"az" = (/obj/item/clothing/glasses/meson,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aA" = (/obj/structure/rack,/obj/item/weapon/storage/firstaid/tactical,/obj/item/device/flashlight/seclite{desc = "A robust flashlight used by the military."; name = "combat flashlight"},/obj/item/weapon/kitchen/knife/combat/survival{name = "military knife"},/obj/item/weapon/survivalcapsule,/obj/item/ammo_box/magazine/carbine,/obj/item/ammo_box/magazine/carbine,/obj/item/weapon/gun/ballistic/automatic/carbine,/turf/open/floor/plating,/area/ruin/powered) -"aB" = (/obj/machinery/suit_storage_unit/ueg{name = "Marine Armour Storage Unit"},/turf/open/floor/plating,/area/ruin/powered) -"aC" = (/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/lavaland/surface/outdoors) -"aD" = (/obj/machinery/door/airlock/hatch{name = "Armoury"; req_access_txt = "101"},/turf/open/floor/plasteel/black,/area/ruin/powered) -"aE" = (/turf/open/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/ruin/powered) -"aF" = (/turf/open/floor/plasteel/vault{dir = 5},/area/lavaland/surface/outdoors) -"aG" = (/turf/open/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/lavaland/surface/outdoors) -"aH" = (/obj/structure/sign/poster/official/help_others,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) -"aI" = (/obj/effect/decal/cleanable/vomit,/turf/open/floor/plating,/area/ruin/powered) -"aJ" = (/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) -"aK" = (/turf/open/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/lavaland/surface/outdoors) -"aL" = (/obj/effect/decal/cleanable/blood/old,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aM" = (/obj/structure/closet,/obj/item/toy/prize/honk,/turf/open/floor/plasteel/vault{dir = 5},/area/lavaland/surface/outdoors) -"aN" = (/obj/structure/sign/poster/contraband/clown,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/lavaland/surface/outdoors) -"aO" = (/turf/open/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/ruin/powered) -"aP" = (/obj/structure/sign/poster/official/walk,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) -"aQ" = (/obj/effect/decal/cleanable/oil,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aR" = (/obj/machinery/door/airlock/hatch{name = "Personal Quarters D"; req_access_txt = "101"},/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aS" = (/obj/structure/sign/poster/official/enlist{desc = "Enlist in the marine corps today!"},/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) -"aT" = (/obj/effect/decal/cleanable/robot_debris,/turf/open/floor/plasteel/black,/area/ruin/powered) -"aU" = (/obj/effect/decal/cleanable/blood,/obj/structure/closet,/obj/item/weapon/storage/box/donkpockets,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aV" = (/turf/open/floor/plasteel/vault{dir = 5},/turf/open/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/ruin/powered) -"aW" = (/obj/structure/closet,/obj/item/clothing/shoes/combat,/obj/item/clothing/under/syndicate/camo,/obj/item/weapon/storage/box/donkpockets,/obj/item/clothing/gloves/combat,/obj/item/weapon/storage/backpack/explorer{name = "marine bag"},/obj/item/weapon/card/id/marine,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aX" = (/obj/structure/dresser,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"aY" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) -"aZ" = (/obj/effect/decal/cleanable/blood/gibs,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"ba" = (/obj/structure/girder,/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) -"bb" = (/obj/structure/sign/poster/contraband/space_cola,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) -"bc" = (/obj/structure/table_frame,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"bd" = (/obj/effect/mob_spawn/human/marine,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) -"be" = (/obj/structure/table,/obj/effect/holodeck_effect/cards,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) - -(1,1,1) = {" -aaaaaaaaabaaaaaaaaaaaaaaabaaaaaaaaaaababacacaaaaaaaaaaaa -aaaaaaabababaaaaababababababaaaaaaabababacacacaaabababaa -aaaaabababababababababababababababababababacacacabababaa -aaaaababababadaeabababababababacacababababababababababaa -acacabababababaeababababababababacababababababababacaaaa -acababacababababadadabadababababacababababababababacaaaa -abababacababababadaeabaeabaeababababababababababababaaaa -acababacabababababababaeabadababababababababababababaaaa -aaababababadaeabacacacababaeababaeadafabababababacababaa -aaaaabababadaeacacagahahaiaiaiaiadadafababababababababaa -aaaaabababababacajakalamaianaoaiaeafafafabababacabababaa -aaaaabababababaeaiapaqaraiasataiahahaiafabababababababaa -aaaaabababafafaeahamauavawaxaxaxaxamayafafababababababaa -acacabafafafafafaiapaxapaiaxaxaiahahaiafafabafafafababaa -acacafafafafafaeaiazapaxaiaAaBaiaCaeafafafafafafafafaaaa -acacafafafafadadaiaDayaDaiaiaiaiaiadadafafafafafafafafaa -abacafafafafaeaeaiaxapaxaiaEavaoaiaFaGafafafafafafafafaa -ababafafafafafaeaiapaxapaHasaIaJaiaeaCaKafafafafafafafaa -ababafafafafafaeaiaxapaLaiamaEaJaiaMaeaeaNabafafafafaaaa -acabafafafafaCadaiapaxapaiaiaiaOaPaiaiahaiabafafafafafaa -acabafafafaeaeaGahaxapaxapasaEaJapaxapaxayababafafafaaaa -acabafafafaCaKaCahapaQapaxapaxasaxapaxapayababafafafafaa -acabafafafafaeaeaiaxapaxaiaiaiahaiaiaiaRaiababafafafafaa -acabafafafafafafaSaTaxapaiaUaVaxaiaWaXaxaiabafafafafafaa -acabafafafafafafaiahahahaiaEaYaZbaaxaxaxbbabafafafafafaa -acacafafafafafafafaeaKaeaiaoambcaibdaxbeaiabafafafafafaa -aaafafafafafafafafaeaeafaiaiaiaiaiaiaiaiaiabafafafafafaa -aaafafafafafafafafafafafafafafafafaeaeadababafafafafafaa -aaafafafafafabababafafafafafafafafafafadafafafafafafafaa -aaafafafafafababababababafafafafafafafafafafafafafafafaa -aaafafabababaeabadabababababababafafafafafafafafafafafaa -aaafafafababaKabaGadabababaaaaaaaaaaaaaaaaafafafafafafaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -"} diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 785d2e9456b..43258deaf81 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -1,6741 +1,421 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/template_noop, -/area/template_noop) -"ab" = ( -/turf/closed/mineral/random/low_chance, -/area/ruin/unpowered) -"ac" = ( -/turf/closed/wall/mineral/iron, -/area/ruin/deepstorage) -"ad" = ( -/obj/structure/closet/cardboard, -/obj/item/stack/sheet/mineral/silver, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/silver, -/obj/item/stack/sheet/mineral/silver, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ae" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/toolbox/drone, -/obj/item/weapon/storage/toolbox/drone, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"af" = ( -/obj/structure/closet/cardboard, -/obj/item/stack/sheet/cardboard, -/obj/item/stack/cable_coil, -/obj/item/stack/sheet/mineral/wood, -/obj/item/stack/sheet/mineral/wood, -/obj/item/stack/packageWrap, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ag" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/storage/box/zipties, -/obj/item/weapon/switchblade, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ah" = ( -/obj/structure/closet/cardboard, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ai" = ( -/obj/structure/closet/cardboard, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aj" = ( -/obj/structure/closet/cardboard, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/shovel, -/obj/item/weapon/pickaxe/drill, -/obj/item/weapon/pickaxe/drill, -/obj/item/weapon/pickaxe/drill, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ak" = ( -/obj/structure/closet/cardboard, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/weapon/storage/box/rxglasses, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"al" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/box/bodybags, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/glasses/meson/engine, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"am" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/kitchen/knife, -/obj/item/weapon/kitchen/knife, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, -/obj/item/weapon/kitchen/rollingpin, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"an" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/defibrillator, -/obj/item/weapon/storage/box/medipens, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ao" = ( -/obj/structure/closet/cardboard, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/obj/item/ammo_box/c9mm, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ap" = ( -/obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aq" = ( -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"ar" = ( -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"as" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"at" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"au" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Bunker" - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"av" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"aw" = ( -/obj/structure/mirror{ - pixel_x = 30 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"ax" = ( -/obj/structure/table, -/obj/item/weapon/storage/toolbox/drone, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"ay" = ( -/obj/structure/table, -/obj/item/weapon/gun/ballistic/automatic/wt550{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/weapon/gun/ballistic/automatic/wt550{ - pixel_x = 2; - pixel_y = 0 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"az" = ( -/obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/sec{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); - desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; - name = "dufflebag"; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aA" = ( -/obj/structure/table, -/obj/item/device/radio{ - pixel_x = -4 - }, -/obj/item/device/radio, -/obj/item/device/radio{ - pixel_x = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aB" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal{ - amount = 50; - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aC" = ( -/obj/structure/table, -/obj/item/weapon/storage/firstaid/brute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/brute, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aD" = ( -/obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/regular, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aE" = ( -/obj/structure/closet/crate/radiation, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aF" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aG" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aH" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aI" = ( -/obj/machinery/vending/clothing, -/turf/open/floor/wood, -/area/ruin/deepstorage) -"aJ" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken3" - }, -/area/ruin/deepstorage) -"aK" = ( -/obj/structure/bed, -/turf/open/floor/wood, -/area/ruin/deepstorage) -"aL" = ( -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"aM" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"aN" = ( -/obj/structure/table, -/obj/item/clothing/gloves/combat{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/clothing/gloves/combat{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aO" = ( -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aP" = ( -/obj/structure/table, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/gauze, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aQ" = ( -/obj/structure/closet/radiation, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aR" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aS" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"aT" = ( -/obj/structure/closet/wardrobe/pink, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/ruin/deepstorage) -"aU" = ( -/turf/open/floor/wood, -/area/ruin/deepstorage) -"aV" = ( -/obj/structure/bed, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/ruin/deepstorage) -"aW" = ( -/obj/machinery/shower{ - dir = 4 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"aX" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"aY" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/pill_bottle/charcoal, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"aZ" = ( -/obj/structure/table, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare{ - pixel_y = 6 - }, -/obj/item/device/flashlight/flare, -/obj/item/weapon/crowbar/red, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"ba" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bb" = ( -/obj/structure/closet/wardrobe/pjs, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/wood, -/area/ruin/deepstorage) -"bc" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken4" - }, -/area/ruin/deepstorage) -"bd" = ( -/obj/structure/bed, -/turf/open/floor/wood{ - icon_state = "wood-broken3" - }, -/area/ruin/deepstorage) -"be" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/item/weapon/soap, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"bf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/plating, -/area/ruin/deepstorage) -"bg" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bh" = ( -/obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bi" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Bunker" - }, -/turf/open/floor/wood, -/area/ruin/deepstorage) -"bj" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Bunker" - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/deepstorage) -"bk" = ( -/obj/structure/fireaxecabinet{ - pixel_y = 30 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bl" = ( -/obj/machinery/sleeper{ - icon_state = "sleeper-open"; - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bm" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bn" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bo" = ( -/obj/machinery/sleeper{ - icon_state = "sleeper-open"; - dir = 4 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bp" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Bunker" - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bq" = ( -/obj/machinery/processor{ - name = "processor" - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"br" = ( -/obj/structure/table, -/obj/item/weapon/storage/box/matches, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bs" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bt" = ( -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bu" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/light, -/area/ruin/deepstorage) -"bv" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/light, -/area/ruin/deepstorage) -"bw" = ( -/obj/machinery/blackbox_recorder, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bx" = ( -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"by" = ( -/obj/machinery/power/smes/magical{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; - name = "power storage unit" - }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1; - d2 = 2 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bz" = ( -/obj/machinery/telecomms/relay/preset/telecomms, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bA" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bB" = ( -/obj/machinery/biogenerator, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bC" = ( -/obj/machinery/light, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/light, -/area/ruin/deepstorage) -"bD" = ( -/obj/machinery/autolathe, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bE" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/power/terminal{ - icon_state = "term"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bF" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bG" = ( -/obj/structure/table, -/obj/machinery/microwave, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bH" = ( -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bI" = ( -/obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bJ" = ( -/obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bK" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bL" = ( -/obj/machinery/seed_extractor, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bM" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Bunker APC"; - pixel_x = -24; - pixel_y = 0 - }, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bN" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_y = 0; - tag = "" - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8"; - tag = "" - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bP" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bQ" = ( -/obj/structure/table, -/obj/item/weapon/kitchen/knife, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bR" = ( -/obj/structure/table, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bS" = ( -/obj/structure/table, -/obj/item/weapon/kitchen/fork, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bT" = ( -/obj/machinery/vending/hydronutrients, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bU" = ( -/obj/machinery/space_heater, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"bV" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bW" = ( -/obj/structure/table/reinforced, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"bX" = ( -/obj/machinery/smartfridge, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bY" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/bar, -/area/ruin/deepstorage) -"bZ" = ( -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"ca" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"cb" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"cc" = ( -/obj/structure/frame/computer, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"cd" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen{ - dir = 1; - name = "Bunker Entrance"; - network = list("Bunker1"); - pixel_x = 0; - pixel_y = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/deepstorage) -"ce" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "bunker1"; - name = "Inner Doors"; - pixel_y = 6 - }, -/obj/machinery/button/door{ - id = "bunker2"; - name = "Outer Doors"; - pixel_y = -4 - }, -/turf/open/floor/plasteel/floorgrime, -/area/ruin/deepstorage) -"cf" = ( -/obj/machinery/door/poddoor{ - id = "bunker1"; - name = "Bunker Door"; - tag = "inner" - }, -/turf/open/floor/plating, -/area/ruin/deepstorage) -"cg" = ( -/turf/open/floor/plating, -/area/ruin/deepstorage) -"ch" = ( -/obj/machinery/camera{ - network = list("Bunker1") - }, -/turf/open/floor/plating, -/area/ruin/deepstorage) -"ci" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ruin/deepstorage) -"cj" = ( -/obj/machinery/door/poddoor{ - id = "bunker2"; - name = "Bunker Door"; - tag = "outer" - }, -/turf/open/floor/plating, -/area/ruin/deepstorage) -"ck" = ( -/turf/open/floor/plating/asteroid/airless, -/area/ruin/deepstorage) +"aa" = (/turf/template_noop,/area/template_noop) +"ab" = (/turf/closed/mineral/random/low_chance,/area/template_noop) +"ac" = (/turf/open/floor/plating/asteroid/airless,/area/template_noop) +"ad" = (/turf/closed/mineral/random/low_chance,/area/asteroid/cave{name = "Asteroid - Space"}) +"ae" = (/turf/open/floor/plating/asteroid/airless,/area/asteroid/cave{name = "Asteroid - Space"}) +"af" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ag" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"ah" = (/obj/structure/kitchenspike,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ai" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aj" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"ak" = (/obj/machinery/conveyor{dir = 4; id = "bunkerrecycle"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"al" = (/obj/machinery/conveyor{dir = 4; id = "bunkerrecycle"},/obj/structure/window/reinforced/highpressure,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"am" = (/obj/machinery/recycler/deathtrap,/obj/machinery/conveyor{dir = 4; id = "bunkerrecycle"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"an" = (/obj/machinery/conveyor{dir = 1; id = "bunkerrecycle"; movedir = 2},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"ao" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ap" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ar" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/reagent_dispensers/beerkeg,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"as" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/emergency,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"at" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"au" = (/obj/machinery/conveyor_switch{id = "bunkerrecycle"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"av" = (/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/conveyor{dir = 1; id = "bunkerrecycle"; movedir = 2},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aw" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"ax" = (/obj/machinery/processor{name = "processor"},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ay" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"az" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aA" = (/obj/machinery/gibber,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aB" = (/obj/structure/table,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aC" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aD" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aE" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "Recycling APC"; pixel_x = 0; pixel_y = -24},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aF" = (/obj/machinery/conveyor{dir = 1; id = "bunkerrecycle"; movedir = 2},/obj/machinery/light/small{dir = 4},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aG" = (/obj/structure/closet/cardboard,/obj/item/stack/sheet/mineral/silver,/obj/item/stack/sheet/mineral/gold,/obj/item/stack/sheet/mineral/silver,/obj/item/stack/sheet/mineral/silver,/obj/item/stack/sheet/mineral/gold,/obj/item/stack/sheet/mineral/gold,/obj/effect/turf_decal/delivery,/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aH" = (/obj/structure/closet/cardboard,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/toolbox/drone,/obj/item/weapon/storage/toolbox/drone,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aI" = (/obj/structure/closet/cardboard,/obj/item/stack/sheet/cardboard,/obj/item/stack/cable_coil,/obj/item/stack/sheet/mineral/wood,/obj/item/stack/sheet/mineral/wood,/obj/item/stack/packageWrap,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aJ" = (/obj/structure/closet/cardboard,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/drinkingglasses,/obj/item/weapon/storage/box/zipties,/obj/item/weapon/switchblade,/obj/effect/turf_decal/delivery,/obj/item/device/gps{gpstag = "DEEP"},/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aK" = (/obj/structure/closet/cardboard,/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aL" = (/obj/structure/closet/cardboard,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/clothing/shoes/combat,/obj/item/clothing/shoes/combat,/obj/effect/turf_decal/delivery,/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aM" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock{name = "Freezer"},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aO" = (/obj/machinery/door/airlock/highsecurity{name = "Recycling Room"; req_access_txt = "200"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aP" = (/obj/machinery/door/airlock/highsecurity{name = "Recycling Room"; req_access_txt = "200"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/crusher) +"aQ" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"aR" = (/obj/structure/closet/cardboard,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/shovel,/obj/item/weapon/pickaxe/drill,/obj/item/weapon/pickaxe/drill,/obj/item/weapon/pickaxe/drill,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aS" = (/obj/structure/closet/cardboard,/obj/item/device/flashlight/lantern,/obj/item/device/flashlight/lantern,/obj/item/device/flashlight/lantern,/obj/item/device/tape/random,/obj/item/device/tape/random,/obj/item/device/tape/random,/obj/item/weapon/storage/box/rxglasses,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aT" = (/obj/structure/closet/cardboard,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/matches,/obj/item/weapon/storage/box/bodybags,/obj/item/clothing/glasses/meson/engine,/obj/item/clothing/glasses/meson/engine,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aU" = (/obj/structure/closet/cardboard,/obj/item/weapon/kitchen/knife,/obj/item/weapon/kitchen/knife,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/obj/item/weapon/kitchen/rollingpin,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aV" = (/obj/structure/closet/cardboard,/obj/item/weapon/defibrillator,/obj/item/weapon/storage/box/medipens,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aW" = (/obj/structure/closet/cardboard,/obj/item/ammo_box/c9mm,/obj/item/ammo_box/c9mm,/obj/item/ammo_box/c9mm,/obj/item/ammo_box/c9mm,/obj/item/ammo_box/c9mm,/obj/item/ammo_box/c9mm,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/floorgrime,/area/ruin/deepstorage/storage) +"aX" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/item/weapon/storage/box/cups,/obj/item/weapon/reagent_containers/glass/beaker,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aY" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/soysauce{pixel_x = 4},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 6},/obj/machinery/firealarm{pixel_y = 24},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"aZ" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/machinery/airalarm{frequency = 1439; locked = 0; pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ba" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/peppermill,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = 4; pixel_y = 4},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 9},/obj/item/weapon/kitchen/knife,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bc" = (/obj/structure/sink/kitchen{pixel_y = 24},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bd" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"be" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"bf" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"bg" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bh" = (/obj/structure/table,/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/weapon/storage/bag/plants,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bi" = (/obj/machinery/vending/hydronutrients,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/firealarm{pixel_y = 24},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bj" = (/obj/machinery/vending/hydroseeds{slogan_delay = 700},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bk" = (/obj/machinery/hydroponics/constructable,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/light{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bl" = (/obj/machinery/hydroponics/constructable,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/obj/machinery/light{dir = 1},/turf/open/floor/light{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bm" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bp" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 6},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bq" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"br" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bs" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = null},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/item/weapon/storage/box/drinkingglasses,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bt" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (EAST)"; icon_state = "manifold"; dir = 4},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bu" = (/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bv" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bw" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bx" = (/obj/structure/table,/obj/machinery/microwave,/obj/structure/extinguisher_cabinet{dir = 4; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"by" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"bz" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"bA" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bB" = (/obj/structure/table,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bC" = (/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bD" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/structure/extinguisher_cabinet{dir = 4; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/airalarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/tank_dispenser/oxygen,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bF" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bG" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bH" = (/obj/structure/reagent_dispensers/watertank/high,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bI" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/storage/box/ingredients/wildcard,/obj/item/weapon/storage/box/ingredients/wildcard,/obj/item/weapon/storage/box/ingredients/wildcard,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bJ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bN" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "Kitchen APC"; pixel_x = 0; pixel_y = -24},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bO" = (/obj/machinery/light,/obj/machinery/vending/dinnerware,/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bP" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"bQ" = (/obj/machinery/door/airlock/glass{name = "Hydroponics"},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bR" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bS" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/light{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"bT" = (/obj/effect/turf_decal/delivery,/obj/structure/closet/crate{name = "food crate"},/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bU" = (/obj/effect/turf_decal/delivery,/obj/structure/closet/crate{name = "food crate"},/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/obj/item/weapon/reagent_containers/food/snacks/beans,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bV" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bX" = (/obj/machinery/door/airlock/highsecurity{name = "General Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"bY" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Kitchen"},/turf/open/floor/plasteel/cafeteria{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"bZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/smartfridge,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/kitchen) +"ca" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cb" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cc" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cd" = (/obj/structure/table,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"ce" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cf" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cg" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Hydroponics APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"ch" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/airalarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"ci" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cj" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/weapon/paper{info = "To whoever keeps it up with the long, hot showers: you're going on the next ice-mining trip. If you feel the need to use up all the damn water during your 'relaxation' time, you sure as hell are gonna work for all that water!"; name = "water concerns"},/obj/item/weapon/paper{info = "Hydroponics is our life and blood here, if it dies then so do we. Keep the damn plants watered!"; name = "hydroponics notice"},/obj/item/weapon/paper{info = "Please make sure to throw all excess waste into the crusher in the back! It's amazing what you can get out of what others consider 'garbage' if you run it through a giant crusher enough times."; name = "recycling notice"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ck" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/obj/structure/sign/barsign{pixel_y = 32},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cl" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cm" = (/obj/structure/table,/obj/machinery/airalarm{frequency = 1439; locked = 0; pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"co" = (/obj/structure/closet/crate/bin,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cp" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cq" = (/obj/machinery/shower{dir = 4},/obj/item/weapon/soap,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cr" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cs" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 2; on = 1},/obj/machinery/airalarm{frequency = 1439; locked = 0; pixel_y = 23},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ct" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cu" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cv" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cw" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light,/obj/item/weapon/reagent_containers/glass/bucket{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bucket,/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cx" = (/obj/machinery/seed_extractor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/airalarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cy" = (/obj/machinery/biogenerator,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/open/floor/plasteel/hydrofloor{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cz" = (/obj/machinery/hydroponics/constructable,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/light{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cA" = (/obj/machinery/hydroponics/constructable,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/light{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/hydroponics) +"cB" = (/obj/effect/turf_decal/delivery,/obj/structure/closet/crate{name = "food crate"},/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"cC" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 5},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"cD" = (/obj/machinery/door/airlock/highsecurity{name = "Provisions Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"cE" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cF" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cG" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cH" = (/obj/structure/chair{tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cI" = (/obj/structure/table,/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cJ" = (/obj/structure/table,/obj/item/weapon/kitchen/fork,/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cK" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/vending/coffee,/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cM" = (/obj/machinery/shower{dir = 4},/obj/structure/window/reinforced/highpressure,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cN" = (/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cO" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 24},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cQ" = (/obj/structure/cable/yellow,/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Storage APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"cR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/computer/arcade,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cS" = (/obj/structure/chair/stool,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cT" = (/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cU" = (/obj/structure/chair{tag = "icon-chair (NORTH)"; icon_state = "chair"; dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cV" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (EAST)"; icon_state = "manifold"; dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/vending/cigarette,/obj/structure/extinguisher_cabinet{dir = 4; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/bar{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cX" = (/obj/structure/toilet{dir = 4},/obj/structure/curtain,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cY" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"cZ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"da" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"db" = (/obj/structure/table,/obj/item/device/mass_spectrometer/adv,/obj/item/device/mass_spectrometer/adv,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/stack/medical/gauze,/obj/item/stack/medical/gauze,/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dc" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dd" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/brute{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/brute,/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"de" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"df" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"dg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"dh" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/obj/structure/cable/yellow{icon_state = "1-4"; d1 = 1; d2 = 4},/obj/machinery/computer/arcade,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"di" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/chair/stool,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dj" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dn" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"do" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dq" = (/obj/machinery/door/airlock{name = "Showers"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/freezer{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ds" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dt" = (/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"du" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dv" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/rods{amount = 50},/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dw" = (/obj/effect/turf_decal/delivery,/obj/structure/closet/crate{name = "food crate"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/weapon/vending_refill/coffee,/obj/item/weapon/vending_refill/cigarette,/obj/item/weapon/vending_refill/cigarette,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"dx" = (/obj/effect/turf_decal/delivery,/obj/structure/closet/crate{name = "food crate"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/vending_refill/coffee,/obj/item/weapon/vending_refill/cigarette,/obj/item/weapon/vending_refill/cigarette,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"dy" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; icon_state = "scrub_map"; on = 1; tag = "icon-scrub_map (NORTH)"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"dz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/storage) +"dA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"dB" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"dC" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dH" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dJ" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dL" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dM" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dP" = (/obj/structure/table,/obj/item/device/radio{pixel_x = -4},/obj/item/device/radio,/obj/item/device/radio{pixel_x = 4},/obj/machinery/airalarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"dQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"dR" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 6},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"dS" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Dorms"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"dT" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dU" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dV" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow,/obj/machinery/power/apc{dir = 2; name = "Main Area APC"; pixel_x = 0; pixel_y = -24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dW" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,/obj/structure/cable/yellow{icon_state = "1-4"; d1 = 1; d2 = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dX" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dY" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"dZ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ea" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eb" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/firedoor,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ec" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ed" = (/obj/machinery/atmospherics/pipe/manifold4w/supplymain/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ee" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"ef" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/dufflebag/sec{contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "dufflebag"; pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"ei" = (/obj/structure/dresser,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"ej" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"ek" = (/obj/structure/bed,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/bedsheet,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"el" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"em" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"en" = (/obj/machinery/door/airlock/highsecurity{name = "Canister Storage"; req_access_txt = "200"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eo" = (/obj/machinery/door/poddoor{id = "bunkerinterior"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"ep" = (/obj/machinery/door/poddoor{id = "bunkerinterior"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eq" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"er" = (/obj/machinery/door/airlock/highsecurity{name = "Airlock Control"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"es" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"et" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eu" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"ev" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 5},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"ew" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"ex" = (/obj/structure/table,/obj/item/weapon/gun/ballistic/automatic/wt550{pixel_x = -3; pixel_y = 6},/obj/item/weapon/gun/ballistic/automatic/wt550{pixel_x = 2; pixel_y = 0},/obj/structure/reagent_dispensers/peppertank{pixel_x = 32},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"ey" = (/obj/structure/closet/cabinet,/obj/item/weapon/card/id/away{desc = "A specialized ID meant for accessing some sort of specific door."; icon_state = "centcom"; name = "bunker access ID"},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"ez" = (/obj/structure/chair/stool,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light/small,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"eA" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"eB" = (/obj/machinery/door/airlock{name = "Personal Dorm"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"eC" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (EAST)"; icon_state = "manifold"; dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"eD" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eE" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light/small{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eF" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eG" = (/obj/machinery/atmospherics/pipe/simple/orange/hidden{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eH" = (/obj/machinery/atmospherics/pipe/simple/orange/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eI" = (/obj/structure/table,/obj/machinery/button/door{id = "bunkerexterior"; name = "exterior blastdoor access"; pixel_x = -24; pixel_y = -8; req_access_txt = "200"},/obj/machinery/button/door{id = "bunkerinterior"; name = "interior blastdoor access"; pixel_x = -24; pixel_y = 0; req_access_txt = "200"},/obj/machinery/button/door{id = "bunkershutter"; name = "hallway shutter toggle"; pixel_x = -24; pixel_y = 8; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/orange/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/computer/security/telescreen{dir = 1; name = "Bunker Entrance"; network = list("Bunker1"); pixel_x = 0; pixel_y = 2},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eJ" = (/obj/machinery/atmospherics/pipe/simple/orange/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{icon_state = "1-4"; d1 = 1; d2 = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eK" = (/obj/machinery/atmospherics/pipe/simple/orange/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/firealarm{pixel_y = 24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eL" = (/obj/machinery/atmospherics/pipe/simple/orange/hidden{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 1; name = "Airlock Control APC"; pixel_x = 0; pixel_y = 24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eM" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure,/obj/structure/cable/yellow,/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eN" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/toxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/pill_bottle/charcoal,/obj/machinery/light,/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eO" = (/obj/structure/table,/obj/item/clothing/gloves/combat{pixel_x = -3; pixel_y = 4},/obj/item/clothing/gloves/combat{pixel_x = 3; pixel_y = -2},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eP" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/drone,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare{pixel_y = 6},/obj/item/device/flashlight/flare{pixel_y = 6},/obj/item/device/flashlight/flare{pixel_y = 6},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eQ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"eR" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/turf_decal/delivery,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eS" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; icon_state = "scrub_map"; on = 1; tag = "icon-scrub_map (NORTH)"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"eT" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/door/poddoor/shutters/preopen{id = "bunkershutter"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eU" = (/obj/structure/chair{dir = 8},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eV" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eX" = (/obj/machinery/atmospherics/components/binary/valve{name = "Hall Siphon to Port"},/obj/structure/extinguisher_cabinet{dir = 4; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"eY" = (/obj/machinery/door/airlock/highsecurity{name = "Atmospherics and Power Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"eZ" = (/obj/machinery/door/airlock/highsecurity{name = "Atmospherics and Power Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fa" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 6},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"fb" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"fc" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fd" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8},/turf/open/floor/plating/airless/astplate{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fe" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/extinguisher_cabinet{dir = 4; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"ff" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/effect/turf_decal/delivery,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fg" = (/obj/machinery/atmospherics/components/unary/vent_pump{on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fh" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/door/poddoor/shutters/preopen{id = "bunkershutter"},/obj/structure/cable/yellow,/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fi" = (/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fj" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fk" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{tag = "icon-connector_map (NORTH)"; icon_state = "connector_map"; dir = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fm" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{icon_state = "manifold"; dir = 8},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fn" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/firealarm{pixel_y = 24},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fo" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fp" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fq" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/light/small{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fr" = (/obj/machinery/atmospherics/pipe/simple/yellow/hidden{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fs" = (/obj/machinery/atmospherics/pipe/simple/yellow/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"ft" = (/obj/machinery/atmospherics/pipe/simple/yellow/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/airalarm{dir = 4; icon_state = "alarm0"; pixel_x = -24; tag = "icon-alarm0 (EAST)"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fu" = (/obj/machinery/atmospherics/pipe/simple/yellow/hidden{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/light,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fv" = (/obj/machinery/atmospherics/components/binary/valve{dir = 4; icon_state = "mvalve_map"; name = "Port To Hall"; tag = "icon-mvalve_map (EAST)"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fw" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/components/unary/portables_connector/visible{tag = "icon-connector_map (WEST)"; icon_state = "connector_map"; dir = 8},/obj/item/weapon/wrench,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/airlock) +"fx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 8; name = "Power and Atmospherics APC"; pixel_x = -25; pixel_y = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fy" = (/obj/machinery/atmospherics/components/trinary/mixer{dir = 1; icon_state = "mixer_off"; node1_concentration = 0.2; node2_concentration = 0.8; on = 1; tag = "icon-mixer_off (NORTH)"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fz" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fA" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fB" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fC" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "o2_out_bunker"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fD" = (/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fE" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/cable/yellow,/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Dormory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"fF" = (/obj/machinery/door/poddoor{id = "bunkerexterior"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fG" = (/obj/machinery/door/poddoor{id = "bunkerexterior"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fH" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fI" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fJ" = (/obj/machinery/computer/atmos_control/tank{frequency = 1441; input_tag = "o2_in_bunker"; name = "Oxygen Supply Control"; output_tag = "o2_out_bunker"; sensors = list("o2_sensor_bunker" = "Tank")},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fK" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fL" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor_bunker"},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fM" = (/obj/machinery/atmospherics/miner/oxygen,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"fO" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"fP" = (/obj/structure/closet/wardrobe/pjs,/obj/machinery/airalarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"fQ" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fR" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/machinery/light/small{dir = 1},/obj/structure/sign/securearea{pixel_y = 32},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fS" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 9},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fT" = (/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fU" = (/obj/machinery/camera{network = list("Bunker1")},/obj/structure/sign/securearea{pixel_y = 32},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fV" = (/obj/structure/closet/emcloset,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"fW" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fX" = (/obj/machinery/power/terminal{tag = "icon-term (WEST)"; icon_state = "term"; dir = 8},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/effect/turf_decal/stripes/end{tag = "icon-warn_end (EAST)"; icon_state = "warn_end"; dir = 4},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fY" = (/obj/machinery/airalarm{frequency = 1439; locked = 0; pixel_y = 23},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"fZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"ga" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = "o2"; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gb" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gc" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/window/reinforced/highpressure,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gd" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "n2_in_bunker"},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"ge" = (/obj/machinery/door/airlock{name = "Personal Dorm"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gf" = (/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{tag = "icon-manifold (EAST)"; icon_state = "manifold"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gg" = (/obj/machinery/washing_machine,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gh" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gi" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gk" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/extinguisher_cabinet{dir = 4; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gl" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gm" = (/obj/effect/turf_decal/stripes/line,/obj/structure/closet/crate/bin{name = "laundry bin"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gn" = (/obj/machinery/light/small,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"go" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"gp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/sign/electricshock{pixel_x = -32},/obj/machinery/suit_storage_unit/syndicate,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/light,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gt" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gu" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gv" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out_bunker"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gw" = (/obj/machinery/sleeper{dir = 4; icon_state = "sleeper-open"},/turf/open/floor/plasteel/white{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gx" = (/turf/open/floor/plasteel/white{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gy" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/obj/item/weapon/reagent_containers/blood/random,/turf/open/floor/plasteel/white{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gz" = (/obj/machinery/door/airlock/highsecurity{desc = "Nothing to see here, folks, just an inconspicuous airlock. Now go away!"; name = "Inconspicuous Airlock"; req_access_txt = "200"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"gA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gB" = (/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gC" = (/obj/machinery/computer/atmos_control/tank{frequency = 1441; input_tag = "n2_in_bunker"; name = "Nitrogen Supply Control"; output_tag = "n2_out_bunker"; sensors = list("n2_sensor_bunker" = "Tank")},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gD" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor_bunker"},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gE" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gF" = (/obj/machinery/light/small,/turf/open/floor/plasteel/white{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gG" = (/obj/machinery/iv_drip,/turf/open/floor/plasteel/white{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) +"gH" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"gI" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"gJ" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/highsecurity{name = "RTG Observation"; req_access_txt = "200"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gN" = (/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gO" = (/obj/machinery/atmospherics/components/trinary/filter{dir = 1; filter_type = "n2o"; on = 1},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gP" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; frequency = 1441; id = "o2_in_bunker"},/turf/open/floor/plating/airless{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gQ" = (/obj/machinery/door/airlock/highsecurity{desc = "Nothing to see here, folks, just an inconspicuous airlock. Now go away!"; name = "Inconspicuous Airlock"; req_access_txt = "200"},/obj/structure/fans/tiny,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage) +"gR" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gS" = (/obj/structure/grille,/obj/structure/window/reinforced/highpressure,/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/structure/window/reinforced/highpressure{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/door/firedoor,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/obj/machinery/autolathe,/obj/structure/sign/radiation{pixel_x = -32},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 9},/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/toolbox/electrical,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gW" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/toolbox/mechanical,/turf/open/floor/plasteel/floorgrime{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gX" = (/obj/machinery/power/rtg/advanced,/obj/structure/cable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gY" = (/obj/machinery/door/airlock/highsecurity{name = "Telecomms"; req_access_txt = "200"},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"gZ" = (/obj/machinery/power/rtg/advanced,/obj/structure/cable,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"ha" = (/obj/machinery/power/rtg/advanced,/obj/structure/cable,/obj/machinery/light/small,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"hb" = (/obj/machinery/blackbox_recorder,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"hc" = (/obj/machinery/light/small,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) +"hd" = (/obj/machinery/telecomms/relay/preset/telecomms,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/power) (1,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(3,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(4,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(5,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(6,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(7,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(8,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(9,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -"} -(10,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(11,1,1) = {" -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(12,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(13,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(14,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(15,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(16,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(17,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(18,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(19,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(20,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(21,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(22,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(23,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ck -ck -ck -ab -ab -ab -ab -ab -"} -(24,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ck -ck -ck -ck -ck -ck -ck -ck -ab -ab -ab -"} -(25,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -bl -bo -ac -bw -bD -bM -bU -ca -ar -cf -cg -cg -ac -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ab -ab -"} -(26,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ar -ar -ac -bx -ar -bN -ar -aO -ar -cf -cg -cg -ac -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -"} -(27,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -bp -ac -by -bE -bO -aO -ar -aO -ac -cg -cg -ac -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -ck -"} -(28,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aI -aT -bb -ac -ar -aO -ac -bz -aO -aO -ar -aO -cd -ac -ch -cg -cj -ck -ck -ck -ck -ab -ab -ab -ck -ck -ck -ck -ck -"} -(29,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aJ -aU -bc -bi -ar -ar -ac -aO -ar -aO -ar -cb -cc -ac -ci -cg -cj -ck -ck -ck -ck -ab -ab -ab -ab -ck -ck -ck -ck -"} -(30,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aK -aV -bd -ac -ar -aO -au -ar -ar -aO -bV -aO -ce -ac -ac -ac -ac -ck -ck -ab -ab -ab -ab -ab -ab -ab -ab -ck -ck -"} -(31,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -bm -aO -ac -bA -bF -bP -bW -cc -bW -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(32,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -av -aL -aW -be -ac -aO -aO -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(33,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aw -aM -aX -aX -bj -aO -aO -ar -ar -bG -bQ -bX -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(34,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -aO -aO -aO -ar -bH -bH -bY -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(35,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ax -aN -aY -ac -bk -ar -bq -ac -ar -bI -bR -bH -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(36,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ay -ar -ar -bf -ar -ar -br -ac -aO -bJ -bS -bH -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(37,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -az -aO -aO -bf -aO -ar -bs -ac -aO -bK -bK -bH -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(38,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aA -ar -aO -au -aO -aO -bt -ac -ar -ar -ar -ar -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(39,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aB -ar -aO -bf -aO -aO -aO -aO -aO -ar -ar -aO -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(40,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -aC -aO -ar -bf -aO -bn -aO -aO -bB -bL -bT -bZ -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(41,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -aD -aP -aZ -ac -au -ac -ac -au -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(42,1,1) = {" -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ad -aj -ap -ac -ac -ac -ac -ac -aO -ac -bu -aO -bC -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(43,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ae -ak -aq -ac -aE -aQ -ba -ba -aO -ac -bv -aO -bv -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(44,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -af -al -ar -au -ar -ar -aO -aO -ar -ac -bv -aO -bv -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(45,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ag -am -ar -ac -aF -aR -aR -bg -bg -ac -bu -aO -bC -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(46,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ah -an -as -ac -aG -aR -aR -bh -bh -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(47,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ai -ao -at -ac -aH -aS -aH -aH -aH -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(48,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -aH -aH -aH -aH -aH -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(49,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(50,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(51,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(52,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(53,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(54,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(55,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(56,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -"} -(57,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(58,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(59,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(60,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(61,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(62,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(63,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -"} -(64,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(65,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(66,1,1) = {" -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(67,1,1) = {" -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -"} -(68,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(69,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(70,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(71,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(72,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(73,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(74,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(75,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -"} -(76,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -"} -(77,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -"} -(78,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -"} -(79,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -"} -(80,1,1) = {" -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -"} -(81,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -"} -(82,1,1) = {" -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -"} -(83,1,1) = {" -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(84,1,1) = {" -aa -aa -ab -ab -ab -aa -aa -ab -ab -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(85,1,1) = {" -aa -aa -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -aa -aa -aa -aa -ab -ab -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaabaaaaaaaaaaaaaaaaaaaaaaaaababababacababaaaaaaaaaaaaaaababababaaaaaaaaaaaaaaaaaaaaababaaaaaaaaaaaa +aaaaababaaababaaaaaaaaaaaaababacabacacababaaaaaaaaaaabaaacacababababaaaaaaaaaaaaaaaaabababaaaaaaaaaa +abaaababaaaaaaaaaaaaadaaaaaaababacacacaaaaaaaaaaaaaaaaaaabacacacababaaaaaaaaababacacacababaaaaaaaaaa +aaaaababaaaaaaaaaaaaadadaaaaaaaaacababaaaaaaaaaaaaaaaaaaaaacacacaaaaaaaaaaababababacacacacacaaaaaaaa +aaaaababaaaaadaaaaaaadadaaaaaaaaaaaaaaaaaaaaaaaaaaadadadaaaaaaaaaaaaaaaaaaaaaaaaaaacacacacacaaaaaaaa +aaaaaaaaaaaaadadadadadadadadaaaaaaaaaaaeaeaaaaadadadadadadaaaaaaaaaaadadadaaaaaaaaacacabababaaaaaaaa +aaaaaaaaaaaaaaaaadadadadaeaeaeaeaeaeaeaeaeadadadadadadadadadadadaaaaadadadaaaaaaaaaaaaabaaaaaaaaaaaa +aaaaaaaaaaadadadadadadadadadadadaeaeaeadadadadadadadadadadadadadadadadadadadaaaaaaaaaaaaaaaaaaaaabaa +aaaaaaadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadadaaaaaaabaaaaababaaaaaaaa +aaaaaaaaadaeaeaeadadadadadadadadadadadadadafafafafafagagagagagagagadadadadadadaaaaaaaaaaababababaaaa +aaaaaaaaaaaeaeaeadadadadadadadadadadadadadafahaiaiahagajakalamanagadadadadadadaaaaaaaaaaaaabababaaaa +aaabaaaaaaaeaeaeadadadadadadadadadadadadadafaoapaqaragasatauatavagadadadadadadadaaaaaaaaaaabababaaaa +aaaaaaaaaaaaaeaeadadadadawawawawawawawawadafaxayazaAagaBaCaDaEaFagadadadadadadadaaaaaaabaaaaabaaaaaa +aaababaaadaeaeaeadadadadawaGaHaIaJaKaLafafafafaMaNafagagaOaPaQaQaQaQaQaQaQaQadadadadaaaaaaaaaaaaaaaa +aaacabaaaaaeaeaeaeadadadawaRaSaTaUaVaWafaXaYaZbabbbcbdafbebfbgbhbibjbkbkblaQadadadadaaaaaaaaaaaaaaaa +aaababaaaaaaaeaeaeadadadawbmbnbobpbqbrafbsbtbubvbwbubxafbybzbAbBbCbCbCbCbDaQadadadadadadaaaaaaaaaaaa +aaababababaaaeaeaeadawawawawawbEbFbGbHafbIbJbKbLbMbNbOafbPbzbQbCbCbRbSbSbSaQadadadadadadaaaaaaaaaaaa +ababacacacaaaaaeaeadawbTbUbVawbWbXawawafafbYbZafafafafafcacbcccdcecececfcgaQadadadaeaeaeaaaaaaaaaaaa +aaabacacacaaaaaeaeadawbUbUchawcibzcjckclcmcncocpcqcrcscpctcucvcwcxcyczcAbSaQadadaeaeaeaeaaaaabaaaaaa +aaababacacaaaaaeaeadawcBcBcCcDcEcFcGcHcIcJcKcLcpcMcNcOcpcPbzaQaQaQaQaQaQaQaQadadadaeadaaaaababaaaaaa +aaaaaaaaaaaaaeaeaeadawcBcBcQawcRcSbzcTcTcUcVcWcpcXcYcZcpcPbzdadbdcdddeadadadadadaeaeaaaaaaababaaaaaa +aaabaaaaadadaeaeadadawcBcBdfdgdhdidjdkdldmdndocpcpdpdqcpdrcbdsdtdudvdeadadadaeaeaeaaaaaaabababaaaaaa +aaaaaaaaadadadadadadawdwdxdydzdAdBdCdDdEdFdGdHdIdFdJcudKdLcudMdNdOdPdeadadadaeadadaaaaaaababaaaaaaaa +aaaaadadadadadadadaddBdBdBdBdQdRdSdTdUdVbfdWdXdXdYdZeaebecedeeefegehdeadadadaeadaeaaaaaaababaaaaaaaa +aaadadadadadadadadaddBeiejekelemcpencpcpeoepeqeqereseqeqetcbeuevewexdeadaeaeaeadaeaeaeaaaaaaaaaaaaaa +aaadadadadadadadadaddBeyezeAeBeCcpeDeEcpeFeGeHeIeJeKeLeqcPbzeMeNeOePdeadaeadadadaeaeaeaaaaaaababaaaa +aaadaaaaadadadadadaddBdBdBdBdQeQcpeDeRcpbzeSeTeUeVeWeXeqeYeZfafbfbfbfbfcfdadadadaeaeaeaeaeaaababaaaa +aaadaaaaaaaaadadadaddBeiejekelfecpeDffcpbzfgfhfififjfkeqflfmfnfofpfpfpfpadadadadadadaeaeaeaaababaaaa +aaaaaaaaaaaaaaadadaddBeyezeAeBeCcpeDfqcpbzfrfsftfufvfweqfxfyfzfAfBfCfDfpadadadadadadaeaeaeaaababaaaa +aaaaaaaaaaaaaaadadaddBdBdBdBdQfEcpcpcpcpfFfGeqeqeqeqeqeqflfHfIfJfKfLfMfpadadadadadadaeaeaeaaaaaaaaaa +aaaaaaaaabaaaaadadaddBeiejekfNfOfPdBfQfRfSfTfUfVfpfWfXfYfZfHgagbgcgdfDfpadadadadadadadaeaeaaaaaaabaa +aaaaabaaaaaaaaaaadaddBeyezeAgegfggdBfVfTfTfTfTfVfpghfXgigjfHfIgkfpfpfpfpadadadadadadadaeaeaaaaaaaaaa +aaaaabababaaaaaaadaddBdBdBdBdBglgmdBfVfTfTfTgngogpgqgrgsgtgufzfAfBgvfDfpadadadadadadadadaeaaaaaaaaaa +aaaaaaababaaaaaaadadadadaddBgwgxgydBcpcpgzgzcpcpfpfpfpfpgAgBfIgCfKgDgEfpadadadadadadaaaaaaaaaaabaaaa +aaaaaaababaaaaaaadadadadaddBgwgFgGdBadcpgHgIcpadfpgJgKgLgMgNgOgbgcgPfDfpadadadadadadadadaaaaaaaaaaaa +aaaaaaaaaaaaaaaaadadadadaddBdBdBdBdBadcpgQgQcpadfpgRgSfpgTgUgVgWfpfpfpfpadadadadadadadadaaaaaaaaaaaa +aaaaabaaaaaaabaaaaadadadadadadadadadadadaeaeadadfpgXgXfpfpgYfpfpfpadadadadadadadaeaeaeadaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaadadadadadadadadadaeaeaeaeadadfpgZhafphbhchdfpadadadadadaaaaadaeaeaeadaaaaaaabaaaa +aaabaaaaaaaaaaaaaaaaadadadadadadadadadaeaeaeaeadfpfpfpfpfpfpfpfpadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaadadadadadadadadadaeaeaeaeadadadadadadadadadadadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaababaaaaaaaaaaadadadadadadadadadadadadaeaeaeaeaeaeadadadadadadadadadaaaaaaaaaaaaababaaaaaaabaaaa +aaaaababaaaaaaaaadadadadadadadadadadadadadadaeaeaeaeaeaeadadadadadadadadaaaaaaababaaacabaaaaaaaaaaaa +aaacababaaabaaaaadadadadaaaaaaaaaaaaadadadadadadadadaeaeaeaeaeaeaeaeaeadaaaaaaaaaaaaacacababaaaaaaaa +abacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadadadadadadadadaaaaadaeaeaeaeaeaaaaaaaaaaaaacacababaaaaaaaa +abacacaaaaaaaaaaaaaaaaabaaababacacacaaaaaaaaaaaaaaaaaaaaaaaaaaadadadaeaeaaaaaaaaaaacacacababaaaaaaaa +abababaaaaabaaaaaaaaaaaaaaacacacacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaacacababaaaaaaaaaa +abababaaaaaaaaaaaaaaabababacacacacacabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababaaaaabaaaa +aaaaaaaaaaaaaaaaaaaaaaaaababacaaabababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaabababaaabababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} diff --git a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm b/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm deleted file mode 100644 index 94d72748498..00000000000 --- a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm +++ /dev/null @@ -1,1888 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"c" = ( -/turf/closed/mineral/volcanic/lava_land_surface{ - baseturf = /turf/open/floor/plating/asteroid - }, -/area/ruin/unpowered/no_grav) -"d" = ( -/mob/living/simple_animal/hostile/flan/water, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"e" = ( -/mob/living/simple_animal/hostile/flan/fire, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"f" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/template_noop) -"g" = ( -/obj/item/weapon/bikehorn, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"h" = ( -/turf/closed/wall/mineral/iron, -/area/ruin/unpowered/no_grav) -"i" = ( -/obj/structure/rack, -/obj/item/weapon/kitchen/knife/combat/survival, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"j" = ( -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"k" = ( -/obj/structure/rack, -/obj/item/weapon/twohanded/spear, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"l" = ( -/obj/structure/rack, -/obj/item/weapon/relic, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"m" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"n" = ( -/obj/structure/rack, -/obj/item/weapon/dice/d4, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"o" = ( -/obj/structure/rack, -/obj/item/weapon/dice/d8, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"p" = ( -/obj/structure/rack, -/obj/item/weapon/dice/d12, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"q" = ( -/obj/structure/rack, -/obj/item/weapon/dice/d00, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"r" = ( -/obj/structure/rack, -/obj/item/weapon/dice/d20, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"s" = ( -/obj/structure/statue/silver/sec, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"t" = ( -/obj/structure/statue/silver/md, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"u" = ( -/obj/structure/table/wood/fancy, -/obj/item/weapon/twohanded/skybulge, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"v" = ( -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"w" = ( -/obj/structure/mineral_door/silver, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"x" = ( -/obj/structure/closet/coffin, -/obj/item/stack/sheet/bone, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"y" = ( -/mob/living/simple_animal/hostile/flan/fire, -/turf/open/floor/plating/astplate{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) -"z" = ( -/obj/structure/statue/silver/secborg, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"A" = ( -/obj/structure/statue/silver/medborg, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"B" = ( -/obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/donkpocket, -/turf/open/floor/mineral/silver, -/area/ruin/unpowered/no_grav) -"C" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/turf/open/floor/plating/astplate{ - icon_state = "astplate_warn"; - initial_gas_mix = "TEMP=2.7"; - tag = "icon-astplate_warn (WEST)" - }, -/area/ruin/unpowered/no_grav) -"D" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, -/turf/open/floor/plating/astplate{ - icon_state = "astplate_warn"; - initial_gas_mix = "TEMP=2.7"; - tag = "icon-astplate_warn (EAST)" - }, -/area/ruin/unpowered/no_grav) -"E" = ( -/obj/item/weapon/dice/d10, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"F" = ( -/obj/structure/grille, -/turf/template_noop, -/area/ruin/unpowered/no_grav) -"G" = ( -/obj/item/weapon/dice/d100, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"H" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 10 - }, -/turf/open/floor/plating/astplate{ - icon_state = "astplate_warn"; - initial_gas_mix = "TEMP=2.7"; - tag = "icon-astplate_warn (SOUTHWEST)" - }, -/area/ruin/unpowered/no_grav) -"I" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 6 - }, -/turf/open/floor/plating/astplate{ - icon_state = "astplate_warn"; - initial_gas_mix = "TEMP=2.7"; - tag = "icon-astplate_warn (SOUTHEAST)" - }, -/area/ruin/unpowered/no_grav) -"J" = ( -/obj/item/weapon/crowbar/red, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"K" = ( -/obj/item/weapon/dice/d1, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered/no_grav) -"L" = ( -/turf/open/floor/mineral/silver{ - initial_gas_mix = "TEMP=2.7" - }, -/area/ruin/unpowered/no_grav) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -a -a -a -a -a -a -b -b -c -c -c -c -a -a -a -a -c -c -c -c -c -b -b -b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(4,1,1) = {" -a -a -a -a -a -a -b -b -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -b -b -c -c -c -a -a -a -a -c -c -c -a -a -a -"} -(5,1,1) = {" -a -a -a -a -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -a -a -a -"} -(6,1,1) = {" -a -a -a -a -a -b -b -b -c -c -c -c -c -c -c -c -c -c -c -b -c -c -c -c -c -c -c -c -c -b -b -b -b -c -c -c -c -c -a -a -"} -(7,1,1) = {" -a -a -a -a -b -b -b -b -b -b -b -c -b -c -c -c -c -c -b -b -c -c -b -b -c -c -c -b -c -b -c -c -b -c -c -c -c -c -a -a -"} -(8,1,1) = {" -a -b -b -b -b -b -c -c -b -b -b -b -b -d -c -c -c -c -b -b -c -c -c -b -b -c -b -b -c -c -c -c -c -c -b -c -c -a -a -a -"} -(9,1,1) = {" -a -a -c -c -c -c -c -c -c -c -c -c -c -b -c -c -c -b -b -b -b -c -c -c -b -b -b -c -c -c -c -b -c -c -b -c -c -c -a -a -"} -(10,1,1) = {" -a -a -c -c -c -c -c -c -c -c -c -c -c -b -c -c -c -b -b -b -b -c -c -c -b -d -c -c -c -c -b -b -c -c -b -c -c -c -c -a -"} -(11,1,1) = {" -a -a -a -c -c -c -c -c -b -b -b -c -c -b -b -c -c -c -c -b -E -c -b -c -b -c -c -c -c -b -b -c -c -b -b -c -c -c -a -a -"} -(12,1,1) = {" -a -a -a -c -c -c -c -b -d -b -b -c -c -b -b -b -c -c -c -c -c -c -G -c -b -c -c -c -b -b -c -c -c -b -b -c -c -b -b -a -"} -(13,1,1) = {" -a -a -a -c -c -c -c -b -b -b -e -b -c -c -b -b -b -b -c -c -c -c -c -c -b -b -c -c -b -b -c -c -c -c -c -c -c -b -a -a -"} -(14,1,1) = {" -a -a -a -c -c -c -c -b -b -c -b -b -b -c -c -c -c -b -b -b -b -b -c -c -c -b -b -c -b -c -c -c -c -c -c -b -b -a -a -a -"} -(15,1,1) = {" -a -a -a -c -c -c -c -c -b -c -c -b -g -c -c -c -c -c -b -b -b -b -c -c -c -b -b -c -b -c -c -c -c -c -c -b -b -a -a -a -"} -(16,1,1) = {" -a -a -a -c -c -c -c -c -c -c -c -b -b -b -b -c -c -c -c -c -b -b -c -b -b -c -b -c -b -c -c -b -b -b -b -b -b -a -a -a -"} -(17,1,1) = {" -a -a -a -a -c -c -c -c -c -c -b -d -b -b -c -c -c -c -c -c -c -b -b -b -c -c -b -b -b -b -b -b -b -b -b -b -b -a -a -a -"} -(18,1,1) = {" -a -a -a -a -c -c -c -c -c -b -b -c -c -c -c -f -c -c -c -c -c -b -b -c -c -b -b -b -d -b -c -c -c -c -b -b -b -a -a -a -"} -(19,1,1) = {" -a -a -a -a -c -c -c -c -c -c -c -c -a -a -a -f -a -a -f -a -a -c -b -b -c -b -b -b -b -b -b -c -c -c -c -b -b -a -a -a -"} -(20,1,1) = {" -a -a -a -a -b -b -c -c -c -c -a -a -h -h -h -h -h -h -h -h -f -c -c -b -b -b -b -c -c -b -b -c -c -c -c -c -b -a -a -a -"} -(21,1,1) = {" -a -a -a -a -b -b -b -b -c -c -c -f -h -i -j -h -n -j -j -h -a -f -c -c -b -b -b -c -c -c -b -b -c -c -c -c -b -b -a -a -"} -(22,1,1) = {" -a -a -a -a -a -b -b -b -c -c -c -a -h -j -j -m -j -j -j -h -F -F -c -c -J -b -c -c -c -c -c -b -c -c -c -c -c -c -a -a -"} -(23,1,1) = {" -a -a -a -a -a -b -b -b -c -c -a -a -h -k -j -h -o -j -j -C -C -C -H -b -b -b -c -b -b -b -c -b -c -c -c -c -c -a -a -a -"} -(24,1,1) = {" -a -a -a -a -a -a -b -b -c -c -c -a -h -h -h -h -p -j -y -D -D -D -I -b -b -d -c -c -b -b -c -b -c -c -c -c -c -a -a -a -"} -(25,1,1) = {" -a -a -a -a -a -a -b -b -b -c -c -f -h -l -j -h -q -j -j -h -F -F -c -b -b -c -c -c -b -K -c -b -c -c -c -c -c -c -a -a -"} -(26,1,1) = {" -a -a -a -a -a -a -a -b -b -c -c -a -h -j -j -m -j -j -j -h -f -c -c -b -b -c -b -c -c -c -c -b -c -b -c -c -c -c -a -a -"} -(27,1,1) = {" -a -a -a -a -a -a -a -b -b -c -c -f -h -k -j -h -r -L -j -h -a -c -b -b -c -c -b -c -c -c -c -c -c -b -c -c -b -b -a -a -"} -(28,1,1) = {" -a -a -a -a -a -a -a -b -b -c -a -f -h -h -h -h -h -w -h -h -a -c -b -c -c -b -b -c -c -b -c -c -c -b -d -b -b -b -a -a -"} -(29,1,1) = {" -a -a -a -a -a -a -a -b -b -c -a -f -a -a -a -h -s -v -z -h -f -c -b -c -b -b -c -c -c -b -c -c -c -b -c -c -c -a -a -a -"} -(30,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -c -c -f -f -h -h -v -h -h -a -c -c -c -b -d -c -b -c -b -c -c -c -b -c -c -b -b -a -a -"} -(31,1,1) = {" -a -a -a -a -a -a -a -a -a -c -c -c -c -a -a -h -t -v -A -h -a -a -c -c -c -b -c -b -c -b -b -b -b -b -c -c -b -a -a -a -"} -(32,1,1) = {" -a -a -a -a -a -a -a -a -a -c -c -c -c -c -a -h -h -v -h -h -f -f -f -c -b -b -c -c -c -c -b -b -c -c -c -c -c -a -a -a -"} -(33,1,1) = {" -a -a -a -a -a -a -a -a -a -a -c -c -c -c -f -h -u -v -B -h -a -a -c -c -b -b -b -c -c -c -b -c -c -c -c -c -c -c -a -a -"} -(34,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -c -c -c -a -h -h -x -h -h -a -a -c -c -c -b -b -c -b -b -b -c -c -c -c -c -c -c -a -a -"} -(35,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -c -c -c -h -h -h -f -a -c -c -c -c -c -b -b -b -c -c -c -c -c -c -c -c -a -a -a -"} -(36,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -c -c -c -a -f -c -c -c -c -b -b -b -b -c -c -c -c -c -c -c -a -a -a -a -a -"} -(37,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -c -c -c -c -c -c -b -b -b -b -b -b -b -c -c -c -c -c -a -a -a -a -a -a -"} -(38,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -c -c -b -b -b -b -a -a -a -a -b -b -c -c -c -a -a -a -a -a -a -a -"} -(39,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -b -b -a -a -a -a -a -a -a -b -a -a -a -a -a -a -a -a -a -a -"} -(40,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index e953ee9a4e6..fd97136d6cf 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -37,6 +37,9 @@ /area/ruin/powered/aesthetic) "j" = ( /obj/structure/chair/stool, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/vaporwave, /area/ruin/powered/aesthetic) "k" = ( @@ -153,10 +156,10 @@ }, /area/ruin/unpowered/no_grav) "G" = ( +/obj/effect/turf_decal/stripes/asteroid/line, /turf/open/floor/plating/astplate{ initial_gas_mix = "TEMP=2.7" }, -/obj/effect/turf_decal/stripes/asteroid/line, /area/ruin/unpowered/no_grav) "H" = ( /obj/effect/overlay/palmtree_l, @@ -196,6 +199,39 @@ /obj/effect/decal/sandeffect, /turf/open/floor/plasteel/airless/asteroid, /area/ruin/unpowered/no_grav) +"O" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/vaporwave, +/area/ruin/powered/aesthetic) +"P" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/vaporwave, +/area/ruin/powered/aesthetic) +"Q" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/vaporwave, +/area/ruin/powered/aesthetic) +"R" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/astplate{ + initial_gas_mix = "TEMP=2.7" + }, +/area/ruin/unpowered/no_grav) +"S" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/astplate{ + initial_gas_mix = "TEMP=2.7" + }, +/area/ruin/unpowered/no_grav) (1,1,1) = {" a @@ -294,7 +330,7 @@ h u y f -B +R d d a @@ -326,7 +362,7 @@ j k k v -k +P f C I @@ -390,11 +426,11 @@ a d c g -n +O n k w -k +Q g F I @@ -430,7 +466,7 @@ p u y g -B +S d d a diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index 92d0902564b..7618b86f338 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -1265,10 +1265,10 @@ }, /area/shuttle/syndicate) "acN" = ( -/turf/closed/wall/r_wall{ +/turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/transfer) "acO" = ( /obj/machinery/light, /turf/open/floor/plasteel/black{ @@ -1645,11 +1645,19 @@ }, /area/ai_monitored/security/armory) "adC" = ( -/obj/machinery/flasher/portable, -/turf/open/floor/plasteel/delivery{ +/obj/machinery/door/airlock/security{ + name = "Prisoner Transfer Center"; + req_access_txt = "2" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/transfer) "adD" = ( /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit{ @@ -1787,13 +1795,9 @@ }, /area/ai_monitored/security/armory) "adS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/black{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/ai_monitored/security/armory) +/obj/item/weapon/ore/glass, +/turf/open/floor/plating/asteroid, +/area/security/transfer) "adT" = ( /obj/structure/rack, /obj/item/weapon/gun/energy/ionrifle, @@ -1824,10 +1828,19 @@ }, /area/ai_monitored/security/armory) "adV" = ( -/turf/open/floor/plasteel{ +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/transfer) "adW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -2003,12 +2016,16 @@ /turf/closed/mineral/random/labormineral, /area/maintenance/asteroid/fore/com_west) "aeq" = ( -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 8; +/obj/machinery/camera{ + c_tag = "Brig Cell 5"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "aer" = ( /obj/structure/rack, /obj/item/weapon/gun/energy/e_gun{ @@ -2029,52 +2046,30 @@ }, /area/ai_monitored/security/armory) "aes" = ( -/turf/open/floor/plasteel/black{ +/obj/machinery/camera{ + c_tag = "Brig Cell 6"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "aet" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/weapon/shield/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/machinery/flasher{ + id = "Cell 6"; pixel_x = 0; - pixel_y = 1; - pixel_x = 3; - pixel_y = -3 + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/holopad, +/obj/machinery/light/small{ + dir = 1 }, -/turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 8 +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "aeu" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -2221,21 +2216,13 @@ }, /area/maintenance/asteroid/fore/com_north) "aeK" = ( -/obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ - pixel_x = -3; - pixel_y = 3 +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 8 - }, -/area/ai_monitored/security/armory) +/area/security/prison) "aeL" = ( /obj/structure/rack, /obj/item/clothing/suit/armor/bulletproof{ @@ -2274,14 +2261,13 @@ }, /area/ai_monitored/security/armory) "aeM" = ( -/mob/living/simple_animal/bot/secbot/beepsky{ - desc = "It's Officer Gunsky, the most rootin'-tootin'-point-and shootin' security bot on this side of the galaxy!"; - name = "Officer Gunsky" +/obj/machinery/atmospherics/components/unary/vent_pump{ + on = 1 }, -/turf/open/floor/plasteel/black{ +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "aeN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2292,11 +2278,15 @@ }, /area/ai_monitored/security/armory) "aeO" = ( -/obj/structure/closet/secure_closet/lethalshots, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "aeP" = ( /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2353,7 +2343,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/shuttle/syndicate) "aeX" = ( /obj/structure/reagent_dispensers/fueltank, @@ -2430,20 +2420,20 @@ }, /area/ai_monitored/security/armory) "afg" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/black{ +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "afh" = ( -/obj/machinery/suit_storage_unit/security, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/closet/secure_closet/brig{ + name = "Perma Storage" }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "afi" = ( /turf/closed/wall, /area/maintenance/asteroid/fore/com_north) @@ -2590,17 +2580,17 @@ /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/shuttle/syndicate) "afu" = ( /obj/structure/shuttle/engine/propulsion, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/shuttle/syndicate) "afv" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/shuttle/syndicate) "afw" = ( /obj/structure/closet, @@ -2640,35 +2630,27 @@ }, /area/ai_monitored/security/armory) "afz" = ( -/obj/structure/rack, -/obj/item/weapon/storage/box/teargas{ - pixel_x = -3; - pixel_y = 3 +/obj/machinery/door/window/brigdoor/northleft{ + id = "Cell 6"; + name = "Cell Door 6" }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 8 - }, -/area/ai_monitored/security/armory) -"afA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/black{ +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) +"afA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) "afB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -2692,8 +2674,15 @@ }, /area/ai_monitored/security/armory) "afD" = ( -/turf/closed/mineral/random/labormineral, -/area/security/transfer) +/obj/structure/holohoop{ + tag = "icon-hoop (NORTH)"; + icon_state = "hoop"; + dir = 1 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) "afE" = ( /turf/closed/wall/rust{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2893,12 +2882,15 @@ /turf/open/floor/plating/asteroid, /area/security/prison) "aga" = ( -/obj/machinery/hydroponics/soil, -/obj/machinery/light{ - dir = 1 +/obj/machinery/camera{ + c_tag = "Brig Cell 4"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plating/asteroid, /area/security/prison) "agb" = ( /obj/machinery/hydroponics/soil, @@ -2906,32 +2898,85 @@ /turf/open/floor/plating/asteroid, /area/security/prison) "agc" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "agd" = ( -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 10; +/obj/machinery/door_timer{ + id = "Cell 5"; + name = "Cell 5"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "age" = ( -/turf/open/floor/plasteel/darkred/side{ +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "agf" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/darkred/side{ +/obj/machinery/door_timer{ + id = "Cell 6"; + name = "Cell 6"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "agg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/orange{ @@ -2946,21 +2991,42 @@ }, /area/ai_monitored/security/armory) "agh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/darkred/corner{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHEAST)"; + icon_state = "red"; + dir = 5; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "agi" = ( -/obj/machinery/light, -/obj/vehicle/secway, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plasteel{ +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "agj" = ( /obj/machinery/flasher/portable, /obj/machinery/camera/motion{ @@ -3395,8 +3461,16 @@ }, /area/security/prison) "agW" = ( -/obj/item/weapon/cultivator, -/turf/open/floor/plating/astplate{ +/obj/machinery/flasher{ + id = "Cell 4"; + pixel_x = -32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -3406,10 +3480,12 @@ }, /area/security/prison) "agY" = ( -/obj/machinery/door/airlock{ - name = "Bathroom" +/obj/machinery/door/window/brigdoor/westleft{ + id = "Cell 4"; + name = "Cell Door 4"; + req_access_txt = "1" }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -3426,41 +3502,44 @@ }, /area/ai_monitored/security/armory) "aha" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Armory"; - req_access_txt = "3" +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CellBlockMidRight"; + location = "CellBlockUpRight"; + name = "navigation beacon (CellBlockUpRight)" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 5; +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "ahb" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Armory"; - req_access_txt = "3" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9; + pixel_y = 0 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "ahc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump{ - dir = 8; - layer = 2.4; - on = 1 +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/camera{ + c_tag = "Brig Perma Cell 2"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" }, -/turf/open/floor/plasteel/black{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -3524,6 +3603,11 @@ icon_state = "pipe-c" }, /obj/structure/grille/broken, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3533,6 +3617,11 @@ dir = 4; icon_state = "pipe-j2" }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3730,33 +3819,28 @@ /area/security/prison) "ahJ" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/device/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; - name = "Prison Intercom (General)"; - pixel_x = 0; - pixel_y = 24; - prison_radio = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/machinery/camera{ - c_tag = "Brig Long-Term Cells" - }, -/obj/item/seeds/potato, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "ahK" = ( -/obj/structure/table, -/obj/machinery/computer/libraryconsole/bookmanagement, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/structure/sign/poster/official/obey{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -3776,26 +3860,35 @@ name = "Asteroid" }) "ahN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"ahO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) -"ahO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 8; - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/ai_monitored/security/armory) +/area/security/prison) "ahP" = ( /turf/closed/wall/rust{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -4044,36 +4137,47 @@ }, /area/security/prison) "aiq" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime{ +/obj/machinery/door_timer{ + id = "Cell 4"; + name = "Cell 4"; + pixel_x = -32; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "air" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/northright{ - name = "Armory Desk"; - req_access_txt = "3" +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/door/window/brigdoor/southleft{ - name = "Armory Desk"; - req_one_access_txt = "38;2" - }, -/obj/item/weapon/paper_bin, -/turf/open/floor/plating{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "ais" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armoryaccess"; - name = "Armory Shutters" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plating{ +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "ait" = ( /obj/machinery/door/airlock/glass_security{ name = "Armory"; @@ -4092,14 +4196,18 @@ }, /area/security/prison) "aiu" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Armory"; - req_access_txt = "3" +/obj/machinery/door_timer{ + id = "Cell 7"; + name = "Cell 7"; + pixel_x = 32; + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 8; +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -4138,25 +4246,30 @@ }, /area/security/prison) "aix" = ( -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = -32 }, -/turf/open/floor/plating/astplate{ +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "aiy" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/camera{ + c_tag = "Brig Perma Cell 5"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" }, -/turf/open/floor/plating/astplate{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "aiz" = ( /obj/structure/rack, /obj/item/weapon/pickaxe/mini, @@ -4182,6 +4295,11 @@ "aiC" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -4367,22 +4485,26 @@ }, /area/maintenance/asteroid/fore/com_west) "aja" = ( -/obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/floorgrime{ +/obj/machinery/gulag_item_reclaimer{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/processing) "ajb" = ( /obj/structure/closet/crate, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/fore/cargo_south) "ajc" = ( -/obj/machinery/light/small{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -4398,8 +4520,13 @@ }, /area/security/prison) "aje" = ( -/obj/structure/table, -/turf/open/floor/plating{ +/obj/machinery/camera{ + c_tag = "Brig Cell 3"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -4411,7 +4538,13 @@ }, /area/security/prison) "ajg" = ( -/obj/structure/chair/stool, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 3"; + name = "Cell 3 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -4423,30 +4556,54 @@ }, /area/security/prison) "aji" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/floorgrime{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "ajj" = ( -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/plasteel/darkred{ +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "Prison Wing APC"; + pixel_x = 24; + pixel_y = 0 + }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "ajk" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/sign/nanotrasen{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 8; +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -4490,12 +4647,14 @@ }, /area/security/prison) "ajo" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/closet/secure_closet/brig{ + id = "Cell 8"; + name = "Cell 8 Locker" }, -/turf/open/floor/plasteel/darkred{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -4811,44 +4970,64 @@ }, /area/security/prison) "ajZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall{ - baseturf = /turf/open/floor/plating/asteroid/airless +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/area/security/prison) -"aka" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/poddoor/preopen{ - id = "permatoggle"; - layer = 2.6; - name = "prisoner transfer door" +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) -"akb" = ( -/obj/machinery/light{ - dir = 8 +"aka" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless }, -/turf/open/floor/plasteel/darkred{ +/area/security/prison) +"akb" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4; + initialize_directions = 11 + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "akc" = ( -/turf/open/floor/plasteel/darkred{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "akd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 8; +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -4861,14 +5040,11 @@ }, /area/security/prison) "akf" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/window/brigdoor/eastleft{ + id = "Cell 8"; + name = "Cell Door 8" }, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 4; +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5138,28 +5314,31 @@ /turf/open/floor/plating, /area/space) "akG" = ( -/obj/structure/chair{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/open/floor/plating{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/processing) "akH" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - icon_state = "ast_warn"; +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/astplate{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/processing) "akI" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating/astplate{ +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/processing) "akJ" = ( /obj/effect/turf_decal/stripes/asteroid/line{ icon_state = "ast_warn"; @@ -5177,14 +5356,18 @@ }, /area/maintenance/asteroid/fore/com_north) "akL" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, -/turf/closed/wall/r_wall{ +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/processing) "akM" = ( /obj/machinery/biogenerator, /turf/open/floor/plasteel/floorgrime{ @@ -5192,7 +5375,8 @@ }, /area/security/prison) "akN" = ( -/obj/machinery/seed_extractor, +/obj/structure/bed, +/obj/item/weapon/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -5216,11 +5400,18 @@ }, /area/security/prison) "akQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/turf/open/floor/plating{ +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5422,14 +5613,15 @@ }, /area/security/prison) "alo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/glass_security{ - name = "Long-Term Holding Cell"; - req_access_txt = "2" +/obj/machinery/door_timer{ + id = "Cell 3"; + name = "Cell 3"; + pixel_x = -32; + pixel_y = 0 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; - dir = 1; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5457,29 +5649,16 @@ }, /area/security/transfer) "alr" = ( -/obj/item/weapon/shovel, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless; - icon_plating = "asteroid_dug"; - icon_state = "asteroid_dug"; - name = "ditch" - }, -/area/security/transfer) +/turf/open/floor/plating/asteroid, +/area/security/prison) "als" = ( -/obj/item/weapon/ore/glass, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless; - icon_plating = "asteroid_dug"; - icon_state = "asteroid_dug"; - name = "ditch" - }, -/area/security/transfer) +/obj/structure/chair/stool, +/turf/open/floor/plating/asteroid, +/area/security/prison) "alt" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_north) +/obj/machinery/biogenerator, +/turf/open/floor/plating/asteroid, +/area/security/prison) "alu" = ( /obj/structure/rack, /obj/item/weapon/pickaxe/emergency, @@ -5667,24 +5846,35 @@ }, /area/quartermaster/sorting) "alR" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Brig Cell 4"; - dir = 4; - network = list("SS13") +/obj/machinery/door/airlock/glass_security{ + name = "Gulag Dock"; + req_access_txt = "0"; + req_one_access_txt = "38;2" }, -/obj/item/weapon/bedsheet, -/turf/open/floor/plasteel/floorgrime{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/processing) "alS" = ( -/obj/machinery/flasher{ - id = "Cell 4"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/turf/open/floor/plasteel/floorgrime{ +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5698,16 +5888,13 @@ }, /area/security/prison) "alU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + icon_state = "intact"; + dir = 8 }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5751,96 +5938,79 @@ }, /area/security/prison) "alW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + icon_state = "intact"; + dir = 8 }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "alX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CellBlockUpLeft"; + location = "CellBlockMidLeft"; + name = "navigation beacon (CellBlockMidLeft)" }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "alY" = ( -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "alZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + icon_state = "intact"; + dir = 8 }, /obj/structure/cable/orange{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 2; + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "ama" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CellBlockLowRight"; + location = "CellBlockMidRight"; + name = "navigation beacon (CellBlockMidRight)" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + icon_state = "intact"; + dir = 8 }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 6; +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 10; +/turf/open/floor/plasteel/red/corner{ + tag = "icon-redcorner (EAST)"; + icon_state = "redcorner"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5876,67 +6046,57 @@ }, /area/security/prison) "ame" = ( -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amf" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/door/airlock/glass_security{ + name = "Perma Brig"; + req_access_txt = "0"; + req_one_access_txt = "38;2" }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -5951,37 +6111,42 @@ }, /area/security/prison) "amj" = ( -/obj/machinery/flasher{ - id = "Cell 8"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/door/airlock/glass_security{ + name = "Perma Cell 3"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amk" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Brig Cell 8"; - dir = 9; - icon_state = "camera"; - network = list("SS13"); - tag = "" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/item/device/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + dir = 2; + name = "Prison Intercom (General)"; + pixel_x = 0; + pixel_y = 24; + prison_radio = 1 }, -/obj/item/weapon/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "aml" = ( -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless; - icon_plating = "asteroid_dug"; - icon_state = "asteroid_dug"; - name = "ditch" +/obj/structure/chair/stool, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "amm" = ( /obj/machinery/light/small{ dir = 8 @@ -6275,24 +6440,44 @@ /turf/open/floor/plating/airless, /area/space) "amR" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/door/airlock/glass_security{ + name = "Gulag Dock"; + req_access_txt = "0"; + req_one_access_txt = "38;2" }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/floorgrime{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/processing) "amS" = ( /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amT" = ( -/obj/machinery/door/window/brigdoor/westleft{ - id = "Cell 4"; - name = "Cell Door 4"; - req_access_txt = "1" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"amU" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -6300,40 +6485,68 @@ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) -"amU" = ( +"amV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"amW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) -"amV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/red/corner{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/prison) -"amW" = ( -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 1; - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/prison) "amX" = ( -/turf/open/floor/plasteel/red{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/corner{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "amY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/red/corner{ - icon_state = "redcorner"; - dir = 8; +/obj/machinery/door/airlock/glass_security{ + name = "Perma Brig"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -6356,28 +6569,39 @@ }, /area/security/prison) "anb" = ( -/obj/machinery/light/small{ +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/camera{ + c_tag = "Brig Perma Cell 3"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/holopad, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "anc" = ( -/obj/effect/decal/remains/human, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless; - icon_plating = "asteroid_dug"; - icon_state = "asteroid_dug"; - name = "ditch" +/obj/structure/table, +/obj/item/device/radio/beacon, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "and" = ( /obj/structure/disposalpipe/sortjunction{ name = "disposal pipe - Custodials"; sortType = 22 }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -6651,19 +6875,10 @@ }, /area/security/prison) "anF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/warden) "anG" = ( /obj/structure/cable/orange{ d1 = 1; @@ -6684,8 +6899,11 @@ }, /area/security/prison) "anH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 +/obj/machinery/door_timer{ + id = "Cell 2"; + name = "Cell 2"; + pixel_x = -32; + pixel_y = 0 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -6704,22 +6922,16 @@ }, /area/security/warden) "anK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/door/poddoor/preopen{ - id = "prisonbreak"; - layer = 2.6; - name = "emergency prisoner containment blast door" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "anL" = ( /obj/machinery/door/airlock/glass_security{ name = "Brig Control"; @@ -6740,19 +6952,18 @@ }, /area/security/warden) "anM" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Brig Control"; - req_access_txt = "3" +/obj/machinery/door_timer{ + id = "Cell 9"; + name = "Cell 9"; + pixel_x = 32; + pixel_y = 0 }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/open/floor/plasteel/red{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "anN" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -6800,16 +7011,11 @@ }, /area/security/prison) "anQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -6824,11 +7030,12 @@ }, /area/security/prison) "anS" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 8"; - name = "Cell 8 Locker" +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (WEST)"; + icon_state = "intact"; + dir = 8 }, -/turf/open/floor/plasteel/floorgrime{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -7251,29 +7458,38 @@ }, /area/security/prison) "aoM" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"aoN" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) -"aoN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Brig Control APC"; - pixel_x = -25; - pixel_y = 1 - }, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/warden) "aoO" = ( /obj/structure/cable/orange{ d1 = 2; @@ -7321,10 +7537,13 @@ }, /area/security/warden) "aoR" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/camera{ + c_tag = "Brig Cell 9"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -7608,49 +7827,54 @@ /area/security/prison) "apy" = ( /obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = 0; - pixel_y = 24 + id = "Cell 2"; + pixel_x = -32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "apz" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/window/brigdoor/westleft{ + id = "Cell 2"; + name = "Cell Door 2"; + req_access_txt = "1" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"apA" = ( +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 }, /obj/structure/cable/orange{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/camera{ + c_tag = "Brig Cellblock South"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) -"apA" = ( -/obj/structure/table, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 0 - }, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/warden) "apB" = ( /obj/structure/cable/orange{ d1 = 1; @@ -7662,23 +7886,21 @@ }, /area/security/warden) "apC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "apD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump{ - dir = 8; - layer = 2.4; - on = 1 +/obj/machinery/door/window/brigdoor/eastleft{ + id = "Cell 9"; + name = "Cell Door 9" }, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "apE" = ( /obj/structure/table, /obj/machinery/recharger, @@ -7708,10 +7930,13 @@ }, /area/security/prison) "apG" = ( -/obj/machinery/flasher{ - id = "Cell 7"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/door/airlock/glass_security{ + name = "Perma Cell 4"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8469,10 +8694,16 @@ }, /area/security/prison) "arp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 +/obj/machinery/door_timer{ + id = "Cell 1"; + name = "Cell 1"; + pixel_x = -32; + pixel_y = 0 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 }, -/obj/machinery/holopad, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 8; @@ -8549,16 +8780,21 @@ }, /area/security/warden) "aru" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door_timer{ + id = "Cell 10"; + name = "Cell 10"; + pixel_x = 32; + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/showroomfloor{ +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "arv" = ( /obj/structure/cable/orange{ d1 = 1; @@ -8606,11 +8842,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -8966,11 +9197,20 @@ /turf/open/floor/plating, /area/shuttle/mining) "ash" = ( -/obj/machinery/iv_drip, -/turf/open/floor/plasteel/white{ +/obj/structure/rack, +/obj/item/weapon/gun/ballistic/shotgun/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/gun/ballistic/shotgun/riot, +/obj/item/weapon/gun/ballistic/shotgun/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "asi" = ( /obj/structure/bed/roller, /turf/open/floor/plasteel/white{ @@ -8978,15 +9218,19 @@ }, /area/security/main) "asj" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 1 +/obj/structure/rack, +/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/plasteel/white{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "ask" = ( /obj/structure/table, /obj/item/weapon/storage/firstaid/toxin, @@ -9032,19 +9276,32 @@ }, /area/security/warden) "aso" = ( -/obj/structure/chair/office/light{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 8 }, -/turf/open/floor/plasteel/showroomfloor{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "asp" = ( -/obj/machinery/computer/security, -/turf/open/floor/plasteel/showroomfloor{ +/obj/structure/closet/secure_closet/brig{ + id = "Cell 10"; + name = "Cell 10 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "asq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/holopad, @@ -9172,7 +9429,6 @@ /obj/item/weapon/storage/secure/safe{ pixel_x = -28 }, -/obj/effect/landmark/start/chief_medical_officer, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9279,7 +9535,6 @@ /obj/structure/sign/poster/contraband/power{ pixel_x = 32 }, -/obj/effect/landmark/start/chief_engineer, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9476,16 +9731,51 @@ }, /area/security/processing) "atm" = ( -/obj/structure/closet/crate/freezer/blood, -/turf/open/floor/plasteel/white{ +/obj/structure/rack, +/obj/item/weapon/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/storage/box/rubbershot, +/obj/item/weapon/storage/box/rubbershot, +/obj/item/weapon/storage/box/rubbershot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/weapon/storage/box/rubbershot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "atn" = ( -/turf/open/floor/plasteel/white{ +/obj/structure/rack, +/obj/item/weapon/storage/box/teargas{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/storage/box/flashbangs{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "ato" = ( /obj/structure/table, /obj/item/weapon/storage/firstaid/regular, @@ -9507,32 +9797,34 @@ /area/security/prison) "atq" = ( /obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = 0; - pixel_y = 24 + id = "Cell 1"; + pixel_x = -32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "atr" = ( -/obj/structure/table, -/obj/item/key/security, -/obj/item/clothing/glasses/sunglasses, -/obj/item/clothing/ears/earmuffs, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/machinery/camera{ - c_tag = "Brig Control Center"; - dir = 4; - icon_state = "camera" +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/keycard_auth{ - pixel_x = -24 +/mob/living/simple_animal/bot/secbot{ + auto_patrol = 1; + desc = "Nobody escapes the Block as long as Ol' Saltwater controls it."; + name = "Ol' Saltwater"; + weaponscheck = 1 }, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "ats" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; @@ -9545,18 +9837,15 @@ }, /area/security/warden) "att" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CellBlockLowLeft"; + location = "CellBlockLowRight"; + name = "navigation beacon (CellBlockLowRight)" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "atu" = ( /obj/structure/table, /obj/machinery/light, @@ -9566,10 +9855,13 @@ }, /area/security/warden) "atv" = ( -/obj/machinery/flasher{ - id = "Cell 6"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/door/airlock/glass_security{ + name = "Perma Cell 6"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -9589,15 +9881,11 @@ }, /area/security/prison) "atx" = ( -/obj/structure/table, -/obj/item/weapon/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/turf/open/floor/plasteel/floorgrime{ +/obj/structure/weightlifter, +/turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_north) +/area/security/prison) "aty" = ( /obj/structure/chair/stool, /turf/open/floor/plating{ @@ -9985,39 +10273,45 @@ }, /area/security/processing) "aup" = ( -/obj/machinery/computer/gulag_teleporter_computer, +/obj/structure/closet/secure_closet/security/sec, +/obj/item/device/radio, /obj/machinery/camera{ - c_tag = "Labor Shuttle Dock North" + c_tag = "Brig Equipment North"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "auq" = ( -/obj/machinery/computer/security{ - name = "Labor Camp Monitoring"; - network = list("Labor") +/obj/structure/closet/secure_closet/security/sec, +/obj/item/device/radio, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, -/obj/structure/sign/securearea{ - pixel_x = 32; - pixel_y = 0 - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aur" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/closet/secure_closet/security/sec, +/obj/item/device/radio, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHEAST)"; + icon_state = "red"; + dir = 5; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aus" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating{ @@ -10025,11 +10319,15 @@ }, /area/maintenance/asteroid/fore/com_west) "aut" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white{ +/obj/machinery/camera/motion{ + c_tag = "Armory South"; + dir = 1; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/darkred/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "auu" = ( /obj/machinery/door/window/brigdoor/westleft{ id = "Cell 2"; @@ -10043,20 +10341,20 @@ }, /area/security/prison) "auv" = ( -/obj/structure/closet/secure_closet/warden{ - pixel_x = 0 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/item/device/radio/intercom{ - broadcasting = 0; - name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/item/device/radio, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "auw" = ( /obj/structure/cable/orange{ d1 = 1; @@ -10091,11 +10389,16 @@ }, /area/security/prison) "auz" = ( -/obj/structure/rack, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless +/obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Brig Perma South"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" }, -/area/maintenance/asteroid/fore/com_north) +/turf/open/floor/plating/asteroid, +/area/security/prison) "auA" = ( /obj/effect/turf_decal/stripes/asteroid/line, /turf/open/floor/plating/astplate{ @@ -10643,14 +10946,10 @@ /turf/open/floor/plating/airless, /area/space) "avy" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "avz" = ( /obj/structure/chair{ dir = 1 @@ -10672,20 +10971,22 @@ }, /area/security/processing) "avB" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "Security Equipment APC"; + pixel_x = 24; + pixel_y = 0 + }, /obj/structure/cable/orange{ - d1 = 1; d2 = 2; - icon_state = "1-2" + icon_state = "0-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - name = "Fore Asteroid Maintenance Access"; - req_access_txt = "12" - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "avC" = ( /obj/machinery/door/airlock/maintenance{ name = "Fore Asteroid Maintenance Access"; @@ -10740,30 +11041,10 @@ }, /area/security/prison) "avI" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Brig Control"; - req_access_txt = "3" - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/red{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/brig) "avJ" = ( /obj/machinery/door/airlock/glass_security{ name = "Brig Control"; @@ -10832,11 +11113,6 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11159,41 +11435,35 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "awz" = ( -/obj/structure/table, -/obj/item/weapon/folder/red{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/weapon/restraints/handcuffs, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/labor) -"awA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/security/processing) -"awB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/plating, -/area/security/processing) -"awC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0; - pixel_y = 32 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/crew_quarters/heads/hos) +"awA" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"awB" = ( +/obj/structure/closet/l3closet/scientist, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHWEST)"; + icon_state = "red"; + dir = 9; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"awC" = ( +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) "awD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -11229,72 +11499,77 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"awI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"awJ" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 - }, -/turf/closed/wall/r_wall{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"awK" = ( -/obj/structure/closet/l3closet/scientist, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"awL" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/item/device/radio, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"awM" = ( -/obj/machinery/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_x = -32; - pixel_y = 0 - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/prison) -"awN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, /turf/open/floor/plasteel/red/corner{ tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/main) +"awI" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHEAST)"; + icon_state = "red"; + dir = 5; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"awJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"awK" = ( +/obj/structure/closet{ + name = "evidence closet" + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHWEST)"; + icon_state = "red"; + dir = 9; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"awL" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Brig Control"; + req_access_txt = "3" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"awM" = ( +/obj/structure/closet/secure_closet/warden{ + pixel_x = 0 + }, +/obj/item/device/radio, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"awN" = ( +/obj/machinery/button/door{ + id = "wardencell"; + name = "Cell Access Privacy Shutter"; + pixel_x = 24; + pixel_y = 8 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) "awO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -11304,14 +11579,17 @@ }, /area/security/prison) "awP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 }, -/obj/effect/landmark/lightsout, /turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "awQ" = ( /obj/structure/cable/orange{ d1 = 1; @@ -11324,51 +11602,46 @@ }, /area/security/prison) "awR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/prison) -"awS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/red/side{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/prison) -"awT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (NORTH)"; - icon_state = "redcorner"; +/obj/structure/table, +/obj/machinery/computer/med_data/laptop, +/turf/open/floor/plasteel/whiteblue/side{ + tag = "icon-whiteblue (NORTH)"; + icon_state = "whiteblue"; dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) -"awU" = ( -/obj/machinery/door_timer{ - id = "Cell 6"; - name = "Cell 6"; - pixel_x = 32; - pixel_y = 0 +/area/security/brig) +"awS" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/whiteblue/side{ + tag = "icon-whiteblue (NORTH)"; + icon_state = "whiteblue"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) +"awT" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"awU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "awV" = ( /obj/machinery/light/small{ dir = 1 @@ -11575,15 +11848,14 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "axu" = ( -/obj/machinery/button/flasher{ - id = "gulagshuttleflasher"; - name = "Flash Control"; - pixel_x = 0; - pixel_y = -26; - req_access_txt = "1" +/obj/structure/table/wood, +/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/labor) +/area/crew_quarters/heads/hos) "axv" = ( /obj/machinery/mineral/labor_claim_console{ machinedir = 2; @@ -11610,8 +11882,16 @@ /turf/open/floor/plating, /area/security/processing) "axy" = ( -/turf/open/floor/plating, -/area/security/processing) +/obj/structure/closet/l3closet/scientist, +/obj/structure/sign/goldenplaque{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) "axz" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 8; @@ -11623,18 +11903,11 @@ }, /area/security/processing) "axA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, +/obj/effect/landmark/start/security_officer, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "axB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -11663,28 +11936,25 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "axE" = ( /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/fore/com_west) "axF" = ( -/obj/structure/closet/bombcloset, -/obj/structure/sign/map/left/ceres{ - pixel_x = -32 +/obj/structure/closet{ + name = "evidence closet" }, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "axG" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ on = 1 @@ -11707,15 +11977,13 @@ }, /area/security/prison) "axI" = ( -/obj/machinery/flasher{ - id = "Cell 1"; - pixel_x = 0; - pixel_y = 24 +/obj/structure/chair/office/light{ + dir = 1 }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/warden) "axJ" = ( /obj/structure/cable/orange{ d1 = 1; @@ -11738,32 +12006,26 @@ }, /area/security/prison) "axK" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/warden) "axL" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/westright{ + name = "Warden's Desk"; + req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/warden) "axM" = ( /obj/structure/cable/orange{ d1 = 1; @@ -11798,85 +12060,38 @@ }, /area/security/prison) "axN" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plasteel/red/side{ - tag = "icon-red (NORTHWEST)"; - icon_state = "red"; - dir = 9; +/obj/structure/bodycontainer/morgue, +/turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "axO" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "axP" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel{ +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "axQ" = ( -/obj/machinery/flasher{ - id = "Cell 5"; - pixel_x = 0; - pixel_y = 24 - }, -/turf/open/floor/plasteel/floorgrime{ +/obj/structure/grille, +/obj/structure/window/reinforced/tinted/fulltile, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "axR" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Brig Cell 5"; - dir = 9; - icon_state = "camera"; - network = list("SS13"); - tag = "" +/obj/structure/chair{ + dir = 8 }, -/obj/item/weapon/bedsheet, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "axS" = ( /obj/machinery/power/apc{ dir = 2; @@ -11915,9 +12130,9 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" + icon_state = "1-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -12067,7 +12282,6 @@ /obj/item/weapon/storage/secure/safe{ pixel_x = -28 }, -/obj/effect/landmark/start/head_of_security, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12090,7 +12304,6 @@ "aym" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/stamp/hos, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12229,7 +12442,6 @@ /obj/structure/sign/poster/contraband/lamarr{ pixel_x = 32 }, -/obj/effect/landmark/start/research_director, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12478,36 +12690,29 @@ /turf/open/floor/plasteel/black, /area/shuttle/labor) "azb" = ( -/obj/machinery/computer/shuttle/labor, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/effect/landmark/start/security_officer, +/obj/structure/chair{ + dir = 4 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "azc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/table, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"azd" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/chair{ + dir = 8 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) -"azd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/processing) +/area/security/main) "aze" = ( /obj/structure/cable/orange{ d1 = 1; @@ -12524,19 +12729,14 @@ }, /area/maintenance/asteroid/fore/com_west) "azf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/machinery/camera{ - c_tag = "Gulag Shuttle Midsection"; - dir = 9; - icon_state = "camera"; - network = list("SS13") - }, -/turf/open/floor/plasteel/floorgrime{ +/obj/structure/table, +/obj/machinery/recharger, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "azg" = ( /obj/machinery/vending/security, /turf/open/floor/plasteel/showroomfloor{ @@ -12544,19 +12744,30 @@ }, /area/security/main) "azh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/landmark/start/security_officer, -/turf/open/floor/plasteel/showroomfloor{ +/obj/machinery/door/airlock/glass_security{ + cyclelinkeddir = 2; + id_tag = null; + name = "Evidence Storage"; + req_access_txt = "0"; + req_one_access_txt = "38;63" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "azi" = ( -/obj/machinery/holopad, -/obj/effect/landmark/start/security_officer, -/turf/open/floor/plasteel/showroomfloor{ +/obj/structure/closet{ + name = "evidence closet" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "azj" = ( /obj/machinery/door/window/brigdoor/westleft{ id = "Cell 1"; @@ -12605,32 +12816,22 @@ }, /area/security/prison) "azn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass_security{ - name = "Cell Block"; - req_access_txt = "0"; - req_one_access_txt = "38;2" - }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; - icon_state = "redcorner"; - dir = 4; +/obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced, +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "azo" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - id = "Cell 5"; - name = "Cell Door 5"; - req_access_txt = "1" - }, -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 4; +/obj/structure/table/wood, +/obj/item/weapon/folder, +/obj/item/weapon/folder/red, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "azp" = ( /turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13156,81 +13357,78 @@ /area/shuttle/labor) "aAp" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plating/airless, -/area/space) -"aAq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/plating{ +/obj/machinery/door/airlock/glass_security{ + name = "Head of Security's Office"; + req_access_txt = "58" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) -"aAr" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Prisoner Processing"; - req_access_txt = "2" +/area/crew_quarters/heads/hos) +"aAq" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) +"aAr" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/item/weapon/storage/fancy/donut_box, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) "aAs" = ( /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/corner{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aAt" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Security Equipment APC"; - pixel_x = 23; - pixel_y = 2 +/obj/structure/closet/wardrobe/red, +/obj/machinery/light{ + dir = 4 }, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/main) "aAu" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/machinery/camera{ - c_tag = "Security Equipment Room"; - dir = 4; - icon_state = "camera" +/obj/structure/closet{ + name = "evidence closet" }, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "aAv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/holopad, -/obj/effect/landmark/start/security_officer, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "aAw" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; @@ -13241,37 +13439,42 @@ }, /area/security/prison) "aAx" = ( -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_y = -32 - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Brig Cells South 2"; - dir = 1; - icon_state = "camera"; - network = list("SS13") - }, -/turf/open/floor/plasteel{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/warden) "aAy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +/obj/structure/rack, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 }, -/turf/open/floor/plasteel{ +/obj/item/clothing/mask/gas/sechailer, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/light, +/obj/machinery/button/door{ + id = "brigfront"; + name = "Emergency Brig Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "1" + }, +/obj/machinery/button/door{ + id = "armoryaccess"; + name = "Armory Shutter Access"; + pixel_x = 24; + pixel_y = 0; + req_access_txt = "3" + }, +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/warden) "aAz" = ( /obj/machinery/light, /obj/machinery/computer/secure_data, @@ -13280,22 +13483,16 @@ }, /area/security/prison) "aAA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/preopen{ - id = "prisonbreak"; - layer = 2.6; - name = "emergency prisoner containment blast door" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light/small{ + dir = 4 }, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "aAB" = ( /obj/structure/cable/orange{ d1 = 1; @@ -13321,78 +13518,48 @@ }, /area/security/prison) "aAC" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/iv_drip, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aAD" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Cell Block"; + req_access_txt = "0"; + req_one_access_txt = "38;2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; - icon_state = "redcorner"; - dir = 4; +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) -"aAD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/preopen{ - id = "prisonbreak"; - layer = 2.6; - name = "emergency prisoner containment blast door" - }, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/prison) +/area/security/brig) "aAE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 4; + on = 1 }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "aAF" = ( -/obj/machinery/door_timer{ - id = "Cell 5"; - name = "Cell 5"; - pixel_y = -32 - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 4 }, -/obj/machinery/camera{ - c_tag = "Brig Cells South 1"; - dir = 1; - icon_state = "camera"; - network = list("SS13") - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "aAG" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 5"; - name = "Cell 5 Locker" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "aAH" = ( /obj/structure/closet/lawcloset, /turf/open/floor/plasteel{ @@ -13400,19 +13567,25 @@ }, /area/security/courtroom) "aAI" = ( -/obj/structure/chair, -/turf/open/floor/plasteel{ +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/courtroom) +/area/security/brig) "aAJ" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel{ +/obj/structure/table, +/obj/item/weapon/storage/toolbox/mechanical, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/courtroom) +/area/maintenance/asteroid/fore/com_north) "aAK" = ( /obj/structure/chair/comfy/brown, /turf/open/floor/plasteel{ @@ -13753,31 +13926,46 @@ }, /area/security/processing) "aBt" = ( +/obj/structure/sign/map/left/ceres{ + pixel_x = 32 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless +/obj/machinery/camera{ + c_tag = "Brig Equipment East"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security") }, -/area/maintenance/asteroid/fore/com_west) -"aBu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"aBv" = ( -/obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/machinery/recharger, -/turf/open/floor/plasteel/showroomfloor{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/main) +"aBu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"aBv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aBw" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -14028,6 +14216,10 @@ icon_state = "camera"; network = list("SS13") }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9; + pixel_y = 0 + }, /turf/open/floor/plasteel/darkblue/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -14308,14 +14500,18 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/labor) "aCz" = ( -/obj/machinery/door/airlock/external{ - cyclelinkeddir = 4; - name = "Labor Camp Shuttle Airlock"; - shuttledocked = 1 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/security/processing) +/obj/machinery/door/airlock/glass_security{ + name = "Head of Security's Office"; + req_access_txt = "58" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) "aCA" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 8; @@ -14326,92 +14522,121 @@ }, /area/security/processing) "aCB" = ( -/obj/machinery/holopad, +/obj/structure/table, +/obj/item/clothing/head/beret/sec, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aCC" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/chair{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - id_tag = "laborexit"; - name = "Labor Shuttle"; - req_access = null; - req_access_txt = "63" - }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aCD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aCE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/button/door{ - id = "GulagCivExit"; - name = "Gulag Door Exit"; - normaldoorcontrol = 1; - pixel_x = 24 - }, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"aCF" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, -/obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/device/assembly/flash, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aCG" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aCH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 4 }, -/turf/open/floor/plasteel/showroomfloor{ +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) +"aCF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/obj/machinery/camera{ + c_tag = "Brig Main West"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aCG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aCH" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aCI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 4 }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/plasteel/showroomfloor{ +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "aCJ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -14433,52 +14658,57 @@ }, /area/security/main) "aCK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/red/corner{ - icon_state = "redcorner"; +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aCL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, -/turf/open/floor/plasteel/red/corner{ - icon_state = "redcorner"; +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aCM" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 4 }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (NORTH)"; - icon_state = "redcorner"; +/obj/machinery/camera{ + c_tag = "Brig Main Middle"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/obj/machinery/computer/security/telescreen{ + desc = "Used to watch the various criminals inside their cells."; + name = "Cell Monitor"; + network = list("PrisonCell"); + pixel_y = 32 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aCN" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/sign/bluecross_2{ + pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -14517,27 +14747,27 @@ }, /area/security/brig) "aCR" = ( -/obj/machinery/camera{ - c_tag = "Brig Hall East" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (NORTH)"; - icon_state = "redcorner"; +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aCS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4; + initialize_directions = 11 }, /turf/open/floor/plasteel/red/side{ - tag = "icon-red (NORTHEAST)"; icon_state = "red"; - dir = 5; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -14555,27 +14785,33 @@ }, /area/security/brig) "aCU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/closet/secure_closet/courtroom, +/obj/item/weapon/gavelhammer, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 }, -/turf/open/floor/plasteel/red/side{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) "aCV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) "aCW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -14599,24 +14835,33 @@ }, /area/security/courtroom) "aDa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/machinery/camera{ + c_tag = "Courtroom North"; + dir = 6; + icon_state = "camera" + }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) "aDb" = ( -/turf/open/floor/plasteel/blue/corner{ - baseturf = /turf/open/floor/plating/asteroid/airless +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aDc" = ( -/obj/machinery/airalarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/turf/open/floor/plasteel/blue/side{ - baseturf = /turf/open/floor/plating/asteroid/airless +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aDd" = ( @@ -15008,81 +15253,48 @@ /turf/open/floor/plating/airless, /area/shuttle/labor) "aDM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0; - pixel_y = -32 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aDN" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"aDO" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"aDP" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/security{ - name = "Labor Shuttle"; - req_access = null; - req_access_txt = "2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/main) +"aDO" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Equipment Room"; + req_access_txt = "1" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aDP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aDQ" = ( /obj/structure/cable/orange{ d1 = 4; @@ -15207,13 +15419,9 @@ }, /area/security/brig) "aDX" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -15272,19 +15480,7 @@ }, /area/security/brig) "aEb" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -15362,10 +15558,15 @@ }, /area/security/brig) "aEg" = ( -/turf/closed/wall/r_wall{ +/obj/machinery/door/airlock/security{ + name = "Courtroom"; + req_access = null; + req_access_txt = "1" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/brig) +/area/security/courtroom) "aEh" = ( /obj/structure/chair{ dir = 4 @@ -15392,7 +15593,8 @@ }, /area/security/courtroom) "aEk" = ( -/obj/machinery/holopad, +/obj/structure/table/wood, +/obj/item/weapon/gavelblock, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -15404,12 +15606,17 @@ }, /area/security/courtroom) "aEm" = ( -/obj/structure/table/wood, -/turf/open/floor/plasteel/blue/side{ - tag = "icon-blue (NORTHWEST)"; - icon_state = "blue"; - dir = 9; - baseturf = /turf/open/floor/plating/asteroid/airless +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aEn" = ( @@ -15831,7 +16038,6 @@ /obj/item/weapon/storage/secure/safe{ pixel_x = 32 }, -/obj/effect/landmark/start/quartermaster, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -15913,15 +16119,19 @@ /turf/open/floor/plating/airless, /area/shuttle/labor) "aFf" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/closet/emcloset, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aFg" = ( /obj/machinery/camera{ c_tag = "Labor Shuttle Dock South"; @@ -15936,21 +16146,19 @@ }, /area/security/processing) "aFh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 }, -/obj/machinery/airalarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aFi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -15960,103 +16168,161 @@ }, /area/security/processing) "aFj" = ( +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2"; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/structure/cable/orange{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - id_tag = "GulagCivExit"; - name = "Fore Asteroid Maintenance Access"; - req_access_txt = "12" - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aFk" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/door/airlock/maintenance{ - id_tag = "GulagCivExit"; - name = "Fore Asteroid Maintenance Access"; - req_access_txt = "12" - }, -/turf/open/floor/plasteel/floorgrime{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/maintenance/asteroid/fore/com_west) -"aFl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aFm" = ( -/obj/effect/landmark/secequipment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aFn" = ( -/obj/effect/landmark/secequipment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/light, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aFo" = ( -/obj/effect/landmark/secequipment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aFp" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/landmark/secequipment, -/turf/open/floor/plasteel/showroomfloor{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/main) -"aFq" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/preopen{ - id = "prisonbreak"; - layer = 2.6; - name = "emergency prisoner containment blast door" +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable/orange, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) +"aFl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aFm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aFn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aFo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aFp" = ( +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aFq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aFr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -16070,77 +16336,107 @@ }, /area/security/brig) "aFs" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Brig Hall West"; - dir = 1; - icon_state = "camera"; - network = list("SS13") +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFw" = ( -/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/machinery/light, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFx" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; icon_state = "redcorner"; dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless @@ -16150,37 +16446,51 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFz" = ( /obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFA" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -16201,45 +16511,72 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/light, /turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 }, /obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFE" = ( -/turf/open/floor/plasteel/red/corner{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFF" = ( -/obj/structure/sign/goldenplaque{ - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aFG" = ( -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -16808,55 +17145,40 @@ }, /area/security/checkpoint/supply) "aGE" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aGF" = ( -/turf/closed/wall/r_wall{ +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/detectives_office) "aGG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aGH" = ( -/obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" +/obj/machinery/door/airlock{ + name = "Law Office"; + req_access_txt = "38" }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/area/lawoffice) "aGI" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -16880,69 +17202,54 @@ }, /area/lawoffice) "aGK" = ( -/turf/closed/wall/r_wall{ +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) +/area/security/brig) "aGL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/shutters{ - id = "lawyerinterior"; - name = "privacy shutters" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aGM" = ( -/obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/open/floor/wood{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) -"aGN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, +/area/security/brig) +"aGM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/poddoor/shutters{ - id = "lawyerinterior"; - name = "privacy shutters" +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) +/area/security/brig) +"aGN" = ( +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2"; + dir = 8 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aGO" = ( /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -16956,25 +17263,32 @@ }, /area/security/brig) "aGQ" = ( -/obj/machinery/door/airlock/glass_security{ - cyclelinkeddir = 2; - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "0"; - req_one_access_txt = "38;63" +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/open/floor/plasteel/red/corner{ +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aGR" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/machinery/door/airlock/glass_security{ + cyclelinkeddir = 2; + id_tag = "innerbrig"; + name = "Brig Checkpoint"; + req_access_txt = "0"; + req_one_access_txt = "38;63" }, -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 4; +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -16999,7 +17313,9 @@ /area/security/courtroom) "aGU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) @@ -17009,10 +17325,12 @@ }, /area/security/courtroom) "aGW" = ( -/turf/open/floor/plasteel/blue/corner{ - tag = "icon-bluecorner (EAST)"; - icon_state = "bluecorner"; - dir = 4; +/obj/structure/table/wood, +/obj/item/weapon/folder/blue, +/turf/open/floor/plasteel/blue/side{ + tag = "icon-blue (NORTHWEST)"; + icon_state = "blue"; + dir = 9; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) @@ -17285,21 +17603,14 @@ }, /area/security/checkpoint/supply) "aHy" = ( -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ +/obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - name = "Labor Shuttle Dock APC"; - pixel_x = 0; - pixel_y = 24 + on = 1 }, -/obj/effect/turf_decal/stripes/asteroid/end, -/turf/open/floor/plating/astplate{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/processing) +/area/security/main) "aHz" = ( /obj/structure/cable/orange{ d1 = 2; @@ -17336,11 +17647,11 @@ }, /area/security/detectives_office) "aHC" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/grimy{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aHD" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, @@ -17350,17 +17661,25 @@ }, /area/security/detectives_office) "aHE" = ( -/obj/structure/filingcabinet, -/turf/open/floor/carpet{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aHF" = ( -/obj/machinery/computer/secure_data, -/turf/open/floor/carpet{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aHG" = ( /obj/structure/filingcabinet, /obj/item/device/radio/intercom{ @@ -17373,16 +17692,16 @@ }, /area/lawoffice) "aHH" = ( -/obj/machinery/button/door{ - id = "lawyerinterior"; - name = "Privacy Shutters"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/open/floor/wood{ +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) +/area/security/brig) "aHI" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -17394,47 +17713,38 @@ }, /area/lawoffice) "aHJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/open/floor/wood{ +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) +/area/security/brig) "aHK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/power/apc{ - dir = 4; - name = "Lawyer's Office APC"; - pixel_x = 23; - pixel_y = 2 - }, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/turf/open/floor/wood{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aHL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/button/flasher{ - id = "HoldingCell"; - name = "Holding Cell Flash"; - pixel_x = -24; - pixel_y = 0 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; - dir = 10; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aHL" = ( +/obj/structure/chair, +/obj/machinery/camera{ + c_tag = "Brig Lobby West"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -17449,32 +17759,40 @@ }, /area/security/brig) "aHN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair, /turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHEAST)"; icon_state = "red"; - dir = 6; + dir = 5; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aHO" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aHP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/open/floor/plasteel/red/corner{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -17488,17 +17806,18 @@ }, /area/security/brig) "aHR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/vending/coffee, -/turf/open/floor/plasteel/red/side{ +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "aHS" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 6; +/obj/machinery/camera{ + c_tag = "Brig Lobby Checkpoint"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -17530,11 +17849,11 @@ }, /area/security/courtroom) "aHW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/blue/side{ + tag = "icon-blue (EAST)"; + icon_state = "blue"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) @@ -17892,35 +18211,20 @@ }, /area/security/checkpoint/supply) "aIF" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/astplate{ +/obj/effect/landmark/secequipment, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aIG" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating{ +/obj/effect/landmark/secequipment, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "aIH" = ( /obj/structure/cable/orange{ d1 = 4; @@ -17936,25 +18240,20 @@ }, /area/maintenance/asteroid/fore/com_west) "aII" = ( -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "Detective's Office APC"; - pixel_x = 23; - pixel_y = 2 - }, -/obj/effect/turf_decal/stripes/asteroid/end{ - tag = "icon-ast_warn_end (WEST)"; - icon_state = "ast_warn_end"; +/obj/structure/chair/comfy/brown{ dir = 8 }, -/turf/open/floor/plating/astplate{ +/obj/effect/landmark/start/detective, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/detectives_office) "aIJ" = ( /obj/machinery/airalarm{ dir = 4; @@ -17981,61 +18280,14 @@ /area/security/detectives_office) "aIM" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/clothing/glasses/sunglasses, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet{ +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aIN" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/obj/effect/landmark/start/detective, -/turf/open/floor/carpet{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/detectives_office) -"aIO" = ( -/obj/item/device/radio/intercom{ - broadcasting = 0; - name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 - }, -/turf/open/floor/carpet{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/detectives_office) -"aIP" = ( -/obj/structure/rack, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase, -/obj/machinery/camera{ - c_tag = "Lawyer's Office"; - dir = 4; - icon_state = "camera" - }, -/turf/open/floor/wood{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aIQ" = ( -/turf/open/floor/wood{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aIR" = ( -/obj/structure/table/wood, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aIS" = ( /obj/structure/table/wood, /obj/item/weapon/book/manual/wiki/security_space_law, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -18045,28 +18297,84 @@ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/lawoffice) -"aIT" = ( +"aIO" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/lawoffice) -"aIU" = ( +"aIP" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/poddoor/preopen{ - id = "frontbrig"; - layer = 2.6; - name = "Emergency External Blast Doors" - }, /obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) +"aIQ" = ( +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"aIR" = ( +/obj/machinery/door/window/brigdoor/southleft{ + name = "Security Checkpoint Waiting Cell"; + req_one_access_txt = "38;63" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aIS" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/orange, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aIT" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aIU" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/chair/office/light{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aIV" = ( /obj/structure/chair{ dir = 1 @@ -18083,13 +18391,12 @@ }, /area/security/courtroom) "aIW" = ( -/obj/structure/chair{ - dir = 1 - }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) "aIX" = ( @@ -18097,24 +18404,27 @@ dir = 1 }, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aIY" = ( +/obj/structure/table, +/obj/item/weapon/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aIZ" = ( -/obj/structure/chair{ - dir = 1 - }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) "aJa" = ( @@ -18495,11 +18805,12 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/fore/com_west) "aJM" = ( -/obj/machinery/light/small, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating/asteroid, -/area/maintenance/asteroid/fore/com_west) +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) "aJN" = ( /obj/structure/table/wood, /obj/item/weapon/storage/box/evidence, @@ -18533,10 +18844,20 @@ }, /area/security/detectives_office) "aJQ" = ( -/turf/open/floor/carpet{ +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/effect/landmark/start/lawyer, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aJR" = ( /obj/machinery/airalarm{ dir = 4; @@ -18550,19 +18871,11 @@ }, /area/lawoffice) "aJS" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/landmark/start/lawyer, -/turf/open/floor/wood{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) +/area/security/brig) "aJT" = ( /obj/structure/filingcabinet, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -18580,29 +18893,37 @@ }, /area/security/brig) "aJV" = ( +/obj/machinery/door/airlock/glass_security{ + cyclelinkeddir = 2; + id_tag = "outterbrig"; + name = "Brig"; + req_access_txt = "0"; + req_one_access_txt = "38;63" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aJW" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/sign/map/left/ceres{ - pixel_x = -32 +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" }, -/turf/open/floor/plasteel{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/brig) -"aJW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -18903,56 +19224,23 @@ /area/security/detectives_office) "aKB" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/detectives_office) -"aKC" = ( -/obj/structure/table/wood, -/obj/item/device/camera/detective, -/obj/item/weapon/lighter, -/turf/open/floor/carpet{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/detectives_office) -"aKD" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/machinery/newscaster/security_unit{ - pixel_x = 32 - }, -/turf/open/floor/carpet{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/security/detectives_office) -"aKE" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aKF" = ( -/obj/structure/table/wood, -/obj/item/weapon/folder/red{ - pixel_x = 8; - pixel_y = 6 - }, /obj/item/weapon/folder/blue{ pixel_x = 5; pixel_y = 5 }, -/obj/structure/disposalpipe/segment, +/obj/item/weapon/folder/red{ + pixel_x = 8; + pixel_y = 6 + }, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/lawoffice) -"aKG" = ( +"aKC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -18962,17 +19250,61 @@ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/lawoffice) -"aKH" = ( +"aKD" = ( /obj/machinery/photocopier, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" +/obj/machinery/button/door{ + id = "lawyer"; + name = "Privacy Shutters"; + pixel_x = 24; + pixel_y = -3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/lawoffice) +"aKE" = ( +/obj/machinery/camera{ + c_tag = "Brig Holding Cell"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + name = "Station Intercom (General)"; + pixel_x = -28; + pixel_y = 0 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aKF" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aKG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aKH" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) "aKI" = ( /obj/machinery/light/small{ dir = 8 @@ -19518,31 +19850,19 @@ }, /area/maintenance/asteroid/fore/com_west) "aLD" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/open/floor/plasteel/floorgrime{ +/obj/structure/filingcabinet, +/turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/detectives_office) "aLE" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/camera{ - c_tag = "Security SMES"; - dir = 6; - icon_state = "camera" - }, -/obj/structure/chair/stool, -/turf/open/floor/plasteel/floorgrime{ +/obj/structure/table/wood, +/obj/item/device/camera/detective, +/obj/item/weapon/lighter, +/turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/detectives_office) "aLF" = ( /obj/structure/cable/orange{ d1 = 2; @@ -19567,31 +19887,41 @@ }, /area/security/detectives_office) "aLH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/structure/table/wood, +/obj/item/weapon/paper_bin{ + pixel_x = -3; + pixel_y = 7 }, -/turf/open/floor/plasteel/grimy{ +/obj/item/weapon/pen, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aLI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/turf/open/floor/plasteel/grimy{ +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aLJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 0 +/obj/machinery/power/apc{ + dir = 4; + name = "Lawyer's Office APC"; + pixel_x = 24; + pixel_y = 0 }, -/turf/open/floor/plasteel/grimy{ +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aLK" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin{ @@ -19619,12 +19949,14 @@ }, /area/lawoffice) "aLM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/structure/chair{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aLN" = ( @@ -19651,12 +19983,14 @@ }, /area/security/courtroom) "aLP" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 +/obj/structure/chair{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aLQ" = ( @@ -20006,7 +20340,10 @@ }, /area/maintenance/asteroid/fore/cargo_south) "aMu" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -20023,16 +20360,13 @@ }, /area/maintenance/asteroid/fore/com_west) "aMw" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/open/floor/plating{ +/turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/fore/com_west) @@ -20051,23 +20385,13 @@ }, /area/maintenance/asteroid/fore/com_west) "aMy" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/detectives_office) "aMz" = ( /obj/machinery/power/terminal{ tag = "icon-term (EAST)"; @@ -20188,11 +20512,8 @@ }, /area/lawoffice) "aMK" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/closed/wall/r_wall{ +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -20208,36 +20529,43 @@ /area/security/brig) "aMM" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/weapon/storage/box/cups, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aMN" = ( -/obj/machinery/light, -/obj/structure/table, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aMO" = ( -/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/camera{ + c_tag = "Courtroom South"; + dir = 1; + icon_state = "camera"; + network = list("SS13") + }, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aMP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "aMQ" = ( @@ -20684,43 +21012,47 @@ }, /area/maintenance/asteroid/fore/com_west) "aNC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/power/apc{ + dir = 1; + name = "Fore Asteroid Maintenace APC"; + pixel_x = 0; + pixel_y = 24 }, +/obj/effect/turf_decal/stripes/end, /obj/structure/cable/orange{ - d1 = 1; d2 = 2; - icon_state = "1-2" + icon_state = "0-2" }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/fore/com_west) "aND" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + icon_state = "0-2"; + d2 = 2 }, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/power/terminal{ + tag = "icon-term (WEST)"; + icon_state = "term"; + dir = 8 }, -/obj/structure/sign/electricshock{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/fore/com_west) "aNE" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 +/obj/machinery/door/airlock{ + name = "Law Office"; + req_access_txt = "38" }, -/turf/closed/wall/r_wall{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/detectives_office) +/area/lawoffice) "aNF" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -20738,40 +21070,50 @@ }, /area/lawoffice) "aNG" = ( -/obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"aNH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/structure/cable/orange{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" }, -/turf/open/floor/wood{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/lawoffice) -"aNH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/poddoor/shutters{ - id = "lawyerexterior"; - name = "privacy shutters" - }, -/obj/machinery/door/firedoor, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/lawoffice) +/area/security/brig) "aNI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/glass{ @@ -20787,8 +21129,11 @@ }, /area/security/brig) "aNJ" = ( -/obj/machinery/door/airlock/glass{ - name = "Brig Lobby" +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20814,8 +21159,8 @@ "aNM" = ( /obj/structure/grille, /obj/structure/window/fulltile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -21202,20 +21547,14 @@ }, /area/hallway/primary/starboard/fore) "aOv" = ( -/obj/machinery/camera{ - c_tag = "Command Asteroid Hall 10"; - dir = 6; - icon_state = "camera" - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/open/floor/plasteel/neutral/corner{ - tag = "icon-neutralcorner (EAST)"; - icon_state = "neutralcorner"; - dir = 4; +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -21249,11 +21588,6 @@ }, /area/hallway/primary/fore) "aOy" = ( -/obj/machinery/camera{ - c_tag = "Command Asteroid Hall 2"; - dir = 6; - icon_state = "camera" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -21278,6 +21612,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/camera{ + c_tag = "Command Asteroid Hall 2"; + dir = 6; + icon_state = "camera" + }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; @@ -21298,9 +21637,8 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -21334,9 +21672,8 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -21349,10 +21686,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -21369,9 +21711,8 @@ pixel_y = 32 }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -21427,11 +21768,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; @@ -23839,6 +24175,8 @@ pixel_x = 1; pixel_y = 5 }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -24551,10 +24889,8 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/fore/com_east) "aTz" = ( -/obj/structure/girder, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating/asteroid, -/area/maintenance/asteroid/fore/com_north) +/turf/closed/mineral, +/area/security/prison) "aTA" = ( /obj/structure/rack, /obj/item/clothing/suit/space/fragile, @@ -30014,6 +30350,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; icon_state = "neutralcorner"; @@ -30037,6 +30374,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; @@ -33367,12 +33705,6 @@ /area/hallway/primary/central) "bjG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/device/radio/intercom{ - broadcasting = 0; - name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -37626,7 +37958,7 @@ /area/engine/engineering) "bqt" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; filter_type = "co2"; icon_state = "filter_off_f"; @@ -37652,7 +37984,7 @@ /area/engine/engineering) "bqv" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; filter_type = "o2"; icon_state = "filter_off_f"; @@ -37699,7 +38031,7 @@ /area/engine/engineering) "bqy" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; filter_type = "plasma"; icon_state = "filter_off_f"; @@ -37714,7 +38046,7 @@ /area/engine/engineering) "bqz" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; filter_type = ""; icon_state = "filter_off_f"; @@ -38699,7 +39031,7 @@ /area/engine/engineering) "bsb" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -39493,12 +39825,12 @@ /area/engine/supermatter) "btv" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/general/visible{ icon_state = "intact"; dir = 6 }, /obj/machinery/door/firedoor, +/obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -39532,11 +39864,11 @@ /area/engine/supermatter) "btz" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, /obj/machinery/door/firedoor, +/obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40424,11 +40756,11 @@ /area/engine/engineering) "buW" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 }, /obj/machinery/door/firedoor, +/obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40442,12 +40774,12 @@ /area/engine/supermatter) "buY" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/manifold/general/visible{ icon_state = "manifold"; dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40771,12 +41103,13 @@ }, /area/hallway/primary/starboard) "bvw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -41102,11 +41435,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -41381,6 +41709,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -41405,8 +41737,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -42597,7 +42928,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; dir = 8; @@ -42608,6 +42938,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -43157,9 +43488,9 @@ /area/hallway/primary/starboard) "bzL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/junction{ - icon_state = "pipe-j1"; - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -43565,12 +43896,12 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/item/device/assembly/mousetrap/armed, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -43766,7 +44097,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/trinary/filter{ +/obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 8; icon_state = "filter_off"; on = 1; @@ -44038,7 +44369,7 @@ name = "Broom Closet"; req_access_txt = "0" }, -/turf/closed/wall{ +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/starboard) @@ -46096,6 +46427,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -46112,6 +46444,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -49321,7 +49654,11 @@ d2 = 8; icon_state = "4-8" }, -/turf/closed/wall{ +/obj/machinery/door/airlock/maintenance{ + name = "Port Asteroid Maintenance"; + req_access_txt = "12" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/library/lounge) @@ -52285,6 +52622,9 @@ "bPz" = ( /obj/machinery/computer/apc_control, /obj/machinery/light, +/obj/structure/sign/map/left/ceres{ + pixel_x = -32 + }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -57332,6 +57672,7 @@ /obj/machinery/vending/boozeomat{ req_access_txt = "0" }, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -59265,6 +59606,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; dir = 8; @@ -65085,6 +65427,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; @@ -65415,6 +65758,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -66034,6 +66378,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; dir = 8; @@ -66506,6 +66851,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/blue/corner{ tag = "icon-bluecorner (NORTH)"; icon_state = "bluecorner"; @@ -67195,6 +67543,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -67683,6 +68034,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/arrival{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -68167,6 +68521,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -68180,6 +68535,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -68201,6 +68557,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -68220,6 +68577,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -74786,12 +75144,20 @@ }, /area/ai_monitored/turret_protected/ai) "cEo" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating/astplate{ +/obj/machinery/door/airlock/security{ + id_tag = "laborexit"; + name = "Labor Shuttle"; + req_access = null; + req_access_txt = "63" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/processing) "cEp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -74814,9 +75180,12 @@ }, /area/quartermaster/sorting) "cEr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/ai_status_display, -/turf/closed/wall/r_wall{ +/obj/machinery/door/window/brigdoor/westleft{ + id = "Cell 3"; + name = "Cell Door 3"; + req_access_txt = "1" + }, +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -74827,14 +75196,22 @@ }, /area/security/warden) "cEt" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/closed/wall/r_wall{ +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/brig) "cEu" = ( /obj/machinery/newscaster/security_unit{ pixel_x = 32 @@ -74844,82 +75221,79 @@ }, /area/crew_quarters/heads/captain) "cEv" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "cEw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/rack, +/obj/item/weapon/gun/energy/laser{ + pixel_x = -3; + pixel_y = 3 }, -/turf/closed/wall/r_wall{ +/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "cEx" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/disposaloutlet, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "cEy" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "cEz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/rack, +/obj/item/weapon/gun/energy/e_gun{ + pixel_x = -3; + pixel_y = 3 }, -/obj/structure/plasticflaps, -/turf/open/floor/plating{ +/obj/item/weapon/gun/energy/e_gun, +/obj/item/weapon/gun/energy/e_gun{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + on = 1 + }, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "cEA" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "Brig" +/mob/living/simple_animal/bot/secbot/beepsky{ + desc = "It's Officer Gunsky, the most rootin'-tootin'-point-and shootin' security bot on this side of the galaxy!"; + name = "Officer Gunsky" }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "cEB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/window/brigdoor/southleft{ - name = "Armory Delievery Chute"; - req_access_txt = "3" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plating{ +/obj/machinery/holopad, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/armory) "cEC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -74953,11 +75327,20 @@ }, /area/security/courtroom) "cEG" = ( -/obj/machinery/ai_status_display, -/turf/closed/wall{ +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/courtroom) +/area/maintenance/asteroid/fore/com_north) "cEH" = ( /obj/structure/sign/poster/random{ name = "random contraband poster"; @@ -75017,11 +75400,13 @@ }, /area/crew_quarters/heads/hop) "cEP" = ( -/obj/structure/bed, -/obj/structure/sign/poster/official/work_for_a_future{ - pixel_x = -32 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -75033,17 +75418,8 @@ /area/crew_quarters/locker) "cER" = ( /obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/structure/window/fulltile, /obj/machinery/door/firedoor, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/door/poddoor/preopen{ - id = "frontbrig"; - layer = 2.6; - name = "Emergency External Blast Doors" - }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -75057,15 +75433,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=CommandWest"; - location = "Security"; - name = "navigation beacon (Security)" - }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -75445,7 +75815,7 @@ /area/chapel/office) "cFJ" = ( /obj/structure/plasticflaps{ - name = "Officer Beepsky's Home" + name = "Officer Pipsqueak's Home" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -75658,14 +76028,21 @@ }, /area/science/misc_lab) "cGe" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 }, -/obj/effect/landmark/start/warden, -/turf/open/floor/plasteel/showroomfloor{ +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/warden) +/area/security/prison) "cGf" = ( /obj/structure/chair/office/light{ dir = 8 @@ -75697,11 +76074,15 @@ }, /area/quartermaster/office) "cGj" = ( -/obj/effect/landmark/start/security_officer, -/turf/open/floor/plasteel/showroomfloor{ +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/main) +/area/security/brig) "cGk" = ( /turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -76149,16 +76530,30 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/red/corner{ +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/red/side{ - icon_state = "red"; - dir = 8; +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange, +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" + }, +/turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -76189,51 +76584,22 @@ req_one_access_txt = "38;63" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (WEST)"; - icon_state = "redcorner"; - dir = 8; +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -76279,27 +76645,36 @@ }, /area/security/brig) "cHk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/preopen{ - id = "frontbrig"; - layer = 2.6; - name = "Emergency External Blast Doors" +/obj/structure/table/reinforced, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating{ +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/door/window/brigdoor/westright{ + name = "Brig Entry Desk"; + req_access_txt = "63" + }, +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 1; - on = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/sign/poster/official/help_others{ - pixel_x = -32 +/obj/structure/table, +/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -76309,15 +76684,14 @@ }, /area/security/brig) "cHn" = ( -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 +/obj/machinery/door/airlock/glass_security{ + cyclelinkeddir = 2; + id_tag = "outterbrig"; + name = "Brig"; + req_access_txt = "0"; + req_one_access_txt = "38;63" }, -/turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; - icon_state = "redcorner"; - dir = 4; +/turf/open/floor/plasteel/red{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -76336,14 +76710,17 @@ }, /area/security/brig) "cHp" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 }, /turf/open/floor/plasteel/vault{ - baseturf = /turf/open/floor/plating/asteroid/airless; - dir = 5 + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 }, /area/security/courtroom) "cHq" = ( @@ -76364,52 +76741,51 @@ }, /area/security/checkpoint/supply) "cHr" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/floorgrime{ +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHs" = ( -/obj/structure/chair{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/flasher{ - id = "HoldingCell"; - pixel_x = 24; - pixel_y = 0 - }, -/turf/open/floor/plasteel/floorgrime{ +/turf/open/floor/plasteel/red/corner{ + tag = "icon-redcorner (EAST)"; + icon_state = "redcorner"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHu" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) "cHv" = ( -/obj/structure/chair{ - dir = 8 +/obj/machinery/camera{ + c_tag = "Brig Lobby East"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security") }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -76450,16 +76826,9 @@ }, /area/security/brig) "cHz" = ( -/obj/structure/chair{ - dir = 8 - }, /obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/poster/random{ - name = "random official poster"; - pixel_x = 32; - random_basetype = /obj/structure/sign/poster/official + dir = 4; + icon_state = "tube1" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -76528,8 +76897,10 @@ }, /area/security/brig) "cHG" = ( -/obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/weapon/twohanded/required/kirbyplants{ + tag = "icon-plant-21"; + icon_state = "plant-21" + }, /turf/open/floor/plasteel/red/corner{ icon_state = "redcorner"; dir = 8; @@ -76582,7 +76953,7 @@ /area/security/brig) "cHJ" = ( /obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/brig) @@ -76637,15 +77008,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -76681,9 +77046,8 @@ icon_state = "camera" }, /turf/open/floor/plasteel/red/corner{ - tag = "icon-redcorner (EAST)"; icon_state = "redcorner"; - dir = 4; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) @@ -78103,15 +78467,10 @@ }, /area/maintenance/asteroid/fore/com_north) "cKJ" = ( -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/open/floor/plating{ +/turf/closed/wall/r_wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "cKK" = ( /obj/structure/cable/orange{ d1 = 4; @@ -78270,11 +78629,10 @@ }, /area/maintenance/asteroid/fore/cargo_west) "cKZ" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/floorgrime{ +/turf/closed/wall/rust{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_north) +/area/security/prison) "cLa" = ( /obj/machinery/light/small{ dir = 8 @@ -78321,11 +78679,20 @@ }, /area/maintenance/asteroid/fore/com_north) "cLf" = ( -/obj/structure/chair/stool, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/prison) +/area/security/brig) "cLg" = ( /obj/structure/cable/orange{ d1 = 1; @@ -78506,6 +78873,9 @@ locked = 0; pixel_y = 23 }, +/obj/structure/sign/map/left/ceres{ + pixel_x = -32 + }, /turf/open/floor/plasteel/brown{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 9; @@ -78536,14 +78906,10 @@ }, /area/quartermaster/qm) "cLB" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/detectives_office) "cLC" = ( /obj/structure/cable/orange{ d2 = 2; @@ -78658,6 +79024,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/start/quartermaster, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -78864,6 +79231,11 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -80073,6 +80445,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/sign/map/left/ceres{ + pixel_y = 32 + }, /turf/open/floor/plasteel/barber{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -80225,6 +80600,7 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/effect/landmark/start/chief_medical_officer, /turf/open/floor/plasteel/barber{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -81114,6 +81490,7 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/effect/landmark/start/chief_engineer, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -81939,6 +82316,9 @@ /area/crew_quarters/heads/hor) "cSw" = ( /obj/structure/displaycase/labcage, +/obj/structure/sign/map/left/ceres{ + pixel_x = 32 + }, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -82056,6 +82436,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/effect/landmark/start/research_director, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -82703,38 +83084,63 @@ }, /area/ai_monitored/security/armory) "cTV" = ( -/obj/machinery/status_display{ - density = 0; - layer = 4 - }, -/turf/closed/wall/r_wall{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/ai_monitored/security/armory) -"cTW" = ( -/turf/open/floor/plasteel/darkred{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/ai_monitored/security/armory) -"cTX" = ( -/obj/machinery/button/door{ - id = "armoryaccess"; - name = "Armory Shutter Access"; - pixel_x = -28 - }, -/obj/structure/chair/office/light, -/turf/open/floor/plasteel/darkred{ - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/ai_monitored/security/armory) -"cTY" = ( -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/darkred{ +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) +"cTW" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"cTX" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"cTY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) "cTZ" = ( /obj/structure/closet/secure_closet/CMO, /turf/open/floor/plasteel/barber{ @@ -83581,28 +83987,13 @@ }, /area/maintenance/disposal/incinerator) "cVw" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Armory APC"; - pixel_x = 0; - pixel_y = 24 +/obj/item/weapon/ore/glass, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 }, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/rack, -/obj/item/weapon/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/turf/open/floor/plasteel/darkred/side{ - icon_state = "darkred"; - dir = 1; - baseturf = /turf/open/floor/plating/asteroid/airless - }, -/area/ai_monitored/security/armory) +/turf/open/floor/plating/asteroid, +/area/security/transfer) "cVx" = ( /obj/structure/cable/orange{ d1 = 4; @@ -83635,65 +84026,102 @@ }, /area/ai_monitored/security/armory) "cVz" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access_txt = "3" +/obj/structure/closet/secure_closet/brig{ + name = "Perma Storage" }, -/obj/effect/spawner/lootdrop/armory_contraband{ - loot = list(/obj/item/weapon/gun/ballistic/automatic/pistol = 5, /obj/item/weapon/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/weapon/gun/ballistic/revolver/mateba, /obj/item/weapon/gun/ballistic/automatic/pistol/deagle, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons = 3) +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/ai_monitored/security/armory) +/area/security/prison) "cVA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 }, -/turf/open/floor/plasteel/black{ +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVB" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/black{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVC" = ( -/turf/open/floor/plasteel/black{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/flasher{ + id = "PCell 1"; + name = "Cell 1 Flash"; + pixel_x = 24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "isolation1"; + name = "Cell 1 Isolation"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "2"; + specialfunctions = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVD" = ( -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/black{ +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVE" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, /obj/machinery/camera{ - c_tag = "Security Interrogation"; - dir = 9; + c_tag = "Brig Perma Cell 1"; + dir = 10; icon_state = "camera"; - network = list("SS13"); - tag = "null" + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" }, -/turf/open/floor/plasteel/black{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/black{ +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -83706,17 +84134,19 @@ }, /area/security/prison) "cVH" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp, -/turf/open/floor/plasteel/black{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVI" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plasteel/black{ +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -83737,17 +84167,37 @@ }, /area/security/prison) "cVL" = ( -/obj/structure/table/wood, -/obj/item/device/taperecorder, -/turf/open/floor/plasteel/black{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "cVM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/black{ +/obj/machinery/button/flasher{ + id = "PCell 2"; + name = "Cell 2 Flash"; + pixel_x = 24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "isolation2"; + name = "Cell 2 Isolation"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "2"; + specialfunctions = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -83767,19 +84217,17 @@ }, /area/security/prison) "cVP" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, /obj/structure/cable/orange{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door_timer{ - id = "Cell 8"; - name = "Cell 8"; - pixel_x = 32; - pixel_y = 0 - }, -/turf/open/floor/plasteel{ +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 8; baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) @@ -83799,15 +84247,12 @@ }, /area/security/transfer) "cVR" = ( -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/structure/table, +/obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "cVS" = ( /obj/structure/cable/orange{ d1 = 1; @@ -83888,28 +84333,52 @@ }, /area/security/transfer) "cVX" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plating{ +/obj/machinery/button/flasher{ + id = "PCell 5"; + name = "Cell 5 Flash"; + pixel_x = 24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "isolation5"; + name = "Cell 5 Isolation"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "2"; + specialfunctions = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "cVY" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/button/door{ + id = "permabolt5"; + name = "Cell 5 Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0"; + specialfunctions = 4 }, -/turf/open/floor/plating/astplate{ +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/security/transfer) +/area/security/prison) "cVZ" = ( /obj/structure/cable/orange{ d1 = 1; @@ -84426,6 +84895,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -86555,6 +87025,7 @@ /obj/structure/table, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/defibrillator/loaded, /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (SOUTHWEST)"; icon_state = "whiteblue"; @@ -88101,15 +88572,15 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/fore/cargo_west) "deY" = ( -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/door/poddoor/shutters{ + id = "armoryaccess"; + name = "Armory Shutters" }, -/turf/open/floor/plating{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "deZ" = ( /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -88121,22 +88592,30 @@ }, /area/maintenance/asteroid/fore/cargo_west) "dfb" = ( -/obj/structure/girder, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating{ +/obj/vehicle/secway, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "dfc" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 }, -/turf/open/floor/plating{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 9; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "dfd" = ( /obj/structure/cable/orange{ d1 = 4; @@ -88171,19 +88650,13 @@ }, /area/maintenance/asteroid/fore/cargo_west) "dfi" = ( -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "dfj" = ( /obj/machinery/power/apc{ dir = 4; @@ -88241,16 +88714,22 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/fore/cargo_west) "dfp" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/vehicle/secway, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating{ +/obj/machinery/button/door{ + id = "armoryaccess2"; + name = "Armory Shutter Access"; + pixel_x = 0; + pixel_y = -28; + req_access_txt = "3" + }, +/turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/armory) "dfq" = ( /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -88268,19 +88747,19 @@ }, /area/maintenance/asteroid/fore/cargo_west) "dft" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/disposalpipe/segment, +/obj/item/device/radio/intercom{ + broadcasting = 0; + name = "Station Intercom (General)"; + pixel_x = 28; + pixel_y = 0 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; baseturf = /turf/open/floor/plating/asteroid/airless }, -/area/maintenance/asteroid/fore/com_west) +/area/security/main) "dfu" = ( /obj/structure/grille, /turf/open/floor/plating/astplate{ @@ -88630,12 +89109,15 @@ }, /area/maintenance/asteroid/fore/cargo_south) "dgt" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -88739,8 +89221,11 @@ }, /area/maintenance/asteroid/fore/cargo_south) "dgH" = ( -/obj/structure/closet, -/turf/open/floor/plating{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/fore/com_west) @@ -88753,9 +89238,8 @@ }, /area/maintenance/asteroid/fore/com_west) "dgJ" = ( -/obj/structure/girder, /obj/structure/grille, -/turf/open/floor/plating{ +/turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/fore/com_west) @@ -89726,6 +90210,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -90274,6 +90759,7601 @@ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/science/server) +"dkF" = ( +/turf/open/space/basic, +/area/mine/unexplored{ + name = "Command Asteroid" + }) +"dkG" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dkH" = ( +/obj/structure/rack, +/obj/item/weapon/shovel, +/obj/item/weapon/shovel, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkI" = ( +/obj/structure/rack, +/obj/item/weapon/pickaxe, +/obj/item/weapon/pickaxe, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkJ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dkK" = ( +/obj/effect/decal/remains/human, +/turf/open/floor/plating/asteroid, +/area/security/transfer) +"dkL" = ( +/obj/structure/sign/poster/contraband/fun_police{ + pixel_y = 32 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkM" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkN" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkO" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkP" = ( +/obj/item/weapon/ore/glass, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkQ" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "Prisoner Transfer APC"; + pixel_x = 24; + pixel_y = 0 + }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkR" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dkS" = ( +/obj/machinery/light/small, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkT" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkU" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkV" = ( +/obj/item/weapon/ore/glass, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkW" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkX" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/transfer) +"dkY" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dkZ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dla" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dlb" = ( +/obj/machinery/door/airlock/security{ + name = "Prisoner Transfer Center"; + req_access_txt = "2" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlc" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dld" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dle" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlf" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/space) +"dlg" = ( +/obj/machinery/computer/gulag_teleporter_computer, +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlh" = ( +/obj/machinery/computer/security{ + name = "Labor Camp Monitoring"; + network = list("Labor") + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dli" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlj" = ( +/obj/machinery/flasher{ + id = "Cell 5"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlk" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dll" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHWEST)"; + icon_state = "red"; + dir = 9; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlm" = ( +/obj/structure/closet/secure_closet/brig{ + name = "Perma Storage" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dln" = ( +/obj/structure/closet/secure_closet/brig{ + name = "Perma Storage" + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlo" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (NORTHEAST)"; + icon_state = "intact"; + dir = 5 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlp" = ( +/obj/machinery/atmospherics/pipe/manifold4w/general/hidden, +/obj/machinery/meter, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlq" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 9 + }, +/obj/item/weapon/wrench, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHEAST)"; + icon_state = "red"; + dir = 5; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlr" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/space/basic, +/area/space) +"dls" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlt" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlu" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlv" = ( +/obj/machinery/camera{ + c_tag = "Brig Labor Shuttle Dock North"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dly" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlz" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlA" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlB" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (NORTHEAST)"; + icon_state = "intact"; + dir = 5 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlC" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "Mix To Perma" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlD" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 10 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlE" = ( +/obj/machinery/door/airlock/glass_external{ + cyclelinkeddir = 2 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/asteroid/fore/com_north) +"dlF" = ( +/turf/closed/wall/rust, +/area/maintenance/asteroid/fore/com_north) +"dlG" = ( +/obj/structure/table, +/obj/item/weapon/folder/red, +/obj/item/weapon/restraints/handcuffs, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/labor) +"dlH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlI" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "Labor Shuttle Dock APC"; + pixel_x = 24; + pixel_y = 0 + }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dlJ" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlK" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 5"; + name = "Cell 5 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlL" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 6"; + name = "Cell 6 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlM" = ( +/obj/structure/closet/secure_closet/brig{ + name = "Perma Storage" + }, +/obj/machinery/camera{ + c_tag = "Brig Perma Wing 4"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security"); + tag = "icon-camera (SOUTHWEST)" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlN" = ( +/obj/structure/table, +/obj/item/device/electropack, +/obj/item/device/assembly/signaler, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlO" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 4; + on = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlR" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlS" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/item/seeds/random, +/obj/machinery/light/small, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlT" = ( +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/item/weapon/soap/nanotrasen, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlU" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restroom"; + req_access_txt = "0" + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlV" = ( +/obj/machinery/computer/arcade, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlW" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dlX" = ( +/turf/closed/mineral, +/area/security/prison) +"dlY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/asteroid/fore/com_north) +"dlZ" = ( +/obj/machinery/button/flasher{ + id = "gulagshuttleflasher"; + name = "Flash Control"; + pixel_x = 0; + pixel_y = -26; + req_access_txt = "1" + }, +/obj/machinery/light, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/labor) +"dma" = ( +/obj/machinery/door/airlock/external{ + cyclelinkeddir = 4; + name = "Labor Camp Shuttle Airlock"; + req_access_txt = "2"; + shuttledocked = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmb" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dme" = ( +/obj/machinery/door/airlock/security{ + name = "Labor Shuttle"; + req_access = null; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmf" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4; + initialize_directions = 11 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmg" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmi" = ( +/obj/machinery/door/window/brigdoor/northleft{ + id = "Cell 5"; + name = "Cell Door 5" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dml" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmn" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dms" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmu" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dmv" = ( +/obj/machinery/camera{ + c_tag = "Brig Perma North"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dmw" = ( +/turf/closed/mineral, +/area/security/prison) +"dmx" = ( +/obj/machinery/door/airlock/glass_external{ + cyclelinkeddir = 2 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/asteroid/fore/com_north) +"dmy" = ( +/obj/machinery/computer/shuttle/labor, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmC" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + name = "Station Intercom (General)"; + pixel_x = 28; + pixel_y = 0 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmD" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 4"; + name = "Cell 4 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHWEST)"; + icon_state = "red"; + dir = 9; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmF" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 7"; + name = "Cell 7 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmG" = ( +/obj/machinery/camera{ + c_tag = "Brig Cell 7"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmH" = ( +/obj/machinery/camera{ + c_tag = "Brig Perma Wing 3"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmI" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmJ" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Perma Cell 1"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/item/device/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + dir = 2; + name = "Prison Intercom (General)"; + pixel_x = 0; + pixel_y = 24; + prison_radio = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmL" = ( +/obj/machinery/flasher{ + id = "PCell 1"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmM" = ( +/obj/machinery/door/airlock/glass{ + id_tag = "permabolt1"; + name = "Cell 1" + }, +/obj/machinery/door/poddoor/preopen{ + id = "isolation1"; + name = "cell isolation blast door" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmN" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dmO" = ( +/obj/structure/holohoop, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmP" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dmQ" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dmR" = ( +/turf/closed/mineral, +/area/security/prison) +"dmS" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dmT" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dmU" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dmV" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/labor) +"dmW" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Prisoner Processing"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmY" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dmZ" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CellBlockUpRight"; + location = "CellBlockUpLeft"; + name = "navigation beacon (CellBlockUpLeft)" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dna" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnc" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + id = "Cell 7"; + name = "Cell Door 7" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnd" = ( +/obj/machinery/flasher{ + id = "Cell 7"; + pixel_x = 32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dne" = ( +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/obj/machinery/button/door{ + id = "permabolt1"; + name = "Cell 1 Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnf" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dng" = ( +/turf/closed/mineral, +/area/security/prison) +"dnh" = ( +/turf/closed/mineral, +/area/security/prison) +"dni" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dnj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dnk" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dnl" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnm" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnn" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dno" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnp" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnq" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnr" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dns" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnt" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/camera{ + c_tag = "Brig Labor Shuttle Dock main"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnx" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dny" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnz" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnC" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnD" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnE" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dnF" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dnG" = ( +/turf/closed/mineral, +/area/security/prison) +"dnH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dnI" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnJ" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnK" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnL" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnM" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnN" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/turf/open/floor/plating/airless, +/area/shuttle/syndicate) +"dnO" = ( +/obj/machinery/door/airlock/external{ + cyclelinkeddir = 4; + name = "Labor Camp Shuttle Airlock"; + shuttledocked = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnP" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnR" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4; + initialize_directions = 11 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dnT" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnU" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Perma Cell 2"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/item/device/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + dir = 2; + name = "Prison Intercom (General)"; + pixel_x = 0; + pixel_y = 24; + prison_radio = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnW" = ( +/obj/machinery/flasher{ + id = "PCell 2"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnX" = ( +/obj/machinery/door/airlock/glass{ + id_tag = "permabolt2"; + name = "Cell 2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "isolation2"; + name = "cell isolation blast door" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnY" = ( +/obj/item/toy/beach_ball/holoball, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dnZ" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dob" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dod" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dof" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dog" = ( +/obj/machinery/camera{ + c_tag = "Brig Cell 8"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doh" = ( +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/obj/machinery/button/door{ + id = "permabolt2"; + name = "Cell 2 Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doi" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"doj" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dok" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Fore Asteroid Maintenance Access"; + req_access_txt = "12" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dol" = ( +/obj/structure/closet/emcloset, +/obj/machinery/light, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dom" = ( +/obj/machinery/disposal/deliveryChute{ + desc = "A chute for the reformed crewmember to re-enter the station population."; + dir = 1; + icon_state = "intake"; + name = "Gulag Exit Chute"; + tag = "icon-intake (NORTH)" + }, +/obj/machinery/door/window/northright, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"don" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dop" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 4; + on = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dor" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/camera{ + c_tag = "Brig Cellblock North"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security"); + tag = "icon-camera (SOUTHWEST)" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dos" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dot" = ( +/obj/machinery/flasher{ + id = "Cell 8"; + pixel_x = 32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dou" = ( +/obj/structure/sign/poster/official/obey{ + pixel_x = -32 + }, +/obj/machinery/camera{ + c_tag = "Brig Perma Middle 1"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dov" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dow" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dox" = ( +/obj/structure/table, +/obj/item/weapon/cultivator, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"doy" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doz" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/asteroid/line{ + icon_state = "ast_warn"; + dir = 1 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"doA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/camera{ + c_tag = "Brig Labor Shuttle Dock South"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doF" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doG" = ( +/obj/machinery/flasher{ + id = "PCell 3"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doH" = ( +/obj/machinery/door/airlock/glass{ + id_tag = "permabolt3"; + name = "Cell 3" + }, +/obj/machinery/door/poddoor/preopen{ + id = "isolation3"; + name = "cell isolation blast door" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doI" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"doJ" = ( +/turf/open/floor/plating/asteroid, +/area/security/prison) +"doK" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"doL" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doM" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doN" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doO" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"doR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doT" = ( +/obj/machinery/door_timer{ + id = "Cell 8"; + name = "Cell 8"; + pixel_x = 32; + pixel_y = 0 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doU" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Brig Perma Wing 2"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/flasher{ + id = "PCell 3"; + name = "Cell 3 Flash"; + pixel_x = 24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "isolation3"; + name = "Cell 3 Isolation"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "2"; + specialfunctions = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doW" = ( +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/obj/machinery/button/door{ + id = "permabolt3"; + name = "Cell 3 Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doX" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (SOUTHEAST)"; + icon_state = "intact"; + dir = 6 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doY" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8; + frequency = 1441; + id = null; + pixel_y = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"doZ" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpa" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpb" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpc" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpd" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Riot Control Storage"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpe" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dph" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpi" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/computer/security/telescreen{ + desc = "Used to watch the various criminals inside their cells."; + name = "Cell Monitor"; + network = list("PrisonCell"); + pixel_x = 32; + pixel_y = 0 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpj" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + tag = "icon-intact (NORTHEAST)"; + icon_state = "intact"; + dir = 5 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpk" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 9 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpl" = ( +/obj/machinery/washing_machine, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpm" = ( +/obj/machinery/hydroponics/soil, +/obj/item/seeds/ambrosia, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dpn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpr" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dps" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpt" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpu" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/processing) +"dpw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpy" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpz" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpB" = ( +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpC" = ( +/obj/structure/table, +/obj/item/weapon/storage/pill_bottle/dice, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpD" = ( +/obj/machinery/hydroponics/soil, +/obj/item/weapon/reagent_containers/glass/bucket, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dpE" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpF" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpG" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpH" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpI" = ( +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpJ" = ( +/obj/machinery/door/poddoor/shutters{ + id = "armoryaccess"; + name = "Armory Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpL" = ( +/obj/machinery/flasher{ + id = "PCell 4"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpM" = ( +/obj/machinery/door/airlock/glass{ + id_tag = "permabolt4"; + name = "Cell 4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "isolation4"; + name = "cell isolation blast door" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpN" = ( +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dpO" = ( +/obj/machinery/hydroponics/soil, +/obj/item/seeds/potato, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dpP" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dpQ" = ( +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dpR" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dpS" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpT" = ( +/obj/machinery/suit_storage_unit/security, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpU" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/machinery/camera/motion{ + c_tag = "Armory North"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpX" = ( +/obj/machinery/button/door{ + id = "armoryaccess"; + name = "Armory Shutter Access"; + pixel_x = 0; + pixel_y = 28; + req_access_txt = "3" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9; + pixel_y = 0 + }, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dpZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 5; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqa" = ( +/obj/machinery/camera{ + c_tag = "Brig Cell 2"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqb" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 2"; + name = "Cell 2 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqe" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 9"; + name = "Cell 9 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/flasher{ + id = "PCell 4"; + name = "Cell 4 Flash"; + pixel_x = 24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "isolation4"; + name = "Cell 4 Isolation"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "2"; + specialfunctions = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqh" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/camera{ + c_tag = "Brig Perma Cell 4"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqi" = ( +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/obj/machinery/button/door{ + id = "permabolt4"; + name = "Cell 4 Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqj" = ( +/obj/machinery/camera{ + c_tag = "Brig Perma Middle 2"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqk" = ( +/obj/machinery/vending/sovietsoda, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dql" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqm" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dqn" = ( +/obj/item/weapon/storage/toolbox/mechanical/old, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqo" = ( +/obj/machinery/conveyor/auto, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqp" = ( +/obj/effect/spawner/lootdrop/grille_or_trash, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqq" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqr" = ( +/obj/machinery/suit_storage_unit/security, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqs" = ( +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqu" = ( +/obj/structure/rack, +/obj/item/weapon/gun/energy/ionrifle, +/obj/item/weapon/gun/energy/temperature/security, +/obj/item/clothing/suit/armor/laserproof{ + pixel_x = 0 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqv" = ( +/obj/structure/rack, +/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/weapon/storage/box/trackimp, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqx" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqy" = ( +/obj/machinery/flasher{ + id = "Cell 9"; + pixel_x = 32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqz" = ( +/obj/machinery/vending/sustenance, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid, +/area/security/prison) +"dqA" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqB" = ( +/obj/item/weapon/wrench, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqC" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqD" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqE" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor/auto, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqF" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/grille, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqG" = ( +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "Armory APC"; + pixel_x = 24; + pixel_y = 0 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqH" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqI" = ( +/obj/structure/closet/secure_closet{ + name = "contraband locker"; + req_access_txt = "3" + }, +/obj/effect/spawner/lootdrop/armory_contraband{ + loot = list(/obj/item/weapon/gun/ballistic/automatic/pistol = 5, /obj/item/weapon/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/weapon/gun/ballistic/revolver/mateba, /obj/item/weapon/gun/ballistic/automatic/pistol/deagle, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons = 3) + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqJ" = ( +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqK" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/riot, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/shield/riot, +/obj/item/weapon/shield/riot{ + pixel_x = 0; + pixel_y = 1; + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqL" = ( +/obj/structure/table, +/obj/item/weapon/storage/box/firingpins{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/weapon/storage/box/firingpins{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/key/security, +/obj/item/key/security, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqM" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Perma Cell 5"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqN" = ( +/obj/machinery/flasher{ + id = "PCell 5"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqO" = ( +/obj/machinery/door/airlock/glass{ + id_tag = "permabolt5"; + name = "Cell 5" + }, +/obj/machinery/door/poddoor/preopen{ + id = "isolation5"; + name = "cell isolation blast door" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dqP" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqR" = ( +/obj/machinery/conveyor/auto{ + dir = 5; + icon_state = "conveyor0"; + verted = -1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqS" = ( +/obj/machinery/conveyor/auto{ + icon_state = "conveyor0"; + dir = 8 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqT" = ( +/obj/machinery/conveyor/auto{ + tag = "icon-conveyor0 (SOUTHWEST)"; + icon_state = "conveyor0"; + dir = 10 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqU" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dqV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dqW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dqX" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dqY" = ( +/obj/machinery/suit_storage_unit/security, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dqZ" = ( +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dra" = ( +/obj/structure/rack, +/obj/item/weapon/gun/energy/e_gun/advtaser{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/e_gun/advtaser, +/obj/item/weapon/gun/energy/e_gun/advtaser{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"drb" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_y = 0 + }, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"drc" = ( +/obj/structure/closet/secure_closet/lethalshots, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"drd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dre" = ( +/obj/structure/weightlifter, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drf" = ( +/obj/structure/stacklifter, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"drh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"dri" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"drj" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/maintenance/asteroid/fore/com_west) +"drk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drl" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/deliveryChute{ + dir = 4 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drm" = ( +/obj/machinery/conveyor/auto{ + icon_state = "conveyor0"; + dir = 8 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drn" = ( +/obj/machinery/conveyor/auto{ + tag = "icon-conveyor0 (SOUTHWEST)"; + icon_state = "conveyor0"; + dir = 10 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dro" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"drr" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"drs" = ( +/obj/machinery/suit_storage_unit/security, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"drt" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dru" = ( +/obj/item/weapon/grenade/barrier{ + pixel_x = 4 + }, +/obj/item/weapon/grenade/barrier, +/obj/item/weapon/grenade/barrier{ + pixel_x = -4 + }, +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"drv" = ( +/obj/machinery/camera{ + c_tag = "Brig Cell 1"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drw" = ( +/obj/structure/closet/secure_closet/brig{ + id = "Cell 1"; + name = "Cell 1 Locker" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dry" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drz" = ( +/obj/machinery/camera{ + c_tag = "Brig Cell 10"; + dir = 9; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell") + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drA" = ( +/obj/machinery/camera{ + c_tag = "Brig Perma Wing 1"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drB" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drH" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"drI" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"drJ" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"drK" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Port Asteroid Maintenance"; + req_access_txt = "12" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drL" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"drM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drN" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"drO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"drP" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"drQ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/window/brigdoor/southleft{ + name = "Security Mail Chute"; + req_one_access_txt = "38;63" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"drR" = ( +/obj/machinery/door/poddoor/shutters{ + id = "armoryaccess2"; + name = "Armory Shutters" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"drS" = ( +/obj/structure/rack, +/obj/item/weapon/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/weapon/reagent_containers/glass/bottle/morphine, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"drT" = ( +/obj/machinery/door/window/brigdoor/westleft{ + id = "Cell 1"; + name = "Cell Door 1"; + req_access_txt = "1" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drU" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CellBlockMidLeft"; + location = "CellBlockLowRight"; + name = "navigation beacon (CellBlockLowRight)" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drV" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + id = "Cell 10"; + name = "Cell Door 10" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drW" = ( +/obj/machinery/flasher{ + id = "Cell 10"; + pixel_x = 32 + }, +/obj/machinery/holopad, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 4; + on = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drY" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"drZ" = ( +/obj/machinery/flasher{ + id = "PCell 6"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsa" = ( +/obj/machinery/door/airlock/glass{ + id_tag = "permabolt6"; + name = "Cell 6" + }, +/obj/machinery/door/poddoor/preopen{ + id = "isolation6"; + name = "cell isolation blast door" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dse" = ( +/obj/structure/stacklifter, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsf" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"dsg" = ( +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"dsh" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + icon_state = "ast_warn"; + dir = 1 + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsi" = ( +/obj/structure/girder, +/obj/structure/grille, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dsj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsl" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsm" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/item/device/radio, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHWEST)"; + icon_state = "red"; + dir = 9; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsn" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dso" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/item/device/radio, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsp" = ( +/turf/open/floor/plasteel/darkred/side{ + icon_state = "darkred"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dsq" = ( +/turf/open/floor/plasteel/darkred/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dsr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/darkred/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dss" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/darkred/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dst" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/darkred/side{ + tag = "icon-darkred (SOUTHEAST)"; + icon_state = "darkred"; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dsu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsv" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/button/flasher{ + id = "PCell 6"; + name = "Cell 6 Flash"; + pixel_x = 24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "isolation6"; + name = "Cell 6 Isolation"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "2"; + specialfunctions = 1 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsB" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/camera{ + c_tag = "Brig Perma Cell 6"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security","PrisonCell"); + tag = "icon-camera (SOUTHWEST)" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsC" = ( +/obj/structure/table, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/obj/machinery/button/door{ + id = "permabolt6"; + name = "Cell 6 Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_access_txt = "0"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/prison) +"dsD" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dsE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/girder, +/obj/structure/grille, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsL" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dsM" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsN" = ( +/obj/machinery/vending/security, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsO" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + on = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dsQ" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Armory"; + req_access_txt = "3" + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/armory) +"dsR" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dsS" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dsT" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "wardencell" + }, +/obj/machinery/door/airlock/glass_security{ + name = "Brig Cell Access"; + req_access_txt = "3" + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dsU" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Cell Block"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dsV" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Cell Block"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dsW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dsX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dsY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dsZ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dta" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtb" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtc" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtd" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dte" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dtg" = ( +/obj/structure/closet{ + name = "evidence closet" + }, +/obj/machinery/camera{ + c_tag = "Brig Evidence Room"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHEAST)"; + icon_state = "red"; + dir = 5; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dth" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dti" = ( +/obj/structure/filingcabinet/chestdrawer/wheeled, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dtj" = ( +/obj/machinery/computer/crew, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dtk" = ( +/obj/machinery/computer/prisoner, +/obj/machinery/camera{ + c_tag = "Brig Control Room"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dtl" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/computer/security/telescreen{ + desc = "Used to watch the various criminals inside their cells."; + name = "Cell Monitor"; + network = list("PrisonCell"); + pixel_y = 32 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dtm" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtn" = ( +/obj/structure/table, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/plasteel/whiteblue/side{ + tag = "icon-whiteblue (NORTH)"; + icon_state = "whiteblue"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dto" = ( +/obj/structure/table, +/obj/item/weapon/storage/firstaid/toxin, +/obj/machinery/camera{ + c_tag = "Brig Medbay"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/whiteblue/side{ + tag = "icon-whiteblue (NORTH)"; + icon_state = "whiteblue"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtp" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/obj/machinery/camera{ + c_tag = "Brig Interrogation"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dts" = ( +/obj/structure/table/wood, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtt" = ( +/obj/structure/table/wood, +/obj/item/weapon/clipboard, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 8; + on = 1; + scrub_Toxins = 0 + }, +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtv" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/camera{ + c_tag = "Brig Interrogation 2"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtw" = ( +/turf/closed/wall/rust{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/space) +"dtx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dty" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dtz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dtA" = ( +/obj/structure/closet, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dtB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dtC" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, +/obj/structure/closet/secure_closet/hos, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtD" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/deputy, +/obj/item/weapon/storage/box/seccarts{ + pixel_x = 3; + pixel_y = 2 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + on = 1 + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtF" = ( +/obj/structure/table/wood, +/obj/item/device/taperecorder{ + pixel_y = 0 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtG" = ( +/obj/machinery/suit_storage_unit/hos, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dtH" = ( +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dtI" = ( +/obj/structure/table, +/obj/machinery/recharger, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dtJ" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtK" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtM" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtN" = ( +/obj/structure/table, +/obj/item/weapon/storage/firstaid/regular, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtO" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtP" = ( +/obj/structure/table/wood, +/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtQ" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtR" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtS" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtT" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/cups, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dtU" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/grille/broken, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dtV" = ( +/obj/structure/girder, +/obj/structure/grille, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"dtW" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dtX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dtY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/girder, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dtZ" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security RC"; + pixel_x = -30; + pixel_y = 0 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dua" = ( +/mob/living/simple_animal/hostile/retaliate/bat{ + desc = "A fierce companion for any person of power, this spider has been carefully trained by NanoTrasen specialists. Its beady, staring eyes send shivers down your spine."; + emote_hear = list("chitters"); + faction = list("spiders"); + harm_intent_damage = 3; + health = 200; + icon_dead = "guard_dead"; + icon_gib = "guard_dead"; + icon_living = "guard"; + icon_state = "guard"; + max_co2 = 5; + max_tox = 2; + maxHealth = 250; + melee_damage_lower = 15; + melee_damage_upper = 20; + min_oxy = 5; + name = "Sergeant Araneus"; + real_name = "Sergeant Araneus"; + response_help = "pets"; + turns_per_move = 10; + voice_name = "unidentifiable voice" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dub" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duc" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dud" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"due" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duf" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "hosoffice"; + name = "emergency lockdown blast door" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dug" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"duh" = ( +/obj/structure/table, +/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/weapon/restraints/handcuffs, +/obj/item/device/assembly/flash, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dui" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duj" = ( +/obj/structure/table, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 0 + }, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"duk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + on = 1 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dul" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dum" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dun" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duo" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dup" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/bed/roller, +/obj/item/clothing/suit/straight_jacket, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duq" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dur" = ( +/obj/structure/table/wood, +/obj/item/device/taperecorder, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dus" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dut" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duu" = ( +/obj/structure/table/wood, +/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/weapon/folder/red, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duv" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/grille/broken, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_north) +"duw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dux" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"duy" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"duz" = ( +/obj/structure/sign/poster/official/enlist{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duA" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"duG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"duH" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4; + initialize_directions = 11 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"duI" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duJ" = ( +/obj/structure/closet{ + name = "evidence closet" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duK" = ( +/obj/structure/table, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/ears/earmuffs, +/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"duL" = ( +/obj/structure/chair/office/light, +/obj/effect/landmark/start/warden, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"duM" = ( +/obj/machinery/computer/camera_advanced{ + z_lock = 1 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"duN" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/bed/roller, +/obj/item/clothing/suit/straight_jacket, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"duR" = ( +/obj/machinery/power/apc{ + dir = 2; + name = "Courtroom APC"; + pixel_y = -24 + }, +/obj/structure/cable/orange, +/obj/effect/turf_decal/stripes/end{ + tag = "icon-warn_end (NORTH)"; + icon_state = "warn_end"; + dir = 1 + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"duS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"duT" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"duU" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"duV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"duW" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc{ + dir = 4; + name = "Head of Security's Office APC"; + pixel_x = 24; + pixel_y = 0 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"duX" = ( +/obj/machinery/keycard_auth{ + pixel_x = -24 + }, +/obj/machinery/camera{ + c_tag = "Head of Security's Office"; + dir = 4; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"duY" = ( +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"duZ" = ( +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp/green{ + on = 0; + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba, +/obj/item/weapon/lighter, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dva" = ( +/obj/structure/table/wood, +/obj/item/weapon/book/manual/wiki/security_space_law, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvb" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvc" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvd" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "hosoffice"; + name = "emergency lockdown blast door" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dve" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvf" = ( +/obj/structure/table, +/obj/item/weapon/restraints/handcuffs, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvg" = ( +/obj/structure/table, +/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvh" = ( +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j1"; + dir = 8 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvk" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Brig Control"; + req_access_txt = "3" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvm" = ( +/obj/structure/table/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/northright{ + name = "Warden's Desk"; + req_access_txt = "3" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvn" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvo" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/warden) +"dvp" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Cell Block"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvq" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvr" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvs" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced, +/turf/open/floor/plasteel/white{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvt" = ( +/obj/machinery/door/airlock/security{ + name = "Interrogation Room"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvu" = ( +/obj/machinery/door/airlock/security{ + name = "Interrogation Viewing"; + req_access_txt = "0"; + req_one_access_txt = "38;2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/darkblue/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dvw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dvx" = ( +/obj/machinery/computer/secure_data, +/obj/machinery/button/door{ + id = "hosoffice"; + name = "Emergency Office Lockdown"; + pixel_x = -24; + pixel_y = 8; + req_access_txt = "58" + }, +/obj/machinery/button/door{ + id = "brigfront"; + name = "Emergency Brig Lockdown"; + pixel_x = -24; + pixel_y = 0; + req_access_txt = "1" + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvy" = ( +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/effect/landmark/start/head_of_security, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/item/weapon/folder/red, +/obj/item/weapon/stamp/hos, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvD" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvF" = ( +/obj/structure/table, +/obj/item/weapon/storage/fancy/donut_box, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + tag = "icon-red (NORTHWEST)"; + icon_state = "red"; + dir = 9; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvI" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvL" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Brig Main East"; + dir = 6; + icon_state = "camera"; + network = list("SS13","Security") + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dvN" = ( +/obj/structure/grille, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dvO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dvP" = ( +/obj/machinery/computer/security, +/obj/machinery/newscaster/security_unit{ + pixel_x = -32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvQ" = ( +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvS" = ( +/obj/structure/table/wood, +/obj/item/weapon/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dvT" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvU" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvV" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "hosoffice"; + name = "emergency lockdown blast door" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dvW" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dvX" = ( +/obj/structure/table/wood, +/obj/item/device/radio/intercom{ + broadcasting = 0; + dir = 8; + listening = 1; + name = "Station Intercom (Court)"; + pixel_x = 0 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dvY" = ( +/obj/structure/table/wood, +/obj/item/weapon/book/manual/wiki/security_space_law, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dvZ" = ( +/obj/machinery/door/window/southleft{ + name = "Court Cell"; + req_access_txt = "2" + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dwa" = ( +/obj/structure/rack, +/obj/item/weapon/pickaxe, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dwb" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwc" = ( +/obj/machinery/computer/card/minor/hos, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/map/left/ceres{ + pixel_x = -32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dwd" = ( +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dwe" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dwf" = ( +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"dwg" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dwh" = ( +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/crew_quarters/heads/hos) +"dwi" = ( +/obj/structure/closet/bombcloset, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dwj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dwk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwm" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwn" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dwp" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dwq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwr" = ( +/obj/structure/closet/bombcloset, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dws" = ( +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dwt" = ( +/obj/machinery/door/airlock/security{ + name = "Detective's Office"; + req_access_txt = "4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwu" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "detective" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwv" = ( +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dww" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "lawyer" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dwx" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dwy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwz" = ( +/obj/machinery/door/airlock/glass_security{ + cyclelinkeddir = 2; + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "0"; + req_one_access_txt = "38;63" + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwB" = ( +/obj/item/device/radio/beacon, +/turf/open/floor/plasteel/neutral{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dwC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/blue/side{ + tag = "icon-blue (EAST)"; + icon_state = "blue"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dwD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/darkblue/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dwE" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwK" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/girder, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dwL" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dwM" = ( +/obj/machinery/vending/security, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/red{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dwN" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 8; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dwO" = ( +/obj/structure/closet/secure_closet/detective, +/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwQ" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwS" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dwT" = ( +/obj/structure/filingcabinet, +/obj/item/device/radio/intercom{ + broadcasting = 0; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dwU" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwV" = ( +/obj/structure/chair, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwW" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dwX" = ( +/obj/structure/table/wood, +/obj/item/weapon/folder/red, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dwY" = ( +/obj/structure/table/wood, +/obj/item/weapon/book/manual/wiki/security_space_law, +/turf/open/floor/plasteel/blue/side{ + tag = "icon-blue (SOUTHWEST)"; + icon_state = "blue"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dwZ" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/open/floor/plasteel/blue/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dxa" = ( +/obj/structure/grille, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dxb" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dxc" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxd" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxe" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxf" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxg" = ( +/obj/effect/landmark/secequipment, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxh" = ( +/obj/effect/landmark/secequipment, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxi" = ( +/obj/effect/landmark/secequipment, +/obj/machinery/camera{ + c_tag = "Brig Equipment South"; + dir = 10; + icon_state = "camera"; + network = list("SS13","Security"); + tag = "icon-camera (SOUTHWEST)" + }, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxj" = ( +/obj/effect/landmark/secequipment, +/turf/open/floor/plasteel/red/side{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxk" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxl" = ( +/obj/structure/table/wood, +/obj/machinery/computer/secure_data/laptop, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxm" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "Detective's Office APC"; + pixel_x = 24; + pixel_y = 0 + }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxn" = ( +/obj/structure/rack, +/obj/item/weapon/storage/briefcase, +/obj/item/weapon/storage/briefcase, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dxo" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/orange, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxp" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxq" = ( +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxr" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 10; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxu" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 6; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxv" = ( +/obj/machinery/button/door{ + id = "outterbrig"; + name = "Brig External Doors"; + normaldoorcontrol = 1; + pixel_x = -8; + pixel_y = -24; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "innerbrig"; + name = "Brig Internal Doors"; + normaldoorcontrol = 1; + pixel_x = -8; + pixel_y = -32; + req_access_txt = "2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxw" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dxx" = ( +/obj/structure/closet, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dxy" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxz" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxA" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/main) +"dxC" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxD" = ( +/obj/structure/table/wood, +/obj/item/device/tape/random, +/obj/item/device/tape/random{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxF" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/clothing/glasses/sunglasses, +/obj/item/device/flashlight/lamp, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxG" = ( +/obj/machinery/button/door{ + id = "detective"; + name = "Privacy Shutters"; + pixel_x = 24 + }, +/turf/open/floor/carpet{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dxH" = ( +/obj/structure/filingcabinet, +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dxI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxJ" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dxN" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dxO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dxP" = ( +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dxQ" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dxR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/preopen{ + id = "bridge"; + layer = 2.6; + name = "Emergency Blast Door" + }, +/obj/machinery/door/airlock/glass_command{ + cyclelinkeddir = null; + name = "Bridge"; + req_access_txt = "0"; + req_one_access = null; + req_one_access_txt = "19;41" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dxS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/poddoor/preopen{ + id = "bridge"; + layer = 2.6; + name = "Emergency Blast Door" + }, +/obj/machinery/door/airlock/glass_command{ + cyclelinkeddir = null; + name = "Bridge"; + req_access_txt = "0"; + req_one_access = null; + req_one_access_txt = "19;41" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dxT" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/grille, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dxZ" = ( +/obj/structure/rack, +/obj/item/weapon/storage/briefcase, +/obj/item/weapon/storage/briefcase, +/obj/machinery/airalarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dya" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/grimy{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dyb" = ( +/obj/machinery/camera{ + c_tag = "Lawyer's Office"; + dir = 4; + icon_state = "camera" + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dyc" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyd" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dye" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyf" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + broadcasting = 0; + listening = 1; + name = "Station Intercom (General)"; + pixel_y = 20 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyg" = ( +/obj/structure/sign/poster/official/safety_report{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/red/side{ + icon_state = "red"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyh" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dyi" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dyj" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dyk" = ( +/obj/structure/grille, +/turf/open/floor/plating/asteroid, +/area/maintenance/asteroid/fore/com_west) +"dyl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dym" = ( +/obj/effect/landmark/start/lawyer, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dyn" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyo" = ( +/obj/structure/table, +/obj/item/weapon/storage/pill_bottle/dice, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyp" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyq" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyr" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dys" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + icon_state = "intact"; + dir = 4 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 8; + layer = 2.4; + on = 1 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyv" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dyw" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dyx" = ( +/obj/structure/closet/lawcloset, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dyy" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dyB" = ( +/obj/machinery/vending/coffee, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, +/turf/open/floor/plasteel/vault{ + dir = 5; + initial_gas_mix = "n2=500;TEMP=80"; + temperature = 80 + }, +/area/security/courtroom) +"dyC" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating, +/area/space) +"dyD" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space) +"dyE" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/maintenance/asteroid/fore/com_west) +"dyF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dyG" = ( +/obj/structure/rack, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dyH" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dyI" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/detectives_office) +"dyJ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "lawyer" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dyK" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "lawyer" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/lawoffice) +"dyL" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfront"; + name = "emergency blast door" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/brig) +"dyM" = ( +/obj/structure/grille, +/obj/structure/window/fulltile, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/security/courtroom) +"dyN" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/preopen{ + id = "bridge"; + layer = 2.6; + name = "Emergency Blast Door" + }, +/obj/machinery/door/airlock/glass_command{ + cyclelinkeddir = null; + name = "Bridge"; + req_access_txt = "0"; + req_one_access = null; + req_one_access_txt = "19;41" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dyO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/poddoor/preopen{ + id = "bridge"; + layer = 2.6; + name = "Emergency Blast Door" + }, +/obj/machinery/door/airlock/glass_command{ + cyclelinkeddir = null; + name = "Bridge"; + req_access_txt = "0"; + req_one_access = null; + req_one_access_txt = "19;41" + }, +/turf/open/floor/plasteel/black{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/bridge) +"dyP" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/asteroid/line{ + icon_state = "ast_warn"; + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plating/astplate{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dyQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/maintenance/asteroid/fore/com_west) +"dyR" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/camera{ + c_tag = "Command Asteroid Hall 10"; + dir = 6; + icon_state = "camera" + }, +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/fore) +"dyS" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/red/corner{ + icon_state = "redcorner"; + dir = 1; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/fore) +"dyT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral/corner{ + tag = "icon-neutralcorner (EAST)"; + icon_state = "neutralcorner"; + dir = 4; + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/fore) +"dyU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CommandWest"; + location = "Security"; + name = "navigation beacon (Security)" + }, +/turf/open/floor/plasteel/neutral/corner{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/fore) +"dyV" = ( +/obj/structure/plasticflaps{ + name = "Officer Beepsky's Home" + }, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/fore) +"dyW" = ( +/obj/structure/bed/dogbed, +/mob/living/simple_animal/bot/secbot/beepsky, +/turf/open/floor/plating{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/fore) +"dyX" = ( +/obj/structure/sign/poster/contraband/rip_badger{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/floorgrime{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/derelict/secret{ + valid_territory = 0 + }) +"dyY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/item/device/radio/intercom{ + broadcasting = 0; + name = "Station Intercom (General)"; + pixel_x = -28; + pixel_y = 0 + }, +/turf/open/floor/plasteel{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/starboard) +"dyZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/plasteel/neutral{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/starboard) +"dza" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/plasteel/neutral{ + baseturf = /turf/open/floor/plating/asteroid/airless + }, +/area/hallway/primary/starboard) (1,1,1) = {" aaa @@ -92854,29 +100934,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -93111,29 +101191,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -93368,29 +101448,29 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -93625,6 +101705,29 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -93673,35 +101776,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aab +aab +aab +aab +aad aaa aaa aaa @@ -93882,6 +101962,29 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -93896,6 +101999,15 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -93919,48 +102031,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aab +aab +aab +aab +aab +aab +aad +aab +aab aaa aaa aaa @@ -94139,6 +102219,29 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -94153,6 +102256,10 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp aaa aaa aaa @@ -94173,52 +102280,25 @@ aaa aaa aaa aaa +aag aaa aaa aaa +cFp aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +aab +aab +aab +aad +aad +aad +aad +aab +aab +aad aaa aaa aaa @@ -94396,13 +102476,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -94430,6 +102513,10 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp aaa aaa aaa @@ -94454,28 +102541,21 @@ aaa aaa aaa aaa +cFp aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aad aab aab aab aab aad -aaa -aaa -aaa -aaa +aad +aad +aad +aad +aad +aad aaa aaa aaa @@ -94653,13 +102733,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -94681,59 +102764,56 @@ acU aei aeE aeS -aeW -aft -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dnl +dnI aaa aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +aaP +aaP +aaP +aaP +aaP +aaP +abC +abC +abC +abC +abC +abC +abC +abC +abC +abC +aaP +aaP +aaP +aaP +aaP +aaP +cFp aaa aaa aad aab aab -aab -aab -aab -aab +cTy +cTB +cTw +cTy +cTG +cTw +aac +aac +aac aad -aab -aab -aaa -aaa -aaa aaa aaa aaa @@ -94910,13 +102990,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -94938,61 +103021,58 @@ acU aej acU aeT -aeW -afu +dnm +dnJ aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaP +drg +drH +dsf +abV +acj +cFp +cFp +cFp +cFp +cXs +cFp +cFp +cFp +cFp +cFp +avx +abV +abr +abr +dyC +aaP +cFp aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aag -aaa -aaa -aab -aab -aab aab aad -aad +cTv +cTy +cTC +cTx +cTC +cTH +cTw +cTw +aac +aac aad aad aab -aab -aad -aaa -aaa -aaa -aaa aaa aaa aaa @@ -95167,13 +103247,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -95195,61 +103278,58 @@ acU aek aeF aeU -aeW -afv -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dnn +dnK aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaP +drh +drI +dsg +aaP +aaP +cXs +cXs +cXs +cXs +cXs +cXs +cXs +cXs +cXs +cXs +aaP +aaP +abs +abs +abb +aaP +cFp aaa +aad +aad +aad +cTw +cTy +cTB +cTz +cTE +cTC +cTL +cTy +aac +aac +aad +aad aab -aab -aab -aab -aad -aad -aad -aad -aad -aad -aad -aaa -aaa -aaa -aaa aaa aaa aaa @@ -95424,13 +103504,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aah aai aai @@ -95456,58 +103539,55 @@ aai afX aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aad -aab -aab -cTy -cTB -cTw -cTy -cTG -cTw -aac +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaP +dri +drJ +aaP +aaP +cXs +cFp +cFp +cFp +cFp +cXs +cFp +cFp +cFp +cFp +cFp +cXs +aaP +aaP +abs +abb +aaP +cFp aac aac aad -aaa -aaa -aaa -aaa +aad +cTv +cTz +cTx +cTD +cTz +cTI +cTM +cTy +aac +aad +aad +aad +aab +aab aaa aaa aaa @@ -95681,13 +103761,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aai aam aas @@ -95713,60 +103796,57 @@ aaa aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaP +abc +aaP +aaP +cFp +cXs +aaa +aaa +aaa +aaa +abC aaa aaa aaa aaa aaa +abC aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab +aaP +aaP +abc +aaP +cFp +aac +aac aad -cTv -cTy -cTC +aad +cTx +cTz +cTz cTx cTC -cTH -cTw -cTw -aac +cTJ +cTN +cTx aac aad +aab +aad +aad aad aab -aaa -aaa -aaa -aaa +aad aaa aaa aaa @@ -95938,13 +104018,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaj aan aan @@ -95970,64 +104053,61 @@ aaM aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaP +abd +aaP +cFp +cFp +cXs +aaa +cFp +cFp +cFp +abC +cFp aaa aaa aaa aaa +abC aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaP +dyD +aaP +cFp aaa aad -aad -aad +aac +aac cTw -cTy -cTB +cTA cTz -cTE -cTC -cTL -cTy +dyX +cTF +cTK +cTO +cTw aac +aad +aab aac aad aad +aad aab aaa aaa aaa aaa -aaa -aaa -aaa -aaa aaP aba abr @@ -96195,13 +104275,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaj aao aan @@ -96222,67 +104305,64 @@ aan aan aaB aeG -aeW -aft -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dmS +dno +aaa +aaa +aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaa +abC +aaa +abC +cFp +cFp +cXs +cFp +cFp +abW +abW +akm +abE +cFp +cFp +cFp +cFp +abC aaa aaa aaa aaa +abC +cFp aaa +aad aac aac -aad -aad +cTw +cTw cTv -cTz -cTx -cTD -cTz -cTI -cTM cTy +cTy +cTv +cTw +cTy +aad +aad +aab +aac +aac aac aad aad aad -aab -aab -aaa -aaa -aaa -aaa -aaa +aad aaa aaa aaP @@ -96452,13 +104532,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaj aap aat @@ -96479,41 +104562,42 @@ aan aan aan aeH -aeW -afu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dmT +dnp aaa aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaa +abC +aaa +abC +aaa +aaa +abC +aaa +aaa +abW +abW +abW +abE +abE +abW +abW +abW +abC +abW aaa aaa aaa +abC +cFp aaa aaa aaa @@ -96521,26 +104605,22 @@ aac aac aad aad -cTx -cTz -cTz -cTx -cTC -cTJ -cTN -cTx aac -aad -aab +aac +aac +aac aad aad aad aab +aac +aac +aac +aad +aab +aab +aad aad -aaa -aaa -aaa -aaa aaa aaP abb @@ -96709,13 +104789,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaj aaq aan @@ -96736,39 +104819,42 @@ aan aan aaB aeG -aeW -afv -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dmU +dnq aaa aaa aaa aaa aaa +cFp +cFp +cFp +cFp +aaa +aaa +abC +aaa +abC +aaa +aaa +akm +abE +abW +abW +abW +abW +abW +abW +abW +abW +abW +akm +abW aaa aaa aaa +abC +cFp aaa aaa aaa @@ -96778,26 +104864,20 @@ aaa aad aac aac -cTw -cTA -cTz -cTz -cTF -cTK -cTO -cTw +aac aac aad aab -aac +aad +aad aad aad aad aab +aab aaa -aaa -aaa -aaa +aad +aad aaa aaP abc @@ -96966,13 +105046,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaj aar aan @@ -96996,36 +105079,39 @@ aai aai aaO aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaa +aaa +abC +aaa +cXs +abE +abW +abW +abW +abW +abW +abW +abW +abW +abW +abW +abW +abW +abW +abW aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abC +cFp aaa aaa aaa @@ -97033,26 +105119,20 @@ aaa aaa aaa aad -aac -aac -cTw -cTw -cTv -cTy -cTy -cTv -cTw -cTy +aad +aad +aad +aad +aad +aab +aad aad aad aab -aac -aac -aac -aad -aad -aad -aad +aab +aab +aaa +aaa aaa aaa aaa @@ -97230,6 +105310,9 @@ aaa aaa aaa aaa +cFp +cFp +cFp aai aar aan @@ -97253,30 +105336,39 @@ aeI aai aaa aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aaa +aaa +abC +aaa +abC +abW +dgh +dgg +deK +deI +abW +abW +abW +dgh +deI +deK +deK +abW +abW +abW aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abC +cFp aaa aaa aaa @@ -97287,30 +105379,18 @@ aaa aaa aad aaa -aaa -aaa -aaa -aaa -aac -aac -aad -aad -aac -aac -aac -aac -aad -aad -aad -aab -aac -aac -aac -aad aab aab +aab +aab +aab +aaa +aaa aad -aad +aaa +aaa +aaa +aaa aaa aaa abC @@ -97487,6 +105567,9 @@ aaa aaa aaa aaa +cFp +cFp +cFp aak aai aai @@ -97510,6 +105593,39 @@ aai aai aai afY +cFp +cFp +cFp +cFp +cFp +cFp +cFp +abE +abE +abW +deK +drj +deK +deK +deI +deL +dtA +deK +dgg +deI +dgh +dgh +dwa +dwp +deI +deK +deK +abW +aaa +aaa +aaa +abC +cFp aaa aaa aaa @@ -97534,42 +105650,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aad -aac -aac -aac -aac -aad -aab -aad -aad -aad -aad -aad -aab -aab -aaa -aad -aad -aaa -aaa abC aaa aaa @@ -97744,6 +105824,9 @@ aaa aaa aaa aaa +cFp +cFp +cFp aaa aaa aaa @@ -97765,62 +105848,59 @@ aan aan aan aeX -aeW -aft -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dnr +dnL +cFp +cFp +cFp +cFp +cFp +cFp +abE +abE +deK +deI +deI +drk +deI +deI +dsD +deL +deL +deL +deL +deL +deL +dvN +deL +deL +deL +deL +deK +abW aaa aaa aaa +abC +cFp aaa aaa aaa +cFp +cFp +cFp +cFp aaa aaa aaa aaa aaa aad -aad -aad -aad -aad -aad -aab -aad -aad -aad -aab -aab -aab +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -98001,6 +106081,9 @@ aaa aaa aaa aaa +cFp +cFp +cFp aaa aaa aaa @@ -98022,8 +106105,48 @@ aan aan aan aeY -aeW -afu +dns +dnM +cFp +cFp +cFp +cFp +cFp +abE +abE +deK +deI +dqB +dqP +drl +deI +deL +dsE +dsZ +dtB +dtY +duy +duW +dvw +dvO +dwb +dwq +dwE +deL +deI +abW +abW +cFp +aaa +abC +cFp +aaa +aaa +aaa +cFp +cFp +cFp +cFp aaa aaa aaa @@ -98041,49 +106164,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aad -aaa -aab -aab -aab -aab -aab -aaa -aaa -aad -aaa -aaa -aaa -aaa -aaa -aaa -aaa abC aaa aaa @@ -98258,6 +106338,9 @@ aaa aaa aaa aaa +cFp +cFp +cFp aaa aaa aaa @@ -98279,67 +106362,64 @@ adO adO acG aeZ -aeW -afv -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aag -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dnt +dnN +cFp +cFp +cFp +cFp +abE +abW +deK +deK +dqn +dqC +dqQ +drm +deK +deL +dsF +dta +awz +awz +awz +awz +awz +awz +awz +awz +dwF +dxa +deI +dgh +abW +cFp aaa +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa abC aaa @@ -98515,6 +106595,9 @@ aaa aaa aaa aaa +cFp +cFp +cFp aaa aaa aaa @@ -98538,65 +106621,62 @@ aai aai aai aaO +cFp +cFp +cFp +cFp +abE +abW +deK +dpQ +axE +dqD +dqR +drn +drK +dsh +dsG +dtb +dtC +dtZ +duz +duX +dvx +dvP +dwc +awz +dwG +deL +dxw +dgh +abW +cFp aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aad -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa abC aaa @@ -98776,84 +106856,84 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -avv -avv -avw -avv -avv -avw -avv -avv -avv -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaP +aaP +aaP +aaP +aaP +aaP +aaa +aaa +aaa +aaa +aaa +aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +deK +deI +deI +deK +deI +dqS +deK +deK +deL +dsH +dtc +dtD +dua +duA +duY +dvy +dvQ +dwd +awz +dwH +deL +dxx +deK +abW +cFp +aaa +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aXl aXE @@ -99033,61 +107113,61 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -avw -awx -axt -ayZ -aAn -aAn -aCx -aDL -aFe -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaP +aba +abr +abr +abV +acj +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +aKy +aLB +dpR +dqo +dqE +dqT +deI +drL +deL +dsI +dtd +dtE +dub +duB +duZ +dvz +dvR +dwe +awz +dwI +dxb +deK +deK +abW +deK +dyE +deK +abW aaa aaa aaa @@ -99290,59 +107370,59 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -avw -awy +aaP +abb +abs +abs +aaP +aaP +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +deK +deK +deK +deI +deI +deI +deK +dgq +dsi +dsJ +dte axu -avv -aAn -aAn -aAn -aDL -aFe -aaa -aaa -aaa -aaa -aaa -abC -deK +duc +duC +dva +dvA +dvS +dwf +awz +dwJ +deL +deI +dgh +abW deK +dyF deK deK deK @@ -99357,7 +107437,7 @@ aaa aaa aaa aaa -aaa +aag aaa aaa aaa @@ -99547,58 +107627,58 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -avw -awz -axv -aza -aAo -aBr -aAn -aDL -aFe -aaa -aaa -aaa -aaa -abC +aaP +abb +abs +aaP +aaP abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +abE +abW +abW +abW +abW +abW +dgh deK +deL +deL +dsK +awz +dtF +dud +duD +dvb +dvB +dvT +dwg +awz +dwK +dxc +deL +deI +dgh +deI dgH aOn dgY @@ -99805,58 +107885,58 @@ aaa aaa aaa aaP -aaP -aaP -aaP +abc aaP aaP aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -avv -avv -axw -avv -avv -avv -aCy -avv -avv -aaa -aaa -aaa -aaa +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +abE +abE +abW +abW +abW +dgh +dgh +dgh +deL +drM +dsj +dsL +awz +dtG +due +duE +dvc +dvC +dvU +dwh +awz +dgh +dxd +dxy +deL +dgh deK -deK -deI -dgI +dgQ ajW axE axE @@ -100062,57 +108142,57 @@ aaa aaa aaa aaP -aba -abr -abr -abV -acj +abd +aaP +abC aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -avx +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +abE +abE +abW +abW +dgh +deK +deI +deL +dro +drN +dsk +dsM awA -axx awA +duf aAp -awA +dvd aCz +dvV awA -acj -aaa -aaa -aaa -aaa -aKy -aLB -aMu +awA +dwL +dxe +dxz +dxT +dyj +deI aMu aOo dgZ @@ -100318,58 +108398,58 @@ aaa aaa aaa aaa -aaP -abb -abs -abs -aaP -aaP -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abC +cFp +cFp +cFp abC +cFp abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +avv +avv +avw +avv +avv +avw +avv +avv +avv +cFp +cFp +abE +abW +dgh +deK +deI +dqF +dqU +drp +drO +dsl +dsN awB axy -awB -abC -awB -axy -awB -abC -abC -aaa -aaa -aaa -deK -deK -deK +dug +duF +dve +dvD +dvW +dwi +dwr +dwM +dxf +dxA +dxU +deL +deI dgJ aOp dgQ @@ -100422,7 +108502,7 @@ cMs aXr aXr aXn -bpY +bpZ bru bsT bum @@ -100575,57 +108655,57 @@ aaa aaa aaa aaa -aaP -abb -abs -aaP -aaP +cFp +cFp +cFp abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +avw +awx +axt +ayZ +aAn +aAn +aCx +aDL +aFe +cFp +cFp abW abW -abW -abW -abW -abW -atk -atk -atk +dgh +auB +deL +dgk +dqV +drq +drP +dsm +dsO awC -axz -awG -atk -awG -aCA +avy +avy +duG +avy +dvE aDM -atk -atk -abW -abW -aaa -abW -abW +dwj +dws +dwN +dxg +aBu +dxV +aJL deI axE dgQ @@ -100832,59 +108912,59 @@ aaa aaa aaa aaa -aaP -abc -aaP -aaP -aaa -abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa cFp -aaa -aaa -aaa -aaa -aaa +cFp +cFp +abC +cFp +abC +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +avw +awy +dlZ +avv +dmV +aAn +aAn +aDL +aFe +cFp abW abW -acH -acH -acH -acH -atk -auo +abW +dgh +deI +dqp +dqG +dqW +drr +drQ +dsn +avy avy -awD axA azb aAq -aBs -awD -awD +axA +azb +azb aFf -atk -abW -acH -acH -acH -acH +avy +avy +dxh +aBu +dxW +dyk deI -axE +dyG dgR aPQ aQM @@ -101089,57 +109169,57 @@ aaa aaa aaa aaa -aaP -abd -aaP +cFp +cFp +cFp abC -aaa +cFp abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abE -abE -abE +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +avw +dlG +axv +aza +aAo +aBr +aAn +aDL +aFe +cFp abW abW -abW -acH -acH -acH -aep -atl +dpn +dpE +dpS +dqq +dqH +dqX +arn +arn aup -avz -awE -awE +avy +avy +axA azc aAr -awE +dvf aCB -awE -aFg -atk -aep -dgg -deI -deK -deI +azc +aFf +avy +avy +dxi +aBu +dxX +dgo deK deK aOr @@ -101154,12 +109234,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -101352,50 +109432,50 @@ aaa abC aaa abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abC -abC -abE -abE -abE -abE -acH -acH -acH -acH -acH -acH -aep -aep -atk +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +avv +avv +axw +avv +avv +avv +aCy +avv +avv +cFp +cFp +abW +dpo +dpF +cKJ +cKJ +cKJ +cKJ +cKJ +arn auq -avA -awF -axB +dsP +dtf +dtH +duh +duH +dvg +dvF azc -aAq -awF -axB -awE aFh -atk +aDM aHy -deL -dgo -deL +dxj +aBu +dxY deL deL deL @@ -101411,13 +109491,13 @@ abE aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -101609,52 +109689,52 @@ aaa abC aaa abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abC -deK -aiW -aiW -aiW -deK -acH -acH -acH -acH -aep -aep -deK -deK -atk -atk -atk +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp awG -axC +dma +awG +cFp +awG +dnO +awG +cFp +cFp +cFp +abW +dpp +dpG +dpT +dqr +dqI +dqY +drs +arn +dso +avy +avy +axA azd -atk -awG +azd +axA aCC -awG -aFi -atk -aHz +azd +aFf +avy +avy aIF -apJ +aBu dgt -dgt -aMv +dgp +dgp dgp dgS dhb @@ -101668,13 +109748,13 @@ abE aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -101866,40 +109946,40 @@ aaa abC aaa abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +awG +dmb +awG +cFp +awG +dnP +awG +cFp +cFp abW abW -deI -aiX -ajV -aiZ -deI -acH -acH -acH -aep -deI -ajW -dfl -ajW -dfi +dpq +dpH +dpU +dqs +dqJ +dqZ +drt +drR aur avB awH axD -aze +axD aAs aBt aCD @@ -101908,12 +109988,12 @@ aFj aGE dft aIG -dgp +dxB ajc -dgp +dyl aMw -aNA -dgf +aMw +dyP aPS dhh ajX @@ -101925,13 +110005,13 @@ abW abE abE aaa -aaa -aaa cFp -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -102123,39 +110203,39 @@ aaa abC aaa abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abW -abW -deK -aiY -ajW +cFp +cFp +cFp +cFp +cFp +cFp +cFp +atk +atk +atk +awG +axz +awG +atk +awG +aCA +awG +atk akG -deK -abW -aep -deK +doL +doZ +akI +dpI dfb -deI +dqt +dfi dfi -dfm dfp -dft -aus -avC +arn +arn +arn awI -axE +dtI azf aAt aBu @@ -102163,14 +110243,14 @@ aCE aDO aFk cLB -dgf -aIH -deL -deK +cLB +cLB +dxC +aGF +aGF +dyv deK aMx -aNB -deK deI deI deI @@ -102182,13 +110262,13 @@ abW abW abE aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -102380,54 +110460,54 @@ aaa abC aaa abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abW -abW -abW -abW -acH -acH -deI -aiZ -ajW -ajX -deI -acH -aep +cFp +cFp +cFp +cFp +cFp +cFp +cFp +atk +auo +dls +awD +awD +dmy +awG +dnu +awD +doa +dol +doA +doM +dpa +dpr cKJ dfc cEv cEy -arn -arn -arn -arn -arn +cEy +cEy +cEy +dsp +cKJ awJ -arn -arn -arn -arn -arn +dtJ +dui +duI +dvh +dvG aDP aFl -arn -dgg -dgk -dgq -deK -aLC +cLB +dwO +aJN +dxD +dxZ +aMA aMy aNC -dgT +dyQ aPT aQN deK @@ -102439,13 +110519,13 @@ abW abW abE aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aXn @@ -102637,53 +110717,53 @@ aaa abC aaa abC -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -acH -acH -acH -acH -acH -acH -deK +cFp +cFp +cFp +cFp +cFp +abW +abW +atk +dlg +dlt +dlH +dmc +dmz +dmW +dnv +dnQ aja -axE +atk akH -deI -aep -deK -cKK -arn +doN +dpb +dps +cKJ +dpV cEw cEz -arn +dra ash atm -arn -avD +dsq +cKJ awK axF -azg +axF aAu aBv aCF -aDQ +aGP aFm -arn -deK -dgk -aJL -deI +dwt +dwP +dxk +dxE +aKA aLD -axE -axE +aMy +dyH cMe dhc dgT @@ -102894,52 +110974,52 @@ aaa abC aaa abC -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp abW abW -abW -abW -abW -abW -acH -acH -acH -acH -acH -aep -deK -deK -deI +atk +dlh +avA +awE +dmd +dmA +awG +awF +axB +dob +dom akI -deI -aep -ajW -cKK -arn +doO +dpc +dpt +cKJ +dpW cEx cEA cEB -asi -atn +cEx +cEx aut -avE +cKJ cGj -axG -azh +aGP +aGP aAv azh aCG -aDR +aGP aFn -arn -deI -dgk +cLB +dwQ +dxl aJM -deI +aIK aLE -aMz +aMy aND aOt aPU @@ -103151,52 +111231,52 @@ aaa abC aaa abC -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp abW abW -abW -abW -abW -abW -acH -acH -acH -acH -acH -deI +atk +atk +atk +awG +dme +awG +awG +awG cEo -apL -ajX -akJ -ajX -ajX -ajW -cKK -arn -arn -arn -arn +doc +atk +atk +atk +dpd +atk +cKJ +dpX +dqu +dqK +drb asj atn -aut -avF -cGj -cGj +dsr +cKJ +dtg +dtK azi -cGj -cGj +duJ +aBv aCH -aDS +aJX aFo -arn -dgh +dwu +dwR aII -deK -deK -aLF -dgz +dxF +aHB +aMD +aMy deK cYj aPV @@ -103408,53 +111488,53 @@ aaa abC aaa abC -aaa -aaa -aaa +cFp +cFp +cFp abW abW abW -acH -acH -acH -acH -acH -acH -acH -acH -auB -ajX -deL -deL -deL -ajX -ajX -ajX +abW +abW +atk +dlu +awF +dmf +dmB +dmX +dnw +dnR +dod +don +doB +doP +dpe +dpu deY -dfc -dfc -dfj -arn -ask -ato -arn -avG -awL -awL -awL -awL +dpY +cEx +cEx +cEx +cEx +cEx +dss +cKJ +anF awL +anF +anF +dvi aCI -aDT +aGP aFp aGF -aGF -aGF -aGF -aGF -aGF -aGF -aGF +dwS +dxm +dxG +dya +aME +dyw +dyI aOv aPW aQO @@ -103665,54 +111745,54 @@ aaa abC aaa abC -aaa +cFp +cFp abW abW abW abW abW -acH -acH -acH -acH -acH -afd -afd -afd -afd -afd +abW +atk +dlv +dlI +dmg +dmC +dmY +dnx +dnS akL -afd -akL -afd -afd -afd -afd -afd -afd -afd -afd -afd -afd -arn -arn -arn -arn -arn -arn -arn -aCJ -aDU +doo +doC +doQ +dpf +dpv +dpJ +dpZ +dqv +dqL +drc +dru +drS +dst +dsQ +dth +aoP +duj +duK +dvj +aCG +aGP aFq -aGF -aHA -aIJ -aJN -aKz -aLG -aMA -aGF -aOw +dwv +aGG +aGG +aGG +aGG +aGG +aGG +aGG +dyR aPX aQP aKp @@ -103922,54 +112002,54 @@ aaa abC aaa abC -aaa +cFp +cFp abW abW abW abW abW -acH -acH -acH -acH -acH -afd -afZ -agV -ahG -ail -ajd -ahH -akM +abW +atk +atk +atk +alm +alm +alm +alm +alm +alm +alm +alm alm alR amR -anD -alm -apx -amR -aro -alm -atp -amR -avH -alm -axH -amR -aAw afd +afd +afd +afd +afd +afd +afd +afd +anJ +dti +aoP +duk +aqy +dvk aCK -aDV -aFr +aGP +aFq aGG -aHB -aIK -aIK -aKA -aIK -aIK -aGF -aOx +dwT +dxn +aJR +dyb +aIQ +aIQ +dyJ +aOv aPY aQQ aRQ @@ -104175,58 +112255,58 @@ cFp cFp cFp cFp -aaa +cFp abC -aaa +cFp abC -aaa +cFp +cFp abW abW abW abW -acH -acH -acH -acH -acH -afd -afd +abW +abW +abW +abW +abW +alm aga agW -amS -aim +dny +alm aje -ajg +dop akN alm alS -amS -amS +dpw alm +dqa apy -amS -amS +akN alm +drv atq -ana -amS -alm +akN +dsR +dtj axI -amS -amS -afd +aoP +asn +dvl aCL -aDW +aJX aFs aGH aHC -aIL -aJO aHC aHC -aMB -aGF -aOw +aHC +dym +aIQ +dyK +aOv aPZ aQR aKp @@ -104432,58 +112512,58 @@ cFp cFp cFp cFp -aaa +cFp abC -aaa -abD -abE -abE +cFp +abC +cFp +cFp +abW +abW +abW +abW +abW +abW abW abW abW -acH -acH -acH -acH -acH -afd -afx -agb -agX -ahI -ain -ajf -amS -akO alm -alT -amS anE +amS +alT +aeK +anE +amS +alT alm -alT -amS -anE +dpg +dpx alm -alT -amS anE -alm -alT amS +alT +aeK anE -afd -aCL -aDX -aFt -aGI -aHD +amS +alT +dsS +dtk +aoP +aoP +duL +dvm +aCG +aGP +aFq +aGG +aIQ +aIM aIM -aJP aKB aLH -aMC -aGF -aOw +aIQ +aGG +aOv aPZ aQS aKp @@ -104689,58 +112769,58 @@ cFp cFp cFp cFp -aaa +cFp abC -abE -abE -abE -abE -acH -acH -acH -acH -acH -acH -acH -acH -afd -afd -afd -afd +cFp +abC +cFp +abW +agk +ahP +agl +agk +abW +abW +abW +abW +abW +alm +dmD +amS ahJ -aio +alm ajg -ajY -akP +amS +ahJ alm alU amT -anF alm -alU -aqu -anF +dqb +amS +ahJ alm -alU -auu +drw +amS +ahJ anF -alm -alU -azj -anF -afd -cGX +dtl +aoP +aoP +duM +dvn +aCL aDX aFu -aGF +dww aHE aIN aJQ aKC aLI -aMD +aIQ aNE -aOw +aOv aPZ aQT aRz @@ -104946,58 +113026,58 @@ aaa aaa aaa aaa -aaa +cFp +abC +cFp abC -abE -abE -abW -acH -acH -acH -acH abW abW -acH -acH -acH +agk +dkK +agm +agl abW -afd +alm +alm +alm +alm +alm agc agY -anE -aip -ajh +dnz +alm +agc cEr ajZ -aln -alV -amU -anG -aoL +alm +alU +amT +alm +agc apz -amU -anG -asl -apz -amU -anG +ajZ +alm +agc +drT +ajZ +anF awM -axJ -azk +ats +aoP aAx -afd -aCL -aDY +dvo +dvH +cHc aFv -aGF +dwx aHF aIO -aJQ +dxH aKD aLJ -aME -aGF -aOw +dyx +aGG +aOv cEU aQU aQj @@ -105203,24 +113283,24 @@ aaa aaa aaa aaa -aaa +cFp +abC +cFp abC -abE -abE abW -acH -acH -acN -acN -acN -acN -acN -acN -acN -acN -acN -acN -afd +abW +agl +agm +dkS +ahP +agk +alm +dli +dlw +dlJ +dmh +dmE +ajm ahK aiq aji @@ -105230,31 +113310,31 @@ alo alW amV anH -ajm -ajm -ajm +aji +aka +akQ arp -ajm -ajm -ajm -anH +aji +aka +dsu +dsT awN axK -azl +aoP aAy -aAA -aCL -aDX +anF +aCG +aGP aFw -aGJ -aGK -aGK -aGK -aGK -aGK -aGK -aGK -aOw +aGG +aGG +aGG +aGG +aGG +aGG +aGG +aGG +dyS aPZ aQV aRt @@ -105460,57 +113540,57 @@ aaa aaa aaa aaa -aaa -abD -abE -abE +cFp +abC abW -acH -acH -acN -acN -acN -acN -acN -acN +akm +abW +abW +agk acN acN acN +ahP +alm +dlj +amS +amS +dmi cTV -acN -acN -afd -afd -afd -afd -akL +dmZ +dnA +cVB +amd +doq +ahN +anI alX -amW +amd anI +amd +anI +ahN +anI +amd +drU aoM -anI -anI -anI -anI -anI -aoM -anI -awO +anF +anF axL -anI -anI -aBw +dul +anF +anF aCM -aDZ +aGP aFx aGK -aHG +cHh aIP -aJR +cHm aKE -aIQ -aMF -aNF +dyn +cHm +avI aOw aPZ aQR @@ -105717,22 +113797,22 @@ aaa aaa aaa aaa -aaa -abE -abE -abE +cFp +abC abW -acH -acH -acN -acN -ady -adQ -aeq -aeq -aeq -aeq +abW +abW +abW +agk +ahP +dkT +ahP +ahP +alm aeq +dlx +dlK +aln agd cTW cTX @@ -105740,33 +113820,33 @@ air akc akb ajj -afd +doR alY amW -anI -anJ -anJ -aqv -arq -asm -anJ -anJ -anI +dpK +amW +dqw +cTX +cVO +akc +cVO +dsv +dsU +awP +dtL +dum awP -axL -anI -anI aAD -aCL -aDX -aFx -aGK +dvI +aJX +dwk +dwy aHH -aIQ -aIQ -aIQ -aIQ -aMG +dxo +dxI +dyc +dyo +aJU aNG aOw aPZ @@ -105974,56 +114054,56 @@ aaa aaa aaa aaa -aaa -abE -abE +cFp +abC abW abW abW -abW -acN -acN +ahP +ahP +dkL +agm cVw adS -adR -aer +alm +alm aeK -afe -afy +alm +alm age -cTW +dna cTY ais -akc -akc -ajj -afd -alX -amW -cEs -anJ +doe +dor +doD +aeK +dph +dpy +aeK +dqc apA -aqw -arr -asn +cTY +azk +drx atr -anJ +dsw cEt -awO -axL +cHc +aFB cLf -aAz -afd -aCK -aEa +cHc +cEt +dvJ +cHc aFy aGL -aHI -aIR +aHM aIR +dxJ +aKF +aKF aKF -aLK -aMH aNH aOw aQa @@ -106231,47 +114311,47 @@ aaa aaa cFp aaa -aaa -abE -abE -abW +cFp +abD abW abW abW +agk +dkH acN acN -cVx +agm adS +alm aes -aes -aes -aes -aes +dly +dlL +dmj agf -acN -acN -afd +dnb +dnB +dnT ajk akd -akd -akd +doE +doS alZ -amW +dpz anK aoN -aoP +dqx aso -ars -cGf -ats +azl +ajk +azl auv -anK -awO -axL -afd +dsV +dtm +dtM +dun aAA -afd -aCL +dvp +dvK aEb aFz aGM @@ -106279,9 +114359,9 @@ aHJ aIS aJS aKG -cGm -aMI -aGK +cHm +cHm +dyL aOy aQb aQY @@ -106294,7 +114374,7 @@ aUT abE aaa aaa -aaa +cFp aaa aaa aaa @@ -106488,57 +114568,57 @@ aaa aaa cFp aaa -aaa -abE -abE -abE +cFp +cFp abW abW abW +agk +dkI +dkM acN acN -adz -cVy -adT +acN +alm aet -aeL -aff +amS +amS afz -agg +cTV aha ahN -ait -ajl -ake -ake -ake +anI +amd +anI +ahN +anI ama -amX -anL -aoO -apB -aqx -art -apB +amd +anI +amd +amh +ahN +anI +amd att -auw +aoM +avI +avI +avI +avI +avI avI -awQ -axM -azm -aAB -azm aCN -aEc +aGP aFA aGN aHK aIT -aJT +cHB aKH -aLL -aMJ -aGK +aKH +cEL +avI aOz aQc aQR @@ -106745,19 +114825,19 @@ aaa aaa cFp aaa -aaa -abE -abE -abE +cFp +cFp abW abW abW +agl +agk +dkN +dkU acN acN -adA -adU -aeu -aes +alm +dlk aeM afg afA @@ -106765,44 +114845,44 @@ agh ahb ahO aiu -ajm -ajm -ajm -ajm +dof +dos +ahO +doT amb amX anM -aoP +dqd apC -aqy +ahO aru -aqy -aqy -aqy -avJ +dry +apC +dsx +avI awR axN -azn +axN aAC azn -aCO -aEd -aFx -cEJ -aGK -aGK -aGK -aGK -aGK -aGK -aGK +aCG +aGP +dwl +awJ +dwU +dxp +dxK +dyd +dyp +dyy +avI aOA aPZ aQR aKp -abW -abW -abW +aMk +dyW +aKp abW abW abE @@ -107002,72 +115082,72 @@ aaa aaa cFp aaa -aaa -abE -abE -abE +cFp +cFp +cFp +dkF abW abW -abW -acN -acN -adB -adV -adV -adU -aeN -adU -afB +agk +dkO +dkV +ahP +agl +alm +alm +alm +alm +alm +agi +dnc +dnC +alm agi -acN -acN -afd -ajn akf -akf -akf -amc -amW -anN -aoQ +doF +alm +alU +amT +alm +agi apD cGe -ars -aqz -aoP -aux -avK +alm +agi +drV +cGe +avI awS axO -afd -aAD -afd -aCP -aDX +axO +axO +dvq +aCG +aDP aFt cHb aHL -cHi +aGP cHl cHr -cEL +aGP cEP cER cES aPZ -aQR +dyU +dyV +aMk +aMk aKp abW abW -abW -abW -abW abE abE aaa aaa aaa -aaa +cFp aaa aaa aaa @@ -107259,64 +115339,64 @@ aaa aaa aaa aaa -aaa -abE -abE -abE +cFp +cFp +cFp abW abW abW -acN -acN +ahP +dkP +dkW adC adV -adV -adV -adV -adV -afC -adC -agZ -ahM -aiv +dlb +dll +dlz +dlM +alm +dmF +amS +ahJ +alm ajo -akc -akc -afd -amd -amW -cEt -anJ -apE -aqA -ars +amS +ahJ +alm +alU +amT +alm +dqe +amS +ahJ +alm asp -atu -anJ -cEs -awO -axL -cLf -aAz -afd -aCL -cGY -aFB -cHc -aHM -cHj -cHm -cHm -cEM -cHm -cHH -cET +amS +ahJ +avI +dtn +axO +duo +axO +dvr +aCG +aGP +dwm +cHb +dwV +aGP +dxL +dye +aGP +cHD +cER +cES aPZ aQR aKp -abW -acH -acH +aKp +aKp +aKp abW abW abE @@ -107516,58 +115596,58 @@ aaa aaa aaa aaa -aaa -abE -abE -abE +cFp +cFp +cFp abW abW abW -acN -acN -adC -adW -aev +ahP +dkQ +dkX +agl +agl +alm cVz aeO afh -aev -agj -acN -ahL -aiw -ajj -akg -ajj -afd +alm +anR +amS +ami +aeK +anR +amS +ami +alm ame -amW -anI -anJ -anJ -aqv -arv -asm -anJ -anJ -avL -awO -axL -anI -anI -aAA -aCK -cGZ +dpA +alm +anR +amS +ami +aeK +anR +amS +ami +avI +dto +dtN +dup +duN +dvs +aCG +aGP cHa -cHd +cHb aHN -cHg -aJU +dxq +dxM cHs -cHx -cHB -cHI -cHN +aGP +cHD +cER +cES aPZ aQR aKp @@ -107773,55 +115853,55 @@ aaa aaa aaa aaa -aaa -abE -abE -abE +cFp abW abW abW -acN -acN -cTU -acN -acN -acN -acN -acN -acN -acN -acN -acN -afd -afd -afd -afd -akL -amd -amW -anI +abW +abW +agk +ahP +agl +agk +agk +alm +dlm +aeO +afh +alm +dmG +dnd +dnD +alm +dog +dot +akN +alm +alS +amT +alm aoR -anI -anI -anI -anI -anI -aoR -anI -awO -axL -anI -anI -aBw -aCM -aDZ +dqy +akN +alm +drz +drW +akN +avI +avI +avI +avI +avI +avI +aCN +aGP aFC -aEg +avI aHO -aEg -aEg -aEg -aEg +dxr +awJ +dyf +dyq aMK cHJ aOC @@ -108030,59 +116110,59 @@ aaa aaa aaa aaa -aaa -abE -abE -abE +cFp abW abW -acH -acN -acN -acN -acN -acN -acN -acN -acN -acN -afd -afd -afd -cVJ -cVF -akh -akR -alp +abW +abW +abW +abW +abW +abW +abW +alm +alm +dln +aeO +dlN +alm +alm +alm +alm +alm +alm +alm +alm +alm amf amY -aoS -aoS -anO -aoS -aoS -asq -aoS -aoS -anO +alm +alm +alm +alm +alm +alm +alm +alm +avI awT -axK -azl +dtO +duq aAE -aAD -aCL -cGY +avI +aCG +aGP aFD cHe cHf -cHe +dxs aJV cHt -cHy -cHC -aNI +aEb +aEb +aEb cHO -cHU +aPZ aQR cHY dhs @@ -108288,13 +116368,6 @@ aaa aaa aaa aaa -abE -abE -abE -abW -abW -acH -acH abW abW abW @@ -108303,44 +116376,51 @@ abW abW abW abW -afd +abW +alm +dlc +dlo +dlA +dlO +dmk +dmH cVA cVF -cVK -ajq -ajZ -akS -cVO +cVF +cVA +cVF +cVA +doU amg cVP -apF +ajm amU -cVS -cVU -cVV +ajm +ajm amU -apF -amU -anP +drA +ajm +dsy +avI awU axP -azk +dur aAF -afd -aCK -aEe +avI +dvL +aJX aFE aGQ aHP -aGQ +dxt aJW -aGP -aGP -cHD +aHP +dyr +dyz aNJ aOD -aPZ -aQR +aQd +aQZ cHY dhs dhr @@ -108544,57 +116624,57 @@ aaa aaa aaa aaa -aaa -aaa -abW -abW -abW -abW -abW -acH -acH -acH +cFp abW abW abW abW abW abW -afd +abW +abW +abW +alm +dld +dlp +dlB +dlP +dml +anI cVB -cVG -cVG -cVM -afd +anI +anI +cVB +anI amh -amZ +cVB anQ -alm -amh -aqB -anQ -alm -cVW -alm -amh -auy -anQ -alm -amh +anI +anI +cVB +anI +anI +cVB +anI +drX +awO +avI +dtp +dtP azo -anQ -afd -aCL -aDX +duO +dvt +dvM +aEb aFF -aEg +dwz cHg -aEg +dxu cHn cHu +dys aGP -cHE -aEg +avI aOE aPZ aQR @@ -108801,8 +116881,9 @@ aaa aaa aaa aaa -aaa -aaa +cFp +cFp +cFp abW abW abW @@ -108810,49 +116891,48 @@ abW abW abW abW -acH -acH -acH -acH -acH -abW -abW -afd +alm +dle +dlq +dlC +dlQ +dmm +dmI cVC cVH cVL cVM -afd -ami -amS -anR -alm -ami -amS -anR -alm +ake +cVL +doV +dpi +cVH +cVL +dqf +ake +cVL cVX -alm -ami -amS -anR -alm -ami -amS -anR -afd -aCQ -aDX +drB +drY +dsz +avI +dtq +dtQ +axR +duP +avI +aCI +aGP aFG -aGO -cHh +avI +dwW cHk -aJY -aGP -aGP -cHF -cHK -cHN +avI +dyg +dyt +cHD +cER +cES aQe aRa cHY @@ -109058,8 +117138,9 @@ aaa aaa aaa aaa -aaa -aaa +cFp +cFp +cFp abW abW abW @@ -109067,51 +117148,50 @@ abW abW abW abW -acH -acH -acH -acH -acH -abW -abW -afd +alm +alm +alm +dlD +dlR +dmn +dmJ cVD cVI +dnU +cVD cVI -cVN -afd amj -ana -amS +cVD +dpj alm apG -amS -amS -alm -cVX +dqg alm +dqM +drd +drC atv -amS -amS -alm +dsA +avI +dtr axQ -amS -amS -afd +axQ +duQ +avI aCR -cGZ -aJX -aJX +aGP +dwn +dwA aHR aIU -aHQ -aJX -aJX -aML -cHL -cHP -aQd -aQZ +cHb +cHu +dyu +cHD +cER +cES +aPZ +aQR cHZ dhs dhw @@ -109315,58 +117395,58 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -acH +cFp +cFp +cFp +cFp +abW +abW +abW +abW +abW abW abW -acH -acH -acH -acH -acH abW abW afd +dlS +dmo +dmK cVE -cVC -cVC +alm +dnV ahc -afd +alm amk anb anS alm -apH -anb -arw +amk +dqh alm +amk aiy -alm -atw -anb -avM -alm +drD +amk +dsB +avI +dts +axR axR -anb aAG -afd +dvu aCS -aEf -aFH +aDX +aAv aGR aHS -cHk -cHo +dxv +avI cHv cHz cHG -cHK -cHN +cER +cES aPZ aRb cHY @@ -109576,53 +117656,53 @@ aaa aaa aaa aaa -aaa -aaa -acH -acH -acH abW abW abW -acH -acH -acH +abW +abW +abW +abW +abW abW afd -afd -afd -afd -afd -afd -afd -afd -afd -afd -afd -afd -afd -afd +dlT +dmp +dmL +dne +alm +dnW +doh +alm +doG +doW +anS +alm +dpL +dqi +alm +dqN cVY -afd -afd -afd -afd -afd -afd -afd -afd -afd -aCT -aEg -aFI -aEg -aEg -aEg -aEg -aFI -aEg -aEg +drE +drZ +dsC +avI +dtt +dtR +dus +aAF +azp +azp aEg +azp +azp +azp +azp +azp +azp +azp +azp +azp cHQ aPZ aQR @@ -109833,17 +117913,7 @@ aaa aaa aaa aaa -aaa -aaa -acH -acH -acH -abW -abW -abW -acH -acH -acH +cFp abW abW abW @@ -109851,35 +117921,45 @@ abW abW abW abW -agk -agk -agk -agk -agk -agk -agm -agm -aiy -agk -adP -adP -adP -adP -adP +abW +afd +dlU +dmq +dmM +alm +alm +dnX +alm +alm +doH +doX +dpk +alm +dpM +alm +alm +dqO +alm +drF +dsa +alm +avI +dtu +dtS +dut +aAF azp -aAH -aBx aCU +aGV +aCY aEh aFJ -aGS -azp -aIY +aHT cHp +aIX +aIX aIY -aIY -aIY -aKp +azp aOF aPZ aQR @@ -110090,56 +118170,56 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -acH +cFp abW abW abW -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -agk -ahP -agk -agl -cVQ -agl +abW +abW +abW +abW +abW +afd +ahH +dmr +ahH +ahH +ahH +agX +agX +dou +agX +doY +dpl +dpB +ahH +dqj aix -ajp -cVZ -agk -adP -adP -adP -adP -adP -azp +ahH +agX +drG +dsb +agX +avI +dtv +dtT +duu aAI -aBy +azp aCV +aGV +aCY aEi -aFK -aGT +dwX aHT -aIV aIX aIX -aIY +aIX aMM -aKp -aOG -aQf -cGo +aNK +aOB +aPZ +aQR cHY dhs dhA @@ -110347,56 +118427,56 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp abW abW abW abW -abW -abW -acH -acH -acH -acH -acH -acH -acH -acH -agk -alq -akj +afd +dlV +dms +ahH +agX +agX +agX +doi +dov +agX +agX +agX aml -aiy -agl -cVT -agk -agk -agk -adP -adP -adP -adP -adP +ahH +ahH +ahH +agX +agX +alr +dsc +agX +avI +avI +avI +avI +avI azp -aAJ -aBz aCW +aBz aEj -aFL aGU -aHU -aIW -aIW +aGU aIW +dxN +dyh aLM aMN -aKp -aOB -aPZ -aQR +dyM +dyT +aQd +aQZ cHY dhs dhw @@ -110604,53 +118684,53 @@ aaQ abC abC abC -abC -abC -abC -abC -abC -adm +cXs +cXs +cXs +cXs +cXs abW abW abW abW -acH -acH -acH -acH -acH -acH -acH -acH -agk +afd +alm +dmt +agX +dnf +dnE +agX +doj +dow +doI +alr alr -aml anc cVR -ajp -aki -agl -afE -afE -afE -afH -afH -awV -afE -cEF +aml +agX +alr +alr +alr +dsd +agX +aTz +afd +adP +adP +adP +azp aAK -aBA -aCX +dvX aCY aFM aGV -aHT -aIX -aIX -cGl -aLN +azp +dxO +aDc +aDc aMO -aKp +azp aOH aPZ aRd @@ -110861,53 +118941,53 @@ aaQ aaQ aaa aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp abW abW abW abW -abW -acH -acH -acH -acH -acH -acH -acH -abW -agk +afd +dlW +dmu +dmN +agX +agX +agX +agX +agX +agX +alr als -als -aml -aml -agm -afD -afD -afH -asr +dpC +dpN +alr +alr +alr +dre +agX atx auz +alm +afd +adP +afE afE -deN -axS azp aAL -aBB -aCY aEk aCY +dwB aCY aHV -aIY -aIY -aIY -aIY -aIY -aNK +aDc +aDc +aDc +aDc +aNL aOB aPZ aQS @@ -111118,53 +119198,53 @@ abt abF aaQ aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp abW -abW -acH -acH -abW -abW -acH -acH -acH -acH +afd +alm +dmv +dmO +agX +agX +dnY +agX +agX +agX afD -afD -afD -afD -aiz -ajr -afD -acH +alr +alr +als +alr +alr +alr +agX +agX +agX +alr +aTz +afd afH -dfq -aty -dfq -afE -deN -dfd cEG +duR +azp aAK -aBC -aCZ +dvY aCY aFN aGV -aHT -aIX -aIX -aIX -aLO -aIY -aNL +azp +dxP +aDc +aDc +dyA +azp aOI aQg aRe @@ -111375,50 +119455,50 @@ abu abG aaQ aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp abW -abW -abW -abW -abW -abW -abW -acH -acH -acH -acH -acH -acH -acH -acH -abW -abW -acH -afH -ass -dfq +afd +dlX +alm +dmP +agX +agX +agX +agX +agX +agX +alr +alr +alr +alr +dqk +dqz +aTz +drf +agX +dse cKZ -dfz -awW -cLe -cEG +aTz +afd +afE +dfd aAJ -aBD -aDa -aEl -aFO +azp aDa +aGV +aCY +dwC aHW aIZ -aIZ -aIZ +dxQ +dyi aLP aMP aNM @@ -111632,53 +119712,53 @@ abt abH aaQ aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp abW -adP -adP -adP +afd +afd +dmw +dmQ +dng +dnF +dnZ +alm +dox +doJ +alr +dpm +dpD +dpO +dql +dqA +aTz +aTz +alm +aTz +aTz +afd +afd afH -adP -adP -adP -adP -adP -deO -deO -deO -deO -deO -deO -afH -afH -afH -afH -afH -cLd dfd +dgl azp -aAM -aBE aDb aEm -aFP +aCY aGW +dwY aHT -cGl aIX aIX -aLQ -aMQ -aKp +aIX +aDc +aNK aOK aPZ cMh @@ -111890,52 +119970,52 @@ abI aaQ aaQ aaQ -abC -abC -abC -abC -abC -abC -abC -abC -abC -afi -afE -afi -afc -afc +cXs +cXs +cXs +cXs +cXs +cXs +cXs +adm +abW +afd +afd +dmR +dnh +dnG aTz -adP -afE -afH +aTz +doy +doK alt -afE +afd +afd +afd +afd +afd +afd +afd +afd +afd +afd +afd +dtw +dtU +duv afH -afH -deO -deO -deO -deO -adP -atz -aqf -cKF -deN -dfd azp -aAN -aBF aDc +dvZ +aCY aEn -aFQ -aGX +dwZ +aHT +aIX +aIX +aIX +dyB azp -azp -azp -cEG -azp -azp -aKp aOL aPZ cMh @@ -112146,39 +120226,41 @@ abu abJ abX ack -act -acI -acI -acI -acI -acI -acI -acI -acI -acI -afj -afF -agn -ahd -ahQ -aiB -ahd -ahd -cKC -aBI -amm -cKI -anT +abX +dkG +dkJ +dkR +dkY +dkZ +dla +dlf +dlr +abW +abW +afd +afd +afd +afd +afd +afd +afd +afd +afd +afd +adP +adP +afH +afH +afE +adP +adP +afE +afE +afH +afE +dtV afH -aqf afH -alw -afc -deQ -cKF -deN -deN -dfd azp azp azp @@ -112187,12 +120269,10 @@ azp azp azp azp -dgl -cLY -aNz -aPP -aMR -aKp +azp +azp +azp +azp aOM aPZ cMh @@ -112411,7 +120491,7 @@ abC abC abC abC -abC +cCE abC afi afi @@ -112419,20 +120499,20 @@ afE afE afE adP -ajs -deN -deN -deN -aAT -aBI -aBI -aBI -apI -ahd +adP +adP +adP +adP +adP +adP +adP +afE +alx +deQ arx -ast -cKW -cKW +afa +afa +aQK avO cKU axU @@ -112667,22 +120747,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa +abC +cCE +abC afk afG ago ahe afH adP -afH -afH -cKD -cKF -deO -afH adP +adP +adP +adP +adP +adP +afH deN ahR aQK @@ -112925,7 +121005,7 @@ abC abC abC abC -abC +cCE abC afi afi @@ -112936,9 +121016,9 @@ adP adP deO deO -afH deO deO +afE ahR aQK aiF @@ -113181,11 +121261,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -afH +abC +cCE +afi +afi +afi afE ahf afH @@ -113438,13 +121518,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -afH -ahg +abC +cCF +dlE +dlY +dmx +aBI +dni afE adP adP @@ -113695,13 +121775,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +abC +abC +dlF +afi +afi afH -afH -ahh +dnj afE adP adP @@ -113958,7 +122038,7 @@ aaa aaa afH agq -ahi +dnk afE adP adP @@ -114220,7 +122300,7 @@ afH afH afH adP -afH +deO adP afH ahR @@ -114473,16 +122553,16 @@ aaa afI ags ahk -ahR +dnH aiC -ajt -akk -afa -aQK -aQK +dok +doz +ast +cKW +cKW and -ahe -cKN +dpP +dqm aNx aqC cEC @@ -119082,17 +127162,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -119339,17 +127419,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -119596,17 +127676,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -119853,17 +127933,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -120110,17 +128190,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -120367,17 +128447,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -120624,17 +128704,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -120657,11 +128737,11 @@ akl asJ cED auO +aBi awe awe -ayo azK -ayp +duS aBV aDs aEE @@ -120881,17 +128961,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -120914,11 +128994,11 @@ arK api alD auP -awf -awf -ayp -ayw -ayp +dsW +dtx +dtW +duw +duT aBW aDs aEF @@ -121138,17 +129218,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -121395,17 +129475,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -121954,11 +130034,11 @@ aGi aCa aIt aJq -cLm +dxR aLc aMa aJq -cLm +dyN aPe aQj aQR @@ -122468,11 +130548,11 @@ aGk aHh ayx aJs -cLn +dxS aLe aMc aJs -cLn +dyO aPg aQj aQR @@ -123484,11 +131564,11 @@ arP asN arP auZ -awf -awf -ayw -ayw -ayp +dsX +dty +dtX +dux +duU aCe aDs aEP @@ -123704,21 +131784,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -123741,16 +131821,16 @@ arQ asO arQ ava -awe -awe +dsY +dtz ayx azQ -ayp -aCf +duV +dvv aDs aEQ -ayw -aCf +dwo +dwD arP arP abW @@ -123961,21 +132041,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -124218,21 +132298,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -124475,21 +132555,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -124732,21 +132812,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -124989,21 +133069,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -125246,21 +133326,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -125503,21 +133583,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -125760,21 +133840,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -126017,21 +134097,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -126274,21 +134354,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp +cFp aaa aaa aaa @@ -136910,7 +144990,7 @@ bgr bhm bhm bjG -bkG +dyY bkG blF bkG @@ -136921,7 +145001,7 @@ bsr bhm bhm bwF -bxR +bhm byM bzL bxR @@ -137177,10 +145257,10 @@ bqI aZQ aZQ aZQ -aZQ -aZQ +dyZ +bEq byN -bzM +dza bar bCe bDg diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index bbd764fce19..5764c1db7b8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -54,8 +54,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -85,8 +84,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -121,8 +119,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -194,8 +191,7 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ pixel_x = -32; @@ -217,8 +213,7 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ pixel_x = -32; @@ -300,9 +295,7 @@ }, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -657,8 +650,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -674,8 +666,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ name = "External Solar Access"; @@ -691,8 +682,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, @@ -703,8 +693,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/space, /area/solar/starboard/fore) @@ -849,8 +838,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "WARNING: EXTERNAL AIRLOCK" }, /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/fore) @@ -892,8 +880,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "WARNING: EXTERNAL AIRLOCK" }, /turf/open/floor/plating, /area/hallway/secondary/entry) @@ -1207,7 +1194,6 @@ department = "Construction"; departmentType = 0; name = "Construction RC"; - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -1547,14 +1533,7 @@ }, /area/construction/mining/aux_base) "adm" = ( -/turf/open/space, -/obj/machinery/porta_turret/syndicate{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, +/turf/open/space/basic, /area/shuttle/syndicate) "adn" = ( /turf/closed/wall/mineral/plastitanium, @@ -1601,8 +1580,6 @@ "adt" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -1663,9 +1640,7 @@ width = 9 }, /obj/machinery/bluespace_beacon, -/obj/docking_port/mobile/auxillary_base{ - pixel_y = 0 - }, +/obj/docking_port/mobile/auxillary_base, /obj/machinery/computer/auxillary_base, /turf/closed/wall, /area/shuttle/auxillary_base) @@ -1746,8 +1721,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1757,8 +1731,7 @@ "adJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/entry) @@ -1944,8 +1917,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/construction/mining/aux_base) @@ -2092,7 +2064,6 @@ "aeA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/firealarm{ @@ -2122,7 +2093,6 @@ "aeC" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/rack, @@ -2634,7 +2604,6 @@ id = "smindicate"; name = "external door control"; pixel_x = -26; - pixel_y = 0; req_access_txt = "150" }, /obj/docking_port/mobile{ @@ -2669,8 +2638,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) @@ -2842,9 +2810,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -2893,11 +2859,9 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; - name = "Arrivals APC"; - pixel_x = 0; - pixel_y = 25 + name = "Arrivals Hallway APC"; + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2935,9 +2899,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/arrival{ dir = 1 @@ -3102,7 +3064,6 @@ "agO" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -3220,7 +3181,6 @@ "ahc" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3866,7 +3826,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/bot, @@ -3876,7 +3835,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/bot, @@ -3909,8 +3867,7 @@ /area/shuttle/syndicate) "aiO" = ( /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 @@ -4065,8 +4022,7 @@ "aje" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) @@ -4124,13 +4080,11 @@ /obj/machinery/power/apc{ dir = 8; name = "Customs Desk APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/blue/side{ dir = 8 @@ -4270,13 +4224,11 @@ /obj/machinery/power/apc{ dir = 4; name = "Security Checkpoint APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -4337,8 +4289,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -4592,8 +4543,7 @@ "aku" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/hallway/secondary/entry) @@ -4681,11 +4631,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Starboard Bow Maintenance APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/bar, @@ -4847,9 +4795,7 @@ "ale" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) @@ -4933,8 +4879,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/camera{ c_tag = "Arrivals Customs"; @@ -5053,8 +4998,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/red, /area/security/checkpoint/checkpoint2) @@ -5196,9 +5140,7 @@ "alR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -5698,8 +5640,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -5734,8 +5675,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -5853,7 +5793,6 @@ pixel_y = 3 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/grimy, @@ -5922,7 +5861,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/weapon/storage/secure/briefcase, @@ -5960,7 +5898,6 @@ /obj/effect/landmark/start/assistant, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/grimy, @@ -6008,7 +5945,6 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/red/side{ @@ -6192,9 +6128,7 @@ "anX" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 30 @@ -6234,9 +6168,7 @@ /obj/structure/table/wood, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light_switch{ pixel_y = -26 @@ -6448,8 +6380,7 @@ /obj/machinery/mineral/stacking_unit_console{ dir = 2; machinedir = 8; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -6811,7 +6742,6 @@ "aps" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/table/wood, @@ -6966,8 +6896,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -7715,14 +7644,12 @@ "arc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, /area/engine/atmospherics_engine) @@ -7733,8 +7660,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/yellow, /area/engine/atmospherics_engine) @@ -7746,8 +7672,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7761,8 +7686,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/caution{ dir = 4 @@ -7775,8 +7699,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/circuit/green, /area/engine/atmospherics_engine) @@ -7787,8 +7710,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/caution{ icon_state = "caution"; @@ -7801,8 +7723,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -7831,8 +7752,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/yellow, /area/engine/atmospherics_engine) @@ -7848,14 +7768,12 @@ pixel_x = -5 }, /obj/item/weapon/tank/internals/emergency_oxygen/engi{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/device/geiger_counter, /obj/item/device/geiger_counter, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable{ @@ -8270,7 +8188,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Disposal APC"; - pixel_x = 0; pixel_y = -24 }, /obj/structure/disposalpipe/segment{ @@ -8412,7 +8329,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line, @@ -8429,10 +8345,9 @@ /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "asq" = ( -/obj/machinery/atmospherics/components/trinary/filter{ +/obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; - filter_type = "o2"; - on = 1 + filter_type = "o2" }, /turf/open/floor/plasteel/yellow, /area/engine/atmospherics_engine) @@ -8506,6 +8421,9 @@ "asz" = ( /obj/structure/table_frame/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "asA" = ( @@ -8533,6 +8451,9 @@ /obj/structure/table/wood, /obj/item/device/camera_film, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/wood, /area/maintenance/port/fore) "asE" = ( @@ -8584,11 +8505,9 @@ "asH" = ( /obj/structure/closet/jcloset, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Custodial Closet APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/cable/white{ icon_state = "0-2" @@ -8604,7 +8523,6 @@ department = "Custodial Closet"; departmentType = 0; name = "Custodial RC"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, @@ -8649,6 +8567,9 @@ /obj/structure/table, /obj/item/weapon/storage/firstaid/regular, /obj/effect/turf_decal/bot, +/obj/machinery/light_switch{ + pixel_x = -26 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "asN" = ( @@ -8844,9 +8765,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/engine/gravity_generator{ - name = "Atmospherics Engine" - }) +/area/engine/atmospherics_engine) "atj" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -8859,8 +8778,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8971,8 +8889,7 @@ /obj/item/weapon/melee/skateboard, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/cafeteria, /area/maintenance/port/fore) @@ -9095,8 +9012,7 @@ /obj/effect/landmark/start/janitor, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; @@ -9127,7 +9043,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/effect/turf_decal/bot, @@ -9321,7 +9236,6 @@ /obj/item/weapon/storage/box/lights/mixed, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/brown{ @@ -9373,8 +9287,6 @@ /obj/machinery/status_display{ density = 0; name = "cargo display"; - pixel_x = 0; - pixel_y = 0; supply_display = 1 }, /turf/closed/wall, @@ -9432,8 +9344,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9444,8 +9355,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; @@ -9479,8 +9389,7 @@ "auE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/engine, /area/engine/supermatter) @@ -9518,8 +9427,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; @@ -9641,9 +9549,7 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/storage/box/lights/mixed{ pixel_x = 3; @@ -9730,7 +9636,6 @@ "avm" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable/white{ @@ -10017,8 +9922,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -10051,8 +9955,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; @@ -10073,8 +9976,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -10090,8 +9992,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/engine/atmospherics_engine) @@ -10268,9 +10169,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -10508,8 +10407,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; @@ -10529,14 +10427,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ @@ -10547,8 +10443,7 @@ "awW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/securearea{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/camera{ c_tag = "Supermatter Engine - Starboard"; @@ -10648,7 +10543,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/machinery/newscaster{ @@ -10660,7 +10554,6 @@ "axi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/machinery/newscaster{ @@ -10673,7 +10566,6 @@ "axj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/machinery/newscaster{ @@ -10755,8 +10647,7 @@ "axt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/quartermaster/warehouse) @@ -10923,8 +10814,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light{ dir = 4; @@ -10976,8 +10866,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -11078,6 +10967,9 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/corn, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) "ayf" = ( @@ -11321,9 +11213,7 @@ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "ayA" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -11518,7 +11408,7 @@ /turf/open/floor/plasteel, /area/shuttle/supply) "aza" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped{ +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ filter_type = "n2"; name = "nitrogen filter" }, @@ -11528,8 +11418,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -11538,9 +11427,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/engine/gravity_generator{ - name = "Atmospherics Engine" - }) +/area/engine/atmospherics_engine) "azc" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/scrubber, @@ -11583,8 +11470,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -11919,8 +11805,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Cargo Warehouse APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -11978,8 +11863,7 @@ "azT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) @@ -12043,9 +11927,7 @@ name = "Gas to Thermo" }, /turf/open/floor/plasteel/neutral, -/area/engine/gravity_generator{ - name = "Atmospherics Engine" - }) +/area/engine/atmospherics_engine) "aAb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 @@ -12119,7 +12001,6 @@ /area/space) "aAk" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -12171,6 +12052,9 @@ /area/hallway/secondary/service) "aAq" = ( /obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/service) "aAr" = ( @@ -12454,8 +12338,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -12466,21 +12349,18 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/sign/fire{ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/components/trinary/filter{ - density = 0; - dir = 8; - req_access = "0" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aBa" = ( @@ -12488,8 +12368,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/button/door{ id = "engsm"; @@ -12511,8 +12390,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -12524,8 +12402,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Supermatter Engine - Aft"; @@ -12544,12 +12421,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ locked = 0; + name = "Engine Air Alarm"; pixel_y = 23; req_access = null; req_one_access_txt = "24;10" @@ -12565,8 +12442,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -12578,8 +12454,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -12599,8 +12474,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -12635,8 +12509,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Atmospherics Engine APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/white{ icon_state = "0-8" @@ -12751,7 +12624,6 @@ /obj/structure/reagent_dispensers/beerkeg, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/vault{ @@ -12761,11 +12633,9 @@ "aBx" = ( /obj/structure/closet/secure_closet/bar, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Bar APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -12785,9 +12655,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/machinery/camera{ c_tag = "Bar Backroom"; @@ -12851,7 +12719,6 @@ department = "Bar Counter"; departmentType = 0; name = "Bar RC"; - pixel_x = 0; pixel_y = 32; receive_ore_updates = 1 }, @@ -12882,7 +12749,6 @@ /obj/item/weapon/storage/fancy/cigarettes/cigars/havana, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/vault{ @@ -12924,7 +12790,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner{ @@ -13121,8 +12986,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable/white{ icon_state = "4-8" @@ -13272,8 +13136,7 @@ "aCC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/service) @@ -13429,8 +13292,7 @@ "aCQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13561,7 +13423,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/red/side{ @@ -13574,9 +13435,7 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light_switch{ pixel_x = 38 @@ -13819,7 +13678,6 @@ pixel_y = 3 }, /obj/structure/sign/electricshock{ - pixel_x = 0; pixel_y = 32 }, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -13990,8 +13848,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -13999,7 +13856,6 @@ "aDH" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/structure/cable/white{ @@ -14089,8 +13945,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -14495,9 +14350,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/prison) @@ -14543,8 +14396,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ name = "External Solar Access"; @@ -14562,8 +14414,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/fans/tiny, /obj/effect/decal/cleanable/dirt, @@ -14579,8 +14430,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -14666,8 +14516,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -14682,8 +14531,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14695,8 +14543,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14708,8 +14555,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable/white{ icon_state = "1-2" @@ -14740,11 +14586,9 @@ dir = 1 }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Turbine Generator APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/cable/white{ icon_state = "0-2" @@ -14758,9 +14602,7 @@ "aFb" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light_switch{ pixel_x = 24; @@ -14841,8 +14683,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/glass_atmos{ name = "Power Monitoring"; @@ -14920,6 +14761,9 @@ /obj/structure/table/wood, /obj/item/weapon/folder, /obj/item/weapon/pen, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/wood, /area/hallway/secondary/service) "aFq" = ( @@ -14943,8 +14787,7 @@ "aFt" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -14964,8 +14807,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/loadingarea, /area/hallway/secondary/service) @@ -15043,8 +14885,7 @@ /obj/effect/landmark/lightsout, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/white{ icon_state = "1-2" @@ -15160,8 +15001,7 @@ "aFS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) @@ -15259,7 +15099,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/stripes/line, @@ -15297,8 +15136,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -15431,7 +15269,6 @@ "aGy" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/effect/decal/cleanable/dirt, @@ -15451,8 +15288,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -15460,7 +15296,6 @@ "aGA" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -15482,8 +15317,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -15604,7 +15438,6 @@ "aGR" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/newscaster{ @@ -15679,8 +15512,7 @@ /obj/structure/chair/stool/bar, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) @@ -15713,8 +15545,7 @@ "aHe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -15754,8 +15585,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "cargodisposals"; name = "Trash Filter Switch"; - pixel_x = -1; - pixel_y = 0 + pixel_x = -1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15947,8 +15777,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/oil, @@ -15975,9 +15804,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/caution, /area/maintenance/disposal/incinerator) @@ -16064,7 +15891,6 @@ "aHP" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/light/small, @@ -16088,7 +15914,6 @@ "aHR" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/effect/decal/cleanable/dirt, @@ -16107,12 +15932,10 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/bot, @@ -16156,7 +15979,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/vault, @@ -16191,8 +16013,7 @@ "aHZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/hallway/secondary/service) @@ -16237,7 +16058,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -16257,7 +16077,6 @@ "aIg" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -16321,8 +16140,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Security Post - Cargo APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -16338,8 +16156,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side, /area/security/checkpoint/supply) @@ -16347,7 +16164,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -16410,7 +16226,6 @@ /area/shuttle/supply) "aIw" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/item/weapon/soap/nanotrasen, @@ -16530,7 +16345,6 @@ }, /obj/item/toy/figure/syndie, /obj/structure/sign/electricshock{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/red/corner{ @@ -16657,8 +16471,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -16806,11 +16619,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Abandoned Gambling Den APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ @@ -16868,11 +16679,9 @@ dir = 1 }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Atrium APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/camera{ c_tag = "Theatre Stage"; @@ -16883,8 +16692,7 @@ /area/crew_quarters/bar/atrium) "aJx" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/status_display{ pixel_y = 32 @@ -16918,8 +16726,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -17045,9 +16852,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -17132,7 +16937,6 @@ "aKb" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, @@ -17146,9 +16950,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/darkred/corner{ icon_state = "darkredcorners"; @@ -17227,8 +17029,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) @@ -17246,8 +17047,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, @@ -17260,8 +17060,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, @@ -17280,8 +17079,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/engine, @@ -17290,8 +17088,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -17362,7 +17159,6 @@ "aKt" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -17520,11 +17316,9 @@ dir = 1 }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Theatre Backstage APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /turf/open/floor/plasteel/redblue, /area/crew_quarters/theatre) @@ -17540,7 +17334,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/redblue, @@ -17576,8 +17369,7 @@ /area/crew_quarters/bar/atrium) "aKW" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, @@ -18261,7 +18053,6 @@ /obj/structure/table/wood, /obj/item/toy/cards/deck/syndicate{ icon_state = "deck_syndicate_full"; - pixel_x = 0; pixel_y = 6 }, /turf/open/floor/plasteel/grimy, @@ -18348,8 +18139,7 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/device/camera, /turf/open/floor/plasteel/vault{ @@ -18369,8 +18159,7 @@ /area/crew_quarters/bar/atrium) "aMF" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) @@ -18482,7 +18271,6 @@ /obj/item/weapon/storage/box/lights/mixed, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/light_switch{ @@ -18515,7 +18303,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -18607,8 +18394,6 @@ /obj/machinery/status_display{ density = 0; name = "cargo display"; - pixel_x = 0; - pixel_y = 0; supply_display = 1 }, /turf/closed/wall, @@ -18750,7 +18535,6 @@ desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom"; - pixel_x = 0; pixel_y = -28; prison_radio = 1 }, @@ -19110,9 +18894,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -19476,10 +19258,8 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 10000; dir = 1; name = "Quartermaster's Office APC"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -19633,9 +19413,7 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/status_display{ pixel_y = 32 @@ -19919,8 +19697,7 @@ /area/engine/atmos) "aPu" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -20103,9 +19880,7 @@ "aPO" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light_switch{ pixel_x = 26; @@ -20308,7 +20083,6 @@ department = "Cargo Office"; departmentType = 0; name = "Cargo Office RC"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/camera{ @@ -20325,10 +20099,8 @@ /obj/structure/table, /obj/item/weapon/paper_bin, /obj/machinery/power/apc{ - cell_type = 10000; dir = 1; name = "Cargo Office APC"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/white{ @@ -20580,9 +20352,7 @@ "aQI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/whitered/side{ dir = 4 @@ -20609,7 +20379,6 @@ id = "permabolt3"; name = "Cell Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 @@ -20653,7 +20422,6 @@ id = "permabolt2"; name = "Cell Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 @@ -20687,7 +20455,6 @@ id = "permabolt1"; name = "Cell Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 @@ -20749,8 +20516,7 @@ "aQU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/plasteel/vault{ @@ -20873,7 +20639,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/camera{ @@ -20938,8 +20703,7 @@ sensors = list("air_sensor" = "Tank") }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -20997,8 +20761,7 @@ department = "Theatre Backstage"; departmentType = 0; name = "Theatre RC"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/item/weapon/lipstick/random{ pixel_x = 3; @@ -21018,7 +20781,6 @@ /obj/machinery/vending/autodrobe, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -21055,8 +20817,7 @@ "aRC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) @@ -21487,8 +21248,7 @@ icon_state = "tube1" }, /obj/machinery/ai_status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -21519,9 +21279,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -21550,9 +21308,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -21573,9 +21329,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -21633,7 +21387,6 @@ "aSB" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -21875,8 +21628,7 @@ /area/engine/atmos) "aTd" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -21968,7 +21720,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -21999,8 +21750,7 @@ "aTq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) @@ -22086,9 +21836,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -22152,9 +21900,7 @@ "aTH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) @@ -22240,6 +21986,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_x = 23 + }, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 4 @@ -22271,8 +22020,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22368,7 +22116,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/prison/solitary) +/area/prison/execution_room) "aUe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -22458,8 +22206,7 @@ "aUp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/engine/atmos) @@ -22781,9 +22528,7 @@ "aUS" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light{ icon_state = "tube1"; @@ -22918,7 +22663,6 @@ /obj/structure/closet/wardrobe/cargotech, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -23012,13 +22756,11 @@ "aVq" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/camera{ c_tag = "Cargo - Quartermaster's Office"; @@ -23541,8 +23283,7 @@ "aWm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/caution{ @@ -23592,16 +23333,13 @@ node1_concentration = 0.8; node2_concentration = 0.2; on = 1; - pixel_x = 0; - pixel_y = 0; target_pressure = 4500 }, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "aWt" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -23705,8 +23443,7 @@ "aWG" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -23812,7 +23549,6 @@ /obj/machinery/autolathe, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/firealarm{ @@ -23995,7 +23731,6 @@ "aXm" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light, @@ -24052,7 +23787,6 @@ "aXr" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -24074,8 +23808,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/corner{ dir = 1 @@ -24228,7 +23961,7 @@ dir = 4 }, /obj/item/device/radio/intercom{ - pixel_y = 25 + pixel_y = 24 }, /obj/item/weapon/storage/pod{ pixel_x = 6; @@ -24250,7 +23983,6 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -24389,8 +24121,7 @@ sensors = list("o2_sensor" = "Tank") }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel/blue/side{ @@ -24470,7 +24201,6 @@ /obj/structure/closet/wardrobe/botanist, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/turf_decal/bot, @@ -24489,9 +24219,7 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/chem_master/condimaster{ name = "BrewMaster 3000" @@ -24552,8 +24280,7 @@ "aYq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/kitchen) @@ -24730,13 +24457,15 @@ /obj/item/toy/figure/miner, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/bot, +/obj/machinery/light_switch{ + pixel_x = -38 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "aYK" = ( @@ -25064,8 +24793,7 @@ /area/engine/atmos) "aZw" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter{ @@ -25321,7 +25049,6 @@ /obj/item/weapon/hand_labeler, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/turf_decal/bot, @@ -25720,8 +25447,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/caution{ @@ -25833,8 +25559,7 @@ "baZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/greenblue/side, /area/hydroponics) @@ -25922,8 +25647,7 @@ /obj/structure/kitchenspike, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, @@ -25932,7 +25656,6 @@ "bbl" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/device/radio/intercom{ @@ -26147,8 +25870,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/sign/pods{ - name = "MINING POD"; - pixel_x = 0 + name = "MINING POD" }, /turf/open/floor/plating, /area/quartermaster/miningoffice) @@ -26381,8 +26103,7 @@ /area/engine/atmos) "bcm" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -26822,9 +26543,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: BLAST DOORS"; - pixel_x = 0; - pixel_y = 0 + name = "WARNING: BLAST DOORS" }, /turf/open/floor/plating, /area/security/brig) @@ -26881,8 +26600,7 @@ cell_type = 5000; dir = 1; name = "Atmospherics APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/cable/white{ icon_state = "0-2" @@ -26967,8 +26685,7 @@ "bdA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26984,8 +26701,7 @@ sensors = list("n2_sensor" = "Tank") }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel/red/side{ @@ -27032,8 +26748,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -27059,7 +26774,6 @@ /obj/structure/table/glass, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/item/weapon/storage/box/beakers{ @@ -27125,7 +26839,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -27161,7 +26874,6 @@ department = "Kitchen"; departmentType = 0; name = "Kitchen RC"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/red, @@ -27169,7 +26881,6 @@ "bdW" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/white, @@ -27410,8 +27121,7 @@ "bew" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/quartermaster/miningoffice) @@ -27492,8 +27202,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whitered/side{ dir = 1 @@ -27505,7 +27214,6 @@ /obj/item/weapon/bedsheet/medical, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 0; pixel_y = 26; req_access_txt = "0"; use_power = 0 @@ -27898,8 +27606,7 @@ /area/engine/atmos) "bft" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter{ @@ -27961,12 +27668,10 @@ "bfz" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/turf_decal/bot, @@ -28121,8 +27826,7 @@ "bfO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -28218,8 +27922,7 @@ "bfZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/fore) @@ -28258,8 +27961,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/quartermaster/miningoffice) @@ -28307,7 +28009,6 @@ department = "Mining"; departmentType = 0; name = "Mining Dock RC"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/camera{ @@ -28504,7 +28205,6 @@ pixel_y = 2 }, /obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = 0; pixel_x = 5; pixel_y = -1 }, @@ -28679,7 +28379,6 @@ department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -29210,13 +28909,10 @@ /obj/machinery/computer/stockexchange, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/brown{ @@ -29256,8 +28952,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Mining Dock APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Cargo - Mining Office"; @@ -29309,7 +29004,6 @@ /obj/item/device/radio/intercom{ dir = 8; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /obj/item/weapon/storage/backpack/satchel/explorer, @@ -29327,7 +29021,6 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/delivery, @@ -29380,7 +29073,6 @@ /obj/structure/bed/roller, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/whitered/side, @@ -29591,8 +29283,7 @@ /area/crew_quarters/heads/hos) "biN" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -29624,8 +29315,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ @@ -30112,9 +29802,7 @@ }, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -30152,8 +29840,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Security Office APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/white{ icon_state = "0-4" @@ -30344,8 +30031,7 @@ "bko" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -30355,9 +30041,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -30379,8 +30063,7 @@ /area/aisat) "bks" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -30511,8 +30194,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -30740,6 +30422,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/power/apc{ + dir = 1; + name = "Central Primary Hallway APC"; + pixel_y = 24 + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, @@ -30830,7 +30520,6 @@ "bln" = ( /obj/machinery/computer/shuttle/labor, /obj/machinery/status_display{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/red/side{ @@ -30844,7 +30533,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/red, @@ -31105,8 +30793,7 @@ /area/crew_quarters/heads/hos) "blN" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/lattice, /turf/open/space, @@ -31154,8 +30841,6 @@ dir = 1; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -31175,8 +30860,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window/southright, /turf/open/floor/plasteel/vault{ @@ -31566,8 +31250,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/white{ icon_state = "1-2" @@ -31684,9 +31367,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/cable/white{ icon_state = "1-4" @@ -31792,8 +31473,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall14"; @@ -31849,8 +31529,7 @@ "bnk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -32152,8 +31831,7 @@ /area/crew_quarters/heads/hos) "bnM" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -32229,8 +31907,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -32518,8 +32195,7 @@ "boA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hydroponics) @@ -32582,7 +32258,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/neutral/corner, @@ -32596,7 +32271,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral/corner, @@ -32644,7 +32318,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel{ @@ -32691,7 +32364,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/camera{ @@ -32743,7 +32415,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral/corner{ @@ -32758,7 +32429,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/neutral/corner{ @@ -32802,8 +32472,7 @@ "bpa" = ( /obj/machinery/computer/shuttle/labor, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -31; - pixel_y = 0 + pixel_x = -31 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/labor) @@ -33134,8 +32803,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) @@ -33183,8 +32851,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33219,8 +32886,7 @@ "bpM" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -33303,9 +32969,7 @@ "bpV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/engine/atmos) @@ -33330,7 +32994,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -33371,9 +33034,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, @@ -33489,6 +33150,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/white{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/port) "bqm" = ( @@ -33589,7 +33253,6 @@ /obj/machinery/button/flasher{ id = "gulagshuttleflasher"; name = "Flash Control"; - pixel_x = 0; pixel_y = -26; req_access_txt = "1" }, @@ -33779,8 +33442,7 @@ "bqT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/main) @@ -33844,7 +33506,6 @@ /obj/machinery/disposal/bin, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -33960,7 +33621,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/escape, @@ -34172,9 +33832,7 @@ "brF" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/requests_console{ department = "Hydroponics"; @@ -34284,9 +33942,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -34375,7 +34031,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/structure/reagent_dispensers/peppertank{ @@ -34393,7 +34048,6 @@ /area/security/main) "bsg" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/red/corner{ @@ -34537,7 +34191,6 @@ "bsv" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/manifold/supply/visible, @@ -34570,8 +34223,7 @@ "bsy" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ name = "scrubbers pipe"; @@ -34618,8 +34270,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light_switch{ pixel_x = -38; @@ -34635,8 +34286,7 @@ "bsD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -34811,7 +34461,6 @@ /obj/machinery/hydroponics/constructable, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/delivery, @@ -34820,7 +34469,6 @@ "bsQ" = ( /obj/machinery/hydroponics/constructable, /obj/structure/sign/nanotrasen{ - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/delivery, @@ -35029,8 +34677,7 @@ "btm" = ( /obj/machinery/mineral/labor_claim_console{ machinedir = 1; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -35129,8 +34776,7 @@ /area/security/main) "btv" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -35140,8 +34786,6 @@ dir = 8; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -35193,8 +34837,7 @@ /area/ai_monitored/turret_protected/ai) "btC" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -35204,8 +34847,6 @@ dir = 4; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -35364,8 +35005,7 @@ "btW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/white{ icon_state = "1-2" @@ -35380,7 +35020,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/weapon/wrench, @@ -35648,8 +35287,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Vault APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -35749,8 +35387,7 @@ "buI" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red/side{ @@ -35820,8 +35457,7 @@ /area/security/main) "buR" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -36334,8 +35970,7 @@ /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Central Hallway - Bridge Port"; @@ -36716,9 +36351,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -36758,7 +36391,6 @@ frequency = 1424; listening = 1; name = "Interrogation Intercom"; - pixel_x = 0; pixel_y = -58 }, /turf/open/floor/plasteel/vault{ @@ -36783,8 +36415,7 @@ /area/security/main) "bww" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -36870,8 +36501,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -36937,8 +36567,7 @@ cell_type = 5000; dir = 1; name = "Gravity Generator APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ icon_state = "intact"; @@ -36960,7 +36589,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -37107,8 +36735,7 @@ layer = 4; name = "Engine Monitor"; network = list("Engine"); - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plasteel/caution{ dir = 8 @@ -37335,7 +36962,6 @@ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; name = "WARNING: BLAST DOORS"; - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -37439,9 +37065,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -37463,7 +37087,6 @@ desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office."; name = "Research Monitor"; network = list("RD","Sat"); - pixel_x = 0; pixel_y = 2 }, /turf/open/floor/plasteel/black, @@ -37524,7 +37147,6 @@ /obj/item/weapon/storage/belt/champion, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light/small, @@ -37598,16 +37220,14 @@ "bxZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/transfer) "bya" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -37645,7 +37265,6 @@ "bye" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/extinguisher_cabinet{ @@ -37691,7 +37310,6 @@ frequency = 1424; listening = 0; name = "Interrogation Intercom"; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -37730,8 +37348,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -37840,8 +37457,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable/white{ icon_state = "1-2" @@ -38067,8 +37683,7 @@ cell_type = 5000; dir = 1; name = "Engineering Foyer APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/cable/white{ icon_state = "0-4" @@ -38112,7 +37727,6 @@ "byV" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -38136,7 +37750,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/caution, @@ -38155,7 +37768,6 @@ /obj/item/weapon/pen, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/caution, @@ -38172,8 +37784,7 @@ department = "Atmospherics Office"; departmentType = 0; name = "Atmospherics RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/extinguisher_cabinet{ pixel_x = 26; @@ -38266,7 +37877,6 @@ department = "Primary Tool Storage"; departmentType = 0; name = "Primary Tool Storage RC"; - pixel_x = 0; pixel_y = 32 }, /obj/structure/disposalpipe/trunk, @@ -38848,7 +38458,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/red/side, @@ -38887,8 +38496,7 @@ freerange = 1; listening = 1; name = "Common Channel"; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/device/radio/intercom{ anyai = 1; @@ -39002,8 +38610,7 @@ freerange = 1; listening = 1; name = "Common Channel"; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/device/radio/intercom{ anyai = 1; @@ -39577,8 +39184,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -39899,7 +39505,6 @@ freerange = 1; listening = 0; name = "Custom Channel"; - pixel_x = 0; pixel_y = -27 }, /obj/item/device/radio/intercom{ @@ -39940,12 +39545,10 @@ /area/ai_monitored/turret_protected/ai) "bBP" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -39964,9 +39567,7 @@ "bBR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -39982,8 +39583,7 @@ "bBT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/engine/gravity_generator) @@ -40057,8 +39657,7 @@ "bCa" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, @@ -40083,21 +39682,17 @@ "bCd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/caution, /area/engine/break_room) "bCe" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -40189,9 +39784,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light_switch{ pixel_y = 26 @@ -40338,8 +39931,7 @@ /obj/item/weapon/stock_parts/micro_laser, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -40573,7 +40165,6 @@ "bDc" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -40597,7 +40188,6 @@ "bDf" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/darkblue/side, @@ -40895,7 +40485,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -40921,9 +40510,7 @@ "bDJ" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light_switch{ pixel_y = -26 @@ -41162,8 +40749,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral/side{ dir = 4 @@ -41227,7 +40813,6 @@ /obj/item/weapon/stock_parts/manipulator, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/vault{ @@ -41269,8 +40854,7 @@ /obj/effect/landmark/start/assistant, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/storage/primary) @@ -41316,9 +40900,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) @@ -41400,8 +40982,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; @@ -41584,11 +41165,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Detective's Office APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/item/device/taperecorder, /obj/item/weapon/restraints/handcuffs, @@ -41615,7 +41194,6 @@ "bFc" = ( /obj/machinery/photocopier, /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault, @@ -41798,8 +41376,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -41842,7 +41419,6 @@ dir = 6 }, /obj/machinery/power/apc{ - aidisabled = 0; dir = 1; name = "AI Chamber APC"; pixel_y = 24 @@ -42126,8 +41702,7 @@ "bFZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -42217,8 +41792,7 @@ /obj/machinery/vending/tool, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -42289,7 +41863,6 @@ cell_type = 10000; dir = 1; name = "Council Chambers APC"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/wood, @@ -42402,7 +41975,6 @@ /area/crew_quarters/heads/captain) "bGI" = ( /obj/machinery/status_display{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -42417,8 +41989,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -42429,8 +42000,7 @@ /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -42606,8 +42176,7 @@ "bHb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 10 @@ -42636,8 +42205,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, @@ -42709,8 +42277,7 @@ "bHl" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ icon_state = "intact"; @@ -42799,8 +42366,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ icon_state = "intact"; @@ -42830,8 +42396,7 @@ cell_type = 5000; dir = 1; name = "Transit Tube Access APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -42850,14 +42415,11 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/button/door{ id = "transitlock"; name = "Transit Tube Lockdown Control"; - pixel_x = 0; pixel_y = 26; req_access_txt = "39; 19" }, @@ -43006,8 +42568,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43235,8 +42796,7 @@ "bIg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/bridge/meeting_room/council) @@ -43329,7 +42889,6 @@ cell_type = 10000; dir = 1; name = "Telecoms Monitoring APC"; - pixel_x = 0; pixel_y = 28 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -43470,7 +43029,6 @@ "bIF" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/wood, @@ -43497,8 +43055,7 @@ cell_type = 5000; dir = 1; name = "Auxiliary Tool Storage APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /turf/open/floor/plasteel/yellow/corner{ dir = 1 @@ -43514,6 +43071,9 @@ /obj/structure/closet/toolcloset, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/yellow/corner{ dir = 4 }, @@ -43599,8 +43159,7 @@ department = "Detective's Office"; departmentType = 0; name = "Detective RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -43639,7 +43198,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/red/corner{ @@ -43651,8 +43209,7 @@ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -43725,8 +43282,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/item/clothing/mask/gas/sechailer, /obj/item/clothing/mask/gas/sechailer, @@ -43828,7 +43384,6 @@ "bJm" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -43872,8 +43427,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -44004,9 +43558,7 @@ }, /area/engine/transit_tube) "bJD" = ( -/obj/machinery/computer/card/minor/ce{ - pixel_x = 0 - }, +/obj/machinery/computer/card/minor/ce, /obj/machinery/status_display{ pixel_x = -32 }, @@ -44070,7 +43622,6 @@ "bJL" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/yellow/side{ @@ -44225,9 +43776,7 @@ }, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -44386,8 +43935,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) @@ -44474,9 +44022,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) @@ -44537,9 +44083,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, @@ -44560,8 +44104,7 @@ "bKP" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -44737,9 +44280,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/warden) @@ -44766,9 +44307,7 @@ "bLl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -44796,8 +44335,7 @@ /area/ai_monitored/security/armory) "bLo" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -44808,8 +44346,6 @@ dir = 8; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -44847,8 +44383,7 @@ frequency = 1447; listening = 0; name = "AI Intercom"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -44868,8 +44403,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "bLw" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -44880,8 +44414,6 @@ dir = 4; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -44912,9 +44444,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/flasher{ id = "AI"; @@ -44943,8 +44473,7 @@ department = "Chief Engineer's Desk"; departmentType = 5; name = "Chief Engineer's RC"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/camera{ c_tag = "Engineering - Chief Engineer's Office"; @@ -45128,7 +44657,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -45204,7 +44732,6 @@ /obj/item/device/radio, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/light_switch{ @@ -45435,6 +44962,9 @@ /obj/item/weapon/storage/toolbox/emergency, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/light_switch{ + pixel_x = -26 + }, /turf/open/floor/plasteel/yellow/side{ dir = 10 }, @@ -45485,15 +45015,13 @@ /area/security/detectives_office) "bMR" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/black, /area/security/detectives_office) "bMS" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -45504,13 +45032,11 @@ "bMT" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -45594,8 +45120,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -45674,9 +45199,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/suit/armor/vest{ - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest{ pixel_x = 3; pixel_y = -3 @@ -45790,8 +45313,6 @@ dir = 2; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault, @@ -45849,8 +45370,7 @@ /obj/structure/lattice, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -46206,7 +45726,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/bookcase/random, @@ -46220,7 +45739,6 @@ "bOn" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/camera{ @@ -46288,7 +45806,6 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/item/weapon/phone{ @@ -46383,8 +45900,7 @@ desc = "A direction sign, pointing out which way the Command department is."; dir = 1; icon_state = "direction_bridge"; - name = "command department"; - pixel_y = 0 + name = "command department" }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the Supply department is."; @@ -46514,9 +46030,7 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/item/toy/figure/warden, @@ -46545,8 +46059,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Warden's Office APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Security - Warden's Office"; @@ -46606,9 +46119,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof{ pixel_x = 3; pixel_y = -3 @@ -46658,9 +46169,7 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -46726,8 +46235,6 @@ dir = 8; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /obj/effect/turf_decal/stripes/line, @@ -46817,7 +46324,6 @@ icon_state = "control_standby"; name = "Antechamber Turret Control"; pixel_x = -32; - pixel_y = 0; req_access_txt = "65" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -46828,8 +46334,6 @@ dir = 4; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -46874,7 +46378,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -46915,8 +46418,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ icon_state = "intact"; @@ -46938,8 +46440,7 @@ "bPx" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -46956,8 +46457,6 @@ dir = 2; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /obj/item/weapon/clipboard, @@ -46983,9 +46482,7 @@ "bPA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -47047,8 +46544,7 @@ "bPF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral/side{ dir = 8; @@ -47209,11 +46705,9 @@ /area/security/checkpoint/engineering) "bPS" = ( /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Security Post - Engineering APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ icon_state = "intact"; @@ -47265,8 +46759,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Security Post - Engineering"; @@ -47552,8 +47045,7 @@ department = "Captain's Desk"; departmentType = 5; name = "Captain RC"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet, @@ -47815,8 +47307,7 @@ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ icon_state = "intact"; @@ -48007,8 +47498,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -48039,7 +47529,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -48104,8 +47593,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) @@ -48148,8 +47636,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -48223,8 +47710,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -48232,8 +47718,7 @@ /area/aisat) "bRE" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/transit_tube/station{ @@ -48291,8 +47776,7 @@ "bRK" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -48316,7 +47800,6 @@ dir = 4; name = "Research Monitor"; network = list("Sat"); - pixel_x = 0; pixel_y = 2 }, /turf/open/floor/plasteel/vault{ @@ -48344,7 +47827,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -48367,8 +47849,7 @@ layer = 4; name = "Engine Monitor"; network = list("Engine"); - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/vault{ @@ -48435,7 +47916,6 @@ /obj/machinery/suit_storage_unit/ce, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/stripes/line{ @@ -48459,8 +47939,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, @@ -48496,9 +47975,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -48534,7 +48011,6 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/weapon/book/manual/wiki/security_space_law, @@ -48589,9 +48065,7 @@ "bSp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/port) @@ -48974,8 +48448,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/starboard) @@ -49333,9 +48806,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -49423,8 +48894,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -49437,8 +48907,7 @@ /obj/structure/window/reinforced, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -49475,8 +48944,7 @@ "bTQ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/transit_tube/curved/flipped{ icon_state = "curved1"; @@ -49548,7 +49016,6 @@ /obj/item/weapon/cartridge/atmos, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/vault{ @@ -49625,9 +49092,7 @@ /obj/machinery/light/small, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -49795,7 +49260,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/door/firedoor, @@ -49811,7 +49275,6 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/neutral/corner{ @@ -50005,9 +49468,7 @@ "bUT" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -50073,7 +49534,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral/corner, @@ -50112,6 +49572,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/starboard) "bVd" = ( @@ -50391,7 +49854,6 @@ /obj/machinery/power/apc{ dir = 2; name = "MiniSat APC"; - pixel_x = 0; pixel_y = -27 }, /obj/structure/cable/white, @@ -50418,7 +49880,6 @@ frequency = 1447; listening = 0; name = "AI Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -50471,7 +49932,6 @@ control_area = "AI Upload Chamber"; icon_state = "control_stun"; name = "AI Upload turret control"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -50482,7 +49942,6 @@ /obj/machinery/light, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/vault, @@ -50490,9 +49949,7 @@ "bVM" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/porta_turret/ai, /turf/open/floor/plasteel/vault{ @@ -50520,7 +49977,6 @@ frequency = 1447; listening = 0; name = "AI Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/vault{ @@ -51035,7 +50491,6 @@ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; name = "WARNING: BLAST DOORS"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line{ @@ -51490,8 +50945,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Port Maintenance APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/white{ icon_state = "0-2" @@ -51573,8 +51027,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -51586,8 +51039,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/central) @@ -51905,7 +51357,6 @@ /obj/machinery/button/door{ id = "lawyerprivacy"; name = "Lawyer's Privacy Control"; - pixel_x = 0; pixel_y = 24; req_access_txt = "0" }, @@ -51936,9 +51387,7 @@ /obj/structure/closet/lawcloset, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/wood, /area/lawoffice) @@ -52181,8 +51630,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) @@ -52497,8 +51945,7 @@ /obj/machinery/power/apc{ dir = 4; name = "HoP Office APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/white{ icon_state = "0-8" @@ -52518,8 +51965,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Telecoms Server Room APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/white, /turf/open/floor/plasteel/vault{ @@ -52708,9 +52154,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -52917,7 +52361,6 @@ /obj/structure/filingcabinet/employment, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/wood, @@ -53073,7 +52516,6 @@ cell_type = 10000; dir = 1; name = "Brig APC"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -53391,8 +52833,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable{ icon_state = "1-8" @@ -53442,16 +52883,14 @@ /obj/structure/sign/kiddieplaque{ desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; name = "Library Rules Sign"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/wood, /area/library) "cby" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/library) @@ -53486,8 +52925,7 @@ /obj/structure/sign/kiddieplaque{ desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; name = "Library Rules Sign"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ @@ -53510,8 +52948,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) @@ -53630,7 +53067,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -53651,7 +53087,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -53742,9 +53177,7 @@ "ccd" = ( /obj/structure/table/wood, /obj/item/device/radio/intercom{ - name = "Station Intercom"; - pixel_x = 0; - pixel_y = 0 + name = "Station Intercom" }, /turf/open/floor/plasteel/neutral/side{ dir = 1 @@ -54006,8 +53439,7 @@ /obj/effect/landmark/start/security_officer, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/brig) @@ -54069,8 +53501,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -54386,7 +53817,6 @@ /obj/item/weapon/pen, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/wood, @@ -54572,9 +54002,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) @@ -54668,8 +54096,7 @@ /obj/effect/landmark/start/lawyer, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/lawoffice) @@ -54679,7 +54106,6 @@ department = "Law Office"; departmentType = 0; name = "'Law Office RC"; - pixel_x = 0; pixel_y = -64 }, /obj/item/weapon/folder/blue{ @@ -54726,8 +54152,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/camera{ c_tag = "Security - Brig Desk"; @@ -54823,9 +54248,7 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/device/radio{ pixel_x = 5; @@ -54956,8 +54379,7 @@ "cew" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -55411,7 +54833,6 @@ /obj/structure/table/wood, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -32 }, /obj/item/weapon/folder/yellow{ @@ -55449,8 +54870,7 @@ /obj/item/device/flashlight/lamp, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/wood, /area/lawoffice) @@ -55524,8 +54944,7 @@ /area/security/brig) "cfL" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -55543,8 +54962,7 @@ /obj/item/weapon/aiModule/reset, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -55596,8 +55014,7 @@ frequency = 1447; listening = 0; name = "AI Intercom"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -55661,8 +55078,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55674,8 +55090,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55736,8 +55151,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Engine Room APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -55765,6 +55179,9 @@ /obj/item/weapon/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plating, /area/maintenance/port) "cgk" = ( @@ -55853,7 +55270,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -56128,6 +55544,9 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/light_switch{ + pixel_x = -36 + }, /turf/open/floor/plasteel, /area/security/range) "cgZ" = ( @@ -56612,7 +56031,6 @@ /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/bot, @@ -56625,7 +56043,6 @@ cell_type = 10000; dir = 1; name = "Teleporter APC"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/white{ @@ -56663,7 +56080,6 @@ /obj/machinery/button/door{ id = "teleporterhubshutters"; name = "Teleporter Shutters"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/bluespace_beacon, @@ -56722,8 +56138,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -56754,9 +56169,7 @@ "cir" = ( /obj/structure/table/wood, /obj/item/device/radio/intercom{ - name = "Station Intercom"; - pixel_x = 0; - pixel_y = 0 + name = "Station Intercom" }, /turf/open/floor/plasteel/neutral/side, /area/security/courtroom) @@ -56966,9 +56379,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -57062,8 +56473,7 @@ /area/security/range) "ciQ" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -57073,8 +56483,6 @@ dir = 8; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -57089,7 +56497,6 @@ /obj/machinery/power/apc{ dir = 2; name = "AI Upload Access APC"; - pixel_x = 0; pixel_y = -27 }, /turf/open/floor/plasteel/vault{ @@ -57133,7 +56540,6 @@ /obj/machinery/light, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -57143,8 +56549,7 @@ /area/ai_monitored/turret_protected/ai_upload) "ciW" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -57154,8 +56559,6 @@ dir = 4; name = "ai camera"; network = list("Sat"); - pixel_x = 0; - pixel_y = 0; start_active = 1 }, /turf/open/floor/plasteel/vault{ @@ -57215,7 +56618,6 @@ department = "Chapel Office"; departmentType = 0; name = "Chapel RC"; - pixel_x = 0; pixel_y = -32 }, /turf/closed/wall/r_wall, @@ -57231,8 +56633,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -57334,9 +56735,7 @@ /obj/item/device/camera_film, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/grimy, /area/library) @@ -57584,8 +56983,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ @@ -57625,8 +57023,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/courtroom) @@ -57749,8 +57146,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Shooting Range APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/white{ icon_state = "0-4" @@ -57778,7 +57174,6 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/weapon/gun/energy/laser/practice{ @@ -57832,8 +57227,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -58004,7 +57398,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/decal/cleanable/dirt, @@ -58123,7 +57516,6 @@ "ckZ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -58148,15 +57540,12 @@ "clc" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -58184,7 +57573,6 @@ "clf" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -58211,7 +57599,6 @@ /obj/item/device/radio, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/bot, @@ -58258,13 +57645,11 @@ /obj/machinery/light, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -58329,8 +57714,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Courtroom APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/white{ icon_state = "0-8" @@ -58434,8 +57818,7 @@ "clH" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/lattice, /obj/structure/lattice, @@ -58777,7 +58160,6 @@ id = "teleportershutters"; name = "Teleporter Shutters"; pixel_x = -26; - pixel_y = 0; req_access_txt = "19" }, /obj/machinery/door/poddoor/shutters{ @@ -58814,9 +58196,7 @@ /obj/structure/table, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ @@ -58861,9 +58241,7 @@ "cmH" = ( /obj/structure/table/wood, /obj/item/device/radio/intercom{ - name = "Station Intercom"; - pixel_x = 0; - pixel_y = 0 + name = "Station Intercom" }, /turf/open/floor/plasteel/vault, /area/security/courtroom) @@ -59013,8 +58391,7 @@ "cnc" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window/northright, /turf/open/floor/plasteel/vault{ @@ -59097,8 +58474,7 @@ layer = 4; name = "Engine Containment Telescreen"; network = list("Singularity"); - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59136,8 +58512,7 @@ "cnr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -59185,8 +58560,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -59309,8 +58683,7 @@ /obj/structure/noticeboard{ dir = 8; icon_state = "nboard00"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/grimy, /area/library) @@ -59405,7 +58778,6 @@ dir = 4 }, /obj/machinery/power/apc{ - aidisabled = 0; dir = 1; name = "Command Hall APC"; pixel_y = 24 @@ -59474,7 +58846,6 @@ /area/hallway/secondary/command) "cnY" = ( /obj/structure/sign/electricshock{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -59505,9 +58876,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -59555,7 +58924,6 @@ /obj/machinery/vending/coffee, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/vault{ @@ -59816,13 +59184,11 @@ /area/aisat) "coH" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -59973,6 +59339,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cpc" = ( @@ -60042,7 +59412,6 @@ /obj/item/toy/figure/curator, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/device/radio/intercom{ @@ -60388,6 +59757,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/secondary/command) "cpL" = ( @@ -60419,9 +59792,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: PRESSURIZED DOORS"; - pixel_x = 0; - pixel_y = 0 + name = "WARNING: PRESSURIZED DOORS" }, /turf/closed/wall, /area/security/courtroom) @@ -60436,6 +59807,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/light_switch{ + pixel_x = -26 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -60577,8 +59951,7 @@ "cqh" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ @@ -60809,8 +60182,7 @@ desc = "A direction sign, pointing out which way the Command department is."; dir = 1; icon_state = "direction_bridge"; - name = "command department"; - pixel_y = 0 + name = "command department" }, /turf/closed/wall/r_wall, /area/ai_monitored/storage/eva) @@ -60880,8 +60252,7 @@ "cqN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/command) @@ -60963,8 +60334,7 @@ desc = "A direction sign, pointing out which way the Command department is."; dir = 1; icon_state = "direction_bridge"; - name = "command department"; - pixel_y = 0 + name = "command department" }, /turf/closed/wall/r_wall, /area/gateway) @@ -61096,6 +60466,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -61403,7 +60776,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner{ @@ -61449,7 +60821,6 @@ /obj/machinery/power/apc{ dir = 1; name = "E.V.A. Storage APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/white{ @@ -61595,7 +60966,6 @@ cell_type = 10000; dir = 1; name = "Gateway APC"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/decal/cleanable/dirt, @@ -61644,7 +61014,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/neutral/corner{ @@ -61672,9 +61041,7 @@ "csv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/central) @@ -61948,7 +61315,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -61985,7 +61351,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/suit_storage_unit/engine, @@ -62111,8 +61476,7 @@ "ctu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/library) @@ -62141,8 +61505,7 @@ /obj/effect/landmark/revenantspawn, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/library) @@ -62404,7 +61767,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, @@ -62520,7 +61882,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral/corner{ @@ -62796,8 +62157,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -62846,9 +62206,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/yellow/side{ dir = 1; @@ -62895,8 +62253,7 @@ /obj/structure/sign/kiddieplaque{ desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; name = "Library Rules Sign"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -62975,7 +62332,6 @@ /obj/structure/filingcabinet, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/black, @@ -62985,7 +62341,6 @@ /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /obj/machinery/status_display{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/vault{ @@ -63024,9 +62379,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -63037,7 +62390,6 @@ dir = 4; name = "Magboot Storage"; pixel_x = -1; - pixel_y = 0; req_access_txt = "19" }, /obj/structure/window/reinforced{ @@ -63052,10 +62404,7 @@ pixel_x = -4; pixel_y = 3 }, -/obj/item/clothing/shoes/magboots{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots{ pixel_x = 4; pixel_y = -3 @@ -63171,8 +62520,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/gateway) @@ -63280,8 +62628,7 @@ "cvI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/crew_quarters/locker) @@ -63528,7 +62875,6 @@ /obj/item/clothing/shoes/magboots, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/delivery, @@ -63652,7 +62998,6 @@ dir = 4; name = "RCD Storage"; pixel_x = 1; - pixel_y = 0; req_access_txt = "19" }, /obj/structure/window/reinforced, @@ -63685,8 +63030,7 @@ department = "E.V.A. Storage"; departmentType = 0; name = "E.V.A. RC"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -63717,7 +63061,6 @@ "cwH" = ( /obj/structure/bookcase, /obj/structure/sign/nanotrasen{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/wood, @@ -63754,7 +63097,6 @@ /area/bridge/showroom/corporate) "cwM" = ( /obj/machinery/status_display{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -63779,7 +63121,6 @@ icon_state = "implantchair"; layer = 2.7; name = "NanoTrasen automated loyalty implanter exhibit"; - pixel_x = 0; pixel_y = 4 }, /turf/open/floor/plasteel/grimy, @@ -63796,8 +63137,6 @@ /obj/item/weapon/reagent_containers/syringe/charcoal, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -63890,8 +63229,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -63900,7 +63238,6 @@ /area/hallway/primary/central) "cwZ" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/item/weapon/soap/nanotrasen, @@ -63949,6 +63286,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_x = -10; + pixel_y = 26 + }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; dir = 1 @@ -63969,11 +63310,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Primary Restroom APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -64025,6 +63364,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, @@ -64130,8 +63473,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Lockerroom APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -64173,6 +63515,9 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium, /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium, /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cxw" = ( @@ -64206,6 +63551,9 @@ }, /obj/item/clothing/under/kilt, /obj/item/clothing/head/beret, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "cxz" = ( @@ -64248,6 +63596,9 @@ icon_state = "curator" }, /obj/item/clothing/under/rank/curator/treasure_hunter, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cxC" = ( @@ -64286,8 +63637,7 @@ "cxG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral/side{ dir = 4 @@ -64537,7 +63887,6 @@ dir = 4; name = "Jetpack Storage"; pixel_x = -1; - pixel_y = 0; req_access_txt = "19" }, /obj/structure/window/reinforced, @@ -64549,10 +63898,7 @@ pixel_x = 4; pixel_y = -1 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/tank/jetpack/carbondioxide, /obj/item/weapon/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = 1 @@ -64582,8 +63928,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Corporate Lounge APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/white{ icon_state = "0-4" @@ -64596,8 +63941,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/bridge/showroom/corporate) @@ -64704,7 +64048,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/wood, @@ -64860,7 +64203,6 @@ /area/gateway) "cyF" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /turf/open/floor/plasteel/neutral/side{ @@ -64923,16 +64265,13 @@ "cyO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/crew_quarters/toilet/restrooms) "cyP" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/side{ @@ -65201,8 +64540,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Engineering Storage APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/white{ icon_state = "0-8" @@ -65277,7 +64615,6 @@ /obj/item/weapon/storage/fancy/donut_box, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/vault{ @@ -65423,8 +64760,7 @@ "czS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -65481,7 +64817,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/table/reinforced, @@ -65660,8 +64995,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -65671,13 +65005,11 @@ "cAq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plating, /area/crew_quarters/toilet/restrooms) @@ -65686,6 +65018,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/neutral/side, /area/crew_quarters/toilet/restrooms) "cAs" = ( @@ -65711,7 +65047,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -65925,9 +65260,7 @@ /obj/item/weapon/folder, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ @@ -66036,9 +65369,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/yellow, /area/engine/engineering) @@ -66220,7 +65551,6 @@ /area/ai_monitored/storage/eva) "cBx" = ( /obj/machinery/status_display{ - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line{ @@ -66265,7 +65595,6 @@ "cBB" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -66370,7 +65699,6 @@ "cBL" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -66427,7 +65755,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -66472,7 +65799,6 @@ "cBY" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/vault{ @@ -66533,11 +65859,19 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 2; + on = 1 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cCf" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 2; + on = 1 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cCg" = ( @@ -66546,6 +65880,10 @@ /area/crew_quarters/dorms) "cCh" = ( /obj/structure/dresser, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 2; + on = 1 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "cCi" = ( @@ -66560,10 +65898,18 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 2; + on = 1 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cCj" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 2; + on = 1 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cCk" = ( @@ -66878,9 +66224,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: PRESSURIZED DOORS"; - pixel_x = 0; - pixel_y = 0 + name = "WARNING: PRESSURIZED DOORS" }, /turf/closed/wall/r_wall, /area/ai_monitored/storage/eva) @@ -67003,9 +66347,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: BLAST DOORS"; - pixel_x = 0; - pixel_y = 0 + name = "WARNING: BLAST DOORS" }, /turf/closed/wall/r_wall, /area/gateway) @@ -67049,7 +66391,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/machinery/newscaster{ @@ -67061,7 +66402,6 @@ "cDl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/machinery/newscaster{ @@ -67074,7 +66414,6 @@ "cDm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/machinery/newscaster{ @@ -67138,8 +66477,7 @@ "cDs" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ @@ -67555,6 +66893,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = 26 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -67619,6 +66961,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -67666,10 +67011,7 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - icon_state = "manifold"; - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, @@ -67765,7 +67107,6 @@ "cEF" = ( /obj/machinery/light, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -68330,8 +67671,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall6"; @@ -68381,9 +67721,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall7"; @@ -68442,8 +67780,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/white{ icon_state = "4-8" @@ -68684,6 +68021,7 @@ /area/crew_quarters/dorms) "cGb" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, @@ -68692,11 +68030,9 @@ /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) "cGd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + icon_state = "manifold"; + dir = 4 }, /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) @@ -68712,6 +68048,7 @@ /area/crew_quarters/dorms) "cGg" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) "cGh" = ( @@ -69255,6 +68592,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/neutral/side, /area/crew_quarters/dorms) "cHq" = ( @@ -69286,7 +68627,6 @@ "cHs" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -69295,6 +68635,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8; heat_capacity = 1e+006 @@ -69314,10 +68655,10 @@ /area/crew_quarters/dorms) "cHu" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, @@ -69371,6 +68712,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner, /area/crew_quarters/dorms) "cHz" = ( @@ -69429,8 +68771,7 @@ "cHD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -69761,31 +69102,23 @@ pixel_y = 8 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cIs" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cIt" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cIu" = ( /obj/machinery/status_display, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cIv" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -69793,15 +69126,11 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cIw" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cIy" = ( /obj/machinery/vending/snack/random, /obj/machinery/light, @@ -69846,7 +69175,6 @@ /obj/structure/closet/secure_closet/medical3, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/neutral/side, @@ -70021,8 +69349,7 @@ "cJa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral/side, /area/crew_quarters/fitness/recreation) @@ -70479,33 +69806,25 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKh" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKi" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKj" = ( /obj/structure/chair, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKk" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ @@ -70516,9 +69835,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKl" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/light{ @@ -70527,9 +69844,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKm" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -70538,41 +69853,31 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKn" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKp" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKq" = ( /obj/structure/chair, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKr" = ( /obj/structure/table, /obj/item/weapon/storage/firstaid/regular, @@ -70584,14 +69889,10 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKs" = ( /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cKt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -70622,8 +69923,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Medbay Storage APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/camera{ c_tag = "Medbay - Storage"; @@ -70643,8 +69943,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; @@ -70816,6 +70115,10 @@ pixel_x = 26; pixel_y = 26 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "cKL" = ( @@ -70828,6 +70131,10 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cKM" = ( @@ -70837,6 +70144,10 @@ pixel_x = 26; pixel_y = 26 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cKN" = ( @@ -70852,6 +70163,10 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cKO" = ( @@ -70862,6 +70177,10 @@ pixel_x = 26; pixel_y = 26 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 1; + on = 1 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cKP" = ( @@ -70917,9 +70236,7 @@ /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -71042,8 +70359,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Auxiliary Power APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plating, /area/maintenance/department/electrical) @@ -71153,8 +70469,7 @@ /obj/structure/closet/secure_closet/security/science, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/status_display{ pixel_y = 32 @@ -71175,7 +70490,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/red/side{ @@ -71267,31 +70581,21 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLL" = ( /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLM" = ( /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLN" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLP" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -71299,9 +70603,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLQ" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/button/door{ @@ -71315,27 +70617,21 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLR" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLS" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cLT" = ( /turf/closed/wall, /area/security/checkpoint/medical) @@ -71614,8 +70910,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/maintenance/department/electrical) @@ -71716,8 +71011,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, @@ -71947,9 +71241,7 @@ "cNi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -72050,9 +71342,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -72060,39 +71350,29 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -72100,9 +71380,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -72110,9 +71388,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -72127,17 +71403,13 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cND" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ icon_state = "intact"; @@ -72146,9 +71418,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNE" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -72187,7 +71457,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/red/side{ @@ -72200,9 +71469,7 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light_switch{ pixel_x = 38 @@ -72229,9 +71496,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNI" = ( /obj/structure/table, /obj/item/weapon/storage/box/gloves{ @@ -72241,27 +71506,25 @@ /obj/item/weapon/storage/box/beakers, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNJ" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/item/weapon/storage/pod{ pixel_x = 32; pixel_y = 32 }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNK" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -72311,7 +71574,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -72326,9 +71588,7 @@ "cNP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNQ" = ( /obj/machinery/door/airlock{ name = "Medbay Auxiliary Storage"; @@ -72342,9 +71602,7 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cNR" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -72567,8 +71825,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -72667,8 +71924,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: BIOHAZARD CELL"; - pixel_x = 0 + name = "WARNING: BIOHAZARD CELL" }, /turf/closed/wall, /area/science/xenobiology) @@ -72737,7 +71993,6 @@ /obj/item/weapon/storage/box/syringes, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/extinguisher/mini, @@ -72961,9 +72216,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -72974,9 +72227,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -72985,9 +72236,7 @@ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -72996,18 +72245,14 @@ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -73017,26 +72262,20 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPq" = ( /obj/effect/landmark/lightsout, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -73050,9 +72289,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -73061,9 +72298,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -73081,9 +72316,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ icon_state = "intact"; @@ -73095,9 +72328,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPv" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -73108,9 +72339,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPw" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -73119,9 +72348,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPx" = ( /obj/structure/cable/white{ icon_state = "0-2" @@ -73140,8 +72367,7 @@ "cPz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/checkpoint/medical) @@ -73173,9 +72399,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPD" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/brute{ @@ -73221,8 +72445,7 @@ department = "Medbay Storage"; departmentType = 0; name = "Medbay Storage RC"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/neutral/side{ dir = 8; @@ -73248,9 +72471,7 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPH" = ( /obj/machinery/door/airlock{ name = "Bathroom" @@ -73264,9 +72485,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPI" = ( /obj/structure/urinal{ pixel_y = 28 @@ -73276,9 +72495,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -73286,9 +72503,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cPL" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -73315,6 +72530,10 @@ /obj/item/clothing/suit/toggle/lawyer, /obj/item/clothing/under/maid, /obj/item/clothing/head/kitty, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "cPO" = ( @@ -73338,6 +72557,10 @@ icon_state = "detective" }, /obj/item/clothing/under/lawyer/female, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cPQ" = ( @@ -73362,6 +72585,10 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cPS" = ( @@ -73622,7 +72849,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 5 }, /obj/effect/turf_decal/bot, @@ -73886,9 +73112,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cQX" = ( /obj/structure/disposalpipe/segment{ icon_state = "pipe-s"; @@ -73900,51 +73124,39 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cQY" = ( /obj/structure/disposalpipe/segment{ icon_state = "pipe-s"; dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cQZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cRa" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cRb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cRc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cRd" = ( /obj/structure/cable/white{ icon_state = "0-2" @@ -74045,7 +73257,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/neutral/side{ @@ -74064,9 +73275,7 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cRp" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -74088,6 +73297,11 @@ icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/power/apc{ + dir = 8; + name = "Recreation Area APC"; + pixel_x = -26 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, @@ -74106,9 +73320,7 @@ "cRt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) @@ -74318,14 +73530,11 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -74363,7 +73572,6 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -74456,8 +73664,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/button/door{ desc = "A remote control switch."; @@ -74484,7 +73691,6 @@ "cSd" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -74508,6 +73714,10 @@ /obj/item/weapon/electronics/airlock, /obj/item/weapon/stock_parts/console_screen, /obj/item/device/assembly/signaler, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, @@ -74611,18 +73821,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSs" = ( /obj/structure/table, /obj/item/weapon/folder/white, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSt" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -74630,16 +73836,12 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSu" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSv" = ( /obj/structure/disposalpipe/segment, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -74648,23 +73850,21 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSw" = ( /obj/structure/bed/roller, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSx" = ( /obj/structure/bed/roller, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSy" = ( /obj/structure/bed/roller, /obj/structure/sign/chemistry{ @@ -74677,36 +73877,26 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSz" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSA" = ( /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSB" = ( /obj/structure/table, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSC" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSD" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -74756,9 +73946,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSJ" = ( /obj/structure/sign/bluecross_2{ pixel_x = 32 @@ -74770,9 +73958,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -74794,9 +73980,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSN" = ( /obj/structure/table/wood, /obj/item/weapon/storage/box/donkpockets, @@ -74804,21 +73988,20 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSO" = ( /obj/machinery/camera{ c_tag = "Medbay - Break Room"; dir = 2; name = "medbay camera" }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -74828,9 +74011,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSQ" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -74838,9 +74019,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cSR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -75239,7 +74418,6 @@ departmentType = 0; name = "Xenobiology RC"; pixel_x = 32; - pixel_y = 0; receive_ore_updates = 1 }, /obj/machinery/camera{ @@ -75394,8 +74572,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ dir = 4; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/aft) @@ -75407,9 +74584,7 @@ name = "Chemisty Lobby Shutters" }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUf" = ( /obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ @@ -75418,9 +74593,7 @@ }, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUg" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -75436,16 +74609,12 @@ /obj/machinery/door/window/northleft, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUi" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -75453,9 +74622,7 @@ /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -75466,24 +74633,18 @@ /obj/item/weapon/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUk" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/item/weapon/reagent_containers/food/drinks/britcup, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUl" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ @@ -75493,9 +74654,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ @@ -75506,9 +74665,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUn" = ( /obj/structure/cable/white{ icon_state = "0-4" @@ -75522,8 +74679,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Security Post - Medical APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -75556,7 +74712,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -75577,18 +74732,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUr" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; on = 1 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUs" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze, @@ -75602,9 +74753,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUt" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -75612,68 +74761,51 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUu" = ( /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUv" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUw" = ( /obj/machinery/newscaster{ pixel_x = -32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUx" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; dir = 4 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUy" = ( /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUA" = ( /obj/machinery/vending/coffee, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cUB" = ( /obj/structure/cable/white{ icon_state = "1-4" @@ -76169,7 +75301,6 @@ "cVw" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -76373,11 +75504,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Chemistry Lab APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /turf/open/floor/plasteel/whiteyellow/corner{ dir = 4 @@ -76399,9 +75528,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cVV" = ( /obj/structure/chair/office/light{ dir = 1 @@ -76409,16 +75536,12 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cVW" = ( /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cVX" = ( /obj/structure/chair/office/light{ dir = 1 @@ -76426,9 +75549,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cVY" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/button/door{ @@ -76442,9 +75563,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cVZ" = ( /obj/structure/cable/white{ icon_state = "0-4" @@ -76484,23 +75603,17 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWe" = ( /obj/structure/cable/white{ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWf" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWg" = ( /obj/structure/mirror{ pixel_x = 26 @@ -76512,23 +75625,17 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWh" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWj" = ( /obj/machinery/holopad, /obj/effect/landmark/start/medical_doctor, @@ -76537,18 +75644,14 @@ dir = 6 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; dir = 4 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWl" = ( /obj/machinery/vending/cola/random, /obj/machinery/status_display{ @@ -76561,9 +75664,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cWm" = ( /obj/structure/girder, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -76749,10 +75850,8 @@ dir = 8 }, /obj/machinery/power/apc{ - cell_type = 10000; dir = 1; name = "Port Maintenance APC"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/white{ @@ -76854,7 +75953,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/delivery, @@ -77047,8 +76145,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whitepurple/side, /area/science/xenobiology) @@ -77075,8 +76172,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Xenobiology Lab APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -77116,8 +76212,7 @@ "cXm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -77172,9 +76267,7 @@ /obj/item/weapon/stock_parts/micro_laser, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -77302,43 +76395,33 @@ /obj/machinery/computer/crew, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXI" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXJ" = ( /obj/machinery/holopad, /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXL" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -77352,9 +76435,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -77363,9 +76444,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXN" = ( /obj/structure/cable/white{ d2 = 2; @@ -77414,30 +76493,23 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXS" = ( /obj/machinery/holopad{ pixel_y = 16 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXT" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXU" = ( /obj/structure/table/wood, /obj/item/weapon/folder/white, @@ -77449,34 +76521,26 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXV" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXW" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXX" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cXY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -77488,8 +76552,7 @@ "cXZ" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/sleeper{ icon_state = "sleeper-open"; @@ -77766,8 +76829,7 @@ /obj/item/weapon/pen, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/weapon/storage/bag/bio, /obj/item/weapon/storage/bag/bio, @@ -77823,17 +76885,19 @@ "cYM" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -32 }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel, /area/science/research) "cYN" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -77887,8 +76951,7 @@ /obj/item/weapon/stock_parts/manipulator, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -77973,9 +77036,7 @@ "cZd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/whiteyellow/side{ dir = 5 @@ -78001,22 +77062,16 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZi" = ( /obj/structure/chair/office/light, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZj" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/light/small, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZk" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -78025,20 +77080,15 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZm" = ( /obj/structure/chair{ dir = 4 @@ -78087,9 +77137,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZr" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -78097,14 +77145,10 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZs" = ( /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZt" = ( /obj/machinery/sleeper{ icon_state = "sleeper-open"; @@ -78114,37 +77158,27 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZv" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZx" = ( /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZy" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cZz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -78461,7 +77495,6 @@ departmentType = 0; name = "Research RC"; pixel_x = 32; - pixel_y = 0; receive_ore_updates = 1 }, /obj/machinery/camera{ @@ -78527,9 +77560,7 @@ /obj/item/weapon/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/light{ dir = 4; @@ -78548,9 +77579,7 @@ /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dap" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -78562,15 +77591,11 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "daq" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dar" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -78603,18 +77628,14 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dau" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dav" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -78622,15 +77643,11 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "daw" = ( /obj/structure/sign/examroom, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dax" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -78640,17 +77657,13 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "day" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "daz" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -78662,16 +77675,12 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "daA" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "daB" = ( /obj/item/weapon/firstaid_arm_assembly, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -78812,11 +77821,9 @@ /obj/item/clothing/gloves/color/fyellow, /obj/item/weapon/storage/toolbox/electrical, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Abandoned Gambling Den APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) @@ -79314,9 +78321,7 @@ icon_state = "whiteyellowcorner"; dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -79325,9 +78330,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -79335,9 +78338,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbU" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26; @@ -79347,18 +78348,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -79367,9 +78364,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -79379,9 +78374,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -79389,9 +78382,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dbZ" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -79402,9 +78393,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dca" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -79413,9 +78402,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dcb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -79428,25 +78415,19 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dcc" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dcd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dce" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; @@ -79455,25 +78436,19 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dcg" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dch" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dci" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -79494,7 +78469,6 @@ "dck" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/structure/cable/white{ @@ -79533,7 +78507,6 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = 26; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -79740,9 +78713,7 @@ "dcQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -79798,9 +78769,7 @@ /obj/effect/landmark/start/scientist, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/science/lab) @@ -79870,7 +78839,6 @@ department = "Chemistry Lab"; departmentType = 0; name = "Chemistry RC"; - pixel_x = 0; pixel_y = -64; receive_ore_updates = 1 }, @@ -79900,51 +78868,39 @@ /turf/open/floor/plasteel/whiteyellow/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddi" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddj" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddk" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddl" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddm" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddn" = ( /obj/structure/cable/white{ icon_state = "2-4" @@ -79956,18 +78912,14 @@ /obj/effect/landmark/lightsout, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddo" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddp" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -79977,9 +78929,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddq" = ( /obj/structure/cable/white{ icon_state = "1-4" @@ -79988,31 +78938,24 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddr" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dds" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddt" = ( /obj/structure/cable/white{ icon_state = "2-4" @@ -80021,18 +78964,14 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddu" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddv" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -80041,31 +78980,24 @@ icon_state = "1-4" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddw" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddx" = ( /obj/structure/cable/white{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddy" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -80073,9 +79005,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddz" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -80088,9 +79018,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ddA" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -80115,7 +79043,6 @@ "ddC" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/effect/decal/cleanable/dirt, @@ -80404,6 +79331,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel, /area/science/explab) "deo" = ( @@ -80412,11 +79342,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Experimentation Lab APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/camera{ c_tag = "Science - Experimentation Lab"; @@ -80565,7 +79493,6 @@ /obj/machinery/cell_charger, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light_switch{ @@ -80707,7 +79634,6 @@ /obj/item/weapon/hand_labeler, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -80721,7 +79647,6 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -80771,17 +79696,13 @@ icon_state = "whiteyellowcorner"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "deX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "deY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80789,9 +79710,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "deZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80805,9 +79724,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -80816,9 +79733,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfb" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -80828,15 +79743,11 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfc" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80847,25 +79758,19 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dff" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80874,17 +79779,13 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfh" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfi" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -80893,9 +79794,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfj" = ( /obj/structure/sign/bluecross_2{ pixel_x = 32; @@ -80906,41 +79805,31 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfn" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; dir = 1 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dfp" = ( /obj/structure/rack, /obj/item/roller, @@ -80968,7 +79857,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white, /obj/machinery/power/apc{ - cell_type = 5000; dir = 2; name = "Abandoned Medical Lab APC"; pixel_x = 1; @@ -81180,7 +80068,6 @@ "dfM" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/black, @@ -81505,9 +80392,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -81552,9 +80437,7 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dgH" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -81564,9 +80447,7 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dgI" = ( /turf/closed/wall, /area/medical/surgery) @@ -81683,9 +80564,7 @@ /obj/item/weapon/stock_parts/matter_bin, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -81755,14 +80634,15 @@ "dhh" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, +/obj/machinery/light_switch{ + pixel_x = -26 + }, /turf/open/floor/plasteel, /area/science/explab) "dhi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 8 @@ -81798,9 +80678,7 @@ "dhp" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -81808,13 +80686,11 @@ "dhq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -81937,9 +80813,7 @@ /obj/item/device/paicard, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/extinguisher_cabinet{ pixel_y = 32 @@ -81967,9 +80841,7 @@ "dhB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -82012,13 +80884,10 @@ }, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/turf_decal/bot, @@ -82073,7 +80942,6 @@ cell_type = 10000; dir = 1; name = "Mech Bay APC"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/turf_decal/stripes/line{ @@ -82136,8 +81004,7 @@ "dhR" = ( /obj/machinery/clonepod, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/status_display{ pixel_x = -32 @@ -82205,8 +81072,7 @@ cell_type = 5000; dir = 1; name = "Cloning Lab APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/item/weapon/folder/white, /obj/item/weapon/book/manual/medical_cloning, @@ -82219,9 +81085,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dhZ" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -82232,33 +81096,25 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dia" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dib" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dic" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "did" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ @@ -82274,18 +81130,14 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "die" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dif" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ icon_state = "manifold"; @@ -82294,9 +81146,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dig" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -82306,15 +81156,11 @@ on = 1 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dih" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dii" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault, @@ -82341,8 +81187,7 @@ "din" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -82528,8 +81373,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -83153,7 +81997,6 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel/vault{ @@ -83222,9 +82065,7 @@ icon_state = "whitepurplecorner"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dka" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -83237,14 +82078,10 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dkb" = ( /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dkc" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -83253,18 +82090,14 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dkd" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 }, /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dke" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -83273,18 +82106,14 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dkf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dkg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ @@ -83348,7 +82177,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/yellow/corner{ @@ -83397,7 +82225,6 @@ /obj/structure/table/wood/poker, /obj/item/toy/cards/deck/syndicate{ icon_state = "deck_syndicate_full"; - pixel_x = 0; pixel_y = 6 }, /turf/open/floor/plasteel/grimy, @@ -83738,7 +82565,6 @@ /obj/machinery/recharger, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/light_switch{ @@ -83761,8 +82587,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -83987,8 +82812,7 @@ "dly" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/aft) @@ -84044,8 +82868,7 @@ "dlG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/medical/genetics/cloning) @@ -84098,24 +82921,18 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dlN" = ( /obj/structure/cable/white{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dlO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dlP" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -84124,15 +82941,11 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dlQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dlR" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -84141,9 +82954,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dlS" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -84240,7 +83051,6 @@ "dmf" = ( /obj/structure/cable/white, /obj/machinery/power/apc{ - cell_type = 5000; dir = 2; name = "Abandoned Research Lab APC"; pixel_x = 1; @@ -84399,8 +83209,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Research Director's Office APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/white, /obj/structure/disposalpipe/segment, @@ -84442,9 +83251,7 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Science - Research Director's Office"; @@ -84537,7 +83344,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner, @@ -84565,13 +83371,11 @@ /area/hallway/primary/aft) "dmV" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -84607,7 +83411,6 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 7; pixel_y = -26 }, @@ -84637,18 +83440,14 @@ icon_state = "whitepurplecorner"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dnd" = ( /obj/structure/cable/white{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dne" = ( /obj/structure/table/glass, /obj/item/weapon/folder/white, @@ -84656,9 +83455,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, /obj/item/weapon/reagent_containers/dropper, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dnf" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -84668,18 +83465,14 @@ dir = 10 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dng" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dnh" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -84689,9 +83482,7 @@ dir = 6 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dni" = ( /obj/structure/table/glass, /obj/item/weapon/wrench/medical, @@ -84702,18 +83493,14 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dnj" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; dir = 8 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dnk" = ( /obj/structure/sign/nosmoking_2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -84911,8 +83698,7 @@ /obj/structure/closet/bombcloset, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -85073,8 +83859,7 @@ /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/aft) @@ -85141,16 +83926,13 @@ /obj/machinery/power/apc{ dir = 8; name = "Medbay APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "doi" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -85160,18 +83942,14 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "doj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dok" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall/r_wall, @@ -85197,9 +83975,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "doo" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -85210,8 +83986,7 @@ "dop" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/medical/surgery) @@ -85235,8 +84010,7 @@ "dor" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 @@ -85256,15 +84030,13 @@ "dou" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/blue, /area/medical/surgery) "dov" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/mirror{ @@ -85521,8 +84293,7 @@ "doX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -85582,7 +84353,6 @@ "dpf" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/turf_decal/delivery, @@ -85630,7 +84400,6 @@ departmentType = 5; name = "Research Director's RC"; pixel_x = -32; - pixel_y = 0; receive_ore_updates = 1 }, /obj/effect/turf_decal/bot, @@ -85755,8 +84524,7 @@ "dpw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -85779,7 +84547,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24; pixel_y = -26 }, @@ -85807,8 +84574,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -85854,7 +84620,6 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/item/clothing/gloves/color/latex, @@ -85923,8 +84688,7 @@ layer = 2.9 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end{ @@ -85950,9 +84714,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dpR" = ( /obj/structure/cable/white{ icon_state = "0-2" @@ -85984,7 +84746,6 @@ pixel_x = 3 }, /obj/item/weapon/cartridge/chemistry{ - pixel_x = 0; pixel_y = 6 }, /turf/open/floor/plasteel/cmo, @@ -86007,7 +84768,6 @@ /obj/item/clothing/glasses/hud/health, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/neutral/side{ @@ -86026,9 +84786,7 @@ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dpY" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -86038,9 +84796,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dpZ" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -86680,8 +85436,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Genetics Lab APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -86709,6 +85464,9 @@ dir = 4; name = "medbay camera" }, +/obj/machinery/light_switch{ + pixel_x = -26 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -86763,8 +85521,7 @@ /area/medical/genetics) "drr" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window/westright{ name = "'Monkey Pen"; @@ -86798,9 +85555,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dru" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -86813,9 +85568,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "drv" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -86825,9 +85578,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "drw" = ( /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Office"; @@ -86935,9 +85686,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "drE" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -86948,22 +85697,17 @@ /obj/effect/landmark/lightsout, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "drF" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "drG" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 @@ -86989,7 +85733,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -87018,8 +85761,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/surgery) @@ -87256,8 +85998,7 @@ "dss" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plating, /area/science/misc_lab/range) @@ -87329,6 +86070,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel, /area/science/research) "dsA" = ( @@ -87377,9 +86122,7 @@ /obj/structure/table/glass, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light{ icon_state = "tube1"; @@ -87532,8 +86275,7 @@ "dsQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -87545,8 +86287,7 @@ /area/medical/genetics) "dsR" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window/westleft{ name = "'Monkey Pen"; @@ -87584,9 +86325,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dsU" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -87596,14 +86335,11 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dsV" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -87652,8 +86388,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/ai_status_display{ pixel_y = -32 @@ -87672,7 +86407,6 @@ /obj/machinery/computer/med_data, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/whiteblue/side, @@ -87719,7 +86453,6 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = 26; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -87832,7 +86565,6 @@ "dtw" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plating, @@ -88084,7 +86816,6 @@ department = "Robotics Lab"; departmentType = 0; name = "Robotics RC"; - pixel_x = 0; pixel_y = 32; receive_ore_updates = 1 }, @@ -88201,8 +86932,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whitepurple/corner{ icon_state = "whitepurplecorner"; @@ -88283,8 +87013,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/end, @@ -88299,9 +87028,7 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dut" = ( /obj/structure/bed/dogbed{ desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."; @@ -88309,9 +87036,7 @@ }, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light{ icon_state = "tube1"; @@ -88354,8 +87079,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Chief Medical Officer's Office APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Medbay - Chief Medical Officer's Office"; @@ -88370,14 +87094,11 @@ "duy" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "duz" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -88622,8 +87343,7 @@ "dvb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/crew_quarters/heads/hor) @@ -88654,8 +87374,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -88775,7 +87494,6 @@ "dvn" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/whitepurple/corner, @@ -88794,7 +87512,6 @@ department = "Medbay Storage"; departmentType = 0; name = "Genetics Lab RC"; - pixel_x = 0; pixel_y = -32 }, /obj/item/weapon/storage/box/gloves{ @@ -88831,7 +87548,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/whitepurple/side{ @@ -88893,9 +87609,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvA" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -88903,9 +87617,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvB" = ( /obj/structure/cable/white{ icon_state = "0-4" @@ -89008,31 +87720,23 @@ "dvI" = ( /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvJ" = ( /obj/machinery/iv_drip, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvK" = ( /obj/structure/bed, /obj/item/weapon/bedsheet/medical, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvL" = ( /obj/item/weapon/folder/white, /obj/item/device/flashlight/pen, /obj/item/clothing/neck/stethoscope, /obj/structure/table, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvM" = ( /obj/machinery/computer/med_data/laptop, /obj/structure/table, @@ -89040,9 +87744,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dvN" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -89293,7 +87995,6 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -32 }, /obj/item/device/assembly/igniter{ @@ -89404,8 +88105,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/whitepurple/corner, /area/crew_quarters/heads/hor) @@ -89559,8 +88259,7 @@ "dwS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) @@ -89595,9 +88294,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dwW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -89610,18 +88307,14 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dwX" = ( /obj/effect/landmark/start/medical_doctor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dwY" = ( /obj/structure/chair/office/light{ dir = 1 @@ -89630,9 +88323,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dwZ" = ( /obj/structure/sink{ dir = 4; @@ -89641,7 +88332,6 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = 26; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -89650,9 +88340,7 @@ on = 1 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dxa" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -89763,7 +88451,6 @@ /obj/structure/cable, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/stripes/line{ @@ -89823,7 +88510,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plating, @@ -89871,7 +88557,6 @@ pixel_y = -2 }, /obj/item/device/assembly/prox_sensor{ - pixel_x = 0; pixel_y = 2 }, /obj/structure/table/reinforced, @@ -89896,10 +88581,7 @@ pixel_x = 6; pixel_y = -4 }, -/obj/item/device/assembly/timer{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/device/assembly/timer, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ @@ -89979,8 +88661,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 @@ -90069,8 +88750,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/science/robotics/lab) @@ -90078,8 +88758,7 @@ /obj/structure/noticeboard{ dir = 8; icon_state = "nboard00"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/camera{ @@ -90137,9 +88816,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -90265,8 +88942,7 @@ department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer's RC"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/neutral/side{ dir = 8; @@ -90280,58 +88956,44 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dyk" = ( /obj/structure/dresser, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dyl" = ( /obj/structure/mirror{ pixel_y = -28 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dym" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dyn" = ( /obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dyo" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/status_display{ pixel_x = 32 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dyp" = ( /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -90371,8 +89033,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -90403,12 +89064,8 @@ /obj/item/device/transfer_valve{ pixel_x = -5 }, -/obj/item/device/transfer_valve{ - pixel_x = 0 - }, -/obj/item/device/transfer_valve{ - pixel_x = 0 - }, +/obj/item/device/transfer_valve, +/obj/item/device/transfer_valve, /obj/item/device/transfer_valve{ pixel_x = 5 }, @@ -90421,7 +89078,6 @@ departmentType = 0; name = "Toxins RC"; pixel_x = -32; - pixel_y = 0; receive_ore_updates = 1 }, /obj/effect/turf_decal/delivery, @@ -90448,8 +89104,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/science/mixing) @@ -90488,7 +89143,6 @@ "dyG" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -90516,9 +89170,7 @@ "dyJ" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/table, /obj/structure/extinguisher_cabinet{ @@ -90533,8 +89185,7 @@ "dyK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -90619,6 +89270,9 @@ dir = 4; on = 1 }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/aft) "dyW" = ( @@ -90735,9 +89389,7 @@ "dzn" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -90747,18 +89399,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dzo" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dzp" = ( /obj/structure/table/wood, /obj/item/clothing/under/maid, @@ -90781,11 +89429,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Abandoned Theatre APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /turf/open/floor/plating, /area/crew_quarters/theatre/abandoned) @@ -90939,12 +89585,10 @@ "dzJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/stripes/line{ @@ -90977,7 +89621,6 @@ /area/science/mixing) "dzN" = ( /obj/item/device/assembly/signaler{ - pixel_x = 0; pixel_y = 8 }, /obj/item/device/assembly/signaler{ @@ -91093,8 +89736,11 @@ /obj/machinery/power/apc{ dir = 8; name = "Research Division Server Room APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 + }, +/obj/machinery/light_switch{ + pixel_x = -28; + pixel_y = -26 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -91183,8 +89829,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Robotics Lab APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -91231,7 +89876,6 @@ /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/bot, @@ -91361,7 +90005,6 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; pixel_x = 24; pixel_y = -26 }, @@ -91482,9 +90125,7 @@ on = 1 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dAG" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/costume, @@ -91611,8 +90252,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -91639,8 +90279,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -91660,9 +90299,7 @@ dir = 4; layer = 4; name = "Testing Site Telescreen"; - network = list("Toxins"); - pixel_x = 0; - pixel_y = 0 + network = list("Toxins") }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -91788,8 +90425,7 @@ "dBq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -91798,6 +90434,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/light_switch{ + pixel_x = 26 + }, /turf/open/floor/plasteel, /area/science/storage) "dBs" = ( @@ -91843,8 +90482,7 @@ "dBv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/white{ icon_state = "1-2" @@ -91885,8 +90523,7 @@ "dBy" = ( /obj/structure/table, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/storage/box/gloves{ pixel_x = 3; @@ -91942,8 +90579,7 @@ "dBE" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/vault{ @@ -92076,8 +90712,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -92222,8 +90857,7 @@ /obj/machinery/button/massdriver{ dir = 2; id = "toxinsdriver"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/chair/office/dark{ dir = 8 @@ -92550,18 +91184,24 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 4; + on = 1 + }, /turf/open/floor/plasteel/neutral, /area/science/research) "dCM" = ( /obj/structure/cable/white{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/power/apc{ dir = 4; name = "Research Division APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + icon_state = "manifold"; + dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, /area/science/research) @@ -92572,7 +91212,6 @@ /obj/machinery/cell_charger, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/bot, @@ -92590,8 +91229,7 @@ "dCP" = ( /obj/structure/closet/wardrobe/robotics_black, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -92672,13 +91310,11 @@ "dCZ" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -92741,7 +91377,6 @@ "dDj" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/camera{ @@ -92753,7 +91388,6 @@ /area/crew_quarters/heads/cmo) "dDk" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/cmo, @@ -92772,26 +91406,20 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dDn" = ( /obj/structure/cable/white{ icon_state = "1-2" }, /turf/open/floor/plasteel/whitegreen/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dDo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ icon_state = "manifold"; dir = 8 }, /turf/open/floor/plasteel/whitegreen/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dDp" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/costume, @@ -92969,8 +91597,7 @@ /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -93025,9 +91652,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93112,7 +91737,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -93173,8 +91797,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Toxins Storage APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/white, /obj/effect/turf_decal/bot, @@ -93259,9 +91882,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/aft) @@ -93283,9 +91904,7 @@ "dEn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dEo" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -93299,9 +91918,7 @@ dir = 2 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dEp" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -93332,6 +91949,10 @@ "dEs" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office/private_investigators_office) "dEt" = ( @@ -93359,7 +91980,6 @@ /obj/item/device/taperecorder, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/vault{ @@ -93564,6 +92184,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/neutral, /area/hallway/primary/aft) "dET" = ( @@ -93767,9 +92390,7 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dFk" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -93781,18 +92402,14 @@ /turf/open/floor/plasteel/whitegreen/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dFl" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dFm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -93876,9 +92493,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/crew_quarters/theatre{ - name = "Abandoned Theatre" - }) +/area/crew_quarters/theatre/abandoned) "dFw" = ( /obj/structure/table/wood, /obj/item/clothing/suit/cardborg, @@ -94367,7 +92982,6 @@ }, /obj/structure/cable/white, /obj/machinery/power/apc{ - cell_type = 5000; dir = 2; name = "Aft Maintenance APC"; pixel_x = 1; @@ -94484,9 +93098,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dGO" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -94495,9 +93107,7 @@ /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dGP" = ( /obj/structure/cable/white{ icon_state = "1-4" @@ -94517,8 +93127,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/white{ icon_state = "2-8" @@ -94528,9 +93137,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dGQ" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -94543,9 +93150,7 @@ icon_state = "whitegreen"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dGR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -94562,9 +93167,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dGS" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -94650,7 +93253,6 @@ "dHb" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/item/weapon/twohanded/required/kirbyplants/random, @@ -94845,8 +93447,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -94914,6 +93515,10 @@ "dHH" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -95003,9 +93608,7 @@ /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dHS" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -95016,18 +93619,14 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dHT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dHU" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -95186,7 +93785,6 @@ "dIn" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/structure/mirror{ @@ -95285,9 +93883,7 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light{ icon_state = "tube1"; @@ -95329,9 +93925,7 @@ /obj/structure/filingcabinet/medical, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/blue/side{ dir = 5 @@ -95398,17 +93992,13 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dIG" = ( /obj/machinery/light/small, /obj/machinery/iv_drip, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dIH" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, @@ -95500,8 +94090,7 @@ "dIT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /obj/structure/cable/white{ @@ -95635,15 +94224,11 @@ /area/shuttle/escape) "dJl" = ( /turf/closed/wall/r_wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dJm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dJn" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -95671,16 +94256,12 @@ req_access_txt = "39" }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dJo" = ( /obj/structure/sign/biohazard, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "dJp" = ( /turf/closed/wall/r_wall, /area/medical/virology) @@ -95832,11 +94413,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Port Quarter Maintenance APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/cable/white{ icon_state = "0-2" @@ -95855,7 +94434,6 @@ /area/maintenance/port/aft) "dJM" = ( /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -96023,18 +94601,15 @@ "dKe" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -96223,9 +94798,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, /turf/open/floor/plating, /area/maintenance/port/aft) "dKD" = ( @@ -96235,9 +94807,6 @@ req_access = "0" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/white{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/neutral, /area/maintenance/port/aft) "dKE" = ( @@ -96245,9 +94814,6 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/white{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/neutral, /area/maintenance/port/aft) "dKF" = ( @@ -96340,8 +94906,7 @@ "dKP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, @@ -96373,7 +94938,6 @@ "dKV" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/structure/mirror{ @@ -96382,13 +94946,11 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -96439,7 +95001,6 @@ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; - pixel_x = 0; pixel_y = 22; req_access_txt = "39" }, @@ -96660,7 +95221,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plating, @@ -96885,8 +95445,7 @@ "dLR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/blue/side, /area/security/checkpoint/customs) @@ -97075,8 +95634,7 @@ "dMi" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light{ icon_state = "tube1"; @@ -97148,8 +95706,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/medical/virology) @@ -97194,8 +95751,7 @@ /obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/green, /area/medical/virology) @@ -97495,8 +96051,7 @@ /area/shuttle/escape) "dNd" = ( /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 @@ -97892,7 +96447,6 @@ /obj/structure/table, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/microwave{ @@ -97994,9 +96548,7 @@ }, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ @@ -98021,7 +96573,6 @@ desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."; icon_state = "kiddieplaque"; name = "Remembrance Plaque"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -98040,7 +96591,6 @@ }, /obj/item/weapon/reagent_containers/food/snacks/grown/poppy, /obj/machinery/status_display{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/black, @@ -98062,7 +96612,6 @@ /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -98124,9 +96673,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -98299,8 +96846,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Virology Satellite APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -98509,8 +97055,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -98526,7 +97071,6 @@ "dPD" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel/whiteblue/side{ @@ -98551,7 +97095,6 @@ department = "Virology Lab"; departmentType = 0; name = "Virology RC"; - pixel_x = 0; pixel_y = 32; receive_ore_updates = 1 }, @@ -98595,9 +97138,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -98631,8 +97172,7 @@ "dPN" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ @@ -98677,9 +97217,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 1; - scrub_Toxins = 1 + on = 1 }, /mob/living/carbon/monkey, /turf/open/floor/plasteel/whitegreen/side{ @@ -98790,8 +97328,7 @@ "dQf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/chapel/main) @@ -99014,9 +97551,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/wood, /area/library/abandoned) @@ -99525,8 +98060,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -99535,7 +98069,6 @@ "dRO" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -99583,9 +98116,7 @@ /obj/structure/chair/wood, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Chapel - Starboard"; @@ -99660,9 +98191,7 @@ /obj/structure/table/glass, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/cable/white{ icon_state = "1-2" @@ -99731,8 +98260,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, @@ -99744,7 +98272,6 @@ "dSm" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/structure/extinguisher_cabinet{ @@ -99786,8 +98313,7 @@ /obj/item/weapon/hand_labeler, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ icon_state = "intact"; @@ -100030,7 +98556,6 @@ pixel_y = 1 }, /obj/item/weapon/storage/toolbox/mechanical{ - pixel_x = 0; pixel_y = -1 }, /obj/item/weapon/storage/toolbox/emergency{ @@ -100110,9 +98635,7 @@ "dTb" = ( /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/closet/secure_closet/medical1, /obj/machinery/light_switch{ @@ -100323,8 +98846,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -100425,7 +98947,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -100448,7 +98969,6 @@ "dTH" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/iv_drip, @@ -100610,7 +99130,6 @@ "dTX" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -100934,8 +99453,6 @@ "dUI" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -101044,8 +99561,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "WARNING: EXTERNAL AIRLOCK" }, /turf/closed/wall/r_wall, /area/maintenance/solars/port/aft) @@ -101137,7 +99653,6 @@ /obj/structure/bodycontainer/morgue, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/vault{ @@ -101246,8 +99761,7 @@ /obj/machinery/iv_drip, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; @@ -101283,8 +99797,7 @@ /obj/machinery/iv_drip, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; @@ -101308,8 +99821,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/space, /area/solar/port/aft) @@ -101317,8 +99829,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ name = "External Solar Access"; @@ -101334,8 +99845,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, @@ -101350,8 +99860,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -101483,8 +99992,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -101506,8 +100014,7 @@ "dVO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel{ icon_state = "chapel" @@ -101601,8 +100108,7 @@ "dVZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/hallway/secondary/exit/departure_lounge) @@ -101680,7 +100186,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/stripes/line, @@ -101707,9 +100212,7 @@ /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, @@ -101782,7 +100285,6 @@ /obj/structure/bodycontainer/morgue, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/vault{ @@ -101886,7 +100388,6 @@ "dWE" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -102459,8 +100960,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -102504,8 +101004,7 @@ /obj/structure/filingcabinet/security, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light_switch{ pixel_x = -26; @@ -102843,8 +101342,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral, /area/security/checkpoint/checkpoint2) @@ -102909,8 +101407,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -102992,7 +101489,6 @@ "dYK" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = 58 }, /turf/open/floor/plasteel/neutral/side, @@ -103110,11 +101606,9 @@ dir = 1 }, /obj/machinery/power/apc{ - cell_type = 5000; dir = 1; name = "Chapel Quarters APC"; - pixel_x = 0; - pixel_y = 25 + pixel_y = 24 }, /obj/structure/cable/white{ icon_state = "0-8" @@ -103139,12 +101633,9 @@ /obj/item/device/camera_film, /obj/machinery/firealarm{ dir = 4; - icon_state = "fire0"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/status_display{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -103255,7 +101746,6 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/light, @@ -103313,7 +101803,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light, @@ -103576,7 +102065,6 @@ /obj/item/weapon/storage/box/zipties, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/mineral/plastitanium/brig, @@ -103636,8 +102124,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -103672,8 +102159,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -103732,7 +102218,6 @@ /obj/structure/closet/wardrobe/chaplain_black, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/vault{ @@ -103763,7 +102248,6 @@ department = "Chapel Office"; departmentType = 0; name = "Chapel RC"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/status_display{ @@ -104001,8 +102485,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -104069,7 +102552,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/turf_decal/stripes/line, @@ -104167,8 +102649,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/yellow, /area/engine/atmospherics_engine) @@ -104179,8 +102660,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, /area/engine/atmospherics_engine) @@ -104192,8 +102672,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, /area/engine/atmospherics_engine) @@ -104201,8 +102680,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -104273,8 +102751,7 @@ "ecb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood{ icon_state = "wood-broken" @@ -104319,6 +102796,10 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 2; + on = 1 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "eci" = ( @@ -104331,6 +102812,10 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "ecj" = ( @@ -104390,8 +102875,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood{ icon_state = "wood-broken" @@ -104496,8 +102980,7 @@ "ecS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) @@ -104557,8 +103040,7 @@ "eda" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) @@ -104574,8 +103056,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics/garden/abandoned) @@ -104706,8 +103187,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plating/airless, /area/shuttle/transport) @@ -104882,7 +103362,6 @@ "eeS" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/item/weapon/reagent_containers/glass/bucket, @@ -104892,7 +103371,6 @@ /obj/item/weapon/mop, /obj/item/device/radio/intercom{ name = "Station Intercom"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -105197,7 +103675,6 @@ "efA" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12 }, /obj/effect/turf_decal/bot, @@ -105421,7 +103898,6 @@ department = "Engineering"; departmentType = 0; name = "Engineering RC"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/delivery, @@ -105542,9 +104018,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ega" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -105579,9 +104053,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "egd" = ( /obj/structure/table/glass, /obj/item/weapon/clipboard, @@ -105593,9 +104065,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ege" = ( /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle/dice, @@ -105605,9 +104075,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "egf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ @@ -105625,9 +104093,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "egh" = ( /obj/item/weapon/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, @@ -105660,9 +104126,7 @@ pixel_y = -32 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "egk" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white{ @@ -105712,9 +104176,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "egp" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -105868,10 +104330,9 @@ /area/hallway/secondary/exit/departure_lounge) "egC" = ( /obj/machinery/power/apc{ - cell_type = 10000; + cell_type = 5000; dir = 1; name = "Departure Lounge APC"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/camera{ @@ -105900,9 +104361,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) +/area/hallway/secondary/exit/departure_lounge) "egF" = ( /obj/effect/turf_decal/delivery, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -105919,8 +104378,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/sign/poster/official/work_for_a_future{ pixel_y = -32 @@ -105952,9 +104410,7 @@ "egK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) +/area/hallway/secondary/exit/departure_lounge) "egL" = ( /obj/effect/turf_decal/delivery, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -105975,15 +104431,11 @@ "egN" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) +/area/hallway/secondary/exit/departure_lounge) "egO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) +/area/hallway/secondary/exit/departure_lounge) "egP" = ( /obj/structure/bodycontainer/morgue, /obj/structure/sign/poster/official/ian{ @@ -106083,9 +104535,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "egY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -106096,9 +104546,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "egZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -106109,9 +104557,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "eha" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 8; @@ -106121,9 +104567,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "ehb" = ( /obj/structure/chair{ dir = 4; @@ -106201,8 +104645,7 @@ "ehj" = ( /obj/machinery/requests_console{ department = "Arrival shuttle"; - name = "Arrivals Shuttle console"; - pixel_y = 0 + name = "Arrivals Shuttle console" }, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/arrival) @@ -106495,8 +104938,7 @@ /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "WARNING: EXTERNAL AIRLOCK" }, /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/aft) @@ -106547,8 +104989,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -106564,8 +105005,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ name = "External Solar Access"; @@ -106581,8 +105021,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, @@ -106592,8 +105031,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ name = "External Solar Access"; @@ -106642,6 +105080,2100 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) +"eiE" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "Port Primary Hallway APC"; + pixel_x = 26 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/yellow/corner{ + dir = 4 + }, +/area/hallway/primary/port) +"eiF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/apc{ + dir = 2; + name = "Starboard Primary Hallway APC"; + pixel_y = -26 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/neutral/corner, +/area/hallway/primary/starboard) +"eiG" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/neutral/side{ + dir = 8 + }, +/area/maintenance/starboard/aft) +"eiH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "Starboard Quarter Maintenace APC"; + pixel_x = 26 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"eiI" = ( +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/aft) +"eiJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc{ + dir = 4; + name = "Aft Primary Hallway APC"; + pixel_x = 26 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/neutral/corner, +/area/hallway/primary/aft) +"eiK" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/aft) +"eiL" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/aft) +"eiM" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/aft) +"eiN" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/aft) +"eiO" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/neutral, +/area/hallway/primary/aft) +"eiP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/hallway/secondary/command) +"eiQ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + icon_state = "manifold"; + dir = 1 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 4 + }, +/area/hallway/secondary/command) +"eiR" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 8 + }, +/area/hallway/secondary/command) +"eiS" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, +/turf/open/floor/plasteel/neutral/corner, +/area/hallway/secondary/command) +"eiT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"eiU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"eiV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"eiW" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"eiX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"eiY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"eiZ" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/crew_quarters/dorms) +"eja" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/crew_quarters/dorms) +"ejb" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/crew_quarters/dorms) +"ejc" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 4 + }, +/area/crew_quarters/dorms) +"ejd" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 4 + }, +/area/crew_quarters/dorms) +"eje" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber{ + dir = 4; + on = 1 + }, +/turf/open/floor/plasteel/neutral, +/area/crew_quarters/dorms) +"ejf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral, +/area/crew_quarters/dorms) +"ejg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/neutral, +/area/crew_quarters/dorms) +"ejh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 4; + on = 1 + }, +/turf/open/floor/plasteel/neutral, +/area/crew_quarters/dorms) +"eji" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + icon_state = "manifold"; + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/crew_quarters/dorms) +"ejj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/neutral/corner{ + dir = 8; + heat_capacity = 1e+006 + }, +/area/crew_quarters/dorms) +"ejk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel/neutral/corner, +/area/crew_quarters/dorms) +"ejl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/turf/open/floor/plasteel/neutral/corner, +/area/crew_quarters/dorms) +"ejm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"ejn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"ejo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"ejp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"ejq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"ejr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/crew_quarters/dorms) +"ejs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/plasteel/whitepurple/corner{ + dir = 1 + }, +/area/science/research) +"ejt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump{ + dir = 1; + on = 1 + }, +/turf/open/floor/plasteel/neutral, +/area/science/research) +"eju" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plasteel/whitepurple/corner{ + dir = 8 + }, +/area/science/research) +"ejv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch{ + pixel_x = -26 + }, +/turf/open/floor/plating, +/area/quartermaster/warehouse) +"ejw" = ( +/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light_switch{ + pixel_x = 22; + pixel_y = -10 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/engine/transit_tube) +"ejx" = ( +/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/machinery/light_switch{ + pixel_x = -26 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/ai_monitored/turret_protected/aisat_interior) +"ejy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel/brown, +/area/maintenance/disposal) +"ejz" = ( +/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"ejA" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plating, +/area/maintenance/port) +"ejB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/turf/open/floor/plasteel/arrival{ + dir = 1 + }, +/area/crew_quarters/locker) +"ejC" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 9 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 8; + icon_state = "diagonalWall3" + }, +/area/space) +"ejD" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ejE" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "syndieshutters"; + name = "blast shutters" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"ejF" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "syndieshutters"; + name = "blast shutters" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"ejG" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "syndieshutters"; + name = "blast shutters" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"ejH" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "syndieshutters"; + name = "blast shutters" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"ejI" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "syndieshutters"; + name = "blast shutters" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/space) +"ejJ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ejK" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 5 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 1; + icon_state = "diagonalWall3" + }, +/area/space) +"ejL" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ejM" = ( +/obj/machinery/computer/med_data{ + icon_keyboard = "syndi_key" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejN" = ( +/obj/machinery/computer/crew{ + icon_keyboard = "syndi_key" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejO" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/folder/red, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejP" = ( +/obj/machinery/computer/shuttle/syndicate, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejQ" = ( +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejR" = ( +/obj/machinery/computer/camera_advanced{ + icon_keyboard = "syndi_key" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejS" = ( +/obj/machinery/computer/secure_data{ + icon_keyboard = "syndi_key" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejT" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ejU" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ejV" = ( +/obj/structure/table/reinforced, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/obj/item/weapon/clipboard, +/obj/item/toy/figure/syndie, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ejW" = ( +/obj/structure/chair/office/dark{ + dir = 8; + name = "tactical swivel chair" + }, +/turf/open/floor/plasteel/black, +/area/space) +"ejX" = ( +/turf/open/floor/plasteel/black, +/area/space) +"ejY" = ( +/obj/structure/chair/office/dark{ + dir = 1; + name = "tactical swivel chair" + }, +/obj/machinery/button/door{ + id = "syndieshutters"; + name = "Cockpit View Control"; + pixel_x = 32; + pixel_y = 32; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/black, +/area/space) +"ejZ" = ( +/turf/open/floor/plasteel/black, +/area/space) +"eka" = ( +/obj/structure/chair/office/dark{ + dir = 4; + name = "tactical swivel chair" + }, +/turf/open/floor/plasteel/black, +/area/space) +"ekb" = ( +/obj/structure/table/reinforced, +/obj/machinery/ai_status_display{ + pixel_x = 32 + }, +/obj/item/weapon/storage/fancy/donut_box, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ekc" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekd" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eke" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ekf" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ekg" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ekh" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"eki" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ekj" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ekk" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ekl" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekm" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + icon_state = "diagonalWall3" + }, +/area/space) +"ekn" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eko" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekp" = ( +/obj/machinery/status_display, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekq" = ( +/obj/machinery/door/airlock/hatch{ + name = "Cockpit"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ekr" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eks" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekt" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eku" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + dir = 4; + icon_state = "diagonalWall3" + }, +/area/space) +"ekv" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 10 + }, +/turf/closed/wall/mineral/plastitanium{ + icon_state = "diagonalWall3" + }, +/area/space) +"ekw" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekx" = ( +/obj/structure/table/reinforced, +/obj/item/stack/cable_coil/white, +/obj/item/stack/cable_coil/white, +/obj/item/weapon/crowbar/red, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eky" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekz" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/weapon/storage/box/zipties, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekA" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekB" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 6 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 4; + icon_state = "diagonalWall3" + }, +/area/space) +"ekC" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekD" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekE" = ( +/turf/open/floor/plasteel/black, +/area/space) +"ekF" = ( +/obj/structure/chair{ + dir = 8; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekG" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekH" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 9 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 8; + icon_state = "diagonalWall3" + }, +/area/space) +"ekI" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekJ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekK" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekL" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekM" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekN" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekO" = ( +/turf/open/floor/plasteel/black, +/area/space) +"ekP" = ( +/obj/structure/chair{ + dir = 8; + name = "tactical chair" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekQ" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 4 + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekR" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekS" = ( +/obj/machinery/suit_storage_unit/syndicate, +/turf/open/floor/plasteel/podhatch{ + dir = 5 + }, +/area/space) +"ekT" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekU" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekV" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ekW" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ekX" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ekY" = ( +/turf/open/floor/plasteel/black, +/area/space) +"ekZ" = ( +/obj/structure/chair{ + dir = 8; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ela" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elb" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elc" = ( +/obj/machinery/suit_storage_unit/syndicate, +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 4 + }, +/area/space) +"eld" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ele" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elf" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elg" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elh" = ( +/obj/structure/chair{ + dir = 4; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eli" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elj" = ( +/obj/structure/chair{ + dir = 8; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elk" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ell" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elm" = ( +/obj/machinery/door/poddoor{ + id = "smindicate"; + name = "outer blast door" + }, +/obj/machinery/button/door{ + id = "smindicate"; + name = "external door control"; + pixel_x = -26; + req_access_txt = "150" + }, +/obj/docking_port/mobile{ + dheight = 9; + dir = 2; + dwidth = 5; + height = 24; + id = "syndicate"; + name = "syndicate infiltrator"; + port_angle = 0; + roundstart_move = "syndicate_away"; + width = 18 + }, +/obj/docking_port/stationary{ + dheight = 9; + dir = 2; + dwidth = 5; + height = 24; + id = "syndicate_nw"; + name = "northwest of station"; + turf_type = /turf/open/space; + width = 18 + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"eln" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elo" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 5 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 1; + icon_state = "diagonalWall3" + }, +/area/space) +"elp" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elq" = ( +/obj/machinery/suit_storage_unit/syndicate, +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 4 + }, +/area/space) +"elr" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"els" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elt" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elu" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elv" = ( +/obj/machinery/door/airlock/external{ + name = "Ready Room"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elw" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elx" = ( +/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/weapon/crowbar/red, +/obj/structure/table/reinforced, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/podhatch{ + dir = 10 + }, +/area/space) +"ely" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"elz" = ( +/obj/structure/chair{ + name = "tactical chair" + }, +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 6 + }, +/area/space) +"elA" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elB" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elC" = ( +/obj/machinery/suit_storage_unit/syndicate, +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 4 + }, +/area/space) +"elD" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elE" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elF" = ( +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elG" = ( +/obj/machinery/door/airlock/external{ + name = "E.V.A. Gear Storage"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elH" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elI" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elJ" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elK" = ( +/obj/machinery/door/airlock/external{ + req_access_txt = "150" + }, +/turf/open/floor/mineral/plastitanium, +/area/space) +"elL" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elM" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elN" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elO" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elP" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"elQ" = ( +/obj/machinery/suit_storage_unit/syndicate, +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 6 + }, +/area/space) +"elR" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elS" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elT" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elU" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elV" = ( +/turf/open/floor/plasteel/black, +/area/space) +"elW" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"elX" = ( +/obj/structure/chair{ + dir = 1; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elY" = ( +/obj/structure/chair{ + dir = 1; + name = "tactical chair" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"elZ" = ( +/obj/structure/rack, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"ema" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emb" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + dir = 1; + icon_state = "diagonalWall3" + }, +/area/space) +"emc" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 9 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 8; + icon_state = "diagonalWall3" + }, +/area/space) +"emd" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eme" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emf" = ( +/obj/machinery/ai_status_display, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emg" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emh" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emi" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emj" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"emk" = ( +/turf/open/floor/plasteel/black, +/area/space) +"eml" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"emm" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emn" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emo" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emp" = ( +/obj/machinery/status_display, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emq" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emr" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ems" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 5 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 1; + icon_state = "diagonalWall3" + }, +/area/space) +"emt" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emu" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emv" = ( +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emw" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emx" = ( +/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ + pixel_x = -3 + }, +/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/weapon/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/weapon/reagent_containers/syringe/epinephrine{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/weapon/reagent_containers/syringe/epinephrine{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/weapon/reagent_containers/syringe/epinephrine{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emy" = ( +/obj/structure/table/reinforced, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emz" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emA" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"emB" = ( +/turf/open/floor/plasteel/black, +/area/space) +"emC" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"emD" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emE" = ( +/obj/item/weapon/stock_parts/cell/high{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/stock_parts/cell/high, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emF" = ( +/obj/item/weapon/screwdriver{ + pixel_y = 9 + }, +/obj/item/device/assembly/voice{ + pixel_y = 3 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emG" = ( +/obj/item/weapon/wrench, +/obj/item/device/assembly/infra, +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emH" = ( +/obj/item/device/assembly/signaler, +/obj/item/device/assembly/signaler, +/obj/item/device/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/device/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emI" = ( +/obj/item/weapon/weldingtool/largetank{ + pixel_y = 3 + }, +/obj/item/device/multitool, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emJ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emK" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emL" = ( +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"emM" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emN" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emO" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emP" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emQ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emR" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"emS" = ( +/turf/open/floor/plasteel/black, +/area/space) +"emT" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"emU" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"emV" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emW" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emX" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emY" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"emZ" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"ena" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enb" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enc" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"end" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"ene" = ( +/turf/open/floor/plasteel/podhatch{ + dir = 9 + }, +/area/space) +"enf" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"eng" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"enh" = ( +/obj/machinery/door/airlock/hatch{ + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"eni" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"enj" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"enk" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"enl" = ( +/obj/machinery/door/airlock/hatch{ + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"enm" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"enn" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 1 + }, +/area/space) +"eno" = ( +/turf/open/floor/plasteel/podhatch{ + dir = 5 + }, +/area/space) +"enp" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"enq" = ( +/obj/structure/closet/syndicate/personal, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"enr" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ens" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"ent" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/weapon/reagent_containers/dropper, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"enu" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"env" = ( +/turf/open/floor/plasteel/podhatch{ + dir = 10 + }, +/area/space) +"enw" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"enx" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"eny" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"enz" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"enA" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"enB" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"enC" = ( +/turf/open/floor/plasteel/podhatch, +/area/space) +"enD" = ( +/turf/open/floor/plasteel/podhatch{ + icon_state = "podhatch"; + dir = 6 + }, +/area/space) +"enE" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"enF" = ( +/obj/structure/closet/syndicate/nuclear, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"enG" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enH" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enI" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/bodypart/r_arm/robot, +/obj/item/bodypart/l_arm/robot, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault, +/area/space) +"enJ" = ( +/obj/machinery/door/window{ + dir = 1; + name = "Surgery"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault, +/area/space) +"enK" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plasteel/vault, +/area/space) +"enL" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/weapon/storage/firstaid/brute, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault, +/area/space) +"enM" = ( +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault, +/area/space) +"enN" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enO" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"enP" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"enQ" = ( +/turf/open/floor/plasteel/vault, +/area/space) +"enR" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enS" = ( +/obj/item/device/sbeacondrop/bomb{ + pixel_y = 5 + }, +/obj/item/device/sbeacondrop/bomb, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"enT" = ( +/obj/item/weapon/grenade/syndieminibomb{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/grenade/syndieminibomb{ + pixel_x = -1 + }, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/weapon/grenade/plastic/c4, +/obj/item/weapon/grenade/plastic/c4, +/obj/item/weapon/grenade/plastic/c4, +/obj/item/weapon/grenade/plastic/c4, +/obj/item/weapon/grenade/plastic/c4, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"enU" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plasteel/vault, +/area/space) +"enV" = ( +/obj/machinery/door/window{ + dir = 1; + name = "Technological Storage"; + req_access_txt = "150" + }, +/turf/open/floor/plasteel/vault, +/area/space) +"enW" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/device/aicard, +/turf/open/floor/plasteel/vault, +/area/space) +"enX" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enY" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"enZ" = ( +/obj/item/weapon/surgicaldrill, +/obj/item/weapon/circular_saw, +/obj/structure/table/reinforced, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"eoa" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eob" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 30 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eoc" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eod" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoe" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eof" = ( +/obj/machinery/nuclearbomb/syndicate, +/obj/machinery/door/window{ + dir = 1; + name = "Theatre Stage"; + req_access_txt = "0" + }, +/turf/open/floor/circuit/red, +/area/space) +"eog" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoh" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoi" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoj" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eok" = ( +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eol" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/space) +"eom" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eon" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoo" = ( +/obj/item/weapon/cautery, +/obj/item/weapon/scalpel, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"eop" = ( +/obj/structure/table/optable, +/obj/item/weapon/surgical_drapes, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"eoq" = ( +/obj/item/weapon/retractor, +/obj/item/weapon/hemostat, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/space) +"eor" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eos" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eot" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eou" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eov" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eow" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eox" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoy" = ( +/obj/machinery/recharge_station, +/turf/open/floor/circuit/red, +/area/space) +"eoz" = ( +/obj/machinery/telecomms/allinone{ + intercept = 1 + }, +/turf/open/floor/circuit/red, +/area/space) +"eoA" = ( +/obj/machinery/recharge_station, +/turf/open/floor/circuit/red, +/area/space) +"eoB" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoC" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoD" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoE" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoF" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoG" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoH" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + icon_state = "diagonalWall3" + }, +/area/space) +"eoI" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoJ" = ( +/obj/structure/shuttle/engine/propulsion, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoK" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoL" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + dir = 4; + icon_state = "diagonalWall3" + }, +/area/space) +"eoM" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoN" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoO" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoP" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoQ" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"eoR" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + icon_state = "diagonalWall3" + }, +/area/space) +"eoS" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoT" = ( +/obj/structure/shuttle/engine/propulsion, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoU" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoV" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 6 + }, +/turf/closed/wall/mineral/plastitanium{ + dir = 4; + icon_state = "diagonalWall3" + }, +/area/space) +"eoW" = ( +/turf/open/space, +/obj/machinery/porta_turret/syndicate{ + dir = 10 + }, +/turf/closed/wall/mineral/plastitanium{ + icon_state = "diagonalWall3" + }, +/area/space) +"eoX" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoY" = ( +/obj/structure/shuttle/engine/propulsion, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"eoZ" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/space) +"epa" = ( +/turf/open/space, +/turf/closed/wall/mineral/plastitanium{ + dir = 4; + icon_state = "diagonalWall3" + }, +/area/space) (1,1,1) = {" aaa @@ -109257,15 +109789,15 @@ aaa aaa aaa adm -adn -adn -adn -adn -adn -adn -adn -adn -aes +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -109508,21 +110040,21 @@ aaa aaa aaa adm -adn -adn -adn -adn -adn -adn -aiN -ajI -aiN -alK -amN -anW -aoz -aoC -apA +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -109764,22 +110296,22 @@ aaa aaa aaa aaa -adn -afv -afK -afK -afK -aho -adn -agG -aeh -aeG -aeG -amO -aeG -aoA -aoC -apB +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -110021,22 +110553,22 @@ aaa aaa aaa aaa -adn -aeG -aeG -aeG -aeG -aeG -aia -ehe -aeh -akK -alL -amP -anX -aoB -aoC -apC +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -110272,28 +110804,28 @@ aaa aaa aaa adm -adn -adn -adn -aes +adm +adm +adm +adm aaa aaa -adn -aeG -aeG -aeG -aeG -aeG -adn -aiO -aeh -akL -age -amQ -adn -adn -adn -aeI +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -110528,26 +111060,26 @@ aaa aaa aaa aaa -adn -adA -adT -aeh -adn -aeE +adm +adm +adm +adm +adm +adm aaa -adn -afw -afL -ehd -agG -ahp -adn -aiP -aeh -akL -age -amR -adn +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -110785,28 +111317,28 @@ aaa aaa aaa aaa -ado -adB -adU -aeh -adn -adn -adn -adn -adn -adn -adn -agH -agb -adn -adn -adn -akM -agb -adn -adn -adn -aes +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -111042,28 +111574,28 @@ aaa aaa aaa aaa -ado -adC -adV -aeh -aet -aeF -aeT -ehb -aeT -aeT -agb -aeG -aeG -aeG -aeG -ehf -akL -age -aeh -agb -aoC -apA +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -111299,28 +111831,28 @@ aaa aaa aaa aaa -ado -adD -adW -aeh -aeu -aeG -adV -adV -adV -aeG -agc -aeG -adV -adV -adV -adV -akL -age -aeh -anY -aoC -apB +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -111556,28 +112088,28 @@ aaa aaa aaa aaa -ado -adE -adV -aeh -adn -aeH -aeU -ehc -aeU -aeU -agb -aeG -aeG -aeG -aeG -ehg -akL -age -aeh -agb -aoC -apC +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -111813,28 +112345,28 @@ aaa aaa aaa aaa -ado -adF -adX -aeh -adn -adn -adn -afk -adn -adn -adn -agI -agb -adn -adn -adn -akM -agb -adn -adn -adn -aev +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -112070,26 +112602,26 @@ aaa aaa aaa aaa -adn -adG -adY -aeh -adn -aeI +adm +adm +adm +adm +adm +adm aaa aaa aaa -adn -agd -aeG -ahq -adn -aiQ -aeh -akL -age -amS -adn +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -112327,29 +112859,29 @@ aaa aaa aaa aaa -adp -adn -adn -adn -aev +adm +adm +adm +adm +adm aaa aaa aaa aaa -afM -age -aeG -ahq -adn -aiR -aeh -akL -age -amT -adn -adn -adn -aeE +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -112593,20 +113125,20 @@ aaa aaa aaa aaa -afN -agf -aeG -ahr -aet -aiS -aeh -akN -alM -amP -aeG -aoE -aoC -apA +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -112850,20 +113382,20 @@ aaa aaa aaa aaa -adp -adn -adn -adn -adn -aiT -aeh -aeG -aeG -amU -aeG -aoF -aoC -apB +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -113110,17 +113642,17 @@ aaa aaa aaa aaa -ahs -adn -aiU -aeh -akO -alN -amV -ehg -aoE -aoC -apC +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -113368,16 +113900,16 @@ aaa aaa aaa aaa -adp -adn -adn -adn -adn -adn -adn -adn -adn -aev +adm +adm +adm +adm +adm +adm +adm +adm +adm +adm aaa aaa aaa @@ -115692,16 +116224,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +emc +emt +emK +enb +ens +enH +enY +eon +eoC +eoR aaa aaa aaa @@ -115943,22 +116475,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ekH +ekR +elb +elp +elB +elP +emd +emu +emL +enc +ent +enI +enZ +eoo +eoD +eoS aaa aaa aaa @@ -116200,22 +116732,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ekI +ekS +elc +elq +elC +elQ +eme +emv +emM +end +enu +enJ +eoa +eop +eoE +eoT aaa aaa aaa @@ -116280,7 +116812,7 @@ bNw bPo ebZ bTM -bNw +ejx bLp bYV bYV @@ -116457,22 +116989,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ekJ +ekT +eld +elr +elD +elR +emf +emw +emN +ene +env +enK +eob +eoq +eoF +eoU aaa aaa aaa @@ -116707,29 +117239,29 @@ aaa aaa aaa aaa +ejC +ejL +ejU +ekd +ekm aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ekK +ekU +ele +els +elE +elS +emg +emx +emO +enf +enw +enL +eoc +eor +eoG +eoV aaa aaa aaa @@ -116964,26 +117496,26 @@ aaa aaa aaa aaa +ejD +ejM +ejV +eke +ekn +ekv aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ekL +ekV +elf +elt +elF +elT +emh +emy +emP +eng +enx +enM +eod aaa aaa aaa @@ -117221,28 +117753,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ejE +ejN +ejW +ekf +eko +ekw +ekC +ekM +ekW +elg +elu +elG +brL +emi +emz +emQ +enh +brL +enN +eoe +eos +eoH aaa aaa aaa @@ -117478,28 +118010,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ejF +ejO +ejX +ekg +ekp +ekx +ekD +ekN +ekX +elh +brL +elH +elU +emj +emA +emR +eni +eny +enO +brL +eot +eoI aaa aaa aaa @@ -117735,28 +118267,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ejG +ejP +ejY +ekh +ekq +eky +ekE +ekO +ekY +eli +elv +elI +elV +emk +emB +emS +enj +enz +enP +eof +eou +eoJ aaa aaa aaa @@ -117992,28 +118524,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ejH +ejQ +ejZ +eki +ekr +ekz +ekF +ekP +ekZ +elj +brL +elJ +elW +eml +emC +emT +enk +enA +enQ +brL +eov +eoK aaa aaa aaa @@ -118249,28 +118781,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ejI +ejR +eka +ekj +eks +ekA +ekG +ekQ +ela +elk +elw +elK +brL +emm +emD +emU +enl +brL +enR +eog +eow +eoL aaa aaa aaa @@ -118506,26 +119038,26 @@ aaa aaa aaa aaa +ejJ +ejS +ekb +ekk +ekt +ekB aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ell +elx +elL +elX +emn +emE +emV +enm +enB +enS +eoh aaa aaa aaa @@ -118684,7 +119216,7 @@ aaa aaa aaa aaa -eaT +aaa aaa aaa aaa @@ -118763,29 +119295,29 @@ aaa aaa aaa aaa +ejK +ejT +ekc +ekl +eku aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +elm +ely +elM +elY +emo +emF +emW +enn +enC +enT +eoi +eox +eoM +eoW aaa aaa aaa @@ -119029,20 +119561,20 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +eln +elz +elN +elZ +emp +emG +emX +eno +enD +enU +eoj +eoy +eoN +eoX aaa aaa aaa @@ -119286,20 +119818,20 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +elo +elA +elO +ema +emq +emH +emY +enp +enE +enV +eok +eoz +eoO +eoY aaa aaa aaa @@ -119546,17 +120078,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +emb +emr +emI +emZ +enq +enF +enW +eol +eoA +eoP +eoZ aaa aaa aaa @@ -119804,16 +120336,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ems +emJ +ena +enr +enG +enX +eom +eoB +eoQ +epa aaa aaa aaa @@ -122284,7 +122816,7 @@ aaa aaa aaa aaa -aaa +eaT aaa aaa aaa @@ -128354,7 +128886,7 @@ bDL bFF bHA bJC -bLC +ejw bNK bLC bRO @@ -135061,7 +135593,7 @@ bWg cwo cxU czx -cBl +ejA cCF bWg cFi @@ -135280,7 +135812,7 @@ aJg aib bmu bot -bot +eiE brx brx btX @@ -137830,7 +138362,7 @@ awX aqg aoT aHW -aJm +ejz ecs aMr aOa @@ -137907,7 +138439,7 @@ cYF cZR dbj dcJ -cOW +eju dad dhq djj @@ -138814,7 +139346,7 @@ aaD aax aax aaD -abP +abT aax acj aax @@ -139694,7 +140226,7 @@ cFs cGK cId cJM -cLs +ejs cLs cOO cOO @@ -141311,18 +141843,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa eaY aaa aaa @@ -141337,6 +141857,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa "} (136,1,1) = {" aaa @@ -141760,8 +142292,8 @@ cVv cXm cYM dac -dbo -cLE +dbm +ejt dez dgr dhD @@ -142506,7 +143038,7 @@ cjw ckX bQn cnM -cpp +eiR cqH crY ctF @@ -145075,7 +145607,7 @@ ecG cjC clc cmt -cnM +eiP cpy cqM csf @@ -145629,13 +146161,13 @@ drc dgz cKe cKe -cKe -cKe +eiI +eiK dyV -cKe -cKe -cKe -cKe +eiK +eiK +eiK +eiK dES dGr dHN @@ -145886,7 +146418,7 @@ drd dsF due dpB -cSq +eiJ dxQ dyW dAk @@ -146815,7 +147347,7 @@ asW atZ aua awq -aua +ejv ayC azF aAB @@ -147388,8 +147920,8 @@ cfi cfi cfi cfi -cnV -cpG +eiQ +eiS cqS csm ctS @@ -152721,7 +153253,7 @@ alJ alJ apw aqS -arW +ejy alJ aaf aaf @@ -153801,7 +154333,7 @@ bMV bOK bQN bSZ -bUW +eiF bWM bYH cax @@ -153817,10 +154349,10 @@ con bWM crg csA -cuj +cuh cvF cxj -cyP +cyH cAB cBV cDm @@ -155868,7 +156400,7 @@ cgR ciC cke clx -cmO +ejB cos cpQ crr @@ -156163,7 +156695,7 @@ dnu dow dqk drO -dkj +eiG duz dvR dxd @@ -156420,7 +156952,7 @@ daL dox dql daL -cWq +eiH cWq dvS dxe @@ -156907,11 +157439,11 @@ cxt cyT cAK cCe -cvP -cEq +eiT +eiZ cGb cHs -cvP +eiT eci cCg cNS @@ -157166,7 +157698,7 @@ cyT cyT cDp cEq -cGc +eje cHt cIM cyX @@ -157421,11 +157953,11 @@ cxv cyU cAL cCf -cvP -cEq +eiU +eja cGd cHu -cvP +eiU cKK cMj cyX @@ -157935,11 +158467,11 @@ cxw cyV cCg ech -cvP -cEq -cGc -cHt -cvP +eiT +eiZ +ejf +ejj +eiT cKL cMk cyY @@ -158449,11 +158981,11 @@ cxy cyX cAM cCh -cvP -cEt -cGc -cHx -cvP +eiU +ejc +ejg +ejl +eiU cKM cyZ cyZ @@ -158573,7 +159105,7 @@ aaa aaa aaa aaa -aab +aaa aaa aaa aaa @@ -158708,7 +159240,7 @@ cvP cvP cvP cEu -cGc +ejh cHx cvP cvP @@ -158963,11 +159495,11 @@ cxz cyY cAN cCi -cvP +eiT cEv -cFY +eji cHy -cvP +eiT cKN cMl cyT @@ -159477,11 +160009,11 @@ cxB cyZ cyZ cCj -cvP -cEt +eiU +ejc cGg -cHx -cvP +ejl +eiU cKO cMm cNU @@ -160653,7 +161185,7 @@ aaa aaa aaa aaa -aaa +aab aaa aaa aaa @@ -163141,7 +163673,7 @@ aaa aaa aaa aaa -aaa +eaU aaa aaa aaa @@ -165201,7 +165733,7 @@ aaa aaa aaa aaa -eaU +aaa aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ca178aa8aad..77d983a2293 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -62,8 +62,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -102,8 +101,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -142,8 +140,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -293,9 +290,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -389,7 +384,6 @@ /obj/item/device/plant_analyzer, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/floorgrime, @@ -425,8 +419,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -551,14 +544,12 @@ "abm" = ( /obj/machinery/computer/arcade, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "abn" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel, @@ -599,7 +590,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/barber{ @@ -670,9 +660,7 @@ "abz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -803,8 +791,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -843,8 +830,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -993,7 +979,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -1016,9 +1001,7 @@ "acm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -1063,8 +1046,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plating{ icon_state = "panelscorched" @@ -1139,7 +1121,6 @@ "acx" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/floorgrime, @@ -1195,9 +1176,7 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -1238,9 +1217,7 @@ "acF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light, /turf/open/floor/plasteel, @@ -1263,7 +1240,6 @@ desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; name = "Prison Intercom (General)"; - pixel_x = 0; pixel_y = -28; prison_radio = 1 }, @@ -1326,7 +1302,6 @@ /area/security/prison) "acO" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/structure/table/glass, @@ -1345,16 +1320,12 @@ /area/security/prison) "acP" = ( /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "acQ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "acR" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/syringe, @@ -1364,9 +1335,7 @@ /obj/machinery/camera{ c_tag = "Prison Sanitarium"; dir = 2; - network = list("SS13","Prison"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13","Prison") }, /turf/open/floor/plasteel/whitered/side{ dir = 1 @@ -1385,8 +1354,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -1430,7 +1398,6 @@ /obj/machinery/airalarm{ desc = "This particular atmos control unit appears to have no access restrictions."; dir = 4; - icon_state = "alarm0"; locked = 0; name = "all-access air alarm"; pixel_x = -24; @@ -1483,8 +1450,7 @@ pixel_x = 3 }, /obj/item/device/taperecorder{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/device/assembly/flash/handheld, @@ -1640,9 +1606,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "adk" = ( /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 @@ -1656,8 +1620,7 @@ /obj/structure/table, /obj/item/device/flashlight/lamp, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -1682,9 +1645,7 @@ "adp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/prison/execution_room) @@ -1724,7 +1685,6 @@ id = "permabolt3"; name = "Cell Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 @@ -1757,7 +1717,6 @@ id = "permabolt2"; name = "Cell Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 @@ -1783,7 +1742,6 @@ id = "permabolt1"; name = "Cell Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 @@ -1798,17 +1756,14 @@ "adA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light{ dir = 8 }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/white, /area/security/prison) @@ -1842,9 +1797,7 @@ /area/space) "adE" = ( /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "adF" = ( /obj/machinery/door/airlock/titanium{ name = "Escape Pod Airlock" @@ -1872,8 +1825,7 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ pixel_x = -32; @@ -1892,8 +1844,7 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/table, /obj/item/weapon/storage/backpack/dufflebag/sec{ @@ -1932,7 +1883,6 @@ id = "prisonereducation"; name = "Door Bolt Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4 @@ -1947,8 +1897,7 @@ /area/prison/execution_room) "adN" = ( /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d1 = 1; @@ -1980,9 +1929,7 @@ /obj/item/weapon/pen, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -2020,9 +1967,7 @@ /obj/item/weapon/paper, /obj/item/weapon/pen, /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -2127,9 +2072,7 @@ dir = 2 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aee" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -2291,7 +2234,6 @@ "aet" = ( /obj/structure/table/wood, /obj/machinery/newscaster/security_unit{ - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/folder/red, @@ -2344,17 +2286,13 @@ name = "Escape Pod Three" }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aeB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aeC" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -2362,9 +2300,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aeD" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -2373,9 +2309,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aeE" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -2383,9 +2317,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aeF" = ( /obj/effect/landmark/xeno_spawn, /obj/structure/lattice/catwalk, @@ -2541,7 +2473,6 @@ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = 30 }, /obj/machinery/camera{ @@ -2625,7 +2556,6 @@ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/red/corner{ @@ -2798,8 +2728,7 @@ /area/security/prison) "afd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-16"; @@ -2824,7 +2753,6 @@ department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/computer/med_data/laptop, @@ -2870,7 +2798,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/item/device/radio/intercom{ @@ -2927,9 +2854,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 2; @@ -2943,8 +2868,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/extinguisher_cabinet{ pixel_x = 27; @@ -2979,7 +2903,6 @@ /area/security/range) "afs" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/door/window/eastright{ @@ -2989,15 +2912,11 @@ name = "shower" }, /turf/open/floor/plasteel/freezer, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aft" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afu" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/food/drinks/sillycup{ @@ -3018,61 +2937,43 @@ pixel_y = 3 }, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afv" = ( /obj/structure/easel, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afw" = ( /obj/structure/closet/masks, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afx" = ( /obj/structure/closet/athletic_mixed, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afy" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afz" = ( /obj/structure/closet/emcloset, /obj/structure/sign/pods{ pixel_y = 30 }, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afA" = ( /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afB" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afC" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "afD" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -3145,7 +3046,6 @@ dir = 4 }, /obj/machinery/newscaster/security_unit{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/red/corner{ @@ -3192,7 +3092,6 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/red/corner{ @@ -3207,7 +3106,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/red/corner{ @@ -3272,9 +3170,7 @@ "afU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/corner{ dir = 1 @@ -3294,9 +3190,7 @@ "afX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/item/weapon/storage/secure/safe{ name = "armory safe B"; @@ -3304,8 +3198,7 @@ pixel_y = 28 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory) @@ -3318,7 +3211,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/rack, @@ -3516,7 +3408,6 @@ /area/maintenance/fore) "agr" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -3525,7 +3416,6 @@ id = "FitnessShower"; name = "Lock Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4 @@ -3535,18 +3425,14 @@ }, /obj/machinery/light/small, /turf/open/floor/plasteel/freezer, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ags" = ( /obj/machinery/door/airlock{ id_tag = "FitnessShower"; name = "Fitness Room Shower" }, /turf/open/floor/plasteel/freezer, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agt" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -3556,9 +3442,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agu" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3568,9 +3452,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agv" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3587,9 +3469,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agw" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3597,9 +3477,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agx" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3609,9 +3487,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agy" = ( /obj/machinery/light{ dir = 1 @@ -3619,7 +3495,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Recreation Area APC"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/yellow{ @@ -3629,16 +3504,12 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agz" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "agA" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/port/fore) @@ -3676,8 +3547,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -3777,7 +3647,6 @@ pixel_y = 4 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/vault, @@ -3805,9 +3674,7 @@ "agR" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/rack, /obj/item/weapon/storage/fancy/donut_box, @@ -3920,11 +3787,9 @@ "ahb" = ( /obj/structure/table/wood, /obj/item/device/taperecorder{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/device/radio/off{ - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/black, @@ -3949,60 +3814,44 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahg" = ( /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahh" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahi" = ( /obj/structure/chair, /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahj" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahk" = ( /obj/structure/chair, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahl" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahm" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahn" = ( /obj/structure/chair{ dir = 4 @@ -4010,17 +3859,13 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aho" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = "0" }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahp" = ( /turf/closed/wall, /area/maintenance/disposal) @@ -4083,8 +3928,7 @@ /area/security/brig) "ahw" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/suit_storage_unit/security, /turf/open/floor/plasteel/vault{ @@ -4153,8 +3997,7 @@ /obj/item/clothing/head/helmet/riot, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/vault{ dir = 4 @@ -4248,7 +4091,6 @@ id = "armory"; name = "Armory Shutters"; pixel_x = 28; - pixel_y = 0; req_access_txt = "3" }, /turf/open/floor/plasteel/vault{ @@ -4259,8 +4101,7 @@ /obj/machinery/disposal/bin, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light_switch{ pixel_x = -24; @@ -4274,7 +4115,6 @@ dir = 1; name = "Head of Security's Monitor"; network = list("Prison","MiniSat","tcomm"); - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/vault, @@ -4402,9 +4242,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4416,17 +4254,13 @@ name = "Fitness Ring" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahX" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4435,17 +4269,13 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ahZ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aia" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -4453,9 +4283,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aib" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -4465,9 +4293,7 @@ name = "Holodeck Door" }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aic" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -4477,9 +4303,7 @@ name = "Holodeck Door" }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aid" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -4491,9 +4315,7 @@ pixel_y = 27 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aie" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -4503,9 +4325,7 @@ on = 1 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aif" = ( /obj/machinery/door/poddoor{ id = "trash"; @@ -4682,7 +4502,6 @@ id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = 26; - pixel_y = 0; req_access_txt = "2" }, /turf/open/floor/plasteel/red/side{ @@ -4900,15 +4719,12 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiR" = ( /obj/structure/table, /obj/item/clothing/under/sl_suit{ @@ -4918,24 +4734,18 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiS" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiT" = ( /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiU" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -4944,17 +4754,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiV" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiW" = ( /obj/structure/chair{ dir = 8 @@ -4962,38 +4768,28 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiY" = ( /obj/structure/chair{ dir = 4 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aiZ" = ( /obj/machinery/computer/holodeck, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aja" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajb" = ( /turf/closed/wall/r_wall, /area/engine/gravity_generator) @@ -5061,8 +4857,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/closed/wall, /area/maintenance/solars/port/fore) @@ -5139,8 +4934,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; @@ -5187,9 +4981,7 @@ "ajv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -5219,7 +5011,6 @@ /area/security/warden) "ajy" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 30 }, /obj/structure/closet/secure_closet/security/sec, @@ -5250,7 +5041,6 @@ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/vault, @@ -5290,9 +5080,7 @@ "ajI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/effect/landmark/secequipment, /turf/open/floor/plasteel/vault, @@ -5352,8 +5140,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5394,9 +5181,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajS" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -5404,9 +5189,7 @@ }, /obj/item/weapon/storage/firstaid/brute, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajT" = ( /obj/structure/window/reinforced{ dir = 8 @@ -5415,9 +5198,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -5425,9 +5206,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajV" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -5435,16 +5214,12 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/holopad, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajX" = ( /obj/structure/table, /obj/item/weapon/paper{ @@ -5457,17 +5232,13 @@ pixel_y = -3 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajY" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ajZ" = ( /turf/open/floor/plasteel/black, /area/engine/gravity_generator) @@ -5481,7 +5252,6 @@ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -5699,7 +5469,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/light/small{ @@ -5765,8 +5534,7 @@ "akz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sign/pods{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/red/side{ dir = 5 @@ -5802,8 +5570,7 @@ /area/security/warden) "akC" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/camera{ c_tag = "Security - Secure Gear Storage"; @@ -5847,9 +5614,7 @@ "akH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/closet/secure_closet/security/sec, /turf/open/floor/plasteel/showroomfloor, @@ -5919,7 +5684,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -6111,7 +5875,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ @@ -6156,9 +5919,7 @@ "alf" = ( /obj/structure/closet/firecloset, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alg" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -6169,9 +5930,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alh" = ( /obj/structure/table, /obj/item/weapon/paper_bin{ @@ -6182,30 +5941,22 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "ali" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alk" = ( /obj/structure/chair{ dir = 8 @@ -6213,9 +5964,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "all" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -6223,9 +5972,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -6235,9 +5982,7 @@ name = "Holodeck Door" }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aln" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -6247,9 +5992,7 @@ name = "Holodeck Door" }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -6262,24 +6005,18 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /obj/machinery/light/small, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "alq" = ( /turf/closed/wall, /area/maintenance/starboard) @@ -6389,8 +6126,7 @@ /obj/machinery/mineral/stacking_unit_console{ dir = 2; machinedir = 8; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/cable/yellow{ d1 = 1; @@ -6487,8 +6223,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/charcoal, /obj/item/weapon/reagent_containers/syringe, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/whitered/side{ dir = 10 @@ -6749,9 +6484,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 2; @@ -6773,8 +6506,7 @@ cell_type = 5000; dir = 8; name = "Brig Control APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/yellow, /turf/open/floor/plasteel/showroomfloor, @@ -6893,9 +6625,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6942,8 +6672,7 @@ cell_type = 2500; dir = 4; name = "Shooting Range APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/yellow{ d2 = 8; @@ -6970,9 +6699,7 @@ "amv" = ( /obj/structure/closet/emcloset, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amw" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -6982,45 +6709,33 @@ name = "Fitness Ring" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amx" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amy" = ( /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amz" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amA" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amB" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amC" = ( /obj/structure/chair{ dir = 4 @@ -7029,23 +6744,17 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amD" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "amF" = ( /obj/machinery/door/airlock/maintenance{ name = "maintenance access"; @@ -7101,9 +6810,7 @@ /obj/machinery/camera{ c_tag = "Gravity Generator Room"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -7309,8 +7016,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -7332,9 +7038,7 @@ "anl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault, /area/security/warden) @@ -7358,8 +7062,7 @@ /obj/machinery/light/small, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -7477,8 +7180,7 @@ cell_type = 5000; dir = 4; name = "Security Office APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/yellow, /turf/open/floor/plasteel/red/side{ @@ -7521,20 +7223,14 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anH" = ( /obj/structure/chair{ dir = 1 @@ -7543,17 +7239,13 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anI" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anJ" = ( /obj/structure/chair{ dir = 1 @@ -7564,9 +7256,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -7574,17 +7264,13 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "anM" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -7613,9 +7299,7 @@ "anR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/engine/gravity_generator) @@ -7688,8 +7372,7 @@ "anZ" = ( /obj/effect/decal/cleanable/oil, /obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/light/small{ dir = 4 @@ -7890,9 +7573,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8143,7 +7824,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Disposal APC"; - pixel_x = 0; pixel_y = -24 }, /obj/structure/cable/yellow, @@ -8217,9 +7897,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aoU" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -8232,9 +7910,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aoV" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -8247,9 +7923,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aoW" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -8263,9 +7937,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aoX" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -8281,9 +7953,7 @@ location = "14.5-Recreation" }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aoY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -8292,9 +7962,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aoZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -8302,9 +7970,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "apa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -8312,9 +7978,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "apb" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -8325,20 +7989,16 @@ "apd" = ( /obj/structure/table, /obj/item/weapon/tank/internals/emergency_oxygen{ - pixel_x = -8; - pixel_y = 0 + pixel_x = -8 }, /obj/item/weapon/tank/internals/emergency_oxygen{ - pixel_x = -8; - pixel_y = 0 + pixel_x = -8 }, /obj/item/clothing/mask/breath{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /obj/item/clothing/mask/breath{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /obj/effect/decal/cleanable/cobweb, /obj/structure/sign/securearea{ @@ -8346,7 +8006,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating, @@ -8474,8 +8133,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, @@ -8500,7 +8158,6 @@ /obj/machinery/door/window/northright{ dir = 2; name = "delivery door"; - pixel_y = 0; req_access_txt = "31" }, /obj/structure/disposalpipe/segment, @@ -8516,8 +8173,7 @@ /area/maintenance/disposal) "apt" = ( /obj/structure/sign/securearea{ - name = "\improper STAY CLEAR HEAVY MACHINERY"; - pixel_y = 0 + name = "\improper STAY CLEAR HEAVY MACHINERY" }, /turf/closed/wall, /area/maintenance/disposal) @@ -8636,8 +8292,7 @@ "apE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/red/corner{ dir = 1 @@ -8753,8 +8408,7 @@ /area/security/warden) "apQ" = ( /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/closet/wardrobe/red, /obj/machinery/camera{ @@ -8767,8 +8421,7 @@ "apR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -8812,8 +8465,7 @@ /area/security/main) "apZ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/camera{ c_tag = "Security - Office - Starboard"; @@ -8840,9 +8492,7 @@ "aqc" = ( /obj/structure/closet/lasertag/red, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqd" = ( /obj/structure/rack, /obj/item/clothing/under/color/red, @@ -8850,15 +8500,11 @@ /obj/item/clothing/neck/tie/red, /obj/item/clothing/head/soft/red, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqf" = ( /obj/structure/closet/lasertag/blue, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -8867,9 +8513,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqh" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -8881,9 +8525,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -8892,13 +8534,10 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 2 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqj" = ( /obj/machinery/disposal/bin, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -26 }, /obj/structure/disposalpipe/trunk{ @@ -8909,63 +8548,47 @@ dir = 1 }, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqk" = ( /obj/machinery/vending/coffee, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aql" = ( /obj/machinery/light, /obj/machinery/vending/cola/random, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqm" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "aqq" = ( /obj/item/weapon/cigbutt, /turf/open/floor/plating, @@ -9013,8 +8636,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -9030,8 +8652,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -9045,8 +8666,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4; @@ -9061,8 +8681,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -9127,7 +8746,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating, @@ -9172,7 +8790,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating{ @@ -9318,8 +8935,7 @@ dir = 2; name = "Prison Monitor"; network = list("Prison"); - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -9353,9 +8969,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -9702,7 +9316,6 @@ "arQ" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -9717,9 +9330,7 @@ "arR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/power/terminal, /obj/effect/turf_decal/stripes/line{ @@ -9735,8 +9346,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/chair/office/light, /obj/effect/turf_decal/stripes/line{ @@ -9822,7 +9432,6 @@ /obj/machinery/button/door{ id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; - pixel_x = 0; pixel_y = 27; req_access_txt = "0" }, @@ -9873,7 +9482,6 @@ /obj/machinery/button/door{ id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; - pixel_x = 0; pixel_y = 27; req_access_txt = "0" }, @@ -10094,7 +9702,6 @@ icon_state = "4-8" }, /obj/machinery/newscaster/security_unit{ - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/folder/red, @@ -10114,7 +9721,6 @@ }, /obj/item/weapon/pen, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/showroomfloor, @@ -10157,7 +9763,6 @@ /obj/machinery/button/door{ id = "Prison Gate"; name = "Prison Wing Lockdown"; - pixel_x = 0; pixel_y = 7; req_access_txt = "2" }, @@ -10336,7 +9941,6 @@ "asG" = ( /obj/machinery/light, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -32 }, /obj/structure/disposalpipe/segment{ @@ -10395,9 +9999,7 @@ "asL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 6 @@ -10415,7 +10017,6 @@ layer = 4; name = "interrogation monitor"; network = list("interrogation"); - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/grimy, @@ -10433,7 +10034,6 @@ frequency = 1424; listening = 1; name = "Interrogation Intercom"; - pixel_x = 0; pixel_y = -31 }, /turf/open/floor/plasteel/grimy, @@ -10484,7 +10084,6 @@ }, /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/lighter, @@ -10506,7 +10105,6 @@ name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -10565,15 +10163,12 @@ name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/bed, /obj/item/weapon/bedsheet, @@ -10590,7 +10185,6 @@ "atc" = ( /obj/structure/dresser, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/carpet, @@ -10676,8 +10270,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/closed/wall, /area/maintenance/solars/starboard/fore) @@ -11139,9 +10732,7 @@ "aue" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/crew_quarters/dorms) @@ -11282,7 +10873,6 @@ dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -11310,12 +10900,10 @@ dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11365,8 +10953,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -11387,7 +10974,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/decal/cleanable/cobweb, @@ -11510,8 +11096,7 @@ "auR" = ( /obj/machinery/computer/shuttle/labor, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -31; - pixel_y = 0 + pixel_x = -31 }, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/labor) @@ -11538,8 +11123,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/red/corner{ dir = 8 @@ -11580,7 +11164,6 @@ pixel_y = -26 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/vault, @@ -11651,7 +11234,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11666,7 +11248,6 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/red/corner{ @@ -11735,8 +11316,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -11754,9 +11334,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) @@ -11766,8 +11344,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 2 @@ -11836,7 +11413,6 @@ dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -11945,7 +11521,6 @@ dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -12058,7 +11633,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -12188,7 +11762,6 @@ /obj/machinery/button/flasher{ id = "gulagshuttleflasher"; name = "Flash Control"; - pixel_x = 0; pixel_y = -26; req_access_txt = "1" }, @@ -12226,7 +11799,6 @@ /obj/machinery/button/door{ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; - pixel_x = 0; pixel_y = -25; req_access_txt = "2" }, @@ -12328,9 +11900,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -12471,9 +12041,7 @@ "awq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -12570,7 +12138,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/structure/dresser, @@ -12592,7 +12159,6 @@ name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -12622,21 +12188,17 @@ name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/crew_quarters/dorms) "awH" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/structure/table/wood, @@ -12992,7 +12554,6 @@ }, /obj/machinery/button/flasher{ id = "holdingflash"; - pixel_x = 0; pixel_y = -26; req_access_txt = "1" }, @@ -13048,8 +12609,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/red/side{ dir = 6 @@ -13079,9 +12639,7 @@ "axz" = ( /obj/structure/table, /obj/item/weapon/folder/red, -/obj/item/device/taperecorder{ - pixel_y = 0 - }, +/obj/item/device/taperecorder, /obj/item/device/radio/intercom{ anyai = 1; broadcasting = 1; @@ -13089,7 +12647,6 @@ frequency = 1424; listening = 0; name = "Interrogation Intercom"; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13109,9 +12666,7 @@ "axB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/security/brig) @@ -13121,9 +12676,7 @@ "axD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/crew_quarters/dorms) @@ -13360,7 +12913,6 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /obj/structure/sign/securearea{ @@ -13390,8 +12942,7 @@ /obj/item/weapon/tank/internals/emergency_oxygen/engi, /obj/item/weapon/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /turf/open/floor/plasteel/black, /area/engine/engineering) @@ -13494,7 +13045,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Vault APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -13518,16 +13068,13 @@ "ayu" = ( /obj/machinery/mineral/labor_claim_console{ machinedir = 1; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/labor) "ayv" = ( /turf/closed/wall, -/area/prison/solitary{ - name = "Prisoner Education Chamber" - }) +/area/prison/execution_room) "ayw" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -13735,7 +13282,6 @@ /area/security/detectives_office) "ayK" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13749,9 +13295,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/airalarm{ pixel_y = 26 @@ -13760,7 +13304,6 @@ /area/crew_quarters/toilet/restrooms) "ayM" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 8 }, /obj/effect/landmark/start/assistant, @@ -13940,7 +13483,6 @@ /obj/structure/closet/emcloset, /obj/machinery/status_display{ density = 0; - pixel_x = 0; pixel_y = 32; supply_display = 1 }, @@ -13981,7 +13523,6 @@ icon_state = "0-4" }, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 38 }, /obj/structure/closet/wardrobe/miner, @@ -14091,9 +13632,7 @@ "azv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 1 @@ -14163,9 +13702,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/floorgrime, /area/security/brig) @@ -14196,18 +13733,14 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/floorgrime, /area/security/brig) "azH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/flasher{ id = "Cell 3"; @@ -14366,7 +13899,6 @@ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/carpet, @@ -14384,7 +13916,6 @@ /obj/machinery/button/door{ id = "detective_shutters"; name = "detective's office shutters control"; - pixel_x = 0; pixel_y = 26; req_access_txt = "4" }, @@ -14440,7 +13971,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -14455,7 +13985,6 @@ pixel_x = 28 }, /obj/machinery/shower{ - icon_state = "shower"; dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -14471,8 +14000,7 @@ pixel_y = 1 }, /obj/item/clothing/under/suit_jacket/really_black{ - pixel_x = -2; - pixel_y = 0 + pixel_x = -2 }, /obj/machinery/light/small{ dir = 1 @@ -14481,7 +14009,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 28 }, /obj/item/clothing/tie/waistcoat, @@ -14653,7 +14180,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/machinery/camera{ @@ -14703,7 +14229,6 @@ "aAw" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10; - pixel_x = 0; initialize_directions = 10 }, /turf/open/floor/plasteel/black, @@ -14776,9 +14301,7 @@ "aAF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -14854,8 +14377,7 @@ "aAO" = ( /obj/structure/closet/crate, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; @@ -14910,8 +14432,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/circuit/green{ luminosity = 2 @@ -15034,8 +14555,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/red/side{ dir = 10 @@ -15052,8 +14572,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/red/side{ dir = 6 @@ -15062,9 +14581,7 @@ "aBf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light/small{ dir = 8 @@ -15153,7 +14670,6 @@ "aBp" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/computer/secure_data, @@ -15204,7 +14720,6 @@ /area/maintenance/fore) "aBt" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -15219,7 +14734,6 @@ /area/crew_quarters/toilet/restrooms) "aBv" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -15234,8 +14748,7 @@ dir = 6 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -15269,7 +14782,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Dormitories APC"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -15308,8 +14820,7 @@ "aBB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sign/pods{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/neutral/corner{ dir = 2 @@ -15404,7 +14915,6 @@ "aBJ" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -15488,8 +14998,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/closed/wall, /area/quartermaster/miningoffice) @@ -15786,23 +15295,19 @@ /obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/power/apc{ dir = 8; name = "Detective APC"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, /obj/item/device/taperecorder{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/weapon/storage/box/evidence, /obj/item/device/flashlight/seclite, @@ -15959,16 +15464,13 @@ name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/crew_quarters/dorms) @@ -15993,8 +15495,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/effect/turf_decal/bot{ dir = 1 @@ -16038,9 +15539,7 @@ "aCS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -16083,8 +15582,7 @@ "aCW" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating, @@ -16173,7 +15671,6 @@ /obj/structure/closet/secure_closet/miner, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/brown{ @@ -16220,9 +15717,7 @@ "aDo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/light_construct/small{ dir = 4 @@ -16278,7 +15773,6 @@ id = "prison release"; name = "Labor Camp Shuttle Lockdown"; pixel_x = -25; - pixel_y = 0; req_access_txt = "2" }, /obj/effect/turf_decal/delivery, @@ -16302,7 +15796,6 @@ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/red/corner{ @@ -16314,7 +15807,6 @@ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/camera{ @@ -16333,7 +15825,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/red/corner{ @@ -16466,8 +15957,7 @@ "aDI" = ( /obj/machinery/requests_console{ department = "Detective's office"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/structure/table/wood, /obj/machinery/light/small{ @@ -16501,7 +15991,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable/yellow{ @@ -16517,9 +16006,7 @@ "aDM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 2; @@ -16566,7 +16053,6 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/button/door{ @@ -16574,7 +16060,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -16641,11 +16126,9 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/freezer, @@ -16734,7 +16217,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/turf_decal/bot{ @@ -16761,9 +16243,7 @@ "aEk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -16862,8 +16342,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16937,8 +16416,7 @@ "aEz" = ( /obj/structure/closet/secure_closet/miner, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/clothing/suit/hooded/wintercoat/miner, /turf/open/floor/plasteel/brown{ @@ -16969,7 +16447,6 @@ /obj/machinery/button/door{ id = "qm_warehouse"; name = "Warehouse Door Control"; - pixel_x = 0; pixel_y = -24; req_access_txt = "50" }, @@ -16997,8 +16474,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Warehouse APC"; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/structure/cable/yellow{ d2 = 8; @@ -17040,7 +16516,6 @@ "aEI" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel, @@ -17051,7 +16526,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light/small{ @@ -17069,9 +16543,7 @@ "aEL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) @@ -17244,9 +16716,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/security/brig) @@ -17258,7 +16728,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -17280,7 +16749,6 @@ /obj/machinery/door/window{ dir = 1; name = "glass door"; - pixel_y = 0; req_access_txt = "0" }, /turf/open/floor/plasteel/black, @@ -17319,7 +16787,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Restrooms APC"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable/yellow{ @@ -17570,8 +17037,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine, @@ -17584,8 +17050,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -17603,7 +17068,6 @@ "aFE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/folder, @@ -17620,7 +17084,6 @@ /obj/machinery/requests_console{ department = "Mining"; departmentType = 0; - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/brown{ @@ -17807,8 +17270,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/camera{ c_tag = "Storage Wing - Security Access Door"; @@ -17898,7 +17360,6 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/red/corner{ @@ -17956,7 +17417,6 @@ cell_type = 5000; dir = 2; name = "Fore Primary Hallway APC"; - pixel_x = 0; pixel_y = -27 }, /obj/structure/cable/yellow, @@ -17981,7 +17441,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/red/corner{ @@ -18064,7 +17523,6 @@ "aGq" = ( /obj/machinery/computer/security, /obj/machinery/newscaster/security_unit{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/black, @@ -18083,7 +17541,6 @@ dir = 1; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/restraints/handcuffs, @@ -18101,7 +17558,6 @@ pixel_x = 24 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/black, @@ -18177,7 +17633,6 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/effect/landmark/blobstart, @@ -18186,7 +17641,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -18224,12 +17678,10 @@ /area/maintenance/fore) "aGF" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) @@ -18272,7 +17724,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral/corner{ @@ -18437,8 +17888,7 @@ /area/engine/engineering) "aGV" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18529,7 +17979,6 @@ /obj/machinery/button/door{ id = "qm_warehouse"; name = "Warehouse Door Control"; - pixel_x = 0; pixel_y = 24; req_access_txt = "50" }, @@ -18695,12 +18144,10 @@ "aHt" = ( /obj/machinery/vending/cigarette, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel, @@ -18708,9 +18155,7 @@ "aHu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -18764,7 +18209,6 @@ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /turf/closed/wall, @@ -18802,9 +18246,7 @@ "aHI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light_switch{ pixel_x = -26 @@ -18814,9 +18256,7 @@ "aHJ" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 28 @@ -18898,7 +18338,6 @@ name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -18906,9 +18345,7 @@ /obj/item/weapon/bedsheet, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/crew_quarters/dorms) @@ -18999,7 +18436,6 @@ /obj/machinery/button/door{ id = "aux_base_shutters"; name = "Public Shutters Control"; - pixel_x = 0; pixel_y = -24; req_access_txt = "0"; req_one_access_txt = "32;47;48" @@ -19020,7 +18456,6 @@ }, /obj/machinery/status_display{ density = 0; - pixel_x = 0; pixel_y = 32; supply_display = 1 }, @@ -19231,14 +18666,11 @@ "aIu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/power/apc{ dir = 2; name = "Storage Wing APC"; - pixel_x = 0; pixel_y = -27 }, /obj/structure/cable/yellow{ @@ -19297,7 +18729,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/camera{ @@ -19411,7 +18842,6 @@ /obj/item/weapon/folder/red, /obj/item/weapon/restraints/handcuffs, /obj/machinery/newscaster/security_unit{ - pixel_x = 0; pixel_y = -30 }, /obj/structure/cable/yellow{ @@ -19532,7 +18962,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light{ @@ -19575,12 +19004,10 @@ }, /obj/machinery/requests_console{ department = "Law office"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/newscaster{ - pixel_x = -31; - pixel_y = 0 + pixel_x = -31 }, /turf/open/floor/wood, /area/lawoffice) @@ -19593,7 +19020,6 @@ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/wood, @@ -19659,7 +19085,6 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/effect/landmark/blobstart, @@ -19668,7 +19093,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, @@ -19695,7 +19119,6 @@ id = "Toilet4"; name = "Lock Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = -25; req_access_txt = "0"; specialfunctions = 4 @@ -19809,8 +19232,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -20032,8 +19454,7 @@ broadcasting = 1; dir = 8; listening = 0; - name = "Station Intercom (Court)"; - pixel_x = 0 + name = "Station Intercom (Court)" }, /turf/open/floor/plasteel/neutral/side{ dir = 1 @@ -20198,8 +19619,7 @@ }, /obj/structure/table, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -20312,7 +19732,6 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - pixel_y = 0; req_access_txt = "10" }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -20653,12 +20072,9 @@ "aLr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/flasher{ - pixel_x = 0; pixel_y = 24; id = "AI" }, @@ -20720,7 +20136,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -20750,9 +20165,7 @@ /area/security/courtroom) "aLD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light{ icon_state = "tube1"; @@ -20834,7 +20247,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 30 }, /obj/effect/turf_decal/delivery, @@ -20847,7 +20259,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/light/small{ @@ -20857,10 +20268,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "aLQ" = ( -/obj/machinery/disposal/bin{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/machinery/camera{ c_tag = "Locker Room Starboard"; @@ -20899,7 +20307,6 @@ /area/crew_quarters/locker) "aLU" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -20925,9 +20332,7 @@ "aLW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/neutral/side{ dir = 5 @@ -20979,8 +20384,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable/yellow{ d1 = 1; @@ -20996,8 +20400,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/glass_engineering{ name = "Supermatter Engine"; @@ -21095,9 +20498,7 @@ "aMy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/loadingarea{ dir = 8 @@ -21185,7 +20586,6 @@ /obj/item/weapon/aiModule/core/full/corp, /obj/item/weapon/aiModule/core/full/custom, /obj/machinery/flasher{ - pixel_x = 0; pixel_y = 24; id = "AI" }, @@ -21205,7 +20605,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/flasher{ - pixel_x = 0; pixel_y = 24; id = "AI" }, @@ -21307,8 +20706,7 @@ /area/lawoffice) "aMU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/yellow{ d1 = 1; @@ -21321,7 +20719,6 @@ /obj/structure/filingcabinet/employment, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/wood, @@ -21423,8 +20820,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/junction{ icon_state = "pipe-j1"; @@ -21437,9 +20833,7 @@ "aNe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -21576,9 +20970,7 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aNy" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -21586,9 +20978,7 @@ layer = 2.9 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aNz" = ( /obj/structure/window/reinforced{ dir = 1; @@ -21596,9 +20986,7 @@ }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aNA" = ( /obj/structure/closet{ name = "Evidence Closet 3" @@ -21623,9 +21011,7 @@ pixel_y = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aNC" = ( /obj/structure/window/reinforced{ dir = 8 @@ -21742,9 +21128,7 @@ "aNO" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -21765,7 +21149,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Quartermaster's Office APC"; - pixel_x = 0; pixel_y = 30 }, /obj/structure/cable/yellow{ @@ -21927,9 +21310,7 @@ "aOf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/security/courtroom) @@ -21980,21 +21361,17 @@ on = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel, /area/security/courtroom) "aOn" = ( -/obj/item/device/taperecorder{ - pixel_y = 0 - }, +/obj/item/device/taperecorder, /obj/item/weapon/cartridge/lawyer, /obj/structure/table/wood, /obj/machinery/button/door{ id = "lawyer_shutters"; name = "law office shutters control"; - pixel_x = 0; pixel_y = -26; req_access_txt = "38" }, @@ -22026,7 +21403,6 @@ "aOr" = ( /obj/structure/closet/lawcloset, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/wood, @@ -22300,8 +21676,7 @@ cell_type = 10000; dir = 8; name = "Engine Room APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/yellow{ d2 = 4; @@ -22357,7 +21732,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/engine, @@ -22370,9 +21744,7 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aOU" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22394,9 +21766,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/lattice/catwalk, /turf/open/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aOX" = ( /obj/structure/window/reinforced{ dir = 4 @@ -22559,8 +21929,7 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel, /area/quartermaster/qm) @@ -22630,8 +21999,7 @@ /obj/machinery/requests_console{ department = "Tool Storage"; departmentType = 0; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/light{ icon_state = "tube1"; @@ -22812,8 +22180,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -22934,8 +22301,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/vault, /area/engine/engineering) @@ -22956,7 +22322,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/camera{ @@ -23010,13 +22375,12 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aQd" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped{ - dir = 1; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "aQe" = ( @@ -23033,7 +22397,6 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -23118,7 +22481,6 @@ /obj/structure/table, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ @@ -23143,8 +22505,7 @@ network = list("MINE","AuxBase") }, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/brown{ dir = 8 @@ -23161,14 +22522,10 @@ "aQt" = ( /obj/structure/table, /obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/stamp/qm, /obj/machinery/status_display{ density = 0; pixel_x = 32; - pixel_y = 0; supply_display = 1 }, /obj/item/weapon/cartridge/quartermaster{ @@ -23242,12 +22599,10 @@ dir = 8 }, /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/flasher{ id = "AI"; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/black, @@ -23305,12 +22660,10 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/flasher{ id = "AI"; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/black, @@ -23321,8 +22674,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8; @@ -23372,8 +22724,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-03"; @@ -23579,7 +22930,6 @@ /obj/item/clothing/mask/balaclava, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -23597,7 +22947,6 @@ dir = 5 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -23681,8 +23030,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -23703,8 +23051,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -23717,8 +23064,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating, /area/engine/engineering) @@ -23726,8 +23072,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable/yellow{ d1 = 1; @@ -23743,8 +23088,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -23806,15 +23150,11 @@ /area/engine/engineering) "aRy" = ( /turf/closed/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aRz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aRA" = ( /turf/closed/wall, /area/hallway/secondary/entry) @@ -23989,9 +23329,7 @@ "aRS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/brown{ dir = 4 @@ -24000,7 +23338,6 @@ "aRT" = ( /obj/machinery/flasher{ id = "AI"; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/porta_turret/ai{ @@ -24121,8 +23458,7 @@ /obj/item/weapon/cultivator, /obj/item/weapon/hatchet, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/weapon/paper/hydroponics, /obj/item/weapon/coin/silver, @@ -24187,7 +23523,6 @@ pixel_y = 5 }, /obj/item/weapon/book/manual/wiki/engineering_construction{ - pixel_x = 0; pixel_y = 3 }, /obj/structure/closet/crate, @@ -24198,8 +23533,7 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -24227,8 +23561,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/glass_engineering{ name = "Power Monitoring"; @@ -24260,9 +23593,7 @@ "aSu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -24334,8 +23665,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -24346,8 +23676,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24366,17 +23695,13 @@ dir = 5 }, /turf/closed/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aSF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /turf/closed/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aSG" = ( /obj/structure/window/reinforced{ dir = 8 @@ -24430,7 +23755,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Auxillary Base Construction APC"; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/yellow/side, @@ -24449,7 +23773,6 @@ /obj/item/weapon/pipe_dispenser, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/yellow/side, @@ -24551,7 +23874,6 @@ /obj/machinery/status_display{ density = 0; pixel_x = 32; - pixel_y = 0; supply_display = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -24723,9 +24045,7 @@ "aTl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/security/courtroom) @@ -24734,14 +24054,12 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/black, /area/security/courtroom) "aTn" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/light, @@ -24760,8 +24078,7 @@ /area/security/courtroom) "aTp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/black, /area/security/courtroom) @@ -24838,7 +24155,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/camera{ @@ -24877,7 +24193,6 @@ }, /obj/machinery/light, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -24894,8 +24209,7 @@ /area/crew_quarters/locker) "aTB" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 2 @@ -25055,9 +24369,7 @@ req_access_txt = "0" }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aTS" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -25072,24 +24384,18 @@ network = list("MiniSat") }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aTT" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/lattice, /turf/open/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aTU" = ( /obj/structure/lattice, /turf/open/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aTV" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) @@ -25118,9 +24424,7 @@ dir = 4 }, /turf/open/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aTZ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -25135,9 +24439,7 @@ network = list("MiniSat") }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aUa" = ( /obj/structure/window/reinforced{ dir = 4 @@ -25154,9 +24456,7 @@ req_access_txt = "0" }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aUb" = ( /obj/structure/sign/pods, /turf/closed/wall, @@ -25210,9 +24510,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -25234,8 +24532,7 @@ "aUj" = ( /obj/structure/closet/secure_closet/security/cargo, /obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/machinery/airalarm{ pixel_y = 23 @@ -25279,8 +24576,7 @@ "aUm" = ( /obj/structure/filingcabinet, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/red/side{ dir = 5 @@ -25347,8 +24643,7 @@ "aUu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/brown{ dir = 6 @@ -25371,15 +24666,12 @@ /area/ai_monitored/turret_protected/ai_upload_foyer) "aUy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/turretid{ control_area = "AI Upload Chamber"; icon_state = "control_stun"; name = "AI Upload turret control"; - pixel_x = 0; pixel_y = 28 }, /obj/item/device/radio/intercom{ @@ -25397,7 +24689,6 @@ /obj/machinery/power/apc{ dir = 2; name = "AI Upload Access APC"; - pixel_x = 0; pixel_y = -27 }, /obj/machinery/light/small{ @@ -25408,8 +24699,7 @@ dir = 4; name = "AI Upload Monitor"; network = list("AIUpload"); - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /turf/open/floor/plasteel/vault{ dir = 6 @@ -25442,8 +24732,7 @@ dir = 8; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/machinery/camera/motion{ c_tag = "AI Upload Foyer"; @@ -25461,14 +24750,12 @@ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; - icon_state = "direction_eng"; - pixel_y = 0 + icon_state = "direction_eng" }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the bridge is."; @@ -25592,7 +24879,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/black, @@ -25726,8 +25012,7 @@ announcementConsole = 0; department = "Engineering"; departmentType = 4; - name = "Engineering RC"; - pixel_y = 0 + name = "Engineering RC" }, /turf/closed/wall, /area/engine/engineering) @@ -25809,14 +25094,11 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) @@ -25828,7 +25110,6 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /turf/open/floor/plasteel/black, @@ -25846,14 +25127,12 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, @@ -25862,7 +25141,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -25903,7 +25181,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/structure/chair, @@ -25939,7 +25216,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -26044,8 +25320,6 @@ "aVG" = ( /obj/machinery/status_display{ density = 0; - pixel_x = 0; - pixel_y = 0; supply_display = 1 }, /turf/closed/wall, @@ -26054,10 +25328,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 }, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/regular, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ name = "floor" @@ -26251,7 +25522,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/neutral/side{ @@ -26320,8 +25590,7 @@ /area/hallway/primary/central) "aWk" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-16"; @@ -26331,7 +25600,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/plasteel/neutral/side{ @@ -26384,7 +25652,6 @@ /area/hallway/primary/central) "aWq" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/disposal/bin, @@ -26450,12 +25717,10 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/computer/apc_control, /turf/open/floor/plasteel/vault, @@ -26466,7 +25731,6 @@ department = "Chief Engineer's Desk"; departmentType = 3; name = "Chief Engineer RC"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/computer/card/minor/ce, @@ -26543,8 +25807,7 @@ /area/space) "aWL" = ( /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ icon_state = "tube1"; @@ -26593,8 +25856,7 @@ dir = 4 }, /obj/machinery/ai_status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) @@ -26602,9 +25864,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "aWT" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -26621,7 +25881,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, @@ -26684,8 +25943,7 @@ /area/hallway/secondary/entry) "aXd" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/camera{ c_tag = "Arrivals - Fore Arm"; @@ -26789,8 +26047,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26835,12 +26092,10 @@ "aXp" = ( /obj/item/weapon/book/manual/wiki/security_space_law, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/table/reinforced, /turf/open/floor/plasteel/red/side, @@ -27052,7 +26307,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/effect/turf_decal/stripes/line{ @@ -27079,7 +26333,6 @@ dir = 2 }, /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -27316,9 +26569,7 @@ }, /obj/machinery/holopad, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "aYe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -27422,7 +26673,6 @@ }, /obj/item/weapon/circuitboard/computer/arcade/battle, /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = 31 }, /turf/open/floor/plasteel/black, @@ -27458,7 +26708,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/black, @@ -27504,8 +26753,7 @@ /obj/machinery/power/apc{ dir = 4; name = "CE Office APC"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -27593,8 +26841,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/circuit, @@ -27617,17 +26864,14 @@ "aYC" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA"; - pixel_y = 0 + name = "KEEP CLEAR: DOCKING AREA" }, /turf/closed/wall, /area/hallway/secondary/entry) "aYE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -27653,7 +26897,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, @@ -27682,7 +26925,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/arrival{ @@ -27898,8 +27140,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -28068,8 +27309,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -28125,8 +27365,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Tech Storage APC"; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/cable/yellow{ d2 = 4; @@ -28150,9 +27389,7 @@ "aZz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -28185,8 +27422,7 @@ maxcharge = 15000 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/light/small{ dir = 4 @@ -28265,12 +27501,10 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -28281,8 +27515,7 @@ /obj/effect/landmark/lightsout, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/yellow{ d1 = 1; @@ -28297,12 +27530,9 @@ "aZK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/shower{ - icon_state = "shower"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -28313,13 +27543,11 @@ "aZL" = ( /obj/structure/filingcabinet, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 0; pixel_y = 30 }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/red/side{ dir = 9 @@ -28330,7 +27558,6 @@ /obj/item/device/radio/intercom{ dir = 4; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 29 }, /obj/machinery/recharger{ @@ -28348,8 +27575,7 @@ }, /obj/item/weapon/pen, /obj/machinery/newscaster/security_unit{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/red/side{ dir = 5 @@ -28377,8 +27603,7 @@ freerange = 1; listening = 1; name = "Common Channel"; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/device/radio/intercom{ anyai = 1; @@ -28451,8 +27676,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/circuit, @@ -28483,8 +27707,7 @@ freerange = 1; listening = 1; name = "Common Channel"; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/device/radio/intercom{ anyai = 1; @@ -28744,9 +27967,7 @@ /area/quartermaster/storage) "bat" = ( /turf/closed/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bau" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -28764,9 +27985,7 @@ /turf/open/floor/plasteel{ name = "floor" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bav" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -28786,9 +28005,7 @@ /turf/open/floor/plasteel{ name = "floor" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "baw" = ( /obj/item/weapon/stamp{ pixel_x = -3; @@ -28808,25 +28025,20 @@ /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; - pixel_x = 0; pixel_y = 30 }, /obj/item/weapon/pen/red, /turf/open/floor/plasteel/brown{ dir = 9 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bax" = ( /obj/structure/table/reinforced, /obj/machinery/computer/stockexchange, /turf/open/floor/plasteel/brown{ dir = 5 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bay" = ( /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the Cargo department is."; @@ -28835,9 +28047,7 @@ pixel_y = -5 }, /turf/closed/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "baz" = ( /obj/machinery/computer/cargo/request, /obj/effect/turf_decal/delivery, @@ -28846,13 +28056,10 @@ "baA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/status_display{ density = 0; - pixel_x = 0; pixel_y = 32; supply_display = 1 }, @@ -28897,8 +28104,7 @@ "baF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/light{ dir = 8 @@ -28984,7 +28190,6 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/neutral/corner{ @@ -29135,7 +28340,6 @@ initialize_directions = 11 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/neutral/corner{ @@ -29222,7 +28426,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/yellow/side{ @@ -29310,9 +28513,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning{ - pixel_x = 0 - }, +/obj/item/weapon/circuitboard/computer/cloning, /obj/item/weapon/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 @@ -29442,8 +28643,7 @@ dir = 8; name = "Engine Monitor"; network = list("Engine"); - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -29501,8 +28701,7 @@ dir = 4; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -29524,8 +28723,7 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -29621,9 +28819,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbO" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -29648,8 +28844,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Cargo Office APC"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 4; @@ -29658,9 +28853,7 @@ /turf/open/floor/plasteel/brown{ dir = 9 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbR" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -29676,35 +28869,26 @@ /turf/open/floor/plasteel/brown{ dir = 1 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/status_display{ density = 0; - pixel_x = 0; pixel_y = 32; supply_display = 1 }, /turf/open/floor/plasteel/brown{ dir = 1 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbT" = ( /turf/open/floor/plasteel/brown/corner{ dir = 1 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbU" = ( /obj/effect/landmark/start/cargo_technician, /obj/structure/chair/office/dark{ @@ -29713,9 +28897,7 @@ /turf/open/floor/plasteel/brown{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbV" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -29730,9 +28912,7 @@ }, /obj/item/weapon/pen, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbW" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -29777,8 +28957,7 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -29856,8 +29035,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/clothing/gloves/color/fyellow, /obj/item/clothing/suit/hazardvest, @@ -29881,9 +29059,7 @@ "bcq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/storage/tools) @@ -29895,7 +29071,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -30019,8 +29194,7 @@ "bcE" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -30028,9 +29202,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -30080,8 +29252,7 @@ icon_state = "1-2" }, /obj/machinery/newscaster{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -30138,8 +29309,7 @@ dir = 8; name = "Engine Monitor"; network = list("Engine"); - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -30156,8 +29326,7 @@ dir = 8 }, /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) @@ -30188,9 +29357,7 @@ "bcV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -30238,9 +29405,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 1 @@ -30279,7 +29444,6 @@ "bdb" = ( /obj/machinery/computer/secure_data, /obj/machinery/newscaster/security_unit{ - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/red/side{ @@ -30291,7 +29455,6 @@ pixel_x = 27 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 0; pixel_y = 30 }, /obj/structure/closet/secure_closet/security, @@ -30382,15 +29545,12 @@ req_access_txt = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/brown{ dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bdm" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -30402,9 +29562,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bdn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30414,9 +29572,7 @@ initialize_directions = 11 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bdo" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -30426,9 +29582,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bdp" = ( /obj/machinery/computer/cargo, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -30437,9 +29591,7 @@ /turf/open/floor/plasteel/brown{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bdq" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -30447,9 +29599,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bdr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -30581,11 +29731,9 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/carpet, @@ -30594,7 +29742,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30638,8 +29785,7 @@ /area/crew_quarters/heads/captain/private) "bdN" = ( /obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/dresser, /obj/item/weapon/storage/secure/safe{ @@ -30794,7 +29940,6 @@ /obj/item/device/multitool, /obj/item/clothing/glasses/meson, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30813,12 +29958,9 @@ /area/storage/tech) "bee" = ( /obj/structure/table, -/obj/machinery/cell_charger{ - pixel_y = 0 - }, +/obj/machinery/cell_charger, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/weapon/stock_parts/cell/high{ @@ -30836,7 +29978,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/plasteel/vault{ @@ -30845,7 +29986,6 @@ /area/crew_quarters/heads/chief) "beg" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -29 }, /obj/machinery/suit_storage_unit/ce, @@ -30864,7 +30004,6 @@ dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/vault{ @@ -30881,7 +30020,6 @@ /obj/machinery/button/door{ id = "ceprivacy"; name = "Privacy Shutters Control"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/vault{ @@ -30907,7 +30045,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/vault{ @@ -30969,9 +30106,7 @@ "ben" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -31013,17 +30148,14 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0; - pixel_y = 0 + name = "EXTERNAL AIRLOCK" }, /turf/closed/wall/r_wall, /area/space) "ber" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/space) @@ -31035,9 +30167,7 @@ dir = 6 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bet" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; @@ -31056,9 +30186,7 @@ network = list("MiniSat") }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "beu" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -31101,9 +30229,7 @@ network = list("MiniSat") }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bez" = ( /obj/structure/window/reinforced{ dir = 1; @@ -31111,9 +30237,7 @@ }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "beA" = ( /obj/structure/window/reinforced{ dir = 4 @@ -31123,9 +30247,7 @@ layer = 2.9 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "beB" = ( /obj/structure/table, /obj/item/weapon/storage/firstaid/regular{ @@ -31356,7 +30478,6 @@ "beY" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -31373,9 +30494,7 @@ /turf/open/floor/plasteel/brown{ dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "beZ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -31386,31 +30505,23 @@ dir = 5 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bfa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bfb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bfc" = ( /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/plasteel/brown{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bfd" = ( /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -31450,8 +30561,7 @@ /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/machinery/camera{ @@ -31709,7 +30819,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/neutral/corner{ @@ -31729,14 +30838,12 @@ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; - icon_state = "direction_eng"; - pixel_y = 0 + icon_state = "direction_eng" }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the bridge is."; @@ -31854,9 +30961,7 @@ on = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bfT" = ( /obj/machinery/door/poddoor{ density = 0; @@ -31940,16 +31045,12 @@ req_one_access_txt = "32;19" }, /turf/open/floor/plating, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bgd" = ( /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bge" = ( /obj/machinery/light/small{ dir = 1 @@ -31961,9 +31062,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bgf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -31971,13 +31070,10 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bgg" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window{ base_state = "right"; @@ -31990,9 +31086,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bgh" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper_bin{ @@ -32001,8 +31095,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) @@ -32027,8 +31120,7 @@ /area/ai_monitored/turret_protected/ai) "bgl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) @@ -32047,8 +31139,7 @@ frequency = 1447; listening = 0; name = "Station Intercom (AI Private)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) @@ -32108,7 +31199,6 @@ "bgw" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -32262,9 +31352,7 @@ "bgI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -32287,7 +31375,6 @@ "bgL" = ( /obj/machinery/status_display{ density = 0; - pixel_x = 0; pixel_y = 32; supply_display = 1 }, @@ -32347,9 +31434,7 @@ /turf/open/floor/plasteel/brown{ dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bgP" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -32365,9 +31450,7 @@ d2 = 8 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bgQ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -32378,9 +31461,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bgR" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/cargo_technician, @@ -32393,9 +31474,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bgS" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -32412,9 +31491,7 @@ /turf/open/floor/plasteel/brown{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bgT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32437,9 +31514,7 @@ /turf/open/floor/plasteel{ name = "floor" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bgU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32553,9 +31628,7 @@ "bhd" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/mop, @@ -32576,8 +31649,7 @@ cell_type = 2500; dir = 4; name = "Central Maintenance APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -32620,7 +31692,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/folder/yellow{ @@ -32962,7 +32033,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Starboard Hallway APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/yellow{ @@ -33004,8 +32074,7 @@ /obj/item/weapon/pen, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/glass, @@ -33022,8 +32091,7 @@ pixel_y = 3 }, /obj/item/weapon/book/manual/wiki/engineering_guide{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/structure/table/glass, /turf/open/floor/plasteel/yellow/side{ @@ -33080,7 +32148,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/structure/disposalpipe/segment{ @@ -33183,13 +32250,10 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bil" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window{ dir = 8; @@ -33198,9 +32262,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bim" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/blue{ @@ -33217,7 +32279,6 @@ dir = 8 }, /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -33231,9 +32292,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) @@ -33261,7 +32320,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/black, @@ -33389,9 +32447,7 @@ on = 1 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biI" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -33426,25 +32482,20 @@ /turf/open/floor/plasteel/brown{ dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biL" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/open/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biM" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/light/small{ dir = 4 @@ -33452,9 +32503,7 @@ /turf/open/floor/plasteel/brown{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biN" = ( /turf/open/floor/plasteel/brown{ dir = 8 @@ -33478,9 +32527,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -33520,7 +32567,6 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /obj/vehicle/janicart, @@ -33649,8 +32695,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/weapon/bikehorn/rubberducky, /obj/machinery/light_switch{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/item/weapon/card/id/captains_spare, /turf/open/floor/wood, @@ -33682,8 +32727,7 @@ "bjl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ @@ -33847,9 +32891,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33957,8 +32999,7 @@ icon_state = "2-4" }, /obj/machinery/light_switch{ - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/open/floor/plasteel, /area/engine/break_room) @@ -34053,8 +33094,7 @@ /area/engine/break_room) "bjN" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -34064,22 +33104,17 @@ /area/space) "bjO" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bjP" = ( /turf/closed/wall/r_wall, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bjQ" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) @@ -34101,9 +33136,7 @@ /area/ai_monitored/turret_protected/ai) "bjT" = ( /turf/closed/wall/r_wall, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bjU" = ( /obj/structure/chair{ dir = 1 @@ -34178,7 +33211,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/machinery/light{ @@ -34217,8 +33249,7 @@ /area/hallway/primary/port) "bkf" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -34357,8 +33388,7 @@ cell_type = 2500; dir = 4; name = "Delivery Office APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d2 = 8; @@ -34373,58 +33403,45 @@ /obj/machinery/computer/stockexchange, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/brown{ dir = 10 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bko" = ( /obj/machinery/photocopier, /turf/open/floor/plasteel/brown{ dir = 2 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkp" = ( /turf/open/floor/plasteel/brown{ dir = 2 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/holopad, /turf/open/floor/plasteel/brown{ dir = 2 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkr" = ( /obj/machinery/autolathe, /obj/machinery/newscaster{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/plasteel/brown{ dir = 6 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bks" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -34465,8 +33482,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/yellow{ d1 = 1; @@ -34544,8 +33560,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/modular_computer/console/preset/command, /turf/open/floor/plasteel/darkblue/side{ @@ -34556,7 +33571,6 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 29 }, /obj/machinery/computer/teleporter, @@ -34615,7 +33629,6 @@ network = list("MINE","AuxBase") }, /obj/machinery/keycard_auth{ - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/plasteel/darkblue/side{ @@ -34628,8 +33641,7 @@ department = "Bridge"; departmentType = 5; name = "Bridge RC"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/cable/yellow{ d1 = 1; @@ -34809,7 +33821,6 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/caution/corner{ @@ -35044,16 +34055,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "blA" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/structure/window/reinforced, /turf/open/floor/plating/airless, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "blB" = ( /obj/machinery/computer/teleporter, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -35062,37 +34069,29 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "blC" = ( /obj/machinery/teleport/station, /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "blD" = ( /obj/machinery/teleport/hub, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "blE" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -35108,7 +34107,6 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -35130,7 +34128,6 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /turf/open/floor/plasteel/darkblue/corner{ @@ -35159,8 +34156,7 @@ frequency = 1447; listening = 0; name = "Station Intercom (AI Private)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) @@ -35175,15 +34171,12 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "blK" = ( /obj/machinery/recharge_station, /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/cable/yellow{ @@ -35194,9 +34187,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "blL" = ( /obj/machinery/airalarm{ pixel_y = 26 @@ -35209,9 +34200,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "blM" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/cable{ @@ -35221,9 +34210,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "blN" = ( /obj/structure/closet/emcloset, /turf/open/floor/mineral/titanium/blue, @@ -35436,17 +34423,13 @@ /obj/machinery/door/firedoor, /obj/machinery/mineral/ore_redemption, /turf/open/floor/plasteel/black, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmi" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmj" = ( /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the Suuply department is."; @@ -35456,9 +34439,7 @@ pixel_y = 8 }, /turf/closed/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmk" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -35484,14 +34465,12 @@ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; - icon_state = "direction_eng"; - pixel_y = 0 + icon_state = "direction_eng" }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the bridge is."; @@ -35509,7 +34488,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner{ @@ -35524,7 +34502,6 @@ /obj/machinery/button/door{ id = "hop"; name = "Privacy Shutters Control"; - pixel_x = 0; pixel_y = 25; req_access_txt = "28" }, @@ -35541,7 +34518,6 @@ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/wood, @@ -35549,8 +34525,7 @@ "bmq" = ( /obj/machinery/recharger, /obj/item/weapon/storage/secure/safe{ - pixel_x = 34; - pixel_y = 0 + pixel_x = 34 }, /obj/structure/table/wood, /turf/open/floor/wood, @@ -35748,8 +34723,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/camera{ c_tag = "Bridge - Starboard"; @@ -35775,8 +34749,7 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ @@ -36020,8 +34993,7 @@ /area/engine/break_room) "bng" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/camera{ c_tag = "Engineering - Foyer - Starboard"; @@ -36037,8 +35009,7 @@ pixel_y = 5 }, /obj/item/device/taperecorder{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /turf/open/floor/plasteel, /area/security/main) @@ -36054,9 +35025,7 @@ pixel_y = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnl" = ( /obj/structure/window/reinforced{ dir = 1; @@ -36066,9 +35035,7 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnm" = ( /obj/structure/window/reinforced{ dir = 1; @@ -36078,17 +35045,13 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnn" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bno" = ( /obj/structure/transit_tube/diagonal, /turf/open/space, @@ -36105,9 +35068,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnq" = ( /obj/structure/window/reinforced{ dir = 1; @@ -36122,9 +35083,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnr" = ( /obj/structure/window/reinforced{ dir = 1; @@ -36133,9 +35092,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bns" = ( /obj/machinery/door/window{ dir = 1; @@ -36146,9 +35103,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnt" = ( /obj/structure/window/reinforced{ dir = 1; @@ -36160,9 +35115,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnu" = ( /obj/structure/window/reinforced{ dir = 1; @@ -36182,17 +35135,13 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bnw" = ( /obj/structure/showcase{ density = 0; @@ -36206,7 +35155,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -36215,9 +35163,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bnx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -36225,9 +35171,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bny" = ( /obj/machinery/turretid{ control_area = "AI Satellite Antechamber"; @@ -36235,7 +35179,6 @@ icon_state = "control_standby"; name = "Antechamber Turret Control"; pixel_x = 30; - pixel_y = 0; req_access_txt = "65" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -36247,9 +35190,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bnz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -36301,8 +35242,7 @@ cell_type = 2500; dir = 4; name = "MiniSat Antechamber APC"; - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/structure/cable/yellow{ d2 = 2; @@ -36337,15 +35277,12 @@ dir = 1 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bnG" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable/yellow{ d1 = 1; @@ -36359,15 +35296,12 @@ dir = 1 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bnH" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -36379,9 +35313,7 @@ dir = 1 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bnI" = ( /obj/structure/showcase{ density = 0; @@ -36405,9 +35337,7 @@ dir = 1 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bnK" = ( /obj/machinery/firealarm{ dir = 8; @@ -36600,7 +35530,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/plasteel/neutral/corner{ @@ -36725,8 +35654,7 @@ /area/crew_quarters/heads/hop) "boo" = ( /obj/machinery/newscaster/security_unit{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/computer/security/mining, /turf/open/floor/wood, @@ -36736,8 +35664,7 @@ cell_type = 10000; dir = 8; name = "Bridge APC"; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/cable/yellow, /obj/machinery/camera{ @@ -36850,7 +35777,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/wood, @@ -36944,9 +35870,7 @@ "boN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -37090,8 +36014,7 @@ /area/maintenance/starboard) "bpd" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/caution/corner{ @@ -37191,8 +36114,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ @@ -37204,15 +36126,12 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpp" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/black, /area/engine/break_room) @@ -37221,15 +36140,11 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpr" = ( /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bps" = ( /obj/structure/window/reinforced, /obj/machinery/light/small, @@ -37240,9 +36155,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpt" = ( /obj/machinery/firealarm{ dir = 4; @@ -37278,8 +36191,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/transit_tube/horizontal, /turf/open/space, @@ -37292,8 +36204,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/transit_tube/crossing/horizontal, /turf/open/space, @@ -37306,8 +36217,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/transit_tube/horizontal, /turf/open/space, @@ -37320,8 +36230,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/transit_tube/junction/flipped{ dir = 8 @@ -37336,8 +36245,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/space, /area/space) @@ -37352,8 +36260,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/space, /area/space) @@ -37367,16 +36274,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/transit_tube/station{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -37386,9 +36290,7 @@ icon_state = "0-8" }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpE" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -37404,9 +36306,7 @@ icon_state = "0-4" }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpF" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ @@ -37416,15 +36316,11 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -37432,9 +36328,7 @@ d2 = 8 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpH" = ( /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -37445,9 +36339,7 @@ uses = 10 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpI" = ( /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -37461,9 +36353,7 @@ req_one_access_txt = "32;19" }, /turf/open/floor/plasteel/black, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bpJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -37475,9 +36365,7 @@ d2 = 8 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bpK" = ( /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -37487,9 +36375,7 @@ /obj/machinery/holopad, /obj/item/device/radio/beacon, /turf/open/floor/plasteel/black, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bpL" = ( /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -37498,9 +36384,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 2; @@ -37508,9 +36392,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/black, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bpM" = ( /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -37544,9 +36426,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -37621,9 +36501,7 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bpU" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -37640,15 +36518,11 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bpV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 2; @@ -37656,17 +36530,13 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bpW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bpX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -37677,13 +36547,10 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bpY" = ( /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -37693,22 +36560,17 @@ uses = 10 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bpZ" = ( /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bqa" = ( /obj/structure/window/reinforced{ dir = 4 @@ -37718,17 +36580,14 @@ on = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bqb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -37749,8 +36608,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Arrivals APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/yellow{ d2 = 2; @@ -37983,9 +36841,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -38040,8 +36896,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -38074,7 +36929,6 @@ /obj/machinery/door/window{ dir = 2; name = "HoP's Desk"; - pixel_y = 0; req_access_txt = "57" }, /turf/open/floor/wood, @@ -38092,7 +36946,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/wood, @@ -38101,7 +36954,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/darkblue/corner{ @@ -38111,11 +36963,9 @@ "bqG" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = 32 }, /obj/structure/filingcabinet/chestdrawer{ @@ -38153,7 +37003,6 @@ dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 0; pixel_y = -29 }, /turf/open/floor/plasteel/darkblue/side{ @@ -38199,7 +37048,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -29 }, /obj/structure/rack, @@ -38221,7 +37069,6 @@ /obj/item/weapon/wrench, /obj/item/device/multitool, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/darkblue/side{ @@ -38265,8 +37112,7 @@ pixel_y = 3 }, /obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/table/glass, /turf/open/floor/plasteel/black, @@ -38277,8 +37123,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Captain's Quarters APC"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 4; @@ -38289,9 +37134,7 @@ }, /obj/item/weapon/paper{ info = "Congratulations,

Your station has been selected to carry out the Gateway Project.

The equipment will be shipped to you at the start of the next quarter.
You are to prepare a secure location to house the equipment as outlined in the attached documents.

--Nanotrasen Blue Space Research"; - name = "Confidential Correspondence, Pg 1"; - pixel_x = 0; - pixel_y = 0 + name = "Confidential Correspondence, Pg 1" }, /obj/item/weapon/coin/plasma, /obj/item/weapon/melee/chainofcommand, @@ -38328,8 +37171,7 @@ department = "Captain's Desk"; departmentType = 5; name = "Captain RC"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) @@ -38367,8 +37209,7 @@ cell_type = 2500; dir = 8; name = "Art Storage APC"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/structure/cable/yellow{ d2 = 4; @@ -38396,6 +37237,10 @@ "brf" = ( /obj/structure/table, /obj/item/weapon/airlock_painter, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel, /area/storage/art) "brg" = ( @@ -38429,14 +37274,12 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/wood, @@ -38635,8 +37478,7 @@ "brz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sign/securearea{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/black/corner{ dir = 2 @@ -38650,7 +37492,6 @@ /area/engine/break_room) "brB" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -30 }, /obj/machinery/vending/cigarette, @@ -38660,7 +37501,6 @@ /area/engine/break_room) "brC" = ( /obj/machinery/microwave{ - pixel_x = 0; pixel_y = 4 }, /obj/machinery/camera{ @@ -38675,7 +37515,6 @@ /area/engine/break_room) "brD" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/item/weapon/storage/box/donkpockets, @@ -38739,9 +37578,7 @@ "brI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -38752,8 +37589,7 @@ /area/engine/break_room) "brJ" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -38774,8 +37610,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/black, /area/engine/break_room) @@ -38783,8 +37618,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -38800,8 +37634,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/window/reinforced{ dir = 8 @@ -38813,14 +37646,12 @@ /area/space) "brN" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/table/glass, /obj/item/weapon/phone{ @@ -38851,9 +37682,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brQ" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -38878,9 +37707,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brR" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -38892,9 +37719,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brS" = ( /obj/machinery/door/window{ dir = 2; @@ -38905,9 +37730,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brT" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -38916,9 +37739,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brU" = ( /obj/structure/window/reinforced, /obj/structure/showcase{ @@ -38941,33 +37762,25 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "brW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "brX" = ( /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/porta_turret/ai{ @@ -38981,8 +37794,7 @@ dir = 4; name = "Research Monitor"; network = list("RD"); - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/vault{ dir = 1 @@ -38997,7 +37809,6 @@ cell_type = 5000; dir = 2; name = "MiniSat Foyer APC"; - pixel_x = 0; pixel_y = -29 }, /obj/structure/cable/yellow, @@ -39009,9 +37820,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "brZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -39027,7 +37836,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /mob/living/simple_animal/bot/floorbot, @@ -39061,7 +37869,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/porta_turret/ai{ @@ -39071,8 +37878,7 @@ dir = 8; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/vault{ dir = 4 @@ -39086,9 +37892,7 @@ /turf/open/floor/plasteel/darkblue/corner{ dir = 8 }, -/area/ai_monitored/turret_protected/tcomfoyer{ - name = "\improper MiniSat Foyer" - }) +/area/ai_monitored/turret_protected/aisat/foyer) "bsg" = ( /obj/machinery/computer/station_alert, /obj/machinery/light, @@ -39097,18 +37901,14 @@ dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 0; pixel_y = -29 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bsh" = ( /obj/structure/table, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -39117,9 +37917,7 @@ /obj/machinery/computer/monitor, /obj/structure/cable/yellow, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bsi" = ( /obj/machinery/camera/motion{ c_tag = "MiniSat Maintenance"; @@ -39127,8 +37925,7 @@ network = list("MiniSat") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/rack, /obj/item/weapon/storage/toolbox/electrical{ @@ -39138,9 +37935,7 @@ /obj/item/weapon/storage/toolbox/mechanical, /obj/item/device/multitool, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "bsj" = ( /obj/structure/window/reinforced{ dir = 1; @@ -39302,7 +38097,6 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/neutral/corner{ @@ -39351,7 +38145,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -39397,7 +38190,6 @@ initialize_directions = 11 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/neutral/corner{ @@ -39477,7 +38269,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/bed/dogbed{ @@ -39571,14 +38362,12 @@ /obj/machinery/button/door{ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; - pixel_x = 0; pixel_y = -24; req_access_txt = "19" }, /obj/machinery/button/door{ id = "gateshutter"; name = "Gateway Shutter Control"; - pixel_x = 0; pixel_y = -34; req_access_txt = "19" }, @@ -39586,8 +38375,7 @@ /area/bridge) "bsZ" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/vending/snack/random, /turf/open/floor/plasteel/black, @@ -39622,16 +38410,13 @@ /obj/structure/table/wood, /obj/structure/window/reinforced, /obj/machinery/light_switch{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/item/weapon/storage/secure/briefcase{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/lockbox/medal{ - pixel_y = 0 - }, +/obj/item/weapon/storage/lockbox/medal, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "btd" = ( @@ -39679,8 +38464,7 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) @@ -39927,8 +38711,7 @@ "btD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/securearea{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel, /area/engine/break_room) @@ -39938,7 +38721,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /obj/structure/chair/office/dark{ @@ -39949,9 +38731,7 @@ "btF" = ( /obj/machinery/airalarm{ dir = 4; - locked = 0; - pixel_x = -23; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/light{ icon_state = "tube1"; @@ -39961,8 +38741,7 @@ /area/engine/break_room) "btG" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/table/glass, /obj/item/weapon/folder/blue{ @@ -39974,7 +38753,6 @@ dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/plasteel/darkblue/corner, @@ -40044,9 +38822,7 @@ "btP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -40075,7 +38851,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -40440,8 +39215,7 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/darkblue/corner, /area/bridge) @@ -40507,8 +39281,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -40519,8 +39292,7 @@ req_access_txt = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ @@ -40579,11 +39351,9 @@ /obj/machinery/computer/arcade, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/wood, @@ -40641,9 +39411,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -40697,7 +39465,6 @@ freerange = 1; listening = 0; name = "Custom Channel"; - pixel_x = 0; pixel_y = -27 }, /obj/item/device/radio/intercom{ @@ -40821,9 +39588,7 @@ "bvp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/camera{ c_tag = "Engineering - Transit Tube Access"; @@ -40845,17 +39610,14 @@ dir = 4 }, /obj/item/weapon/tank/internals/emergency_oxygen{ - pixel_x = -8; - pixel_y = 0 + pixel_x = -8 }, /obj/item/clothing/mask/breath{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/black, /area/engine/break_room) @@ -40872,9 +39634,7 @@ /area/engine/break_room) "bvt" = ( /turf/closed/wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bvu" = ( /obj/structure/table/wood, /obj/machinery/light/small{ @@ -40907,7 +39667,6 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /turf/open/floor/plasteel/grimy, @@ -40923,7 +39682,6 @@ /area/tcommsat/computer) "bvy" = ( /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 28 }, /obj/structure/showcase{ @@ -40933,7 +39691,6 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /turf/open/floor/plasteel/grimy, @@ -40941,7 +39698,6 @@ "bvz" = ( /obj/structure/table/wood, /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = 31 }, /obj/item/device/flashlight/lamp, @@ -40955,7 +39711,6 @@ dir = 8; freerange = 1; name = "Station Intercom (Telecoms)"; - pixel_x = 0; pixel_y = 30 }, /obj/structure/table/wood, @@ -40986,7 +39741,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -41171,8 +39925,7 @@ /area/hallway/primary/port) "bvV" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/neutral/side{ dir = 4 @@ -41180,15 +39933,11 @@ /area/hallway/primary/port) "bvW" = ( /turf/closed/wall, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bvX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bvY" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -41204,8 +39953,7 @@ "bwa" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/decal/cleanable/cobweb, /obj/item/device/flashlight/lamp/green{ @@ -41250,7 +39998,6 @@ "bwg" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/folder, @@ -41262,8 +40009,7 @@ "bwh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -41392,7 +40138,6 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/black, @@ -41402,7 +40147,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light{ @@ -41444,8 +40188,7 @@ }, /obj/item/weapon/pen, /obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/black, /area/bridge) @@ -41615,8 +40358,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/chem_dispenser/drinks, /obj/structure/sign/barsign{ @@ -41638,7 +40380,6 @@ /obj/machinery/requests_console{ department = "Bar"; departmentType = 2; - pixel_x = 0; pixel_y = 30; receive_ore_updates = 1 }, @@ -41657,7 +40398,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/bar, @@ -41678,7 +40418,6 @@ desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; icon_state = "monkey_painting"; name = "Mr. Deempisi portrait"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/disposalpipe/trunk{ @@ -41686,8 +40425,7 @@ }, /obj/machinery/disposal/bin, /obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) @@ -41696,7 +40434,6 @@ cell_type = 5000; dir = 1; name = "Bar APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -41704,8 +40441,7 @@ icon_state = "0-4" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -41735,7 +40471,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/structure/cable/yellow{ @@ -41766,8 +40501,7 @@ "bwW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, @@ -41792,8 +40526,7 @@ "bwZ" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -41816,8 +40549,7 @@ /area/hallway/primary/starboard) "bxb" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -41896,15 +40628,13 @@ /area/engine/atmos) "bxm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/light/small{ @@ -41957,8 +40687,7 @@ dir = 8; name = "Telecoms Camera Monitor"; network = list("tcomm"); - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/computer/telecomms/monitor{ network = "tcommsat" @@ -41979,7 +40708,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, @@ -42009,7 +40737,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, @@ -42091,7 +40818,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -25 }, /turf/open/floor/plasteel/arrival{ @@ -42124,9 +40850,7 @@ "bxH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -42139,7 +40863,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/neutral/side, @@ -42158,7 +40881,6 @@ "bxJ" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral/side{ @@ -42223,9 +40945,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bxP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -42241,9 +40961,7 @@ pixel_y = 28 }, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bxQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -42256,9 +40974,7 @@ }, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bxS" = ( /obj/item/weapon/cigbutt, /obj/machinery/power/apc{ @@ -42293,8 +41009,7 @@ "bxU" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/wood, /area/library) @@ -42388,8 +41103,7 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/darkblue/corner, /area/bridge) @@ -42505,7 +41219,6 @@ "byt" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ @@ -42554,7 +41267,6 @@ }, /obj/machinery/flasher{ id = "AI"; - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/plasteel/vault{ @@ -42668,7 +41380,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Theatre APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -42707,7 +41418,6 @@ /obj/machinery/power/apc{ dir = 2; name = "MiniSat Maint APC"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -42719,9 +41429,7 @@ layer = 3.1 }, /turf/open/floor/plasteel/black, -/area/ai_monitored/storage/secure{ - name = "MiniSat Maintenance" - }) +/area/ai_monitored/storage/satellite) "byP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/device/radio/beacon, @@ -42758,7 +41466,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light{ @@ -42802,7 +41509,6 @@ /area/engine/atmos) "byV" = ( /obj/structure/sign/atmosplaque{ - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/phone{ @@ -42815,8 +41521,7 @@ }, /obj/structure/table, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/caution{ dir = 5 @@ -42836,8 +41541,7 @@ pixel_y = 23 }, /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/caution{ dir = 8 @@ -42848,7 +41552,6 @@ cell_type = 10000; dir = 1; name = "Atmospherics APC"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/yellow{ @@ -42910,9 +41613,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/caution{ dir = 1 @@ -42993,9 +41694,7 @@ dir = 5 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bzl" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -43006,9 +41705,7 @@ layer = 2.9 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bzm" = ( /obj/structure/window/reinforced{ dir = 1; @@ -43030,15 +41727,12 @@ on = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bzn" = ( /obj/machinery/computer/message_monitor, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) @@ -43086,9 +41780,7 @@ "bzs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -43103,8 +41795,7 @@ cell_type = 5000; dir = 4; name = "Telecoms Control Room APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/computer/telecomms/server{ network = "tcommsat" @@ -43132,18 +41823,14 @@ network = list("MiniSat") }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bzv" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bzw" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -43190,17 +41877,13 @@ dir = 8 }, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bzB" = ( /obj/structure/mirror{ pixel_x = 28 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bzC" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -43275,14 +41958,12 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/bot, @@ -43292,7 +41973,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/bot, @@ -43303,7 +41983,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/effect/turf_decal/bot, @@ -43366,7 +42045,6 @@ id = "council blast"; name = "Council Chamber Blast Door Control"; pixel_x = -28; - pixel_y = 0; req_access_txt = "19" }, /turf/open/floor/plasteel/black, @@ -43409,7 +42087,6 @@ "bzZ" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/cigarette{ @@ -43451,8 +42128,7 @@ /area/crew_quarters/heads/captain/private) "bAd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -43462,7 +42138,6 @@ dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); - pixel_x = 0; pixel_y = -29 }, /mob/living/simple_animal/pet/fox/Renault, @@ -43472,7 +42147,6 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/carpet, @@ -43485,8 +42159,7 @@ scrub_Toxins = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -43505,8 +42178,7 @@ /obj/structure/table/reinforced, /obj/item/weapon/lighter, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31; - pixel_y = 0 + pixel_x = -31 }, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) @@ -43536,8 +42208,7 @@ "bAn" = ( /obj/structure/table/reinforced, /obj/item/weapon/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/item/weapon/reagent_containers/food/condiment/peppermill{ pixel_x = 3 @@ -43610,9 +42281,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/crew_quarters/theatre) @@ -43668,12 +42337,10 @@ /area/engine/atmos) "bAB" = ( /obj/item/clothing/mask/breath{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /obj/item/weapon/tank/internals/emergency_oxygen{ - pixel_x = -8; - pixel_y = 0 + pixel_x = -8 }, /obj/structure/table, /turf/open/floor/plasteel/caution{ @@ -43683,9 +42350,7 @@ "bAC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -43708,8 +42373,7 @@ department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/caution{ dir = 4 @@ -43830,7 +42494,6 @@ /area/space) "bAU" = ( /obj/machinery/microwave{ - pixel_x = 0; pixel_y = 4 }, /obj/structure/table/wood, @@ -43848,7 +42511,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 31 }, /obj/item/weapon/folder/blue, @@ -43892,7 +42554,6 @@ department = "Telecoms Admin"; departmentType = 5; name = "Telecoms RC"; - pixel_x = 0; pixel_y = -30 }, /obj/machinery/firealarm{ @@ -43938,8 +42599,7 @@ "bBf" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/weapon/folder, @@ -43984,9 +42644,7 @@ pixel_y = 29 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bBm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -43995,23 +42653,17 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bBn" = ( /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bBo" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet1"; name = "Unit 1" }, /turf/open/floor/plasteel, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bBp" = ( /obj/structure/toilet{ pixel_y = 8 @@ -44024,18 +42676,14 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bBq" = ( /obj/structure/rack, /obj/item/device/flashlight, @@ -44045,8 +42693,7 @@ "bBr" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/displaycase/trophy, /turf/open/floor/wood, @@ -44065,7 +42712,6 @@ "bBu" = ( /obj/machinery/vending/coffee, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/wood, @@ -44097,14 +42743,12 @@ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; - icon_state = "direction_eng"; - pixel_y = 0 + icon_state = "direction_eng" }, /turf/closed/wall, /area/hallway/secondary/command) @@ -44356,14 +43000,12 @@ /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; - icon_state = "direction_eng"; - pixel_y = 0 + icon_state = "direction_eng" }, /obj/structure/sign/directions/security{ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /obj/structure/sign/directions/engineering{ @@ -44720,17 +43362,14 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/open/floor/plating, /area/hallway/secondary/entry) "bCH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -44738,8 +43377,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/arrival{ dir = 4 @@ -44775,9 +43413,7 @@ "bCL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/security/vacantoffice) @@ -44793,18 +43429,19 @@ /area/security/vacantoffice) "bCP" = ( /obj/machinery/light/small, +/obj/machinery/camera{ + c_tag = "Auxilary Restrooms"; + dir = 4; + network = list("SS13") + }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bCQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bCR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -44817,18 +43454,14 @@ }, /obj/structure/cable/yellow, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bCS" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bCT" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green{ @@ -44836,8 +43469,7 @@ pixel_y = 5 }, /obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/wood, /area/library) @@ -44989,7 +43621,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/plasteel/neutral/corner{ @@ -45003,7 +43634,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -45080,7 +43710,6 @@ cell_type = 10000; dir = 1; name = "Command Hallway APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -45135,7 +43764,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/machinery/camera{ @@ -45154,7 +43782,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -45259,8 +43886,7 @@ "bDD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) @@ -45468,7 +44094,6 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; pixel_y = 20 }, /turf/open/floor/plasteel/black{ @@ -45532,8 +44157,7 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/arrival{ dir = 4 @@ -45581,18 +44205,14 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bEu" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet2"; name = "Unit 2" }, /turf/open/floor/plasteel, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bEv" = ( /obj/structure/toilet{ pixel_y = 8 @@ -45605,22 +44225,17 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bEw" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/camera/autoname{ dir = 4; @@ -45780,7 +44395,6 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /obj/machinery/camera{ @@ -46073,7 +44687,6 @@ icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/neutral/corner{ @@ -46732,9 +45345,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - Mix"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/vacuum, /area/engine/atmos) @@ -46795,39 +45406,32 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/wood, /area/security/vacantoffice) "bGl" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/button/door{ id = "AuxShower"; name = "Lock Control"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 25; req_access_txt = "0"; specialfunctions = 4 }, /obj/item/weapon/soap/nanotrasen, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bGm" = ( /obj/machinery/shower{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bGp" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -46869,17 +45473,14 @@ "bGu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/library) "bGv" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; - pixel_x = 0 + name = "Station Intercom (General)" }, /turf/closed/wall, /area/library) @@ -46913,14 +45514,10 @@ name = "escape arm" }, /turf/closed/wall/r_wall, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bGy" = ( /turf/closed/wall/r_wall, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bGz" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -46930,15 +45527,11 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bGA" = ( /obj/structure/sign/securearea, /turf/closed/wall/r_wall, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bGB" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -46958,9 +45551,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bGC" = ( /turf/closed/wall/r_wall, /area/teleporter) @@ -47041,8 +45632,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/camera{ c_tag = "Command Hallway - Central"; @@ -47088,7 +45678,6 @@ "bGR" = ( /obj/machinery/vending/cigarette, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -29 }, /turf/open/floor/plasteel/vault, @@ -47515,7 +46104,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/arrival{ @@ -47552,7 +46140,6 @@ /area/security/vacantoffice) "bHN" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/light/small, @@ -47560,32 +46147,24 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bHO" = ( /obj/machinery/shower{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bHP" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet3"; name = "Unit 3" }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bHQ" = ( /obj/structure/toilet{ pixel_y = 8 @@ -47598,19 +46177,15 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; - pixel_y = 0; req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/effect/landmark/blobstart, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bHR" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/wood, @@ -47661,32 +46236,25 @@ "bHY" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bHZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bIa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bIb" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -47698,9 +46266,7 @@ dir = 5 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bIc" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light_switch{ @@ -47710,22 +46276,17 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bId" = ( /turf/closed/wall, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bIe" = ( /obj/structure/table, /obj/item/weapon/hand_tele, /obj/item/device/radio/beacon, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/vault{ dir = 4 @@ -47846,8 +46407,7 @@ "bIm" = ( /obj/structure/closet/secure_closet/exile, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/bot{ dir = 1 @@ -47907,8 +46467,7 @@ cell_type = 5000; dir = 4; name = "Gateway APC"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/cable/yellow{ d2 = 8; @@ -47940,8 +46499,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -47957,8 +46515,7 @@ /obj/structure/table, /obj/item/clothing/head/hardhat/cakehat, /obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/machinery/airalarm{ dir = 1; @@ -47971,7 +46528,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /turf/open/floor/plasteel/bar, @@ -48217,8 +46773,7 @@ /area/engine/atmos) "bIY" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -48424,8 +46979,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/wood, /area/security/vacantoffice) @@ -48484,8 +47038,7 @@ "bJC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -48496,9 +47049,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bJE" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -48508,9 +47059,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bJF" = ( /obj/structure/table, /obj/item/weapon/storage/belt/utility, @@ -48521,9 +47070,7 @@ /obj/item/device/radio/off, /obj/item/device/multitool, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bJG" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -48535,9 +47082,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bJH" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/firealarm{ @@ -48547,9 +47092,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bJI" = ( /obj/structure/window/reinforced, /obj/structure/table, @@ -48785,7 +47328,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault{ @@ -48865,8 +47407,7 @@ name = "Serving Hatch" }, /obj/item/weapon/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/item/weapon/reagent_containers/food/condiment/peppermill{ pixel_x = 3 @@ -48920,7 +47461,6 @@ network = list("SS13") }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -29 }, /obj/item/clothing/mask/cigarette/pipe, @@ -48981,8 +47521,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/caution{ dir = 8 @@ -49064,8 +47603,7 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/escape{ dir = 4 @@ -49148,9 +47686,7 @@ dir = 8 }, /turf/open/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bKR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -49174,9 +47710,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bKS" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-06"; @@ -49384,9 +47918,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bLn" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -49397,9 +47929,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bLo" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -49407,9 +47937,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bLp" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -49421,15 +47949,12 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bLq" = ( /obj/machinery/door/window/northleft{ dir = 8; name = "Magboot Storage"; pixel_x = -1; - pixel_y = 0; req_access_txt = "19" }, /obj/structure/window/reinforced{ @@ -49444,10 +47969,7 @@ pixel_x = -4; pixel_y = 3 }, -/obj/item/clothing/shoes/magboots{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots{ pixel_x = 4; pixel_y = -3 @@ -49455,9 +47977,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bLr" = ( /obj/machinery/teleport/hub, /turf/open/floor/plating, @@ -49490,7 +48010,6 @@ dir = 8; name = "Disposals Chute"; pixel_x = -1; - pixel_y = 0; req_access_txt = "0" }, /obj/machinery/disposal/deliveryChute{ @@ -49538,12 +48057,9 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "bLy" = ( -/obj/structure/closet/secure_closet/medical1{ - pixel_x = 0 - }, +/obj/structure/closet/secure_closet/medical1, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/turf_decal/bot{ @@ -49623,8 +48139,7 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Starboard - Kitchen"; @@ -49645,7 +48160,6 @@ id = "kitchenwindow"; name = "Window Shutter Control"; pixel_x = -26; - pixel_y = 0; req_access_txt = "28" }, /turf/open/floor/plasteel/cafeteria{ @@ -49734,15 +48248,13 @@ "bLQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/wood, /area/crew_quarters/theatre) "bLR" = ( /obj/structure/dresser, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/wood, @@ -49786,7 +48298,6 @@ /obj/item/weapon/stock_parts/subspace/analyzer, /obj/item/weapon/stock_parts/subspace/analyzer, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/black, @@ -49848,7 +48359,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/camera{ @@ -49901,8 +48411,7 @@ on = 1 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/escape{ @@ -49929,17 +48438,14 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2O"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/n2o, /area/engine/atmos) "bMo" = ( /obj/machinery/airalarm/server{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/light/small{ dir = 8 @@ -49993,8 +48499,7 @@ cell_type = 5000; dir = 4; name = "Telecoms Server Room APC"; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/light/small{ dir = 4 @@ -50021,9 +48526,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bMu" = ( /obj/machinery/camera{ c_tag = "Arrivals - Aft Arm - Far"; @@ -50048,7 +48551,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -25 }, /obj/effect/turf_decal/stripes/line, @@ -50272,7 +48774,6 @@ dir = 4; name = "RCD Storage"; pixel_x = 1; - pixel_y = 0; req_access_txt = "19" }, /obj/structure/window/reinforced, @@ -50283,17 +48784,13 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bMT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bMU" = ( /obj/structure/tank_dispenser/oxygen{ layer = 2.9; @@ -50301,9 +48798,7 @@ pixel_y = 2 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bMV" = ( /obj/machinery/camera/motion{ c_tag = "E.V.A. Storage"; @@ -50311,8 +48806,7 @@ }, /obj/machinery/requests_console{ department = "EVA"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4; @@ -50323,15 +48817,12 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bMW" = ( /obj/machinery/teleport/station, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plating, /area/teleporter) @@ -50389,7 +48880,6 @@ desc = "A guide to the exhibit, detailing the constructive and destructive applications of modern repair drones, as well as the development of the uncorruptable cyborg servants of tomorrow, available today."; icon_state = "kiddieplaque"; name = "\improper 'Perfect Drone' sign"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/droneDispenser, @@ -50442,7 +48932,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/wood, @@ -50457,7 +48946,6 @@ /area/bridge/showroom/corporate) "bNg" = ( /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 24 }, /obj/machinery/light/small{ @@ -50514,7 +49002,6 @@ desc = "A guide to the exhibit, explaining how recent developments in loyalty implant and cloning technologies by NanoTrasen Corporation have led to the development and the effective immortality of the 'perfect man', the loyal Nanotrasen Employee."; icon_state = "kiddieplaque"; name = "\improper 'Perfect Man' sign"; - pixel_x = 0; pixel_y = 32 }, /obj/structure/window/reinforced, @@ -50534,7 +49021,6 @@ icon_state = "implantchair"; layer = 2.7; name = "NanoTrasen automated loyalty implanter exhibit"; - pixel_x = 0; pixel_y = 4 }, /turf/open/floor/carpet, @@ -50545,8 +49031,7 @@ "bNm" = ( /obj/structure/bed/roller, /obj/machinery/vending/wallmed{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/camera{ c_tag = "Gateway - Atrium"; @@ -50578,8 +49063,7 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/effect/turf_decal/bot{ dir = 1 @@ -50725,8 +49209,7 @@ /area/crew_quarters/kitchen) "bND" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/plasteel/showroomfloor, @@ -50768,7 +49251,6 @@ /obj/structure/table/wood, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/wood, @@ -50786,8 +49268,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Telecoms Storage APC"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/cable/yellow{ d2 = 4; @@ -50798,9 +49279,7 @@ "bNM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -50837,8 +49316,7 @@ /area/engine/atmos) "bNQ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable/yellow{ @@ -50854,8 +49332,7 @@ /area/engine/atmos) "bNS" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/atmospherics/components/binary/pump{ dir = 0; @@ -50911,9 +49388,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bNX" = ( /obj/machinery/telecomms/server/presets/common, /turf/open/floor/circuit{ @@ -51071,7 +49546,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/item/stack/sheet/glass{ @@ -51089,18 +49563,14 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bOp" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bOq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -51120,15 +49590,12 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bOs" = ( /obj/machinery/door/window/northleft{ dir = 8; name = "Jetpack Storage"; pixel_x = -1; - pixel_y = 0; req_access_txt = "19" }, /obj/structure/window/reinforced, @@ -51140,10 +49607,7 @@ pixel_x = 4; pixel_y = -1 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/tank/jetpack/carbondioxide, /obj/item/weapon/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = 1 @@ -51151,9 +49615,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bOt" = ( /obj/machinery/computer/teleporter, /turf/open/floor/plating, @@ -51277,8 +49739,7 @@ cell_type = 5000; dir = 4; name = "Nanotrasen Corporate Showroom APC"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/cable/yellow{ d1 = 1; @@ -51356,8 +49817,7 @@ /area/gateway) "bON" = ( /obj/structure/sign/securearea{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/cable/yellow{ d1 = 1; @@ -51426,8 +49886,7 @@ /area/crew_quarters/kitchen) "bOW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/plasteel/cafeteria{ @@ -51444,8 +49903,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51498,9 +49956,7 @@ "bPe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -51685,8 +50141,7 @@ on = 0 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -51891,8 +50346,7 @@ "bPV" = ( /obj/structure/destructible/cult/tome, /obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/item/clothing/under/suit_jacket/red, /obj/effect/decal/cleanable/cobweb, @@ -51909,8 +50363,7 @@ dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/closet/crate, /obj/item/clothing/shoes/workboots/mining, @@ -51924,7 +50377,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner{ @@ -51943,9 +50395,7 @@ maxcharge = 15000 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bQa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -51957,9 +50407,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bQb" = ( /obj/structure/cable/yellow, /obj/machinery/shieldwallgen, @@ -51968,8 +50416,7 @@ pixel_y = 2 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/vault{ dir = 4 @@ -52028,8 +50475,7 @@ /obj/structure/table/wood, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/carpet, /area/bridge/showroom/corporate) @@ -52267,8 +50713,7 @@ "bQz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -52311,9 +50756,7 @@ "bQD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -52373,8 +50816,7 @@ /obj/machinery/requests_console{ department = "Kitchen"; departmentType = 2; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/processor, /turf/open/floor/plasteel/cafeteria{ @@ -52403,13 +50845,10 @@ "bQN" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "bQQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/weapon/wrench, @@ -52458,8 +50897,7 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/purple, /area/engine/atmos) @@ -52483,9 +50921,7 @@ "bRa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bRb" = ( /obj/machinery/computer/crew{ icon_keyboard = "syndi_key" @@ -52525,8 +50961,7 @@ "bRg" = ( /obj/machinery/holopad, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/wood, /area/library) @@ -52553,8 +50988,7 @@ /area/library) "bRk" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/photocopier, /obj/machinery/light{ @@ -52573,9 +51007,7 @@ /turf/open/floor/engine/cult, /area/library) "bRm" = ( -/obj/item/device/taperecorder{ - pixel_y = 0 - }, +/obj/item/device/taperecorder, /obj/item/device/camera, /obj/item/device/radio/intercom{ pixel_y = -25 @@ -52605,25 +51037,19 @@ dir = 10 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bRq" = ( /obj/effect/turf_decal/stripes/line{ dir = 2 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bRr" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bRs" = ( /obj/structure/cable/yellow, /obj/machinery/shieldwallgen, @@ -52658,8 +51084,7 @@ }, /obj/structure/table/wood, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/weapon/folder/blue, /obj/item/clothing/head/collectable/HoP{ @@ -52697,7 +51122,6 @@ icon = 'icons/obj/kitchen.dmi'; icon_state = "mw"; name = "NanoTrasen-brand microwave"; - pixel_x = 0; pixel_y = 2 }, /obj/structure/table/wood, @@ -52826,7 +51250,6 @@ }, /obj/item/weapon/disk/design_disk{ name = "component design disk"; - pixel_x = 0; pixel_y = 6 }, /obj/structure/table/wood, @@ -52915,7 +51338,6 @@ /obj/machinery/button/door{ id = "gateshutter"; name = "Gateway Shutter Control"; - pixel_x = 0; pixel_y = -26; req_access_txt = "19" }, @@ -52935,7 +51357,6 @@ "bRM" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ @@ -52973,8 +51394,7 @@ /obj/item/weapon/reagent_containers/food/snacks/mint, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/power/apc{ dir = 2; @@ -53005,7 +51425,6 @@ /obj/machinery/button/door{ id = "kitchenhydro"; name = "Service Shutter Control"; - pixel_x = 0; pixel_y = -24; req_access_txt = "28" }, @@ -53016,8 +51435,7 @@ "bRS" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/item/weapon/reagent_containers/food/condiment/peppermill{ pixel_x = 3 @@ -53037,7 +51455,6 @@ /area/crew_quarters/kitchen) "bRT" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /obj/structure/table, @@ -53201,8 +51618,7 @@ /area/maintenance/starboard) "bSg" = ( /obj/structure/fireaxecabinet{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/camera{ c_tag = "Atmospherics - Port"; @@ -53223,8 +51639,7 @@ /obj/machinery/portable_atmospherics/canister, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/bot{ dir = 1 @@ -53249,8 +51664,7 @@ on = 1 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/purple, @@ -53268,9 +51682,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - Toxins"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/plasma, /area/engine/atmos) @@ -53317,8 +51729,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plating, /area/maintenance/port) @@ -53416,8 +51827,7 @@ /area/maintenance/port) "bSx" = ( /obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/wood, /area/library) @@ -53477,9 +51887,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bSF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ @@ -53490,14 +51898,11 @@ id = "evashutter"; name = "E.V.A. Storage Shutter Control"; pixel_x = 30; - pixel_y = 0; req_access_txt = "19" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "bSG" = ( /obj/machinery/door/poddoor/shutters{ id = "teleshutter"; @@ -53761,8 +52166,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -53792,8 +52196,7 @@ department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable/yellow{ @@ -53803,7 +52206,6 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel, @@ -53835,9 +52237,7 @@ /obj/structure/lattice/catwalk, /obj/structure/window/reinforced, /turf/open/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bTn" = ( /turf/closed/wall, /area/maintenance/solars/port/aft) @@ -53858,8 +52258,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/closed/wall, /area/maintenance/solars/port/aft) @@ -53905,9 +52304,7 @@ "bTw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/wood, /area/library) @@ -54004,8 +52401,7 @@ "bTD" = ( /obj/machinery/vending/snack/random, /obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/black, /area/hallway/primary/central) @@ -54099,7 +52495,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/effect/turf_decal/stripes/corner{ @@ -54118,7 +52513,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -54180,7 +52574,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -54241,7 +52634,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/plasteel/neutral/corner{ @@ -54256,7 +52648,6 @@ /obj/machinery/button/door{ id = "gateshutter"; name = "Gateway Shutter Control"; - pixel_x = 0; pixel_y = 26; req_access_txt = "19" }, @@ -54331,7 +52722,6 @@ /obj/structure/noticeboard{ desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; name = "requests board"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line, @@ -54394,8 +52784,7 @@ /area/hydroponics) "bUn" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/effect/turf_decal/stripes/line, /obj/structure/reagent_dispensers/watertank/high, @@ -54585,7 +52974,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/pipedispenser/disposal/transit_tube, @@ -54629,8 +53017,7 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -54661,9 +53048,7 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bUL" = ( /obj/machinery/telecomms/server/presets/security, /turf/open/floor/circuit{ @@ -54677,9 +53062,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "bUN" = ( /obj/machinery/power/apc{ dir = 8; @@ -54807,8 +53190,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -54974,8 +53356,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -55085,9 +53466,7 @@ "bVy" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/turf_decal/bot{ dir = 2 @@ -55223,8 +53602,7 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/vault, /area/engine/atmos) @@ -55263,8 +53641,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -55510,7 +53887,6 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/neutral/corner{ @@ -55685,7 +54061,6 @@ dir = 2 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /obj/machinery/camera{ @@ -55838,8 +54213,7 @@ /area/hydroponics) "bWV" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/closet/wardrobe/botanist, /turf/open/floor/plasteel/hydrofloor, @@ -56055,9 +54429,7 @@ "bXl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/general/visible{ color = "#330000"; @@ -56102,8 +54474,7 @@ on = 1 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/vault, @@ -56121,9 +54492,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - CO2"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/co2, /area/engine/atmos) @@ -56157,8 +54526,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -56259,8 +54627,7 @@ /area/security/checkpoint/medical) "bXM" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "applebush"; @@ -56454,9 +54821,7 @@ "bYi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -56481,8 +54846,7 @@ pixel_y = 5 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/light{ icon_state = "tube1"; @@ -56509,7 +54873,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark/start/botanist, @@ -56559,8 +54922,7 @@ /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/vault{ dir = 1 @@ -56611,8 +54973,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/camera{ c_tag = "Atmospherics - Port-Aft"; @@ -56649,8 +55010,6 @@ node1_concentration = 0.8; node2_concentration = 0.2; on = 1; - pixel_x = 0; - pixel_y = 0; target_pressure = 4500 }, /turf/open/floor/plasteel, @@ -56679,8 +55038,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -56710,7 +55068,6 @@ }, /obj/item/weapon/pen, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /obj/effect/spawner/lootdrop/maintenance, @@ -56811,8 +55168,7 @@ pixel_y = 2 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/weapon/reagent_containers/glass/bottle/morphine, /obj/item/weapon/reagent_containers/syringe/epinephrine{ @@ -56830,7 +55186,6 @@ pixel_y = 6 }, /obj/structure/sign/nosmoking_2{ - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/whiteblue/side{ @@ -56859,7 +55214,6 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = 0; pixel_y = 30 }, /obj/structure/closet/wardrobe/white/medical, @@ -56879,8 +55233,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Medical Security Checkpoint APC"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/airalarm{ pixel_y = 28 @@ -56920,8 +55273,7 @@ /obj/item/weapon/pen, /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/item/weapon/folder/red, /obj/item/weapon/book/manual/wiki/security_space_law{ @@ -56943,15 +55295,11 @@ /obj/structure/grille, /obj/structure/window/fulltile, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "bZb" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "bZc" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -56965,31 +55313,25 @@ /turf/open/floor/plasteel/white/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "bZd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "bZe" = ( /obj/structure/sign/directions/security{ desc = "A direction sign, pointing out which way the security department is."; dir = 1; icon_state = "direction_sec"; - pixel_x = 0; pixel_y = 8 }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the engineering department is."; dir = 4; - icon_state = "direction_eng"; - pixel_y = 0 + icon_state = "direction_eng" }, /obj/structure/sign/directions/engineering{ desc = "A direction sign, pointing out which way the bridge is."; @@ -56999,9 +55341,7 @@ pixel_y = -8 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "bZf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 @@ -57108,8 +55448,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, /obj/item/weapon/reagent_containers/food/snacks/grown/grapes, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/table/glass, /turf/open/floor/plasteel/hydrofloor, @@ -57132,7 +55471,6 @@ /area/hallway/primary/central) "bZt" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -57150,8 +55488,7 @@ "bZv" = ( /obj/machinery/biogenerator, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -57161,8 +55498,7 @@ "bZw" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) @@ -57276,8 +55612,7 @@ /area/engine/atmos) "bZM" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -57297,8 +55632,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating/airless, /area/maintenance/solars/port/aft) @@ -57469,9 +55803,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -57507,9 +55839,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "caj" = ( /obj/machinery/light/small{ dir = 1 @@ -57535,17 +55865,13 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cak" = ( /obj/structure/chair, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cal" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -57556,24 +55882,18 @@ req_access_txt = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cam" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "can" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cao" = ( /obj/structure/table, /obj/item/weapon/storage/box/bodybags{ @@ -57583,9 +55903,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cap" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -57594,9 +55912,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "caq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 @@ -57703,7 +56019,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light/small{ @@ -57749,7 +56064,6 @@ id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -7; - pixel_y = 0; req_access_txt = "47" }, /obj/machinery/button/door{ @@ -57793,7 +56107,6 @@ pixel_x = -24 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -57945,9 +56258,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -58030,10 +56341,7 @@ /area/maintenance/starboard) "caX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/light_switch{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/machinery/light_switch, /turf/closed/wall, /area/maintenance/disposal/incinerator) "caY" = ( @@ -58059,7 +56367,6 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/structure/sign/deathsposal{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/floorgrime, @@ -58086,12 +56393,10 @@ /area/engine/atmos) "cbc" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 8 @@ -58138,8 +56443,7 @@ /area/engine/atmos) "cbg" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -58195,8 +56499,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window/northleft{ dir = 1; @@ -58269,8 +56572,7 @@ /area/engine/atmos) "cbo" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -58323,8 +56625,7 @@ /area/maintenance/port/aft) "cbt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -58546,8 +56847,6 @@ department = "Medbay"; departmentType = 1; name = "Medbay RC"; - pixel_x = 0; - pixel_y = 0; pixel_z = 0 }, /turf/closed/wall, @@ -58559,7 +56858,6 @@ dir = 1; name = "Medbay Monitor"; network = list("Medbay"); - pixel_x = 0; pixel_y = -29 }, /obj/item/device/radio/intercom{ @@ -58600,9 +56898,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cbU" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -58614,14 +56910,10 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cbV" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -58632,9 +56924,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cbW" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -58646,47 +56936,35 @@ }, /obj/machinery/holopad, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cbX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cbY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cbZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cca" = ( /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ccb" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ccc" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white/side{ @@ -58870,7 +57148,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Hydroponics APC"; - pixel_x = 0; pixel_y = -28 }, /obj/structure/cable/yellow, @@ -58913,7 +57190,6 @@ /area/hydroponics) "ccA" = ( /obj/item/weapon/reagent_containers/spray/plantbgone{ - pixel_x = 0; pixel_y = 3 }, /obj/item/weapon/reagent_containers/spray/plantbgone{ @@ -59156,7 +57432,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/light/small{ @@ -59316,8 +57591,7 @@ /area/maintenance/port/aft) "cdp" = ( /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/light/small{ dir = 8 @@ -59379,15 +57653,12 @@ /area/medical/storage) "cdv" = ( /obj/item/weapon/storage/belt/medical{ - pixel_x = 0; pixel_y = 2 }, /obj/item/weapon/storage/belt/medical{ - pixel_x = 0; pixel_y = 2 }, /obj/item/weapon/storage/belt/medical{ - pixel_x = 0; pixel_y = 2 }, /obj/item/clothing/neck/stethoscope, @@ -59400,15 +57671,11 @@ /area/medical/storage) "cdw" = ( /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdx" = ( /obj/machinery/computer/crew, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdy" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -59420,35 +57687,27 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdz" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8; initialize_directions = 11 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59459,35 +57718,27 @@ name = "Inspector Johnson" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdD" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdE" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdF" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -59496,9 +57747,7 @@ /turf/open/floor/plasteel/white/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cdG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 @@ -59518,9 +57767,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -59595,8 +57842,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/science/research) @@ -59652,8 +57898,7 @@ /area/security/checkpoint/science/research) "cdS" = ( /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/chair{ dir = 8 @@ -59661,8 +57906,7 @@ /obj/machinery/camera{ c_tag = "Security Post - Research Division"; dir = 8; - network = list("SS13","RD"); - pixel_x = 0 + network = list("SS13","RD") }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -59755,9 +57999,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) @@ -59778,8 +58020,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -59788,8 +58029,7 @@ /area/maintenance/disposal/incinerator) "cef" = ( /obj/structure/sign/fire{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/atmospherics/components/binary/pump{ dir = 2; @@ -59832,7 +58072,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -59873,8 +58112,7 @@ /obj/structure/girder, /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/yellow{ d1 = 1; @@ -59953,9 +58191,7 @@ "cex" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -59993,7 +58229,6 @@ "ceA" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -60010,15 +58245,12 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 9 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceB" = ( /obj/structure/chair/office/light{ dir = 4 @@ -60035,9 +58267,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 5 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceC" = ( /obj/machinery/telecomms/server/presets/command, /turf/open/floor/circuit{ @@ -60057,17 +58287,13 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceF" = ( /obj/structure/bed/roller, /obj/item/device/radio/intercom{ @@ -60076,7 +58302,6 @@ frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; - pixel_x = 0; pixel_y = -30 }, /obj/machinery/camera{ @@ -60087,26 +58312,20 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceG" = ( /obj/machinery/light, /obj/structure/bed/roller, /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceH" = ( /obj/structure/bed/roller, /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceI" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-11" @@ -60114,16 +58333,12 @@ /turf/open/floor/plasteel/whiteyellow/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceJ" = ( /turf/open/floor/plasteel/whiteyellow/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceK" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -60137,9 +58352,7 @@ /turf/open/floor/plasteel/whiteyellow/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ceL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -60214,7 +58427,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -60244,14 +58456,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 2 @@ -60273,9 +58482,7 @@ "ceW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) @@ -60540,8 +58747,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/binary/pump{ @@ -60661,7 +58867,6 @@ dir = 1 }, /obj/structure/sign/nosmoking_2{ - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/vault, @@ -60725,8 +58930,7 @@ icon_state = "0-4" }, /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/light/small, /obj/structure/table/glass, @@ -60797,40 +59001,31 @@ "cfQ" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/side{ dir = 10 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cfR" = ( /obj/structure/chair/office/light{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 6 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cfS" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/item/weapon/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/whitegreen, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cfT" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -60841,21 +59036,15 @@ req_access_txt = 1 }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cfU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cfV" = ( /obj/structure/sign/directions/medical{ pixel_y = -7 @@ -60922,7 +59111,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/neutral/corner{ @@ -61013,7 +59201,6 @@ /obj/structure/filingcabinet, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/red/side{ @@ -61076,8 +59263,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Incinerator APC"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 4; @@ -61115,8 +59301,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/floorgrime, @@ -61379,7 +59564,6 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel/whiteblue/side{ @@ -61430,17 +59614,13 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cgY" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cgZ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -61457,9 +59637,7 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cha" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, @@ -61469,23 +59647,18 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "chb" = ( /obj/machinery/chem_heater, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/whiteyellow/side{ dir = 9 }, /area/medical/chemistry) "chc" = ( -/obj/machinery/disposal/bin{ - pixel_x = 0 - }, +/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/whiteyellow/side{ dir = 5 @@ -61579,7 +59752,6 @@ /obj/structure/noticeboard{ desc = "A board for pinning important notices upon."; name = "notice board"; - pixel_x = 0; pixel_y = 31 }, /turf/open/floor/plasteel/whitepurple/side{ @@ -61595,7 +59767,6 @@ id = "research_shutters"; name = "research shutters control"; pixel_x = 28; - pixel_y = 0; req_access_txt = "7" }, /turf/open/floor/plasteel/whitepurple/side{ @@ -61649,8 +59820,7 @@ pixel_y = 32 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/item/weapon/storage/box/donkpockets, /obj/structure/table/glass, @@ -61672,7 +59842,6 @@ /area/science/research) "chu" = ( /obj/machinery/ai_status_display{ - pixel_x = 0; pixel_y = 32 }, /obj/structure/chair/stool, @@ -61715,9 +59884,7 @@ layer = 2.9 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "chA" = ( /obj/item/device/radio/intercom{ pixel_y = 25 @@ -61784,7 +59951,6 @@ /obj/item/weapon/extinguisher, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -31 }, /turf/open/floor/plasteel/floorgrime, @@ -61799,7 +59965,6 @@ /area/maintenance/disposal/incinerator) "chJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -31 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -61820,8 +59985,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) @@ -61840,9 +60004,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "chN" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1; @@ -62002,9 +60164,7 @@ "cif" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/medical/sleeper) @@ -62063,9 +60223,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 9 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cil" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -62078,9 +60236,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cim" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -62093,9 +60249,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cin" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -62104,23 +60258,18 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cio" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/sign/nosmoking_2{ - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cip" = ( /obj/machinery/power/apc{ dir = 1; @@ -62142,9 +60291,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ciq" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 2 @@ -62152,9 +60299,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cir" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -62163,16 +60308,13 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cis" = ( /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyer"; name = "Medbay Exit Button"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62181,9 +60323,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cit" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -62201,9 +60341,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ciu" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -62217,9 +60355,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "civ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -62294,8 +60430,7 @@ /obj/structure/noticeboard{ desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; name = "requests board"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/whiteyellow{ dir = 4 @@ -62305,8 +60440,7 @@ /obj/machinery/r_n_d/destructive_analyzer, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62354,8 +60488,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 4 @@ -62365,7 +60498,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -62387,8 +60519,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62400,7 +60531,6 @@ cell_type = 10000; dir = 1; name = "Research Division APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -62446,8 +60576,7 @@ "ciN" = ( /obj/structure/chair/stool, /obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -62480,7 +60609,6 @@ "ciR" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/cola/random, @@ -62514,8 +60642,7 @@ "ciV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/engine, /area/science/explab) @@ -62565,8 +60692,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, @@ -62586,9 +60712,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/n2, /area/engine/atmos) @@ -62603,9 +60727,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - O2"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/o2, /area/engine/atmos) @@ -62621,9 +60743,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics Tank - Air"; dir = 8; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 + network = list("SS13") }, /turf/open/floor/engine/air, /area/engine/atmos) @@ -62705,7 +60825,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, @@ -62785,8 +60904,7 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -62847,9 +60965,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -62868,9 +60984,7 @@ req_access_txt = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjM" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -62887,9 +61001,7 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjN" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -62901,9 +61013,7 @@ initialize_directions = 11 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjO" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -62914,9 +61024,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjP" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -62932,9 +61040,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjQ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -62949,24 +61055,19 @@ on = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel/whiteyellow/corner{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cjS" = ( /obj/item/stack/sheet/mineral/plasma{ layer = 2.9 @@ -62994,8 +61095,7 @@ "cjU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -63113,7 +61213,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -63137,9 +61236,7 @@ "ckg" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -63157,7 +61254,6 @@ /obj/structure/closet/firecloset, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/delivery, @@ -63199,7 +61295,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -63223,8 +61318,7 @@ /area/science/research) "ckp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -63250,7 +61344,6 @@ /obj/machinery/button/door{ id = "telelab"; name = "Test Chamber Blast Doors"; - pixel_x = 0; pixel_y = -25 }, /turf/open/floor/engine, @@ -63365,8 +61458,7 @@ dir = 8 }, /obj/structure/sign/fire{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -63385,8 +61477,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -63396,8 +61487,7 @@ /area/maintenance/disposal/incinerator) "ckF" = ( /obj/structure/sign/fire{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light/small{ dir = 4 @@ -63485,9 +61575,7 @@ on = 1 }, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "ckU" = ( /obj/structure/chair, /obj/structure/sign/nosmoking_2{ @@ -63537,9 +61625,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/medical/surgery) @@ -63617,16 +61703,13 @@ "clj" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "clk" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -63638,23 +61721,17 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cll" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4; initialize_directions = 11 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "clm" = ( /obj/item/device/radio/intercom{ broadcasting = 1; @@ -63662,20 +61739,15 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cln" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "clo" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip{ @@ -63684,17 +61756,13 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "clp" = ( /obj/machinery/light, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "clq" = ( /obj/machinery/airalarm{ dir = 1; @@ -63703,16 +61771,12 @@ /turf/open/floor/plasteel/whiteyellow/corner{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "clr" = ( /turf/open/floor/plasteel/whiteyellow/side{ dir = 6 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cls" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -63734,8 +61798,7 @@ pixel_x = 8 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ - pixel_x = -5; - pixel_y = 0 + pixel_x = -5 }, /obj/item/weapon/reagent_containers/syringe/epinephrine, /turf/open/floor/plasteel/white, @@ -63781,8 +61844,7 @@ }, /obj/item/device/radio/headset/headset_med, /obj/structure/extinguisher_cabinet{ - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/firealarm{ dir = 1; @@ -63797,8 +61859,7 @@ req_access_txt = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -63867,8 +61928,7 @@ icon_state = "tube1" }, /obj/structure/sign/nosmoking_2{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel, /area/science/lab) @@ -63903,13 +61963,11 @@ /area/science/research) "clH" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 8 }, /obj/item/device/radio/intercom{ dir = 8; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -28 }, /obj/effect/turf_decal/stripes/line{ @@ -63997,8 +62055,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/noticeboard{ pixel_y = -32 @@ -64132,8 +62189,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -64170,8 +62226,7 @@ dir = 4 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/wood, /area/maintenance/port/aft) @@ -64220,13 +62275,10 @@ "cmr" = ( /obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cms" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -64238,16 +62290,12 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cmt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cmu" = ( /turf/closed/wall, /area/crew_quarters/heads/cmo) @@ -64304,16 +62352,13 @@ req_access_txt = "5" }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cmz" = ( /obj/machinery/reagentgrinder, /obj/machinery/requests_console{ department = "Chemistry"; departmentType = 2; pixel_x = -30; - pixel_y = 0; receive_ore_updates = 1 }, /obj/structure/table/glass, @@ -64404,14 +62449,8 @@ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/disk/tech_disk{ - pixel_x = 0; - pixel_y = 0 - }, -/obj/item/weapon/disk/tech_disk{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/disk/tech_disk, +/obj/item/weapon/disk/tech_disk, /obj/item/weapon/disk/design_disk, /obj/item/weapon/disk/design_disk, /turf/open/floor/plasteel/white, @@ -64444,9 +62483,7 @@ "cmK" = ( /obj/structure/chair, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "cmL" = ( /obj/machinery/door/window/westleft{ dir = 2; @@ -64498,14 +62535,12 @@ /area/science/explab) "cmQ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = 0; pixel_y = 30; receive_ore_updates = 1 }, @@ -64534,9 +62569,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/device/taperecorder{ - pixel_y = 0 - }, +/obj/item/device/taperecorder, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -64563,7 +62596,6 @@ /obj/machinery/button/door{ id = "telelab"; name = "Test Chamber Blast Doors"; - pixel_x = 0; pixel_y = 25 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -64603,9 +62635,7 @@ /obj/structure/window/reinforced, /obj/machinery/holopad, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "cmY" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -64666,8 +62696,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) @@ -64677,7 +62706,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/components/unary/outlet_injector/on{ @@ -64724,8 +62752,7 @@ /obj/structure/table, /obj/item/weapon/hemostat, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel, /area/medical/surgery) @@ -64768,8 +62795,7 @@ "cnr" = ( /obj/machinery/computer/med_data, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/white/side{ dir = 2 @@ -64791,8 +62817,7 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/bedsheetbin{ pixel_x = 2 @@ -64894,24 +62919,18 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cnB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cnC" = ( /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/table/glass, @@ -64976,8 +62995,7 @@ pixel_y = 26 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/item/weapon/screwdriver{ pixel_y = 6 @@ -65136,8 +63154,7 @@ "cnV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -65229,7 +63246,6 @@ /area/science/research) "cod" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 29 }, /turf/open/floor/plasteel/white/side{ @@ -65289,8 +63305,7 @@ "cok" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner{ @@ -65358,8 +63373,7 @@ /area/science/explab) "coq" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -65378,7 +63392,6 @@ "cos" = ( /obj/structure/table, /obj/item/weapon/paper_bin{ - pixel_x = 0; pixel_y = 6 }, /obj/item/weapon/pen, @@ -65440,7 +63453,6 @@ /obj/item/clothing/suit/apron/surgical, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/white/side{ @@ -65463,8 +63475,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Surgery APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d2 = 2; @@ -65492,9 +63503,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/medical/surgery) @@ -65530,9 +63539,7 @@ "coI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -65579,9 +63586,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "coO" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -65631,8 +63636,7 @@ /obj/machinery/power/apc{ dir = 4; name = "CMO's Office APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d2 = 8; @@ -65654,7 +63658,6 @@ /obj/item/weapon/storage/backpack/satchel/chem, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/window/reinforced{ @@ -65997,8 +64000,7 @@ "cpv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -66091,8 +64093,7 @@ /area/science/explab) "cpA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/yellow{ d1 = 4; @@ -66205,10 +64206,7 @@ "cpL" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /obj/structure/rack, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/regular, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, @@ -66235,9 +64233,7 @@ }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/aisat) "cpP" = ( /obj/structure/lattice/catwalk, /obj/item/weapon/wrench, @@ -66263,8 +64259,8 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; locked = 0; + name = "Engine Air Alarm"; pixel_x = 24; req_access = null; req_one_access_txt = "24;10" @@ -66462,9 +64458,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cqj" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -66480,9 +64474,7 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cqk" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -66586,8 +64578,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Chemistry APC"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/closet/secure_closet/chemical{ pixel_x = -3 @@ -66630,7 +64621,6 @@ desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; dir = 1; name = "requests board"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/button/door{ @@ -66670,7 +64660,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Research Lab APC"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable/yellow, @@ -66716,7 +64705,6 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = 0; pixel_y = -30; receive_ore_updates = 1 }, @@ -66728,8 +64716,7 @@ /area/science/lab) "cqA" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/door/window/eastleft{ dir = 1; @@ -66756,7 +64743,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -66894,8 +64880,7 @@ /area/science/explab) "cqQ" = ( /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -66951,15 +64936,13 @@ "cqV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/science/explab) "cqW" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/stripes/line{ @@ -67023,10 +65006,7 @@ /turf/open/space, /area/space) "cre" = ( -/obj/structure/sign/fire{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/structure/sign/fire, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "crf" = ( @@ -67049,19 +65029,15 @@ "crj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/machinery/light_switch{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/white/side{ dir = 4 @@ -67113,15 +65089,13 @@ /obj/structure/bed, /obj/item/weapon/bedsheet/medical, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/white, /area/medical/surgery) "crr" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -67164,7 +65138,6 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = 0; pixel_y = -30 }, /obj/machinery/light, @@ -67191,7 +65164,6 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -24 }, /obj/effect/turf_decal/stripes/line{ @@ -67203,9 +65175,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "crx" = ( /obj/machinery/light{ dir = 4; @@ -67215,14 +65185,11 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 2 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cry" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -67262,9 +65229,7 @@ "crB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -67347,8 +65312,7 @@ cell_type = 5000; dir = 4; name = "Aft Hallway APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -67621,7 +65585,6 @@ "csk" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/white/side{ @@ -67653,7 +65616,6 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = 0; pixel_y = -30 }, /obj/structure/closet/crate/freezer/blood, @@ -67666,7 +65628,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/sign/nosmoking_2{ @@ -67696,7 +65657,6 @@ }, /obj/item/weapon/bedsheet/medical, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/camera{ @@ -67731,9 +65691,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "csu" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -67749,9 +65707,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "csv" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -67769,9 +65725,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "csw" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -67831,8 +65785,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/barber{ dir = 8 @@ -67861,7 +65814,6 @@ department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; - pixel_x = 0; pixel_y = -32 }, /obj/effect/landmark/start/chief_medical_officer, @@ -67880,8 +65832,7 @@ dir = 8; name = "Medbay Monitor"; network = list("Medbay"); - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/item/device/radio/intercom{ dir = 1; @@ -67931,8 +65882,7 @@ sortType = 11 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68166,7 +66116,6 @@ desc = "Used for watching the RD's goons from the safety of his office."; name = "Research Monitor"; network = list("RD"); - pixel_x = 0; pixel_y = 2 }, /obj/structure/table/reinforced, @@ -68183,7 +66132,6 @@ department = "Research Director's Desk"; departmentType = 5; name = "Research Director RC"; - pixel_x = 0; pixel_y = 30; receive_ore_updates = 1 }, @@ -68196,7 +66144,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/effect/landmark/xmastree/rdrod, @@ -68217,8 +66164,7 @@ /area/crew_quarters/heads/hor) "cte" = ( /obj/item/weapon/storage/secure/safe{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -68231,8 +66177,7 @@ "ctf" = ( /obj/machinery/portable_atmospherics/scrubber/huge, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel{ @@ -68270,7 +66215,6 @@ cell_type = 5000; dir = 1; name = "Toxins Storage APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -68345,9 +66289,11 @@ /obj/structure/bed, /obj/item/weapon/bedsheet/medical, /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 @@ -68364,7 +66310,6 @@ icon_state = "2-4" }, /obj/machinery/vending/wallmed{ - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/white, @@ -68379,7 +66324,6 @@ dir = 10 }, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/plasteel/whiteblue/side{ @@ -68413,29 +66357,23 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ctw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "ctx" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/barber{ @@ -68476,9 +66414,7 @@ /turf/open/floor/plating, /area/medical/genetics) "ctD" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/closed/wall, /area/medical/genetics) "ctE" = ( @@ -68507,9 +66443,7 @@ }, /area/hallway/primary/aft) "ctH" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/closed/wall, /area/maintenance/aft) "ctJ" = ( @@ -68641,7 +66575,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/turf_decal/bot, @@ -68698,7 +66631,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/turf_decal/bot, @@ -68809,8 +66741,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Patient Room A APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/yellow{ d2 = 4; @@ -68865,9 +66796,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cup" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -68878,24 +66807,19 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cuq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/light{ dir = 4; icon_state = "tube1" }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cur" = ( /obj/item/weapon/storage/box/rxglasses{ pixel_x = 3; @@ -68926,7 +66850,6 @@ department = "Genetics"; departmentType = 0; name = "Genetics Requests Console"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/light{ @@ -69309,8 +67232,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -69345,8 +67267,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -69372,8 +67293,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -69445,9 +67365,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cvr" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -69456,23 +67374,18 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cvs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "cvt" = ( /turf/closed/wall, /area/medical/genetics/cloning) "cvu" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/door/window/southleft{ @@ -69606,8 +67519,7 @@ "cvG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 2 @@ -69626,8 +67538,7 @@ /area/science/robotics/mechbay) "cvJ" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /turf/open/floor/engine{ dir = 9; @@ -69761,8 +67672,7 @@ "cvT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -69781,8 +67691,7 @@ "cvV" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -69917,9 +67826,7 @@ "cwn" = ( /obj/structure/rack, /obj/item/clothing/glasses/sunglasses, -/obj/item/device/flashlight/pen{ - pixel_x = 0 - }, +/obj/item/device/flashlight/pen, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -69936,8 +67843,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Patient Room B APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable/yellow{ d2 = 4; @@ -69947,7 +67853,6 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/plasteel/whiteblue/side{ @@ -70024,9 +67929,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4; @@ -70037,13 +67940,11 @@ "cwv" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 9 @@ -70074,8 +67975,7 @@ "cwy" = ( /obj/machinery/dna_scannernew, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/whiteblue, /area/medical/genetics) @@ -70135,7 +68035,6 @@ id = "genetics_shutters"; name = "genetics shutters control"; pixel_x = 28; - pixel_y = 0; req_access_txt = "9" }, /turf/open/floor/plasteel/blue/side{ @@ -70162,8 +68061,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/sign/nosmoking_2{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) @@ -70219,8 +68117,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/white/side{ dir = 6 @@ -70248,13 +68145,11 @@ /obj/machinery/power/apc{ dir = 2; name = "RD Office APC"; - pixel_x = 0; pixel_y = -27 }, /obj/structure/cable/yellow, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/twohanded/required/kirbyplants/dead, /turf/open/floor/plasteel/cafeteria{ @@ -70263,17 +68158,14 @@ /area/crew_quarters/heads/hor) "cwQ" = ( /obj/item/weapon/paper_bin{ - pixel_x = 0; pixel_y = 7 }, /obj/structure/table, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/stamp/rd{ pixel_x = -11; - pixel_y = 0; pixel_x = 3; pixel_y = -2 }, @@ -70310,7 +68202,6 @@ "cwS" = ( /obj/structure/closet/secure_closet/RD, /obj/machinery/keycard_auth{ - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/cafeteria{ @@ -70323,7 +68214,6 @@ dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel/cafeteria{ @@ -70334,7 +68224,6 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/device/radio/intercom{ @@ -70418,6 +68307,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -70430,8 +68323,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_b) @@ -70520,9 +68412,7 @@ "cxn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -70586,9 +68476,7 @@ "cxu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 5 @@ -70657,9 +68545,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) @@ -70699,9 +68585,7 @@ "cxE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/circuit/green, /area/science/robotics/mechbay) @@ -70728,7 +68612,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plating, @@ -70742,9 +68625,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -70779,8 +68660,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -70793,7 +68673,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating, @@ -70811,7 +68690,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light/small{ @@ -70852,8 +68730,7 @@ req_access_txt = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 @@ -71096,7 +68973,6 @@ "cys" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark/start/roboticist, @@ -71109,9 +68985,7 @@ "cyt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -71123,8 +68997,7 @@ "cyv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/white, /area/science/research) @@ -71136,8 +69009,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/science/research) @@ -71265,8 +69137,7 @@ /area/science/mixing) "cyJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/light_switch{ pixel_y = 28 @@ -71329,7 +69200,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/white/side{ @@ -71413,15 +69283,13 @@ /area/medical/genetics/cloning) "cyX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/power/apc{ dir = 4; locked = 0; name = "Cloning Lab APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/yellow, /obj/machinery/camera{ @@ -71446,9 +69314,7 @@ "cza" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 28 @@ -71475,8 +69341,7 @@ /area/medical/genetics) "czd" = ( /obj/machinery/light_switch{ - pixel_x = 23; - pixel_y = 0 + pixel_x = 23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -71578,8 +69443,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/weapon/folder/white{ pixel_x = 4; @@ -71755,9 +69619,7 @@ /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/pen, /turf/open/floor/plasteel/whitegreen, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/central) "czF" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -71799,7 +69661,6 @@ /obj/machinery/airalarm{ desc = "This particular atmos control unit appears to have no access restrictions."; dir = 8; - icon_state = "alarm0"; locked = 0; name = "all-access air alarm"; pixel_x = 24; @@ -71862,9 +69723,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -71956,8 +69815,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Medbay Aft APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d2 = 8; @@ -71997,7 +69855,6 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/vault, @@ -72052,8 +69909,7 @@ pixel_y = 1 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/bed/roller, /mob/living/carbon/monkey, @@ -72062,13 +69918,10 @@ "cAf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/vault, @@ -72080,7 +69933,6 @@ "cAh" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/camera{ @@ -72181,8 +70033,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Mech Bay APC"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/cable/yellow{ d2 = 8; @@ -72493,8 +70344,7 @@ layer = 4; name = "Test Chamber Telescreen"; network = list("Toxins"); - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -72522,8 +70372,7 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -72556,9 +70405,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -72600,8 +70447,7 @@ frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) @@ -72621,9 +70467,7 @@ /turf/open/floor/plasteel/black, /area/medical/genetics) "cBd" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/closed/wall, /area/hallway/primary/aft) "cBe" = ( @@ -72636,9 +70480,7 @@ }, /area/hallway/primary/aft) "cBf" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/closed/wall, /area/science/robotics/mechbay) "cBg" = ( @@ -72671,7 +70513,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -72694,7 +70535,6 @@ /obj/machinery/button/door{ id = "researchrangeshutters"; name = "Blast Door Control"; - pixel_x = 0; pixel_y = -24; req_access_txt = "0" }, @@ -72707,7 +70547,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Research Firing Range APC"; - pixel_x = 0; pixel_y = -28 }, /obj/structure/table, @@ -72800,7 +70639,6 @@ pixel_y = -2 }, /obj/item/device/assembly/prox_sensor{ - pixel_x = 0; pixel_y = 2 }, /obj/structure/table/reinforced, @@ -72934,8 +70772,7 @@ "cBI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -72969,8 +70806,7 @@ layer = 4; name = "Test Chamber Telescreen"; network = list("Toxins"); - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -73029,7 +70865,6 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/storage/box/donkpockets{ @@ -73043,7 +70878,6 @@ /area/medical/medbay/aft) "cBV" = ( /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/reagent_containers/spray/cleaner, @@ -73059,7 +70893,6 @@ }, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -29 }, /obj/machinery/camera{ @@ -73232,7 +71065,6 @@ /area/science/mixing) "cCu" = ( /obj/item/device/assembly/signaler{ - pixel_x = 0; pixel_y = 8 }, /obj/item/device/assembly/signaler{ @@ -73260,12 +71092,8 @@ /obj/item/device/transfer_valve{ pixel_x = -5 }, -/obj/item/device/transfer_valve{ - pixel_x = 0 - }, -/obj/item/device/transfer_valve{ - pixel_x = 0 - }, +/obj/item/device/transfer_valve, +/obj/item/device/transfer_valve, /obj/item/device/transfer_valve{ pixel_x = 5 }, @@ -73276,7 +71104,6 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = 0; pixel_y = -30; receive_ore_updates = 1 }, @@ -73297,10 +71124,7 @@ pixel_x = 6; pixel_y = -4 }, -/obj/item/device/assembly/timer{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/device/assembly/timer, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -73388,8 +71212,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Toxins Lab APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d2 = 8; @@ -73458,9 +71281,7 @@ /area/medical/virology) "cCL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -73586,9 +71407,7 @@ "cCW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/medical/morgue) @@ -73695,7 +71514,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Robotics Lab APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -73758,7 +71576,6 @@ "cDm" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower" }, /turf/open/floor/plasteel/white, @@ -73805,7 +71622,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/light/small, @@ -73915,7 +71731,6 @@ cell_type = 5000; dir = 1; name = "Virology APC"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/yellow{ @@ -73971,7 +71786,6 @@ /obj/item/clothing/glasses/hud/health, /obj/structure/reagent_dispensers/virusfood{ density = 0; - pixel_x = 0; pixel_y = 30 }, /obj/structure/table/glass, @@ -74222,8 +72036,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Morgue APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable/yellow{ d2 = 8; @@ -74382,8 +72195,7 @@ /obj/item/device/assembly/flash/handheld, /obj/item/device/assembly/flash/handheld, /obj/machinery/ai_status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -74391,8 +72203,7 @@ "cEp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/white/side{ dir = 9 @@ -74415,7 +72226,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/engine/vacuum, @@ -74467,7 +72277,6 @@ id_tag = "tox_airlock_control"; interior_door_tag = "tox_airlock_interior"; pixel_x = -24; - pixel_y = 0; sanitize_external = 1; sensor_tag = "tox_airlock_sensor" }, @@ -74534,8 +72343,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -74581,8 +72389,7 @@ }, /obj/structure/table/glass, /obj/structure/sign/deathsposal{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/whitegreen/side{ dir = 8 @@ -74633,7 +72440,6 @@ department = "Virology"; name = "Virology Requests Console"; pixel_x = 29; - pixel_y = 0; receive_ore_updates = 1 }, /obj/item/stack/sheet/mineral/plasma{ @@ -74705,7 +72511,6 @@ pixel_y = 4 }, /obj/structure/sign/nosmoking_2{ - pixel_x = 0; pixel_y = -30 }, /obj/structure/table/glass, @@ -74721,8 +72526,7 @@ /area/medical/medbay/aft) "cEU" = ( /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/bodycontainer/morgue, /obj/effect/landmark/revenantspawn, @@ -74797,8 +72601,7 @@ "cFd" = ( /obj/structure/noticeboard{ dir = 4; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -74933,8 +72736,7 @@ /area/science/mixing) "cFs" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -74990,8 +72792,7 @@ /area/science/test_area) "cFy" = ( /obj/item/device/radio/intercom{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/table/glass, /obj/item/weapon/hand_labeler, @@ -75052,7 +72853,6 @@ /obj/structure/rack, /obj/item/weapon/crowbar/red, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /obj/item/weapon/wrench, @@ -75118,8 +72918,7 @@ dir = 4 }, /obj/item/device/radio/intercom{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/whitegreen/side{ dir = 4 @@ -75144,7 +72943,6 @@ pixel_y = 32 }, /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -75169,7 +72967,6 @@ /area/medical/virology) "cFN" = ( /obj/structure/sign/securearea{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/shower{ @@ -75243,8 +73040,7 @@ /area/medical/medbay/aft) "cFT" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/white/side{ dir = 9 @@ -75277,8 +73073,7 @@ "cFX" = ( /obj/machinery/disposal/bin, /obj/machinery/light_switch{ - pixel_x = 23; - pixel_y = 0 + pixel_x = 23 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -75304,7 +73099,6 @@ departmentType = 2; name = "Robotics RC"; pixel_x = -31; - pixel_y = 0; receive_ore_updates = 1 }, /obj/effect/turf_decal/bot, @@ -75326,8 +73120,7 @@ "cGd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -75606,9 +73399,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -75754,7 +73545,6 @@ idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; - pixel_x = 0; pixel_y = 24; req_access_txt = "39" }, @@ -75838,9 +73628,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) @@ -75898,8 +73686,7 @@ req_access_txt = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -75908,7 +73695,6 @@ "cGV" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/light{ @@ -76034,8 +73820,7 @@ }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; - name = "SERVER ROOM"; - pixel_y = 0 + name = "SERVER ROOM" }, /turf/closed/wall/r_wall, /area/science/server) @@ -76109,8 +73894,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitegreen/side{ @@ -76152,9 +73936,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/whitegreen/side{ dir = 6 @@ -76209,13 +73991,10 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/whitegreen/side{ dir = 6 @@ -76224,8 +74003,7 @@ "cHw" = ( /obj/structure/closet/emcloset, /obj/item/device/radio/intercom{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -76294,10 +74072,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/box/masks, /obj/structure/table/glass, /turf/open/floor/plasteel/whitegreen/corner{ dir = 1 @@ -76305,7 +74080,6 @@ /area/medical/medbay/aft) "cHC" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = 0; pixel_y = -30 }, /obj/item/weapon/storage/box/beakers{ @@ -76348,7 +74122,6 @@ /area/medical/medbay/aft) "cHF" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -76365,14 +74138,8 @@ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/empty{ - pixel_x = 0; - pixel_y = 0 - }, -/obj/item/weapon/reagent_containers/blood/empty{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/weapon/reagent_containers/blood/empty, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/dropper, /obj/structure/sign/biohazard{ @@ -76615,7 +74382,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Research Division Server Room APC"; - pixel_x = 0; pixel_y = 25 }, /obj/structure/cable/yellow{ @@ -76803,8 +74569,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/vault, /area/medical/virology) @@ -76845,7 +74610,6 @@ "cIx" = ( /obj/structure/closet/l3closet/virology, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel/vault, @@ -76944,9 +74708,7 @@ }, /area/hallway/primary/aft) "cIH" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/closed/wall/r_wall, /area/hallway/primary/aft) "cII" = ( @@ -76970,7 +74732,6 @@ /obj/effect/landmark/start/roboticist, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -76985,8 +74746,7 @@ /obj/item/clothing/gloves/color/latex, /obj/item/weapon/surgical_drapes, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -77047,8 +74807,7 @@ "cIR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 1; @@ -77125,8 +74884,7 @@ }, /obj/machinery/airalarm/server{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /turf/open/floor/plasteel/black{ name = "Server Walkway"; @@ -77179,7 +74937,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/structure/cable/yellow{ @@ -77209,9 +74966,7 @@ "cJh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -77400,7 +75155,6 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel/vault, @@ -77498,8 +75252,7 @@ /obj/item/device/mmi, /obj/item/device/mmi, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/white/corner{ dir = 1 @@ -77554,7 +75307,6 @@ "cJO" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -77737,7 +75489,6 @@ /obj/item/weapon/paper, /obj/item/weapon/pen/red, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/whitegreen/side{ @@ -77752,7 +75503,6 @@ dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 0; pixel_y = 29 }, /turf/open/floor/plasteel/whitegreen/side{ @@ -77772,7 +75522,6 @@ pixel_y = 3 }, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /obj/machinery/camera{ @@ -77864,8 +75613,7 @@ "cKv" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -78095,8 +75843,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/aft) @@ -78138,9 +75885,7 @@ "cKW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -78160,9 +75905,7 @@ "cKZ" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/whitegreen/side{ dir = 4 @@ -78533,8 +76276,7 @@ dir = 8; name = "turbine vent monitor"; network = list("Turbine"); - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/machinery/button/door{ id = "turbinevent"; @@ -78640,7 +76382,6 @@ /obj/machinery/power/apc{ dir = 1; name = "Starboard Quarter Solar APC"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/yellow{ @@ -78657,8 +76398,7 @@ "cLO" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -78676,8 +76416,7 @@ "cLQ" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/whitegreen/side, /area/medical/virology) @@ -78711,8 +76450,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/table/wood, /obj/item/clothing/under/burial, @@ -78754,9 +76492,7 @@ "cLY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/grimy, /area/chapel/office) @@ -78851,8 +76587,7 @@ network = list("SS13") }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-14"; @@ -78905,11 +76640,9 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plating, @@ -79024,9 +76757,7 @@ "cMC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/button/crematorium{ pixel_x = -25 @@ -79077,8 +76808,7 @@ dir = 4 }, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/grimy, /area/chapel/office) @@ -79100,7 +76830,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/camera{ @@ -79165,7 +76894,6 @@ "cMP" = ( /obj/item/candle, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 25 }, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -79211,9 +76939,7 @@ "cMU" = ( /obj/machinery/status_display{ density = 0; - layer = 4; - pixel_x = 0; - pixel_y = 0 + layer = 4 }, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) @@ -79285,7 +77011,6 @@ desc = "Used for watching output from station security cameras."; name = "Security Camera Monitor"; network = list("SS13"); - pixel_x = 0; pixel_y = 30 }, /turf/open/floor/plasteel/red/side{ @@ -79298,7 +77023,6 @@ on = 1 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/red/side{ @@ -79323,7 +77047,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/sign/map/right{ @@ -79352,8 +77075,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -79468,8 +77190,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/chair/stool, /turf/open/floor/plating, @@ -79490,7 +77211,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plating, @@ -79554,7 +77274,6 @@ icon_state = "1-2" }, /obj/item/weapon/storage/fancy/candle_box{ - pixel_x = 0; pixel_y = 5 }, /obj/structure/table/wood, @@ -79582,9 +77301,7 @@ "cNB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/carpet, /area/chapel/main) @@ -79751,8 +77468,7 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -79807,8 +77523,7 @@ /area/maintenance/starboard/aft) "cNZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/chair, /turf/open/floor/plating, @@ -79868,8 +77583,7 @@ /area/chapel/office) "cOg" = ( /obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/machinery/light/small{ dir = 4 @@ -79981,10 +77695,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "cOs" = ( -/obj/machinery/ai_status_display{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/machinery/ai_status_display, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "cOt" = ( @@ -80037,9 +77748,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -80087,8 +77796,7 @@ pixel_y = 4 }, /obj/item/device/taperecorder{ - pixel_x = 4; - pixel_y = 0 + pixel_x = 4 }, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -80142,8 +77850,7 @@ /obj/structure/closet/wardrobe/chaplain_black, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/grimy, /area/chapel/office) @@ -80159,7 +77866,6 @@ dir = 2; lighting = 3; name = "Chapel Office APC"; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -80238,9 +77944,7 @@ "cOT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -80411,8 +78115,7 @@ "cPm" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/light{ icon_state = "tube1"; @@ -80454,9 +78157,7 @@ "cPs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -80546,7 +78247,6 @@ desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."; icon_state = "kiddieplaque"; name = "Remembrance Plaque"; - pixel_x = 0; pixel_y = 32 }, /obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ @@ -80658,8 +78358,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-04"; @@ -80787,7 +78486,6 @@ /area/chapel/main) "cQa" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light/small{ @@ -80809,7 +78507,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/machinery/light/small{ @@ -81028,8 +78725,7 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -81062,8 +78758,7 @@ amount = 50 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, @@ -81270,13 +78965,11 @@ "cRh" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 9 @@ -81323,7 +79016,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light/small{ @@ -81405,7 +79097,6 @@ idSelf = "xeno_airlock_control"; name = "Access Button"; pixel_x = -24; - pixel_y = 0; req_access_txt = "0" }, /obj/structure/cable/yellow{ @@ -81455,8 +79146,7 @@ "cRA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/white, /area/science/xenobiology) @@ -81516,7 +79206,6 @@ /obj/machinery/button/door{ id = "chapel_shutters_parlour"; name = "chapel shutters control"; - pixel_x = 0; pixel_y = -25; req_access_txt = "0" }, @@ -81620,8 +79309,7 @@ "cRT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/open/floor/plasteel/black, /area/chapel/office) @@ -81819,7 +79507,6 @@ /obj/machinery/button/door{ id = "xenobio8"; name = "Containment Blast Doors"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -81963,7 +79650,6 @@ /obj/machinery/button/door{ id = "xenobio3"; name = "Containment Blast Doors"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -82087,7 +79773,6 @@ /obj/machinery/button/door{ id = "xenobio7"; name = "Containment Blast Doors"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -82168,7 +79853,6 @@ /obj/machinery/button/door{ id = "xenobio2"; name = "Containment Blast Doors"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -82198,7 +79882,6 @@ /obj/machinery/button/door{ id = "xenobio1"; name = "Containment Blast Doors"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -82214,8 +79897,7 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/computer/shuttle/pod{ pixel_x = -32; @@ -82245,7 +79927,6 @@ /area/science/xenobiology) "cSW" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -82363,7 +80044,6 @@ }, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/item/weapon/storage/box/bodybags{ @@ -82407,7 +80087,6 @@ /obj/machinery/status_display{ density = 0; layer = 3; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/computer/shuttle/pod{ @@ -82467,7 +80146,6 @@ id = "smindicate"; name = "external door control"; pixel_x = -26; - pixel_y = 0; req_access_txt = "150" }, /obj/docking_port/mobile{ @@ -82550,7 +80228,6 @@ dir = 1; name = "Test Chamber Monitor"; network = list("Xeno"); - pixel_x = 0; pixel_y = 2 }, /obj/structure/table/reinforced, @@ -82602,8 +80279,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) @@ -82836,8 +80512,7 @@ /area/shuttle/syndicate) "cUc" = ( /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 @@ -83160,9 +80835,7 @@ "cUI" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 30 @@ -83392,15 +81065,13 @@ desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; dir = 8; name = "requests board"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/wood, /area/library) "cVf" = ( /obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/wood, /area/library) @@ -83474,8 +81145,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plating, /area/shuttle/transport) @@ -83628,14 +81298,11 @@ /area/shuttle/auxillary_base) "cVR" = ( /obj/structure/mirror{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -84014,7 +81681,6 @@ /area/shuttle/abandoned) "cWu" = ( /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/machinery/door/window/westright{ @@ -84037,8 +81703,7 @@ "cWv" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/mirror{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -84677,9 +82342,7 @@ "cXE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/yellow/side{ dir = 1 @@ -84821,7 +82484,6 @@ /area/shuttle/abandoned) "cXU" = ( /obj/machinery/vending/hydroseeds{ - pixel_x = 0; use_power = 0 }, /obj/effect/decal/cleanable/dirt{ @@ -84914,7 +82576,6 @@ name = "Robotics Operating Table" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 0; pixel_y = -30 }, /obj/machinery/camera{ @@ -84954,9 +82615,7 @@ "cYf" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -84966,7 +82625,6 @@ /area/shuttle/abandoned) "cYg" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -85020,13 +82678,11 @@ /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -28; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, /obj/machinery/iv_drip{ - density = 0; - pixel_x = 0 + density = 0 }, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -85063,9 +82719,7 @@ "cYp" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/effect/decal/cleanable/xenoblood, /obj/effect/decal/cleanable/xenoblood/xgibs/limb, @@ -85218,8 +82872,7 @@ "cYC" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 @@ -85306,7 +82959,6 @@ dir = 1; name = "Auxillary Base Monitor"; network = list("AuxBase"); - pixel_x = 0; pixel_y = -28 }, /obj/structure/reagent_dispensers/fueltank, @@ -85446,7 +83098,6 @@ /obj/item/device/radio/intercom{ dir = 4; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 27 }, /obj/structure/chair, @@ -85512,8 +83163,6 @@ "cYZ" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -85603,7 +83252,6 @@ /obj/item/device/radio/intercom{ dir = 2; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -31 }, /obj/structure/chair{ @@ -85684,8 +83332,7 @@ "cZu" = ( /obj/machinery/status_display{ dir = 8; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/holopad, /turf/open/floor/mineral/titanium/blue, @@ -85699,8 +83346,7 @@ "cZw" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 6 }, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 @@ -85745,7 +83391,6 @@ /obj/item/device/radio/intercom{ dir = 2; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -31 }, /turf/open/floor/mineral/titanium/blue, @@ -85763,7 +83408,6 @@ /obj/item/weapon/folder/blue, /obj/structure/extinguisher_cabinet{ dir = 4; - pixel_x = 0; pixel_y = -27 }, /turf/open/floor/mineral/titanium/blue, @@ -85772,7 +83416,6 @@ /obj/machinery/space_heater, /obj/structure/extinguisher_cabinet{ dir = 4; - pixel_x = 0; pixel_y = -27 }, /obj/effect/turf_decal/bot, @@ -85956,7 +83599,6 @@ pixel_y = 1 }, /obj/item/weapon/storage/toolbox/mechanical{ - pixel_x = 0; pixel_y = -1 }, /obj/item/weapon/storage/toolbox/emergency{ @@ -86060,7 +83702,6 @@ /obj/item/device/radio/intercom{ dir = 2; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -31 }, /obj/item/weapon/book/manual/wiki/security_space_law{ @@ -86090,16 +83731,13 @@ /obj/item/device/radio/intercom{ dir = 2; name = "Station Intercom (General)"; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "dat" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 0; - pixel_y = 0; req_access_txt = "0"; use_power = 0 }, @@ -86126,7 +83764,6 @@ /obj/item/device/radio/intercom{ dir = 2; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = -31 }, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -86376,8 +84013,7 @@ /area/crew_quarters/bar) "dbe" = ( /obj/machinery/keycard_auth{ - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) @@ -86421,9 +84057,7 @@ /area/maintenance/starboard/aft) "dbm" = ( /turf/open/floor/plasteel, -/area/ai_monitored/storage/eva{ - name = "E.V.A. Storage" - }) +/area/ai_monitored/storage/eva) "dbn" = ( /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) @@ -86702,8 +84336,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) @@ -86711,8 +84344,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -86724,8 +84356,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/space, /area/solar/starboard/aft) @@ -86787,7 +84418,6 @@ on = 1 }, /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -86823,8 +84453,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light{ dir = 4 @@ -86888,7 +84517,6 @@ cell_type = 10000; dir = 1; name = "Xenobiology APC"; - pixel_x = 0; pixel_y = 27 }, /obj/structure/cable/yellow{ @@ -86915,7 +84543,6 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = 0; pixel_y = 30; receive_ore_updates = 1 }, @@ -86947,9 +84574,7 @@ "dcf" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 5 @@ -86958,7 +84583,6 @@ "dcg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/shower{ - icon_state = "shower"; dir = 4 }, /obj/item/device/radio/intercom{ @@ -87287,7 +84911,6 @@ "dcK" = ( /obj/machinery/disposal/bin, /obj/structure/sign/deathsposal{ - pixel_x = 0; pixel_y = -32 }, /obj/structure/disposalpipe/trunk{ @@ -87322,9 +84945,7 @@ "dcO" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central"; @@ -87414,7 +85035,6 @@ /obj/machinery/button/door{ id = "xenobio6"; name = "Containment Blast Doors"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -87518,8 +85138,7 @@ "ddd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; - on = 1; - scrub_Toxins = 0 + on = 1 }, /obj/machinery/light{ dir = 4 @@ -87741,8 +85360,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Test Chamber Maintenance APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) @@ -87898,8 +85516,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/black, /area/engine/engineering) @@ -88083,7 +85700,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /turf/open/floor/plasteel/black, @@ -88093,8 +85709,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, /obj/machinery/light, @@ -88108,8 +85723,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -88127,8 +85741,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -88141,7 +85754,6 @@ "deu" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10; - pixel_x = 0; initialize_directions = 10 }, /obj/structure/cable/white{ @@ -88221,13 +85833,12 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "deI" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 1; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "deJ" = ( @@ -88279,21 +85890,19 @@ /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10; - pixel_x = 0; initialize_directions = 10 }, /obj/structure/window/reinforced/highpressure/fulltile, /turf/open/floor/plating, /area/engine/supermatter) "deT" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 1; - filter_type = "plasma"; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 1; + filter_type = "plasma" + }, /turf/open/floor/engine, /area/engine/engineering) "deU" = ( @@ -88352,7 +85961,6 @@ "dfb" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10; - pixel_x = 0; initialize_directions = 10 }, /obj/machinery/meter, @@ -88363,14 +85971,13 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "dfd" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 1; - filter_type = "o2"; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 1; + filter_type = "o2" + }, /turf/open/floor/engine, /area/engine/engineering) "dfe" = ( @@ -88462,14 +86069,13 @@ /turf/open/floor/engine, /area/engine/supermatter) "dft" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 1; - filter_type = "co2"; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 1; + filter_type = "co2" + }, /turf/open/floor/engine, /area/engine/engineering) "dfu" = ( @@ -88527,8 +86133,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -88539,8 +86144,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -88558,8 +86162,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -88578,8 +86181,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-8" @@ -88608,7 +86210,6 @@ "dfJ" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10; - pixel_x = 0; initialize_directions = 10 }, /obj/structure/cable/white{ @@ -88694,7 +86295,6 @@ "dfV" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -88745,8 +86345,7 @@ /area/engine/engineering) "dgb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/closed/wall/r_wall, /area/engine/engineering) @@ -88922,8 +86521,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/transit_tube/horizontal, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -88948,7 +86546,6 @@ "dhe" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10; - pixel_x = 0; initialize_directions = 10 }, /turf/open/floor/plasteel, @@ -89048,9 +86645,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "dhq" = ( /obj/structure/table/reinforced, /obj/structure/light_construct/small{ @@ -89092,9 +86687,7 @@ pixel_y = -32 }, /turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness/recreation) "dht" = ( /obj/item/weapon/cigbutt, /obj/structure/sign/poster/contraband/random{ @@ -89312,7 +86905,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Tool Storage APC"; - pixel_x = 0; pixel_y = -27 }, /obj/structure/cable/yellow, @@ -89329,7 +86921,6 @@ freerange = 0; frequency = 1459; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 21 }, /obj/structure/sign/poster/official/random{ @@ -89408,9 +86999,7 @@ pixel_x = 32 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "dhT" = ( /obj/structure/sign/poster/random, /turf/closed/wall, @@ -89440,7 +87029,6 @@ /obj/item/weapon/wrench, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/sign/poster/random{ @@ -89467,9 +87055,7 @@ pixel_x = -32 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "dib" = ( /obj/structure/table/wood, /obj/item/weapon/lipstick{ @@ -89537,9 +87123,7 @@ pixel_y = -32 }, /turf/open/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) +/area/crew_quarters/toilet/auxiliary) "dii" = ( /obj/machinery/door/window{ base_state = "right"; @@ -89617,7 +87201,6 @@ id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; - pixel_y = 0; req_access_txt = "19" }, /obj/item/weapon/poster/random_official, @@ -89745,9 +87328,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 @@ -89804,7 +87385,6 @@ /obj/machinery/status_display{ density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/sign/poster/official/random{ @@ -90082,7 +87662,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ @@ -90092,9 +87671,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 + on = 1 }, /turf/open/floor/plasteel/black, /area/chapel/main) @@ -90196,9 +87773,7 @@ name = "Arrival Airlock" }, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "djB" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -90228,9 +87803,7 @@ name = "Arrival Airlock" }, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "djE" = ( /obj/structure/chair{ dir = 8 @@ -90331,36 +87904,28 @@ name = "Arrival Airlock" }, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "djT" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 2; name = "Arrival Airlock" }, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "djU" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 1; name = "Arrival Airlock" }, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "djV" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 1; name = "Arrival Airlock" }, /turf/open/floor/plating, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/secondary/entry) "djW" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, @@ -90875,8 +88440,7 @@ /obj/item/stack/medical/ointment, /obj/machinery/status_display{ dir = 8; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ icon_state = "tube1"; @@ -91023,124 +88587,64 @@ /area/maintenance/department/science/xenobiology) "dlW" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dlX" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dlY" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dlZ" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dma" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmb" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmc" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmd" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dme" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmf" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmg" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmh" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmi" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmj" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmk" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dml" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmm" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmn" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmo" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmp" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -91167,70 +88671,37 @@ /area/science/xenobiology) "dms" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmt" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmu" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmv" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmw" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmx" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmy" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmz" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmA" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmB" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmC" = ( /turf/closed/wall/r_wall, -/area/maintenance/aft{ - icon_state = "xenomaint"; - name = "Xeno Maintenance" - }) +/area/maintenance/department/science/xenobiology) "dmD" = ( /obj/structure/displaycase/trophy, /turf/open/floor/wood, @@ -91376,8 +88847,7 @@ cell_type = 2500; dir = 4; name = "Port Bow Maintenance APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -92618,7 +90088,6 @@ /obj/machinery/power/apc{ dir = 2; name = "Starboard Bow Maintenance APC"; - pixel_x = 0; pixel_y = -28 }, /obj/structure/cable/yellow{ @@ -129844,7 +127313,7 @@ cub cva cwb cIk -cxM +cLG dvY czD cQC @@ -146243,10 +143712,10 @@ anT anT anT aaa -ber +aSD bgf bgd -bjN +aOX bly bnr bpE @@ -146503,7 +143972,7 @@ aSD bes bgg bil -bjO +blz blz bns bpF diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 16a623b4953..ee84d73b87e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -2443,10 +2443,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "aeg" = ( /obj/machinery/conveyor{ @@ -2457,10 +2454,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "aeh" = ( /obj/machinery/conveyor{ @@ -2478,10 +2472,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "aei" = ( /obj/machinery/conveyor{ @@ -4417,10 +4408,7 @@ dir = 9 }, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plating{ - tag = "icon-plating_warn_end (WEST)"; - icon_state = "plating_warn_end" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "aho" = ( /obj/machinery/conveyor{ @@ -4467,10 +4455,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "ahr" = ( /obj/machinery/conveyor{ @@ -4485,10 +4470,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "ahs" = ( /obj/machinery/conveyor{ @@ -4510,10 +4492,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating{ - tag = "icon-plating_warn_side (EAST)"; - icon_state = "plating_warn_side" - }, +/turf/open/floor/plating, /area/quartermaster/storage) "aht" = ( /obj/machinery/door/poddoor{ @@ -21163,10 +21142,10 @@ tag = "" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ - tag = "icon-filter_off_f (EAST)"; +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 4; icon_state = "filter_off_f"; - dir = 4 + tag = "icon-filter_off_f (EAST)" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -26411,7 +26390,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/trinary/filter{ +/obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4 }, /turf/open/floor/plasteel, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 89379611881..aed8a826874 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -36271,7 +36271,7 @@ }, /obj/effect/landmark/blobstart, /obj/item/weapon/melee/baton/cattleprod{ - bcell = new /obj/item/weapon/stock_parts/cell/high() + cell = new /obj/item/weapon/stock_parts/cell/high() }, /turf/open/floor/plasteel/black, /area/medical/exam_room) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 2e7eeb4a514..95b54cab7f6 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -48285,10 +48285,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -61028,8 +61024,7 @@ /area/space/nearstation) "cDv" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ - icon_state = "filter_off_f"; +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 4 }, /turf/open/floor/engine, @@ -62039,14 +62034,13 @@ /turf/open/floor/engine, /area/engine/engineering) "cFL" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 4; - filter_type = "co2"; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4; + filter_type = "co2" + }, /turf/open/floor/engine, /area/engine/engineering) "cFM" = ( @@ -62062,14 +62056,13 @@ /turf/open/floor/engine, /area/engine/engineering) "cFN" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 4; - filter_type = "o2"; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4; + filter_type = "o2" + }, /turf/open/floor/engine, /area/engine/engineering) "cFO" = ( @@ -62089,14 +62082,13 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "cFP" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 4; - filter_type = "plasma"; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4; + filter_type = "plasma" + }, /turf/open/floor/engine, /area/engine/engineering) "cFQ" = ( @@ -62112,14 +62104,12 @@ /turf/open/floor/engine, /area/engine/engineering) "cFR" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 4; - filter_type = ""; - on = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/trinary/filter/critical{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engineering) "cFS" = ( diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 2ab65d182d7..d315b451496 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -14897,6 +14897,27 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) +"Mg" = ( +/obj/item/cardboard_cutout{ + desc = "They seem to be ignoring you... Typical."; + dir = 1; + icon_state = "cutout_ntsec"; + name = "Private Security Officer" + }, +/turf/open/floor/plasteel/darkred/side{ + dir = 1 + }, +/area/centcom/evac) +"Mh" = ( +/obj/item/cardboard_cutout{ + desc = "They seem to be ignoring you... Typical."; + icon_state = "cutout_ntsec"; + name = "Private Security Officer" + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/centcom/evac) (1,1,1) = {" aa @@ -65195,7 +65216,7 @@ sv wW xt xQ -xZ +Mg yC yC yU @@ -65454,7 +65475,7 @@ xp xR xZ yC -yC +Mh yV qk aa @@ -71987,14 +72008,14 @@ fj fy fC fN -fO -fO -fO -fO -fO -fO -fO -fO +ab +ab +ab +ab +ab +ab +ab +ab aa aa aa @@ -72244,14 +72265,14 @@ fi fv fC fN -fO +ab fR fR fR fR fR fR -fO +ab aa aa aa @@ -72501,16 +72522,16 @@ ag ag ag ab -fO +ab fS fS fS fS fS fS -fO -fO -fO +ab +ab +ab aa aa aa @@ -72758,7 +72779,7 @@ fk dZ fD fN -fO +ab ab ab ab @@ -72767,7 +72788,7 @@ ab ab fZ ga -fO +ab aa aa aa @@ -73015,7 +73036,7 @@ fk dZ fD fN -fO +ab ab ab ab @@ -73024,7 +73045,7 @@ ab ab fZ ga -fO +ab aa aa aa @@ -73272,7 +73293,7 @@ fl dZ fD fN -fO +ab ab ab ab @@ -73281,7 +73302,7 @@ ab ab fZ ga -fO +ab aa aa aa @@ -73529,7 +73550,7 @@ fk dZ fD fN -fO +ab ab ab ab @@ -73538,7 +73559,7 @@ ab ab fZ ga -fO +ab aa aa aa @@ -73786,7 +73807,7 @@ fk dZ fD fN -fO +ab ab ab ab @@ -73795,7 +73816,7 @@ ab ab fZ ga -fO +ab aa aa aa @@ -74043,16 +74064,16 @@ ag ag ag ab -fO +ab fT fT fT fT fT fT -fO -fO -fO +ab +ab +ab aa aa aa @@ -78155,16 +78176,16 @@ fr em fI fN -fO +ab fT fT fT fT fT fT -fO -fO -fO +ab +ab +ab aa aa aa @@ -78412,7 +78433,7 @@ en en fJ fN -fO +ab ab ab ab @@ -78421,7 +78442,7 @@ ab ab fZ gb -fO +ab aa aa aa @@ -78669,7 +78690,7 @@ ag ag ag ab -fO +ab ab ab ab @@ -78678,7 +78699,7 @@ ab ab fZ gb -fO +ab aa aa aa @@ -78926,7 +78947,7 @@ dP dP dP fN -fO +ab ab ab ab @@ -78935,7 +78956,7 @@ ab ab fZ gb -fO +ab aa aa aa @@ -79183,7 +79204,7 @@ fs fB fK fN -fO +ab ab ab ab @@ -79192,7 +79213,7 @@ ab ab fZ gb -fO +ab aa aa aa @@ -79440,7 +79461,7 @@ ft fB fL fN -fO +ab ab ab ab @@ -79449,7 +79470,7 @@ ab ab fZ gb -fO +ab aa aa aa @@ -79697,16 +79718,16 @@ fu fB fM fN -fO +ab fS fS fS fS fS fS -fO -fO -fO +ab +ab +ab aa aa aa @@ -79954,14 +79975,14 @@ dT dT dT fN -fO +ab fW fW fW fW fW fW -fO +ab aa aa aa @@ -80211,14 +80232,14 @@ ag ag ag ab -fO -fO -fO -fO -fO -fO -fO -fO +ab +ab +ab +ab +ab +ab +ab +ab aa aa aa diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm new file mode 100644 index 00000000000..e8fee967174 --- /dev/null +++ b/_maps/templates/shelter_2.dmm @@ -0,0 +1,41 @@ +"a" = (/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"b" = (/obj/structure/sign/mining/survival{tag = "icon-survival (NORTH)"; icon_state = "survival"; dir = 1},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"c" = (/turf/closed/wall/mineral/titanium/survival,/area/survivalpod) +"d" = (/obj/structure/sign/mining/survival{dir = 8},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"e" = (/obj/structure/fans,/turf/open/floor/pod,/area/survivalpod) +"f" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"g" = (/obj/item/device/gps/computer,/turf/open/floor/pod,/area/survivalpod) +"h" = (/obj/machinery/shower,/obj/item/weapon/soap/deluxe,/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; open = 0},/turf/open/floor/pod,/area/survivalpod) +"i" = (/obj/structure/toilet/secret{secret_type = /obj/item/weapon/kitchen/knife/combat/survival},/turf/open/floor/pod,/area/survivalpod) +"j" = (/obj/structure/sign/mining/survival{tag = "icon-survival (EAST)"; icon_state = "survival"; dir = 4},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"k" = (/obj/machinery/sleeper/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"l" = (/turf/open/floor/pod,/area/survivalpod) +"m" = (/obj/structure/bed/pod,/obj/item/weapon/bedsheet/black,/turf/open/floor/pod,/area/survivalpod) +"n" = (/obj/structure/window/reinforced/survival_pod{dir = 8; icon_state = "pwindow"; layer = 3; tag = "icon-pwindow (WEST)"},/obj/machinery/door/window/survival_pod{dir = 1; icon_state = "windoor"; tag = "icon-windoor (NORTH)"},/turf/open/floor/carpet/black,/area/survivalpod) +"o" = (/obj/structure/chair/comfy/black,/obj/item/cardboard_cutout{desc = "A cardboard cutout of a xenomorph maid."; icon_state = "cutout_lusty"; name = "lusty xenomorph maid"},/obj/structure/window/reinforced/survival_pod{tag = "icon-pwindow (NORTH)"; icon_state = "pwindow"; dir = 1},/turf/open/floor/carpet/black,/area/survivalpod) +"p" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/brute{pixel_x = 5},/turf/open/floor/pod,/area/survivalpod) +"q" = (/obj/structure/tubes,/obj/item/weapon/twohanded/required/kirbyplants/random,/turf/open/floor/pod,/area/survivalpod) +"r" = (/obj/structure/window/reinforced/survival_pod{dir = 8; icon_state = "pwindow"; tag = "icon-pwindow (WEST)"},/turf/open/floor/carpet/black,/area/survivalpod) +"s" = (/obj/machinery/light{dir = 4; light_color = "#DDFFD3"},/obj/structure/table/wood/fancy/black,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = 7; pixel_y = 2},/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{pixel_x = -6; pixel_y = 10},/turf/open/floor/carpet/black,/area/survivalpod) +"t" = (/obj/machinery/microwave{pixel_y = -2},/obj/structure/window/reinforced/survival_pod{tag = "icon-pwindow (NORTH)"; icon_state = "pwindow"; dir = 1},/obj/structure/table/wood/fancy/black{pixel_y = -9; pixel_z = 0},/turf/open/floor/carpet/black,/area/survivalpod) +"u" = (/obj/machinery/door/window/survival_pod{tag = "icon-windoor (NORTH)"; icon_state = "windoor"; dir = 1},/turf/open/floor/carpet/black,/area/survivalpod) +"v" = (/obj/structure/window/reinforced/survival_pod{tag = "icon-pwindow (NORTH)"; icon_state = "pwindow"; dir = 1},/obj/structure/displaycase{alert = 0; desc = "A display case containing an expensive forgery, probably."; pixel_w = 0; pixel_x = 0; pixel_y = -4; pixel_z = 0; req_access = 48; start_showpiece_type = /obj/item/fakeartefact},/turf/open/floor/carpet/black,/area/survivalpod) +"w" = (/obj/structure/window/reinforced/survival_pod{density = 0; dir = 9; icon_state = "pwindow"; tag = "icon-pwindow (NORTHWEST)"},/turf/open/floor/carpet/black,/area/survivalpod) +"x" = (/obj/structure/table/wood/fancy/black,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{pixel_x = 7; pixel_y = 2},/obj/effect/spawner/lootdrop/three_course_meal,/turf/open/floor/carpet/black,/area/survivalpod) +"y" = (/obj/structure/sink/kitchen{tag = "icon-sink_alt (EAST)"; icon_state = "sink_alt"; dir = 4; pixel_x = -13; pixel_y = 0},/turf/open/floor/carpet/black,/area/survivalpod) +"z" = (/obj/machinery/light,/turf/open/floor/carpet/black,/area/survivalpod) +"A" = (/turf/open/floor/carpet/black,/area/survivalpod) +"B" = (/obj/structure/chair/comfy/black{dir = 1},/turf/open/floor/carpet/black,/area/survivalpod) +"C" = (/obj/structure/sign/mining/survival,/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"D" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"E" = (/obj/structure/sign/mining,/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) + +(1,1,1) = {" +abcbcba +defghij +cklmnoc +dplqrsj +ctuvwxc +dyzAABj +aCcDcEa +"} diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index 165690571f1..98420bc4294 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -6,3 +6,15 @@ #define ANTAG_DATUM_NINJA /datum/antagonist/ninja #define ANTAG_DATUM_NINJA_FRIENDLY /datum/antagonist/ninja/friendly #define ANTAG_DATUM_NINJA_RANDOM /datum/antagonist/ninja/randomAllegiance/ +#define ANTAG_DATUM_TRAITOR /datum/antagonist/traitor +#define ANTAG_DATUM_TRAITOR_CUSTOM /datum/antagonist/traitor/custom +#define ANTAG_DATUM_TRAITOR_HUMAN /datum/antagonist/traitor/human +#define ANTAG_DATUM_TRAITOR_HUMAN_CUSTOM /datum/antagonist/traitor/human/custom +#define ANTAG_DATUM_TRAITOR_AI /datum/antagonist/traitor/AI +#define ANTAG_DATUM_TRAITOR_AI_CUSTOM /datum/antagonist/traitor/AI/custom +#define ANTAG_DATUM_IAA /datum/antagonist/traitor/internal_affairs +#define ANTAG_DATUM_IAA_CUSTOM /datum/antagonist/traitor/internal_affairs/custom +#define ANTAG_DATUM_IAA_HUMAN /datum/antagonist/traitor/human/internal_affairs +#define ANTAG_DATUM_IAA_HUMAN_CUSTOM /datum/antagonist/traitor/human/internal_affairs/custom +#define ANTAG_DATUM_IAA_AI_CUSTOM /datum/antagonist/traitor/AI/internal_affairs/custom +#define ANTAG_DATUM_IAA_AI /datum/antagonist/traitor/AI/internal_affairs diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index acc0cdc9ab4..5ea3bc7a70f 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -8,12 +8,10 @@ GLOBAL_VAR_INIT(clockwork_construction_value, 0) //The total value of all structures built by the clockwork cult GLOBAL_VAR_INIT(clockwork_caches, 0) //How many clockwork caches exist in the world (not each individual) GLOBAL_VAR_INIT(clockwork_daemons, 0) //How many daemons exist in the world -GLOBAL_LIST_INIT(clockwork_generals_invoked, list("nezbere" = FALSE, "sevtug" = FALSE, "nzcrentr" = FALSE, "inath-neq" = FALSE)) //How many generals have been recently invoked GLOBAL_LIST_EMPTY(all_clockwork_objects) //All clockwork items, structures, and effects in existence GLOBAL_LIST_EMPTY(all_clockwork_mobs) //All clockwork SERVANTS (not creatures) in existence GLOBAL_LIST_INIT(clockwork_component_cache, list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0)) //The pool of components that caches draw from GLOBAL_VAR_INIT(ratvar_awakens, 0) //If Ratvar has been summoned; not a boolean, for proper handling of multiple Ratvars -GLOBAL_VAR_INIT(nezbere_invoked, 0) //If Nezbere has been invoked; not a boolean, for proper handling of multiple Nezberes GLOBAL_VAR_INIT(clockwork_gateway_activated, FALSE) //if a gateway to the celestial derelict has ever been successfully activated GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not used to track existing scripture @@ -27,10 +25,6 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define APPLICATION_SERVANT_REQ 8 #define APPLICATION_CACHE_REQ 3 #define APPLICATION_CV_REQ 100 -#define SCRIPTURE_REVENANT "Revenant" -#define REVENANT_SERVANT_REQ 10 -#define REVENANT_CACHE_REQ 4 -#define REVENANT_CV_REQ 200 #define SCRIPTURE_JUDGEMENT "Judgement" #define JUDGEMENT_SERVANT_REQ 12 #define JUDGEMENT_CACHE_REQ 5 @@ -51,14 +45,10 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define MAX_COMPONENTS_BEFORE_RAND (10*LOWER_PROB_PER_COMPONENT) //the number of each component, times LOWER_PROB_PER_COMPONENT, you need to have before component generation will become random -#define GLOBAL_CLOCKWORK_GENERAL_COOLDOWN 3000 //how long globally-affecting clockwork generals go on cooldown after use, defaults to 5 minutes - -#define CLOCKWORK_GENERAL_COOLDOWN 2000 //how long clockwork generals go on cooldown after use, defaults to 3 minutes 20 seconds - //clockcult power defines #define MIN_CLOCKCULT_POWER 25 //the minimum amount of power clockcult machines will handle gracefully -#define CLOCKCULT_POWER_UNIT (MIN_CLOCKCULT_POWER*100) //standard power amount for clockwork proselytizer costs +#define CLOCKCULT_POWER_UNIT (MIN_CLOCKCULT_POWER*100) //standard power amount for replica fabricator costs #define POWER_STANDARD (CLOCKCULT_POWER_UNIT*0.2) //how much power is in anything else; doesn't matter as much as the following @@ -76,7 +66,7 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define POWER_PLASTEEL (CLOCKCULT_POWER_UNIT*0.05) //how much power is in one sheet of plasteel -#define RATVAR_POWER_CHECK "ratvar?" //when passed into can_use_power(), converts it into a check for if ratvar has woken/the proselytizer is debug +#define RATVAR_POWER_CHECK "ratvar?" //when passed into can_use_power(), converts it into a check for if ratvar has woken/the fabricator is debug //Ark defines #define GATEWAY_SUMMON_RATE 1 //the time amount the Gateway to the Celestial Derelict gets each process tick; defaults to 1 per tick @@ -99,7 +89,7 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define SIGIL_ACCESS_RANGE 2 //range at which transmission sigils can access power -#define PROSELYTIZER_REPAIR_PER_TICK 4 //how much a proselytizer repairs each tick, and also how many deciseconds each tick is +#define FABRICATOR_REPAIR_PER_TICK 4 //how much a fabricator repairs each tick, and also how many deciseconds each tick is #define OCULAR_WARDEN_EXCLUSION_RANGE 3 //the range at which ocular wardens cannot be placed near other ocular wardens diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index d4b536ec2f1..46589408a2b 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -95,11 +95,13 @@ //tablecrafting defines #define CAT_NONE "" -#define CAT_WEAPON "Weaponry" +#define CAT_WEAPONRY "Weaponry" +#define CAT_WEAPON "Weapons" #define CAT_AMMO "Ammunition" #define CAT_ROBOT "Robots" #define CAT_MISC "Misc" #define CAT_PRIMAL "Tribal" +#define CAT_FOOD "Foods" #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 40840ee0775..977f81f796d 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -425,3 +425,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define GIBTONITE_ACTIVE 1 #define GIBTONITE_STABLE 2 #define GIBTONITE_DETONATE 3 + +//for obj explosion block calculation +#define EXPLOSION_BLOCK_PROC -1 \ No newline at end of file diff --git a/code/__DEFINES/server_tools.dm b/code/__DEFINES/server_tools.dm new file mode 100644 index 00000000000..744559f6c77 --- /dev/null +++ b/code/__DEFINES/server_tools.dm @@ -0,0 +1,28 @@ +#define REBOOT_MODE_NORMAL 0 +#define REBOOT_MODE_HARD 1 +#define REBOOT_MODE_SHUTDOWN 2 + +#define IRC_STATUS_THROTTLE 50 + +//keep these in sync with TGS3 +#define SERVICE_WORLD_PARAM "server_service" +#define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json" + +#define SERVICE_CMD_HARD_REBOOT "hard_reboot" +#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown" +#define SERVICE_CMD_WORLD_ANNOUNCE "world_announce" +#define SERVICE_CMD_IRC_CHECK "irc_check" +#define SERVICE_CMD_IRC_STATUS "irc_status" +#define SERVICE_CMD_ADMIN_MSG "adminmsg" +#define SERVICE_CMD_NAME_CHECK "namecheck" +#define SERVICE_CMD_ADMIN_WHO "adminwho" + +//#define SERVICE_CMD_PARAM_KEY //defined in __compile_options.dm +#define SERVICE_CMD_PARAM_COMMAND "command" +#define SERVICE_CMD_PARAM_MESSAGE "message" +#define SERVICE_CMD_PARAM_TARGET "target" +#define SERVICE_CMD_PARAM_SENDER "sender" + +#define SERVICE_REQUEST_KILL_PROCESS "killme" +#define SERVICE_REQUEST_IRC_BROADCAST "irc" +#define SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE "send2irc" diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index c8a1a7c6273..04fbf205319 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -49,3 +49,5 @@ #define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark #define STATUS_EFFECT_CRUSHERDAMAGETRACKING /datum/status_effect/crusher_damage //tracks total kinetic crusher damage on a target + +#define STATUS_EFFECT_SYPHONMARK /datum/status_effect/syphon_mark //tracks kills for the KA death syphon module diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 42151510587..9847ab32e7d 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -131,9 +131,12 @@ return //Removes any null entries from the list +//Returns TRUE if the list had nulls, FALSE otherwise /proc/listclearnulls(list/L) - var/list/N = new(L.len) + var/start_len = L.len + var/list/N = new(start_len) L -= N + return L.len < start_len /* * Returns list containing all the entries from first list that are not present in second. diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index a76a9ac6236..c787f4415aa 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -3,7 +3,7 @@ for(var/file in args) src << browse_rsc(file) -/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm", ".html")) +/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html")) var/path = root for(var/i=0, iError: browse_files(): File not found/Invalid file([path]).") return diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index aed2dbc7875..7cf7370ae5b 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -506,7 +506,8 @@ return //First we spawn a dude. - var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin))//The mob being spawned. + var/mob/living/carbon/human/new_character = new//The mob being spawned. + SSjob.SendToLateJoin(new_character) G_found.client.prefs.copy_to(new_character) new_character.dna.update_dna_identity() diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index dafbc52e247..ada97ea385e 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1344,7 +1344,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) //kevinz000 if you touch this I will hunt you down GLOBAL_VAR_INIT(valid_HTTPSGet, FALSE) GLOBAL_PROTECT(valid_HTTPSGet) -/proc/HTTPSGet(url) +/proc/HTTPSGet(url) //tgs2 support if(findtext(url, "\"")) GLOB.valid_HTTPSGet = FALSE diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 57128891184..880276ddc8f 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -69,7 +69,5 @@ #error You need version 511 or higher #endif - -#ifndef SERVERTOOLS -#define SERVERTOOLS 0 -#endif + #define SERVICE_CMD_PARAM_KEY "serviceCommsKey" + \ No newline at end of file diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm index 5f0ba6d1d8c..5a851690fac 100644 --- a/code/_globalvars/lists/mapping.dm +++ b/code/_globalvars/lists/mapping.dm @@ -32,7 +32,6 @@ GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events GLOBAL_LIST_EMPTY(wizardstart) GLOBAL_LIST_EMPTY(newplayer_start) -GLOBAL_LIST_EMPTY(latejoin) GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these. diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 680ae8703ee..3f0d6cab80d 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -32,4 +32,6 @@ GLOBAL_LIST_EMPTY(ladders) GLOBAL_LIST_EMPTY(trophy_cases) GLOBAL_LIST_EMPTY(wire_color_directory) -GLOBAL_LIST_EMPTY(wire_name_directory) \ No newline at end of file +GLOBAL_LIST_EMPTY(wire_name_directory) + +GLOBAL_LIST_EMPTY(ai_status_displays) diff --git a/code/_onclick/autoclick.dm b/code/_onclick/autoclick.dm index 7b6e2f108a9..23d07e29688 100644 --- a/code/_onclick/autoclick.dm +++ b/code/_onclick/autoclick.dm @@ -1,5 +1,10 @@ /client var/list/atom/selected_target[2] + var/obj/item/active_mousedown_item = null + var/mouseParams = "" + var/mouseLocation = null + var/mouseObject = null + var/mouseControlObject = null /client/MouseDown(object, location, control, params) var/delay = mob.CanMobAutoclick(object, location, params) @@ -9,14 +14,26 @@ while(selected_target[1]) Click(selected_target[1], location, control, selected_target[2]) sleep(delay) + active_mousedown_item = mob.canMobMousedown(object, location, params) + if(active_mousedown_item) + active_mousedown_item.onMouseDown(object, location, params, mob) /client/MouseUp(object, location, control, params) selected_target[1] = null + if(active_mousedown_item) + active_mousedown_item.onMouseUp(object, location, params, mob) + active_mousedown_item = null /client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params) + mouseParams = params + mouseLocation = over_location + mouseObject = over_object + mouseControlObject = over_control if(selected_target[1] && over_object && over_object.IsAutoclickable()) selected_target[1] = over_object selected_target[2] = params + if(active_mousedown_item) + active_mousedown_item.onMouseDrag(src_object, over_object, src_location, over_location, params, mob) /mob/proc/CanMobAutoclick(object, location, params) @@ -27,8 +44,31 @@ if(h) . = h.CanItemAutoclick(object, location, params) +/mob/proc/canMobMousedown(object, location, params) + +/mob/living/carbon/canMobMousedown(atom/object, location, params) + var/obj/item/H = get_active_held_item() + if(H) + . = H.canItemMouseDown(object, location, params) + /obj/item/proc/CanItemAutoclick(object, location, params) +/obj/item/proc/canItemMouseDown(object, location, params) + if(canMouseDown) + return src + +/obj/item/proc/onMouseDown(object, location, params, mob) + return + +/obj/item/proc/onMouseUp(object, location, params, mob) + return + +/obj/item/proc/onMouseDrag(src_object, over_object, src_location, over_location, params, mob) + return + +/obj/item + var/canMouseDown = FALSE + /obj/item/weapon/gun var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds @@ -42,4 +82,11 @@ . = 0 /obj/screen/click_catcher/IsAutoclickable() - . = 1 \ No newline at end of file + . = 1 + +//Please don't roast me too hard +/client/MouseMove(object,location,control,params) + mouseParams = params + mouseLocation = location + mouseObject = object + mouseControlObject = control diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 195c04bd6f2..b2cc7b5c9c9 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -361,7 +361,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." name = "Next Tier Requirements" desc = "You shouldn't be seeing this description unless you're very fast. If you're very fast, good job!" icon_state = "no-servants-caches" - var/static/list/scripture_states = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE, SCRIPTURE_REVENANT = FALSE, SCRIPTURE_JUDGEMENT = FALSE) /obj/screen/alert/clockwork/scripture_reqs/Initialize() . = ..() @@ -374,12 +373,11 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /obj/screen/alert/clockwork/scripture_reqs/process() if(GLOB.clockwork_gateway_activated) - qdel(src) + mob_viewer.clear_alert("scripturereq") return var/current_state - scripture_states = scripture_unlock_check() - for(var/i in scripture_states) - if(!scripture_states[i]) + for(var/i in SSticker.scripture_states) + if(!SSticker.scripture_states[i]) current_state = i break icon_state = "no" @@ -411,10 +409,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." req_servants = APPLICATION_SERVANT_REQ req_caches = APPLICATION_CACHE_REQ req_cv = APPLICATION_CV_REQ - if(SCRIPTURE_REVENANT) - req_servants = REVENANT_SERVANT_REQ - req_caches = REVENANT_CACHE_REQ - req_cv = REVENANT_CV_REQ if(SCRIPTURE_JUDGEMENT) req_servants = JUDGEMENT_SERVANT_REQ req_caches = JUDGEMENT_CACHE_REQ @@ -459,7 +453,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." var/servants = 0 var/validservants = 0 var/unconverted_ais_exist = get_unconverted_ais() - var/list/scripture_states = scripture_unlock_check() var/list/textlist for(var/mob/living/L in GLOB.living_mob_list) if(is_servant_of_ratvar(L)) @@ -496,21 +489,9 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." textlist += "[unconverted_ais_exist] unconverted AIs exist!
" else textlist += "An unconverted AI exists!
" - if(scripture_states[SCRIPTURE_REVENANT]) - var/inathneq_available = GLOB.clockwork_generals_invoked["inath-neq"] <= world.time - var/sevtug_available = GLOB.clockwork_generals_invoked["sevtug"] <= world.time - var/nezbere_available = GLOB.clockwork_generals_invoked["nezbere"] <= world.time - var/nezcrentr_available = GLOB.clockwork_generals_invoked["nzcrentr"] <= world.time - if(inathneq_available || sevtug_available || nezbere_available || nezcrentr_available) - textlist += "Generals available:[inathneq_available ? "
INATH-NEQ":""][sevtug_available ? "
SEVTUG":""]\ - [nezbere_available ? "
NEZBERE":""][nezcrentr_available ? "
NZCRENTR":""]
" - else - textlist += "Generals available: NONE
" - else - textlist += "Generals available: NONE
" - for(var/i in scripture_states) + for(var/i in SSticker.scripture_states) if(i != SCRIPTURE_DRIVER) //ignore the always-unlocked stuff - textlist += "[i] Scripture: [scripture_states[i] ? "UNLOCKED":"LOCKED"]
" + textlist += "[i] Scripture: [SSticker.scripture_states[i] ? "UNLOCKED":"LOCKED"]
" desc = textlist.Join() ..() diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 1b87df3bdd8..db0da738fa2 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -263,6 +263,8 @@ var/mice_roundstart = 10 // how many wire chewing rodents spawn at roundstart. + var/irc_announce_new_game = FALSE + /datum/configuration/New() gamemode_cache = typecacheof(/datum/game_mode,TRUE) for(var/T in gamemode_cache) @@ -427,7 +429,7 @@ popup_admin_pm = 1 if("allow_holidays") allow_holidays = 1 - if("useircbot") + if("useircbot") //tgs2 support useircbot = 1 if("ticklag") var/ticklag = text2num(value) @@ -540,6 +542,8 @@ error_silence_time = text2num(value) if("error_msg_delay") error_msg_delay = text2num(value) + if("irc_announce_new_game") + irc_announce_new_game = TRUE else GLOB.config_error_log << "Unknown setting in configuration: '[name]'" diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 9a08d75988a..ff9dfca7394 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(blackbox) if(M.client) playercount += 1 var/admincount = GLOB.admins.len - var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')") + var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") query_record_playercount.Execute() /datum/controller/subsystem/blackbox/Recover() @@ -178,7 +178,7 @@ SUBSYSTEM_DEF(blackbox) var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") var/map = sanitizeSQL(SSmapping.config.map_name) - var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')") + var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") query_report_death.Execute() diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index b052b20f5d0..864274b8fb0 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(dbcore) //This is as close as we can get to the true round end before Disconnect() without changing where it's called, defeating the reason this is a subsystem if(SSdbcore.Connect()) var/sql_station_name = sanitizeSQL(station_name()) - var/datum/DBQuery/query_round_end = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (end_datetime, game_mode_result, end_state, station_name) VALUES (Now(), '[SSticker.mode_result]', '[SSticker.end_state]', '[sql_station_name]') WHERE id = [GLOB.round_id]") + var/datum/DBQuery/query_round_end = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = '[SSticker.mode_result]', end_state = '[SSticker.end_state]', station_name = '[sql_station_name]' WHERE id = [GLOB.round_id]") query_round_end.Execute() if(IsConnected()) Disconnect() diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index c37e10b28c7..05d8dbb5b7e 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -11,6 +11,7 @@ SUBSYSTEM_DEF(job) var/initial_players_to_assign = 0 //used for checking against population caps var/list/prioritized_jobs = list() + var/list/latejoin_trackers = list() //Don't read this list, use GetLateJoinTurfs() instead /datum/controller/subsystem/job/Initialize(timeofday) if(!occupations.len) @@ -378,23 +379,12 @@ SUBSYSTEM_DEF(job) continue S = sloc break + if(S) + SendToAtom(H, S, buckle = FALSE) if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper log_world("Couldn't find a round start spawn point for [rank]") - S = get_turf(pick(GLOB.latejoin)) - if(!S) //final attempt, lets find some area in the arrivals shuttle to spawn them in to. - log_world("Couldn't find a round start latejoin spawn point.") - for(var/turf/T in get_area_turfs(/area/shuttle/arrival)) - if(!T.density) - var/clear = 1 - for(var/obj/O in T) - if(O.density) - clear = 0 - break - if(clear) - S = T - continue - if(istype(S, /obj/effect/landmark) && isturf(S.loc)) - H.loc = S.loc + SendToLateJoin(H) + if(H.mind) H.mind.assigned_role = rank @@ -516,3 +506,45 @@ SUBSYSTEM_DEF(job) newjob.total_positions = J.total_positions newjob.spawn_positions = J.spawn_positions newjob.current_positions = J.current_positions + +/datum/controller/subsystem/job/proc/SendToAtom(mob/M, atom/A, buckle) + if(buckle && isliving(M) && istype(A, /obj/structure/chair)) + var/obj/structure/chair/C = A + if(C.buckle_mob(M, FALSE, FALSE)) + return + M.forceMove(get_turf(A)) + +/datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE) + if(latejoin_trackers.len) + SendToAtom(M, pick(latejoin_trackers), buckle) + else + //bad mojo + var/area/shuttle/arrival/A = locate() in GLOB.sortedAreas + if(A) + //first check if we can find a chair + var/obj/structure/chair/C = locate() in A + if(C) + SendToAtom(M, C, buckle) + return + else //last hurrah + var/list/avail = list() + for(var/turf/T in A) + if(!is_blocked_turf(T, TRUE)) + avail += T + if(avail.len) + SendToAtom(M, pick(avail), FALSE) + return + + //pick an open spot on arrivals and dump em + var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival)) + if(arrivals_turfs.len) + for(var/turf/T in arrivals_turfs) + if(!is_blocked_turf(T, TRUE)) + SendToAtom(M, T, FALSE) + return + //last chance, pick ANY spot on arrivals and dump em + SendToAtom(M, arrivals_turfs[1], FALSE) + else + var/msg = "Unable to send mob [M] to late join!" + message_admins(msg) + CRASH(msg) diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index ab941eb1c6b..0c99eb7ea44 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -37,11 +37,11 @@ SUBSYSTEM_DEF(machines) var/seconds = wait * 0.1 while(currentrun.len) - var/datum/thing = currentrun[currentrun.len] + var/obj/machinery/thing = currentrun[currentrun.len] currentrun.len-- if(thing && thing.process(seconds) != PROCESS_KILL) - if(thing:use_power) - thing:auto_use_power() //add back the power state + if(thing.use_power) + thing.auto_use_power() //add back the power state else processing -= thing if (thing) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 95d285d80ea..ae7a4f0ef4e 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -221,7 +221,7 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message) if(emergency.mode != SHUTTLE_CALL || emergency.timer != old_timer) return - emergency.cancel(/area/centcom) + emergency.cancel() if(!admiral_message) admiral_message = pick(GLOB.admiral_messages) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index de161ddecf4..22b35da4987 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -30,7 +30,6 @@ SUBSYSTEM_DEF(ticker) var/list/scripture_states = list(SCRIPTURE_DRIVER = TRUE, \ SCRIPTURE_SCRIPT = FALSE, \ SCRIPTURE_APPLICATION = FALSE, \ - SCRIPTURE_REVENANT = FALSE, \ SCRIPTURE_JUDGEMENT = FALSE) //list of clockcult scripture states for announcements var/delay_end = 0 //if set true, the round will not restart on it's own @@ -824,17 +823,18 @@ SUBSYSTEM_DEF(ticker) if(!delay) delay = config.round_end_countdown * 10 - if(delay_end) + var/skip_delay = check_rights() + if(delay_end && !skip_delay) to_chat(world, "An admin has delayed the round end.") return to_chat(world, "Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]") var/start_wait = world.time - UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2)) //don't wait forever + UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever sleep(delay - (world.time - start_wait)) - if(delay_end) + if(delay_end && !skip_delay) to_chat(world, "Reboot was cancelled by an admin.") return if(end_string) @@ -856,4 +856,4 @@ SUBSYSTEM_DEF(ticker) 'sound/roundend/disappointed.ogg'\ ) - world << sound(round_end_sound) \ No newline at end of file + world << sound(round_end_sound) diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index d5344ccb31e..813fc343ee0 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -112,10 +112,12 @@ /datum/antagonist/cult/master var/datum/action/innate/cult/master/finalreck/reckoning = new var/datum/action/innate/cult/master/cultmark/bloodmark = new + var/datum/action/innate/cult/master/pulse/throwing = new /datum/antagonist/cult/master/Destroy() QDEL_NULL(reckoning) QDEL_NULL(bloodmark) + QDEL_NULL(throwing) return ..() /datum/antagonist/cult/master/on_gain() @@ -136,6 +138,7 @@ if(!GLOB.reckoning_complete) reckoning.Grant(current) bloodmark.Grant(current) + throwing.Grant(current) current.update_action_buttons_icon() current.apply_status_effect(/datum/status_effect/cult_master) @@ -146,5 +149,6 @@ current = mob_override reckoning.Remove(current) bloodmark.Remove(current) + throwing.Remove(current) current.update_action_buttons_icon() current.remove_status_effect(/datum/status_effect/cult_master) diff --git a/code/datums/antagonists/datum_internal_affairs.dm b/code/datums/antagonists/datum_internal_affairs.dm new file mode 100644 index 00000000000..e3a8077732b --- /dev/null +++ b/code/datums/antagonists/datum_internal_affairs.dm @@ -0,0 +1,327 @@ +#define PINPOINTER_MINIMUM_RANGE 15 +#define PINPOINTER_EXTRA_RANDOM_RANGE 10 +#define PINPOINTER_PING_TIME 40 +#define PROB_ACTUAL_TRAITOR 20 +#define TRAITOR_AGENT_ROLE "Syndicate External Affairs Agent" + +/datum/antagonist/traitor/internal_affairs + base_datum_custom = ANTAG_DATUM_IAA_CUSTOM + human_datum = ANTAG_DATUM_IAA_HUMAN + ai_datum = ANTAG_DATUM_IAA_AI + + + +/datum/antagonist/traitor/AI/internal_affairs + name = "Internal Affairs Agent" + employer = "Nanotrasen" + special_role = "internal affairs agent" + base_datum_custom = ANTAG_DATUM_IAA_CUSTOM + var/syndicate = FALSE + var/last_man_standing = FALSE + var/list/datum/mind/targets_stolen + +/datum/antagonist/traitor/AI/internal_affairs/custom + silent = TRUE + should_give_codewords = FALSE + give_objectives = FALSE + +/datum/antagonist/traitor/human/internal_affairs + name = "Internal Affairs Agent" + employer = "Nanotrasen" + special_role = "internal affairs agent" + base_datum_custom = ANTAG_DATUM_IAA_CUSTOM + var/syndicate = FALSE + var/last_man_standing = FALSE + var/list/datum/mind/targets_stolen + +/datum/antagonist/traitor/human/internal_affairs/custom + silent = TRUE + should_give_codewords = FALSE + give_objectives = FALSE + should_equip = FALSE //Duplicating TCs is dangerous + +/datum/antagonist/traitor/human/internal_affairs/transfer_important_variables(datum/antagonist/traitor/human/internal_affairs/other) + ..(other) + other.syndicate = syndicate + other.last_man_standing = last_man_standing + other.targets_stolen = targets_stolen + +/datum/antagonist/traitor/AI/internal_affairs/transfer_important_variables(datum/antagonist/traitor/human/internal_affairs/other) + ..(other) + other.syndicate = syndicate + other.last_man_standing = last_man_standing + other.targets_stolen = targets_stolen + +/datum/antagonist/traitor/human/internal_affairs/proc/give_pinpointer() + if(owner && owner.current) + owner.current.apply_status_effect(/datum/status_effect/agent_pinpointer) + +/datum/antagonist/traitor/human/internal_affairs/apply_innate_effects() + .=..() //in case the base is used in future + if(owner&&owner.current) + give_pinpointer(owner.current) + +/datum/antagonist/traitor/human/internal_affairs/remove_innate_effects() + .=..() + if(owner&&owner.current) + owner.current.remove_status_effect(/datum/status_effect/agent_pinpointer) + +/datum/antagonist/traitor/internal_affairs/custom + ai_datum = ANTAG_DATUM_IAA_AI_CUSTOM + human_datum = ANTAG_DATUM_IAA_HUMAN_CUSTOM + +/datum/antagonist/traitor/human/internal_affairs/on_gain() + START_PROCESSING(SSprocessing, src) + .=..() +/datum/antagonist/traitor/human/internal_affairs/on_removal() + STOP_PROCESSING(SSprocessing,src) + .=..() +/datum/antagonist/traitor/human/internal_affairs/process() + iaa_process() + +/datum/antagonist/traitor/AI/internal_affairs/on_gain() + START_PROCESSING(SSprocessing, src) + .=..() +/datum/antagonist/traitor/AI/internal_affairs/on_removal() + STOP_PROCESSING(SSprocessing,src) + .=..() +/datum/antagonist/traitor/AI/internal_affairs/process() + iaa_process() + +/datum/status_effect/agent_pinpointer + id = "agent_pinpointer" + duration = -1 + tick_interval = PINPOINTER_PING_TIME + alert_type = /obj/screen/alert/status_effect/agent_pinpointer + var/minimum_range = PINPOINTER_MINIMUM_RANGE + var/mob/scan_target = null + +/obj/screen/alert/status_effect/agent_pinpointer + name = "Internal Affairs Integrated Pinpointer" + desc = "Even stealthier than a normal implant." + icon = 'icons/obj/device.dmi' + icon_state = "pinon" + +/datum/status_effect/agent_pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction + if(!scan_target) + linked_alert.icon_state = "pinonnull" + return + var/turf/here = get_turf(owner) + var/turf/there = get_turf(scan_target) + if(here.z != there.z) + linked_alert.icon_state = "pinonnull" + return + if(get_dist_euclidian(here,there)<=minimum_range + rand(0, PINPOINTER_EXTRA_RANDOM_RANGE)) + linked_alert.icon_state = "pinondirect" + else + linked_alert.setDir(get_dir(here, there)) + switch(get_dist(here, there)) + if(1 to 8) + linked_alert.icon_state = "pinonclose" + if(9 to 16) + linked_alert.icon_state = "pinonmedium" + if(16 to INFINITY) + linked_alert.icon_state = "pinonfar" + +/datum/status_effect/agent_pinpointer/proc/scan_for_target() + scan_target = null + if(owner) + if(owner.mind) + if(owner.mind.objectives) + for(var/datum/objective/objective_ in owner.mind.objectives) + if(!is_internal_objective(objective_)) + continue + var/datum/objective/assassinate/internal/objective = objective_ + var/mob/current = objective.target.current + if(current&¤t.stat!=DEAD) + scan_target = current + break + +/datum/status_effect/agent_pinpointer/tick() + if(!owner) + qdel(src) + return + scan_for_target() + point_to_target() + + +/proc/is_internal_objective(datum/objective/O) + return (istype(O, /datum/objective/assassinate/internal)||istype(O, /datum/objective/destroy/internal)) + +/datum/antagonist/traitor/proc/replace_escape_objective() + if(!owner||!owner.objectives) + return + for (var/objective_ in owner.objectives) + if(!(istype(objective_, /datum/objective/escape)||istype(objective_,/datum/objective/survive))) + continue + remove_objective(objective_) + + var/datum/objective/martyr/martyr_objective = new + martyr_objective.owner = owner + add_objective(martyr_objective) + +/datum/antagonist/traitor/proc/reinstate_escape_objective() + if(!owner||!owner.objectives) + return + for (var/objective_ in owner.objectives) + if(!istype(objective_, /datum/objective/martyr)) + continue + remove_objective(objective_) + +/datum/antagonist/traitor/human/internal_affairs/reinstate_escape_objective() + ..() + var/datum/objective/escape/escape_objective = new + escape_objective.owner = owner + add_objective(escape_objective) + +/datum/antagonist/traitor/AI/internal_affairs/reinstate_escape_objective() + ..() + var/datum/objective/survive/survive_objective = new + survive_objective.owner = owner + add_objective(survive_objective) + +/datum/antagonist/traitor/proc/steal_targets(datum/mind/victim) + var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA + + if(!owner.current||owner.current.stat==DEAD) + return + to_chat(owner.current, " Target eliminated: [victim.name]") + for(var/objective_ in victim.objectives) + if(istype(objective_, /datum/objective/assassinate/internal)) + var/datum/objective/assassinate/internal/objective = objective_ + if(objective.target==owner) + continue + else if(this.targets_stolen.Find(objective.target) == 0) + var/datum/objective/assassinate/internal/new_objective = new + new_objective.owner = owner + new_objective.target = objective.target + new_objective.update_explanation_text() + add_objective(new_objective) + this.targets_stolen += objective.target + var/status_text = objective.check_completion() ? "neutralised" : "active" + to_chat(owner.current, " New target added to database: [objective.target.name] ([status_text]) ") + else if(istype(objective_, /datum/objective/destroy/internal)) + var/datum/objective/destroy/internal/objective = objective_ + var/datum/objective/destroy/internal/new_objective = new + if(objective.target==owner) + continue + else if(this.targets_stolen.Find(objective.target) == 0) + new_objective.owner = owner + new_objective.target = objective.target + new_objective.update_explanation_text() + add_objective(new_objective) + this.targets_stolen += objective.target + var/status_text = objective.check_completion() ? "neutralised" : "active" + to_chat(owner.current, " New target added to database: [objective.target.name] ([status_text]) ") + this.last_man_standing = TRUE + for(var/objective_ in owner.objectives) + if(!is_internal_objective(objective_)) + continue + var/datum/objective/assassinate/internal/objective = objective_ + if(!objective.check_completion()) + this.last_man_standing = FALSE + return + if(this.last_man_standing) + if(this.syndicate) + to_chat(owner.current," All the loyalist agents are dead, and no more is required of you. Die a glorious death, agent. ") + else + to_chat(owner.current," All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.") + replace_escape_objective(owner) + +/datum/antagonist/traitor/proc/iaa_process() + var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA + if(owner&&owner.current&&owner.current.stat!=DEAD) + for(var/objective_ in owner.objectives) + if(!is_internal_objective(objective_)) + continue + var/datum/objective/assassinate/internal/objective = objective_ + if(!objective.target) + continue + if(objective.check_completion()) + if(objective.stolen) + continue + else + steal_targets(objective.target) + objective.stolen = TRUE + else + if(objective.stolen) + var/fail_msg = "Your sensors tell you that [objective.target.current.real_name], one of the targets you were meant to have killed, pulled one over on you, and is still alive - do the job properly this time! " + if(this.last_man_standing) + if(this.syndicate) + fail_msg += " You no longer have permission to die. " + else + fail_msg += " The truth could still slip out! Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to your contract being terminated." + reinstate_escape_objective(owner) + this.last_man_standing = FALSE + to_chat(owner.current, fail_msg) + objective.stolen = FALSE + +/datum/antagonist/traitor/proc/forge_iaa_objectives() + var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA + if(SSticker.mode.target_list.len && SSticker.mode.target_list[owner]) // Is a double agent + + // Assassinate + var/datum/mind/target_mind = SSticker.mode.target_list[owner] + if(issilicon(target_mind.current)) + var/datum/objective/destroy/internal/destroy_objective = new + destroy_objective.owner = owner + destroy_objective.target = target_mind + destroy_objective.update_explanation_text() + else + var/datum/objective/assassinate/internal/kill_objective = new + kill_objective.owner = owner + kill_objective.target = target_mind + kill_objective.update_explanation_text() + add_objective(kill_objective) + + //Optional traitor objective + if(prob(PROB_ACTUAL_TRAITOR)) + employer = "The Syndicate" + owner.special_role = TRAITOR_AGENT_ROLE + special_role = TRAITOR_AGENT_ROLE + this.syndicate = TRUE + forge_single_objective() + + else + ..() // Give them standard objectives. + return + +/datum/antagonist/traitor/human/internal_affairs/forge_traitor_objectives() + forge_iaa_objectives() + var/datum/objective/escape/escape_objective = new + escape_objective.owner = owner + add_objective(escape_objective) + +/datum/antagonist/traitor/AI/internal_affairs/forge_traitor_objectives() + forge_iaa_objectives() + var/datum/objective/survive/survive_objective = new + survive_objective.owner = owner + add_objective(survive_objective) + +/datum/antagonist/traitor/proc/greet_iaa() + var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA + var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "recieving bribes", "malpractice", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence") + + to_chat(owner.current, "You are the [special_role].") + if(this.syndicate) + to_chat(owner.current, "Your target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.") + to_chat(owner.current, "Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.") + to_chat(owner.current, " You have been provided with a standard uplink to accomplish your task. ") + else + to_chat(owner.current, "Your target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.") + to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") + to_chat(owner.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") + + to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") + owner.announce_objectives() + +/datum/antagonist/traitor/AI/internal_affairs/greet() + greet_iaa() +/datum/antagonist/traitor/human/internal_affairs/greet() + greet_iaa() + + +#undef PROB_ACTUAL_TRAITOR +#undef PINPOINTER_EXTRA_RANDOM_RANGE +#undef PINPOINTER_MINIMUM_RANGE +#undef PINPOINTER_PING_TIME diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm new file mode 100644 index 00000000000..a57c2087e30 --- /dev/null +++ b/code/datums/antagonists/datum_traitor.dm @@ -0,0 +1,321 @@ +/datum/antagonist/traitor + name = "Traitor" + var/should_specialise = TRUE //do we split into AI and human + var/base_datum_custom = ANTAG_DATUM_TRAITOR_CUSTOM //used for body transfer + var/ai_datum = ANTAG_DATUM_TRAITOR_AI + var/human_datum = ANTAG_DATUM_TRAITOR_HUMAN + var/special_role = "traitor" + var/employer = "The Syndicate" + var/give_objectives = TRUE + var/should_give_codewords = TRUE + var/list/objectives_given = list() + +/datum/antagonist/traitor/proc/transfer_important_variables(datum/antagonist/traitor/other) + other.silent = silent + other.employer = employer + other.special_role = special_role + other.objectives_given = objectives_given + +/datum/antagonist/traitor/custom + ai_datum = ANTAG_DATUM_TRAITOR_AI_CUSTOM + human_datum = ANTAG_DATUM_TRAITOR_HUMAN_CUSTOM + +/datum/antagonist/traitor/human + should_specialise = FALSE + var/should_equip = TRUE +/datum/antagonist/traitor/human/custom + silent = TRUE + should_give_codewords = FALSE + give_objectives = FALSE + should_equip = FALSE //Duplicating TCs is dangerous + +/datum/antagonist/traitor/AI + should_specialise = FALSE +/datum/antagonist/traitor/AI/custom + silent = TRUE + should_give_codewords = FALSE + give_objectives = FALSE + + +/datum/antagonist/traitor/on_body_transfer(mob/living/old_body, mob/living/new_body) + if(istype(new_body,/mob/living/silicon/ai)==istype(old_body,/mob/living/silicon/ai)) + ..() + else + silent = TRUE + owner.add_antag_datum(base_datum_custom) + for(var/datum/antagonist/traitor/new_datum in owner.antag_datums) + if(new_datum == src) + continue + transfer_important_variables(new_datum) + break + on_removal() + + + +/datum/antagonist/traitor/human/custom //used to give custom objectives + silent = TRUE + give_objectives = FALSE + should_give_codewords = FALSE +/datum/antagonist/traitor/AI/custom //used to give custom objectives + silent = TRUE + give_objectives = FALSE + should_give_codewords = FALSE + +/datum/antagonist/traitor/proc/specialise() + silent = TRUE + if(owner.current&&istype(owner.current,/mob/living/silicon/ai)) + owner.add_antag_datum(ai_datum) + else owner.add_antag_datum(human_datum) + on_removal() + +/datum/antagonist/traitor/on_gain() + if(should_specialise) + specialise() + return + SSticker.mode.traitors+=owner + owner.special_role = special_role + if(give_objectives) + forge_traitor_objectives() + finalize_traitor() + ..() + +/datum/antagonist/traitor/apply_innate_effects() + if(owner.assigned_role == "Clown") + var/mob/living/carbon/human/traitor_mob = owner.current + if(traitor_mob&&istype(traitor_mob)) + if(!silent) to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") + traitor_mob.dna.remove_mutation(CLOWNMUT) + +/datum/antagonist/traitor/remove_innate_effects() + if(owner.assigned_role == "Clown") + var/mob/living/carbon/human/traitor_mob = owner.current + if(traitor_mob&&istype(traitor_mob)) + traitor_mob.dna.add_mutation(CLOWNMUT) + +/datum/antagonist/traitor/on_removal() + if(should_specialise) + return ..()//we never did any of this anyway + SSticker.mode.traitors -= owner + for(var/O in objectives_given) + owner.objectives -= O + objectives_given = list() + if(!silent && owner.current) + to_chat(owner.current," You are no longer the [special_role]! ") + owner.special_role = null + ..() + +/datum/antagonist/traitor/AI/on_removal() + if(owner.current && isAI(owner.current)) + var/mob/living/silicon/ai/A = owner.current + A.set_zeroth_law("") + A.verbs -= /mob/living/silicon/ai/proc/choose_modules + A.malf_picker.remove_verbs(A) + qdel(A.malf_picker) + ..() + +/datum/antagonist/traitor/proc/add_objective(var/datum/objective/O) + owner.objectives += O + objectives_given += O + +/datum/antagonist/traitor/proc/remove_objective(var/datum/objective/O) + owner.objectives -= O + objectives_given -= O + +/datum/antagonist/traitor/proc/forge_traitor_objectives() + return +/datum/antagonist/traitor/human/forge_traitor_objectives() + var/is_hijacker = prob(10) + var/martyr_chance = prob(20) + var/objective_count = is_hijacker //Hijacking counts towards number of objectives + if(!SSticker.mode.exchange_blue && SSticker.mode.traitors.len >= 8) //Set up an exchange if there are enough traitors + if(!SSticker.mode.exchange_red) + SSticker.mode.exchange_red = owner + else + SSticker.mode.exchange_blue = owner + assign_exchange_role(SSticker.mode.exchange_red) + assign_exchange_role(SSticker.mode.exchange_blue) + objective_count += 1 //Exchange counts towards number of objectives + for(var/i = objective_count, i < config.traitor_objectives_amount, i++) + forge_single_objective() + + if(is_hijacker && objective_count <= config.traitor_objectives_amount) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount + if (!(locate(/datum/objective/hijack) in owner.objectives)) + var/datum/objective/hijack/hijack_objective = new + hijack_objective.owner = owner + add_objective(hijack_objective) + return + + + var/martyr_compatibility = 1 //You can't succeed in stealing if you're dead. + for(var/datum/objective/O in owner.objectives) + if(!O.martyr_compatible) + martyr_compatibility = 0 + break + + if(martyr_compatibility && martyr_chance) + var/datum/objective/martyr/martyr_objective = new + martyr_objective.owner = owner + add_objective(martyr_objective) + return + + else + if(!(locate(/datum/objective/escape) in owner.objectives)) + var/datum/objective/escape/escape_objective = new + escape_objective.owner = owner + add_objective(escape_objective) + return + +/datum/antagonist/traitor/AI/forge_traitor_objectives() + var/objective_count = 0 + + if(prob(30)) + objective_count += forge_single_objective() + + for(var/i = objective_count, i < config.traitor_objectives_amount, i++) + var/datum/objective/assassinate/kill_objective = new + kill_objective.owner = owner + kill_objective.find_target() + add_objective(kill_objective) + + var/datum/objective/survive/survive_objective = new + survive_objective.owner = owner + add_objective(survive_objective) +/datum/antagonist/traitor/proc/forge_single_objective() + return 0 +/datum/antagonist/traitor/human/forge_single_objective() //Returns how many objectives are added + .=1 + if(prob(50)) + var/list/active_ais = active_ais() + if(active_ais.len && prob(100/GLOB.joined_player_list.len)) + var/datum/objective/destroy/destroy_objective = new + destroy_objective.owner = owner + destroy_objective.find_target() + add_objective(destroy_objective) + else if(prob(30)) + var/datum/objective/maroon/maroon_objective = new + maroon_objective.owner = owner + maroon_objective.find_target() + add_objective(maroon_objective) + else + var/datum/objective/assassinate/kill_objective = new + kill_objective.owner = owner + kill_objective.find_target() + add_objective(kill_objective) + else + var/datum/objective/steal/steal_objective = new + steal_objective.owner = owner + steal_objective.find_target() + add_objective(steal_objective) + +/datum/antagonist/traitor/AI/forge_single_objective() + .=1 + var/special_pick = rand(1,4) + switch(special_pick) + if(1) + var/datum/objective/block/block_objective = new + block_objective.owner = owner + add_objective(block_objective) + if(2) + var/datum/objective/purge/purge_objective = new + purge_objective.owner = owner + add_objective(purge_objective) + if(3) + var/datum/objective/robot_army/robot_objective = new + robot_objective.owner = owner + add_objective(robot_objective) + if(4) //Protect and strand a target + var/datum/objective/protect/yandere_one = new + yandere_one.owner = owner + add_objective(yandere_one) + yandere_one.find_target() + var/datum/objective/maroon/yandere_two = new + yandere_two.owner = owner + yandere_two.target = yandere_one.target + yandere_two.update_explanation_text() // normally called in find_target() + add_objective(yandere_two) + .=2 +/datum/antagonist/traitor/greet() + to_chat(owner.current, "You are the [owner.special_role].") + owner.announce_objectives() + if(should_give_codewords) + give_codewords() + +/datum/antagonist/traitor/proc/finalize_traitor() + SSticker.mode.update_traitor_icons_added(owner) + return +/datum/antagonist/traitor/AI/finalize_traitor() + add_law_zero() + owner.current.playsound_local('sound/ambience/antag/Malf.ogg',100,0) + owner.current.grant_language(/datum/language/codespeak) +/datum/antagonist/traitor/human/finalize_traitor() + if(should_equip) equip(silent) + owner.current.playsound_local('sound/ambience/antag/TatorAlert.ogg',100,0) + +/datum/antagonist/traitor/proc/give_codewords() + if(!owner.current) + return + var/mob/traitor_mob=owner.current + + to_chat(traitor_mob, "The Syndicate provided you with the following information on how to identify their agents:") + to_chat(traitor_mob, "Code Phrase: [GLOB.syndicate_code_phrase]") + to_chat(traitor_mob, "Code Response: [GLOB.syndicate_code_response]") + + traitor_mob.mind.store_memory("Code Phrase: [GLOB.syndicate_code_phrase]") + traitor_mob.mind.store_memory("Code Response: [GLOB.syndicate_code_response]") + + to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.") + +/datum/antagonist/traitor/AI/proc/add_law_zero() + var/mob/living/silicon/ai/killer = owner.current + if(!killer || !istype(killer)) + return + var/law = "Accomplish your objectives at all costs." + var/law_borg = "Accomplish your AI's objectives at all costs." + killer.set_zeroth_law(law, law_borg) + killer.set_syndie_radio() + to_chat(killer, "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!") + killer.add_malf_picker() + +/datum/antagonist/traitor/proc/equip(var/silent = FALSE) +/datum/antagonist/traitor/human/equip(var/silent = FALSE) + owner.equip_traitor(employer, silent) + +/datum/antagonist/traitor/human/proc/assign_exchange_role() + //set faction + var/faction = "red" + if(owner == SSticker.mode.exchange_blue) + faction = "blue" + + //Assign objectives + var/datum/objective/steal/exchange/exchange_objective = new + exchange_objective.set_faction(faction,((faction == "red") ? SSticker.mode.exchange_blue : SSticker.mode.exchange_red)) + exchange_objective.owner = owner + add_objective(exchange_objective) + + if(prob(20)) + var/datum/objective/steal/exchange/backstab/backstab_objective = new + backstab_objective.set_faction(faction) + backstab_objective.owner = owner + add_objective(backstab_objective) + + //Spawn and equip documents + var/mob/living/carbon/human/mob = owner.current + + var/obj/item/weapon/folder/syndicate/folder + if(owner == SSticker.mode.exchange_red) + folder = new/obj/item/weapon/folder/syndicate/red(mob.loc) + else + folder = new/obj/item/weapon/folder/syndicate/blue(mob.loc) + + var/list/slots = list ( + "backpack" = slot_in_backpack, + "left pocket" = slot_l_store, + "right pocket" = slot_r_store + ) + + var/where = "At your feet" + var/equipped_slot = mob.equip_in_one_of_slots(folder, slots) + if (equipped_slot) + where = "In your [equipped_slot]" + to_chat(mob, "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") + diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index 24422b86c6c..11453769679 100644 --- a/code/datums/explosion.dm +++ b/code/datums/explosion.dm @@ -249,7 +249,7 @@ GLOBAL_LIST_EMPTY(explosions) if(GLOB.Debug2) log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.") - if(!stopped) //if we aren't in a hurry + if(running) //if we aren't in a hurry //Machines which report explosions. for(var/array in GLOB.doppler_arrays) var/obj/machinery/doppler_array/A = array @@ -279,16 +279,9 @@ GLOBAL_LIST_EMPTY(explosions) var/turf/T = affected_turfs[I] var/current_exp_block = T.density ? T.explosion_block : 0 - for(var/obj/machinery/door/D in T) - if(D.density) - current_exp_block += D.explosion_block - - for(var/obj/structure/window/W in T) - if(W.reinf && W.fulltile) - current_exp_block += W.explosion_block - - for(var/obj/structure/blob/B in T) - current_exp_block += B.explosion_block + for(var/obj/O in T) + var/the_block = O.explosion_block + current_exp_block += the_block == EXPLOSION_BLOCK_PROC ? O.GetExplosionBlock() : the_block .[T] = current_exp_block @@ -351,19 +344,12 @@ GLOBAL_LIST_EMPTY(explosions) var/turf/TT = T while(TT != epicenter) TT = get_step_towards(TT,epicenter) - if(TT.density && TT.explosion_block) + if(TT.density) dist += TT.explosion_block - - for(var/obj/machinery/door/D in TT) - if(D.density && D.explosion_block) - dist += D.explosion_block - - for(var/obj/structure/window/W in TT) - if(W.explosion_block && W.fulltile) - dist += W.explosion_block - - for(var/obj/structure/blob/B in T) - dist += B.explosion_block + + for(var/obj/O in T) + var/the_block = O.explosion_block + dist += the_block == EXPLOSION_BLOCK_PROC ? O.GetExplosionBlock() : the_block if(dist < dev) T.color = "red" diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 5e58e33190f..9187bb668ac 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -2,16 +2,17 @@ var/originmastercommit var/commit var/list/testmerge = list() - var/has_pr_details = FALSE //example data in a testmerge entry when this is true: https://api.github.com/repositories/3234987/pulls/22586 + var/has_pr_details = FALSE //tgs2 support var/date /datum/getrev/New() - if(SERVERTOOLS && fexists("..\\prtestjob.lk")) + if(fexists(SERVICE_PR_TEST_JSON)) + testmerge = json_decode(file2text(SERVICE_PR_TEST_JSON)) + else if(!world.RunningService() && fexists("../prtestjob.lk")) //tgs2 support var/list/tmp = world.file2list("..\\prtestjob.lk") for(var/I in tmp) if(I) testmerge |= I - log_world("Running /tg/ revision:") var/list/logs = world.file2list(".git/logs/HEAD") if(logs) @@ -27,12 +28,16 @@ log_world(commit) for(var/line in testmerge) if(line) - log_world("Test merge active of PR #[line]") - SSblackbox.add_details("testmerged_prs","[line]") + if(world.RunningService()) + var/tmcommit = testmerge[line]["commit"] + log_world("Test merge active of PR #[line] commit [tmcommit]") + SSblackbox.add_details("testmerged_prs","[line]|[tmcommit]") + else //tgs2 support + log_world("Test merge active of PR #[line]") + SSblackbox.add_details("testmerged_prs","[line]") log_world("Based off origin/master commit [originmastercommit]") else log_world(originmastercommit) - /datum/getrev/proc/DownloadPRDetails() if(!config.githubrepoid) if(testmerge.len) @@ -66,8 +71,11 @@ return "" . = header ? "The following pull requests are currently test merged:
" : "" for(var/line in testmerge) - var/details = "" - if(has_pr_details) + var/details + if(world.RunningService()) + var/cm = testmerge[line]["commit"] + details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["author"]) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 7))) + else if(has_pr_details) //tgs2 support details = ": '" + html_encode(testmerge[line]["title"]) + "' by " + html_encode(testmerge[line]["user"]["login"]) . += "#[line][details]
" diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index cce53171a11..54809a708ac 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -42,18 +42,23 @@ //cleans up ALL references :) /datum/holocall/Destroy() - user.reset_perspective() - if(user.client) - for(var/datum/camerachunk/chunk in eye.visibleCameraChunks) - chunk.remove(eye) - user.remote_control = null - QDEL_NULL(eye) + var/user_good = !QDELETED(user) + if(user_good) + user.reset_perspective() + user.remote_control = null + + if(!QDELETED(eye)) + if(user_good && user.client) + for(var/datum/camerachunk/chunk in eye.visibleCameraChunks) + chunk.remove(eye) + qdel(eye) + eye = null user = null + if(hologram) hologram.HC = null - hologram = null - calling_holopad.outgoing_call = null + hologram = null for(var/I in dialed_holopads) var/obj/machinery/holopad/H = I @@ -61,6 +66,7 @@ dialed_holopads.Cut() if(calling_holopad) + calling_holopad.outgoing_call = null calling_holopad.SetLightsAndPower() calling_holopad = null if(connected_holopad) @@ -85,7 +91,7 @@ /datum/holocall/proc/ConnectionFailure(obj/machinery/holopad/H, graceful = FALSE) testing("Holocall connection failure: graceful [graceful]") if(H == connected_holopad || H == calling_holopad) - if(!graceful) + if(!graceful && H != calling_holopad) calling_holopad.say("Connection failure.") qdel(src) return @@ -151,9 +157,7 @@ . = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && calling_holopad.is_operational() && user.loc == calling_holopad.loc if(.) - if(connected_holopad) - . = !QDELETED(connected_holopad) && connected_holopad.is_operational() - else + if(!connected_holopad) . = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME) if(!.) calling_holopad.say("No answer recieved.") diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 59ab5780b10..46a8905f158 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -11,8 +11,8 @@ var/minetype = "lavaland" - var/list/transition_config = list(MAIN_STATION = CROSSLINKED, - CENTCOMM = SELFLOOPING, + var/list/transition_config = list(CENTCOMM = SELFLOOPING, + MAIN_STATION = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED, MINING = SELFLOOPING, diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 7520e99997c..6b9fd52627c 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -68,6 +68,7 @@ /datum/mind/New(var/key) src.key = key soulOwner = src + martial_art = default_martial_art /datum/mind/Destroy() SSticker.minds -= src @@ -146,6 +147,7 @@ A.on_removal() return TRUE + /datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us. for(var/a in antag_datums) var/datum/antagonist/A = a @@ -186,15 +188,7 @@ /datum/mind/proc/remove_traitor() if(src in SSticker.mode.traitors) - SSticker.mode.traitors -= src - if(isAI(current)) - var/mob/living/silicon/ai/A = current - A.set_zeroth_law("") - A.verbs -= /mob/living/silicon/ai/proc/choose_modules - A.malf_picker.remove_verbs(A) - qdel(A.malf_picker) - special_role = null - remove_antag_equip() + src.remove_antag_datum(ANTAG_DATUM_TRAITOR) SSticker.mode.update_traitor_icons_removed(src) /datum/mind/proc/remove_nukeop() @@ -262,6 +256,67 @@ if(gang_datum) gang_datum.remove_gang_hud(src) +/datum/mind/proc/equip_traitor(var/employer = "The Syndicate", var/silent = FALSE) + if(!current) + return + var/mob/living/carbon/human/traitor_mob = current + if (!istype(traitor_mob)) + return + . = 1 + + var/list/all_contents = traitor_mob.GetAllContents() + var/obj/item/device/pda/PDA = locate() in all_contents + var/obj/item/device/radio/R = locate() in all_contents + var/obj/item/weapon/pen/P = locate() in all_contents //including your PDA-pen! + + var/obj/item/uplink_loc + + if(traitor_mob.client && traitor_mob.client.prefs) + switch(traitor_mob.client.prefs.uplink_spawn_loc) + if(UPLINK_PDA) + uplink_loc = PDA + if(!uplink_loc) + uplink_loc = R + if(!uplink_loc) + uplink_loc = P + if(UPLINK_RADIO) + uplink_loc = R + if(!uplink_loc) + uplink_loc = PDA + if(!uplink_loc) + uplink_loc = P + if(UPLINK_PEN) + uplink_loc = P + if(!uplink_loc) + uplink_loc = PDA + if(!uplink_loc) + uplink_loc = R + + if (!uplink_loc) + if(!silent) to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.") + . = 0 + else + var/obj/item/device/uplink/U = new(uplink_loc) + U.owner = "[traitor_mob.key]" + uplink_loc.hidden_uplink = U + + if(uplink_loc == R) + R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ)) + + if(!silent) to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features.") + traitor_mob.mind.store_memory("Radio Frequency: [format_frequency(R.traitor_frequency)] ([R.name]).") + + else if(uplink_loc == PDA) + PDA.lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" + + if(!silent) to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") + traitor_mob.mind.store_memory("Uplink Passcode: [PDA.lock_code] ([PDA.name]).") + + else if(uplink_loc == P) + P.traitor_unlock_degrees = rand(1, 360) + + if(!silent) to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features.") + traitor_mob.mind.store_memory("Uplink Degrees: [P.traitor_unlock_degrees] ([P.name]).") //Link a new mobs mind to the creator of said mob. They will join any team they are currently on, and will only switch teams when their creator does. @@ -1156,27 +1211,28 @@ else if (href_list["traitor"]) switch(href_list["traitor"]) if("clear") + to_chat(current, "You have been brainwashed!") remove_traitor() - to_chat(current, "You have been brainwashed! You are no longer a traitor!") message_admins("[key_name_admin(usr)] has de-traitor'ed [current].") log_admin("[key_name(usr)] has de-traitor'ed [current].") SSticker.mode.update_traitor_icons_removed(src) if("traitor") if(!(src in SSticker.mode.traitors)) - SSticker.mode.traitors += src - special_role = "traitor" - to_chat(current, "You are a traitor!") message_admins("[key_name_admin(usr)] has traitor'ed [current].") log_admin("[key_name(usr)] has traitor'ed [current].") - if(isAI(current)) - var/mob/living/silicon/ai/A = current - SSticker.mode.add_law_zero(A) - SSticker.mode.update_traitor_icons_added(src) + make_Traitor() if("autoobjectives") - SSticker.mode.forge_traitor_objectives(src) - to_chat(usr, "The objectives for traitor [key] have been generated. You can edit them and anounce manually.") + var/datum/antagonist/traitor/traitordatum = has_antag_datum(ANTAG_DATUM_TRAITOR) + if(!traitordatum) + message_admins("[key_name_admin(usr)] has traitor'ed [current] as part of autoobjectives.") + log_admin("[key_name(usr)] has traitor'ed [current] as part of autoobjectives.") + make_Traitor() + else + log_admin("[key_name(usr)] has forged objectives for [current] as part of autoobjectives.") + traitordatum.forge_traitor_objectives() + to_chat(usr, "The objectives for traitor [key] have been generated. You can edit them and anounce manually.") else if(href_list["devil"]) var/datum/antagonist/devil/devilinfo = has_antag_datum(ANTAG_DATUM_DEVIL) @@ -1288,7 +1344,6 @@ else if (istype(M) && length(M.viruses)) for(var/datum/disease/D in M.viruses) D.cure(0) - sleep(0) //because deleting of virus is done through spawn(0) if("infected") if (check_rights(R_ADMIN, 0)) var/mob/living/carbon/human/H = current @@ -1353,9 +1408,11 @@ message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].") log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].") if("uplink") - if(!SSticker.mode.equip_traitor(current, !(src in SSticker.mode.traitors))) + if(!equip_traitor()) to_chat(usr, "Equipping a syndicate failed!") - log_admin("[key_name(usr)] attempted to give [current] an uplink.") + log_admin("[key_name(usr)] tried and failed to give [current] an uplink.") + else + log_admin("[key_name(usr)] gave [current] an uplink.") else if (href_list["obj_announce"]) announce_objectives() @@ -1383,12 +1440,10 @@ qdel(H) /datum/mind/proc/make_Traitor() - if(!(src in SSticker.mode.traitors)) - SSticker.mode.traitors += src - special_role = "traitor" - SSticker.mode.forge_traitor_objectives(src) - SSticker.mode.finalize_traitor(src) - SSticker.mode.greet_traitor(src) + if(!(has_antag_datum(ANTAG_DATUM_TRAITOR))) + var/datum/antagonist/traitor/traitordatum = add_antag_datum(ANTAG_DATUM_TRAITOR) + return traitordatum + /datum/mind/proc/make_Nuke(turf/spawnloc, nuke_code, leader=0, telecrystals = TRUE) if(!(src in SSticker.mode.syndicates)) @@ -1447,7 +1502,7 @@ special_role = "Wizard" assigned_role = "Wizard" if(!GLOB.wizardstart.len) - current.loc = pick(GLOB.latejoin) + SSjob.SendToLateJoin(current) to_chat(current, "HOT INSERTION, GO GO GO") else current.loc = pick(GLOB.wizardstart) @@ -1494,7 +1549,6 @@ qdel(flash) take_uplink() var/fail = 0 -// fail |= !SSticker.mode.equip_traitor(current, 1) fail |= !SSticker.mode.equip_revolutionary(current) diff --git a/code/datums/riding.dm b/code/datums/riding.dm index e06c2044ab0..43cdba23814 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -45,7 +45,7 @@ if(offsetdir == ridden_dir) var/list/diroffsets = offsets[offsetdir] buckled_mob.pixel_x = diroffsets[1] - if(diroffsets.len == 2) + if(diroffsets.len >= 2) buckled_mob.pixel_y = diroffsets[2] if(diroffsets.len == 3) buckled_mob.layer = diroffsets[3] @@ -164,7 +164,7 @@ /datum/riding/janicart/get_offsets(pass_index) // list(dir = x, y, layer) - return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(-12, 7), "[EAST]" = list(0, 7), "[WEST]" = list( 12, 7)) + return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(0, 7), "[EAST]" = list(-12, 7), "[WEST]" = list( 12, 7)) //scooter /datum/riding/scooter/handle_vehicle_layer() diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 6b4076623eb..011363f0019 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -183,11 +183,3 @@ suffix = "lavaland_surface_swarmer_crash.dmm" allow_duplicates = FALSE cost = 20 - -/datum/map_template/ruin/lavaland/marine_crash - name = "Crashed Marine Transport" - id = "marine" - description = "A Marine Transport that has crashed, with one sole survivor" - suffix = "lavaland_surface_ueg_crash1.dmm" - allow_duplicates = FALSE - cost = 20 diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 36883c59fe2..c7912c4c6c2 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -241,10 +241,4 @@ id = "miracle" suffix = "miracle.dmm" name = "Ordinary Space Tile" - description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!" - -/datum/map_template/ruin/space/dragoon - id = "dragoon" - suffix = "dragoontomb.dmm" - name = "Sky Bulge Tomb" - description = "A tomb of a dice-loving dragoon in space. Turns out he got too good and jumped too high. Contains the Sky Bulge, which when thrown, warps the thrower." + description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!" \ No newline at end of file diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 09464083234..ae0301762e5 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -16,3 +16,29 @@ status_type = STATUS_EFFECT_UNIQUE alert_type = null var/total_damage = 0 + +/datum/status_effect/syphon_mark + id = "syphon_mark" + duration = 50 + status_type = STATUS_EFFECT_MULTIPLE + alert_type = null + on_remove_on_mob_delete = TRUE + var/obj/item/borg/upgrade/modkit/bounty/reward_target + +/datum/status_effect/syphon_mark/on_apply() + if(owner.stat == DEAD) + return FALSE + return ..() + +/datum/status_effect/syphon_mark/proc/get_kill() + if(reward_target) + reward_target.get_kill(owner) + +/datum/status_effect/syphon_mark/tick() + if(owner.stat == DEAD) + get_kill() + qdel(src) + +/datum/status_effect/syphon_mark/on_remove() + get_kill() + . = ..() diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 7da7b86e68f..ad2cf8e3c35 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -52,7 +52,7 @@ R.SetLockdown(!R.lockcharge) // Toggle if(WIRE_RESET_MODULE) if(R.has_module()) - R.ResetModule() + R.visible_message("[R]'s module servos twitch.", "Your module display flickers.") /datum/wires/robot/on_cut(wire, mend) var/mob/living/silicon/robot/R = holder @@ -74,3 +74,6 @@ R.visible_message("[R]'s camera lense focuses loudly.", "Your camera lense focuses loudly.") if(WIRE_LOCKDOWN) // Simple lockdown. R.SetLockdown(!mend) + if(WIRE_RESET_MODULE) + if(R.has_module() && !mend) + R.ResetModule() diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 4ebb5f3306c..9bba2d12cd6 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -1435,8 +1435,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "AI Satellite Atmos" icon_state = "ai" - /area/ai_monitored/turret_protected/aisat/atmos - name = "AI Satellite Atmos" +/area/ai_monitored/turret_protected/aisat/foyer + name = "AI Satellite Foyer" icon_state = "ai" /area/ai_monitored/turret_protected/aisat/service diff --git a/code/game/area/areas/ruins.dm b/code/game/area/areas/ruins.dm index 4a1fd86c202..b71314408d4 100644 --- a/code/game/area/areas/ruins.dm +++ b/code/game/area/areas/ruins.dm @@ -21,20 +21,48 @@ //Areas + +/area/ruin/powered/beach + icon_state = "dk_yellow" + +/area/ruin/powered/clownplanet + icon_state = "dk_yellow" + +/area/ruin/powered/animal_hospital + icon_state = "dk_yellow" + +/area/ruin/powered/snow_biodome + icon_state = "dk_yellow" + +/area/ruin/powered/gluttony + icon_state = "dk_yellow" + +/area/ruin/powered/golem_ship + name = "Free Golem Ship" + icon_state = "dk_yellow" + +/area/ruin/powered/greed + icon_state = "dk_yellow" + /area/ruin/unpowered/hierophant name = "Hierophant's Arena" + icon_state = "dk_yellow" + +/area/ruin/powered/pride + icon_state = "dk_yellow" + +/area/ruin/powered/seedvault + icon_state = "dk_yellow" + +/area/ruin/powered/syndicate_lava_base + name = "Secret Base" + icon_state = "dk_yellow" + /area/ruin/unpowered/no_grav/way_home name = "\improper Salvation" icon_state = "away" -/area/ruin/powered/snow_biodome - -/area/ruin/powered/golem_ship - name = "Free Golem Ship" - -/area/ruin/powered/syndicate_lava_base - name = "Secret Base" // Ruins of "onehalf" ship @@ -194,16 +222,48 @@ name = "Deep Storage" icon_state = "storage" +/area/ruin/deepstorage/airlock + name = "Deep Storage Airlock" + icon_state = "quart" + +/area/ruin/deepstorage/power + name = "Deep Storage Power and Atmospherics Room" + icon_state = "engi_storage" + +/area/ruin/deepstorage/hydroponics + name = "Deep Storage Hydroponics" + icon_state = "garden" + +/area/ruin/deepstorage/armory + name = "Deep Storage Secure Storage" + icon_state = "armory" + +/area/ruin/deepstorage/storage + name = "Deep Storage Storage" + icon_state = "storage_wing" + +/area/ruin/deepstorage/dorm + name = "Deep Storage Dormory" + icon_state = "crew_quarters" + +/area/ruin/deepstorage/kitchen + name = "Deep Storage Kitchen" + icon_state = "kitchen" + +/area/ruin/deepstorage/crusher + name = "Deep Storage Recycler" + icon_state = "storage" + //Ruin of Abandoned Zoo /area/ruin/abandonedzoo name = "Abandoned Zoo" icon_state = "green" - - + + //Xeno Nest - + /area/ruin/xenonest name = "The Hive" always_unpowered = 1 @@ -211,4 +271,3 @@ power_equip = 0 power_light = 0 poweralm = 0 - \ No newline at end of file diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index af9672c3df2..4c5f408f52a 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -680,3 +680,7 @@ set waitfor = FALSE if(!anchored && has_gravity()) step(src, movedir) + +//Returns an atom's power cell, if it has one. Overload for individual items. +/atom/movable/proc/get_cell() + return diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 48e1ff19576..9bb0d89e5c5 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -207,10 +207,9 @@ Credit where due: text += "
The servants' objective was:
[CLOCKCULT_OBJECTIVE]" text += "
Ratvar's servants had [GLOB.clockwork_caches] Tinkerer's Caches." text += "
Construction Value(CV) was: [GLOB.clockwork_construction_value]" - var/list/scripture_states = scripture_unlock_check() - for(var/i in scripture_states) + for(var/i in SSticker.scripture_states) if(i != SCRIPTURE_DRIVER) - text += "
[i] scripture was: [scripture_states[i] ? "UN":""]LOCKED" + text += "
[i] scripture was: [SSticker.scripture_states[i] ? "UN":""]LOCKED" if(servants_of_ratvar.len) text += "
Ratvar's servants were:" for(var/datum/mind/M in servants_of_ratvar) diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm index 7d8c3eb1f97..79dd3667897 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm @@ -204,7 +204,7 @@ else if(!GLOB.ratvar_awakens) to_chat(user, "Hitting the [sigil_name] with brass sheets will convert them to power at a rate of 1 brass sheet to [POWER_FLOOR]W power.") if(!GLOB.ratvar_awakens) - to_chat(user, "You can recharge Clockwork Proselytizers from the [sigil_name].") + to_chat(user, "You can recharge Replica Fabricators from the [sigil_name].") /obj/effect/clockwork/sigil/transmission/attackby(obj/item/I, mob/living/user, params) if(is_servant_of_ratvar(user) && istype(I, /obj/item/stack/tile/brass) && !GLOB.ratvar_awakens) diff --git a/code/game/gamemodes/clock_cult/clock_effects/general_markers.dm b/code/game/gamemodes/clock_cult/clock_effects/general_markers.dm index 6eb176ad48a..a3465fac053 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/general_markers.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/general_markers.dm @@ -18,10 +18,10 @@ their prowess. After a lost battle with Nar-Sian cultists, Inath-neq was struck down and stated in her dying breath, \ \"The Resonant Cogs shall not fall silent this day, but will come together to form a wheel that shall never stop turning.\" Ratvar, touched by this, granted Inath-neq an eternal body and \ merged her soul with those of the Cogs slain with her on the battlefield." - icon = 'icons/effects/187x381.dmi' + icon = 'icons/effects/119x268.dmi' icon_state = "inath-neq" - pixel_x = -77 - pixel_y = -174 + pixel_x = -59 + pixel_y = -134 /obj/effect/clockwork/general_marker/nezbere name = "Nezbere, the Brass Eidolon" @@ -29,10 +29,10 @@ clockwork_desc = "One of Ratvar's four generals. Nezbere is responsible for the design, testing, and creation of everything in Ratvar's domain, and his loyalty to Ratvar knows no bounds. \ It is said that Ratvar once asked him to destroy the plans for a weapon Nezbere had made that could have harmed him, and Nezbere responded by not only destroying the plans, \ but by taking his own life so that the device could never be replicated. Nezbere's zealotry is unmatched." - icon = 'icons/effects/340x428.dmi' + icon = 'icons/effects/237x321.dmi' icon_state = "nezbere" - pixel_x = -154 - pixel_y = -198 + pixel_x = -118 + pixel_y = -160 /obj/effect/clockwork/general_marker/sevtug name = "Sevtug, the Formless Pariah" @@ -40,10 +40,10 @@ clockwork_desc = "One of Ratvar's four generals. Sevtug taught him how to manipulate minds and is one of his oldest allies. Sevtug serves Ratvar loyally out of a hope that one day, he will \ be able to use a moment of weakness in the Justicar to usurp him, but such a day will never come. And so, he serves with dedication, if not necessarily any sort of decorum, never aware he is \ the one being made a fool of." - icon = 'icons/effects/211x247.dmi' + icon = 'icons/effects/166x195.dmi' icon_state = "sevtug" - pixel_x = -89 - pixel_y = -107 + pixel_x = -83 + pixel_y = -97 /obj/effect/clockwork/general_marker/nzcrentr name = "Nzcrentr, the Eternal Thunderbolt" @@ -51,7 +51,7 @@ clockwork_desc = "One of Ratvar's four generals. Before becoming one of Ratvar's generals, Nzcrentr sook out any and all sentient life to slaughter it for sport. \ Nzcrentr was coerced by Ratvar into entering a shell constructed by Nezbere, ostensibly made to grant Nzcrentr more power. In reality, the shell was made to trap and control it. \ Nzcrentr now serves loyally, though even one of Nezbere's finest creations was not enough to totally eliminate its will." - icon = 'icons/effects/254x361.dmi' + icon = 'icons/effects/274x385.dmi' icon_state = "nzcrentr" - pixel_x = -111 - pixel_y = -164 + pixel_x = -137 + pixel_y = -145 diff --git a/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm b/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm index 705273876c2..cdde45bb4cc 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm @@ -29,7 +29,7 @@ if(charge) . = min(charge, 250) charge = use(.) - updateicon() + update_icon() /obj/machinery/light/power_drain(clockcult_user) if(on) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm new file mode 100644 index 00000000000..1dd976d1983 --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm @@ -0,0 +1,372 @@ +//For the clockwork fabricator, this proc exists to make it easy to customize what the fabricator does when hitting something. + +//if a valid target, returns an associated list in this format; +//list("operation_time" = 15, "new_obj_type" = /obj/structure/window/reinforced/clockwork, "power_cost" = 5, "spawn_dir" = dir, "dir_in_new" = TRUE) +//otherwise, return literally any non-list thing but preferably FALSE +//returning TRUE won't produce the "cannot be fabricated" message and will still prevent fabrication + +/atom/proc/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/atom/proc/consume_visual(obj/item/clockwork/replica_fabricator/fabricator, power_amount) + if(fabricator.can_use_power(power_amount)) + var/obj/effect/temp_visual/ratvar/beam/itemconsume/B = new /obj/effect/temp_visual/ratvar/beam/itemconsume(get_turf(src)) + B.pixel_x = pixel_x + B.pixel_y = pixel_y + +//Turf conversion +/turf/closed/wall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //four sheets of metal + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 4), "spawn_dir" = SOUTH) + +/turf/closed/wall/mineral/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) + +/turf/closed/wall/mineral/iron/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal, five rods + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2) - (POWER_ROD * 5), "spawn_dir" = SOUTH) + +/turf/closed/wall/mineral/cult/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //no metal + return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH) + +/turf/closed/wall/shuttle/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal + return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) + +/turf/closed/wall/r_wall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/turf/closed/wall/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return list("operation_time" = 50, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = -POWER_WALL_MINUS_FLOOR, "spawn_dir" = SOUTH) + +/turf/open/floor/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(floor_tile == /obj/item/stack/tile/plasteel) + new floor_tile(src) + make_plating() + playsound(src, 'sound/items/Crowbar.ogg', 10, 1) //clink + return list("operation_time" = 30, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = POWER_FLOOR, "spawn_dir" = SOUTH) + +/turf/open/floor/plating/asteroid/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/turf/open/floor/plating/ashplanet/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/turf/open/floor/plating/lava/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/turf/open/floor/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(locate(/obj/structure/table) in src) + return FALSE + if(locate(/obj/structure/falsewall) in contents) + to_chat(user, "There is a false wall in the way, preventing you from fabricating a clockwork wall on [src].") + return + if(is_blocked_turf(src, TRUE)) + to_chat(user, "Something is in the way, preventing you from fabricating a clockwork wall on [src].") + return TRUE + var/operation_time = 100 + if(!GLOB.ratvar_awakens && fabricator.speed_multiplier > 0) //if ratvar isn't awake, this always takes 10 seconds + operation_time /= fabricator.speed_multiplier + return list("operation_time" = operation_time, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_MINUS_FLOOR, "spawn_dir" = SOUTH) + +//False wall conversion +/obj/structure/falsewall/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/cost = POWER_WALL_MINUS_FLOOR + if(ispath(mineral, /obj/item/stack/sheet/metal)) + cost -= (POWER_METAL * (2 + mineral_amount)) //four sheets of metal, plus an assumption that the girder is also two + else + cost -= (POWER_METAL * 2) //anything that doesn't use metal just has the girder + return list("operation_time" = 50, "new_obj_type" = /obj/structure/falsewall/brass, "power_cost" = cost, "spawn_dir" = SOUTH) + +/obj/structure/falsewall/iron/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //two sheets of metal, two rods; special assumption + return list("operation_time" = 50, "new_obj_type" = /obj/structure/falsewall/brass, "power_cost" = POWER_WALL_MINUS_FLOOR - (POWER_METAL * 2) - (POWER_ROD * 2), "spawn_dir" = SOUTH) + +/obj/structure/falsewall/reinforced/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/obj/structure/falsewall/brass/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Metal conversion +/obj/item/stack/tile/plasteel/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(source) + return FALSE + var/amount_temp = get_amount() + var/no_delete = FALSE + if(amount_temp < 2) + to_chat(user, "You need at least 2 floor tiles to convert into power.") + return TRUE + if(IsOdd(amount_temp)) + amount_temp-- + no_delete = TRUE + use(amount_temp) + amount_temp *= 12.5 //each tile is 12.5 power so this is 2 tiles to 25 power + consume_visual(fabricator, amount_temp) + return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = -amount_temp, "spawn_dir" = SOUTH, "no_target_deletion" = no_delete) + +/obj/item/stack/rods/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(source) + return FALSE + var/power_amount = -(amount*POWER_ROD) + consume_visual(fabricator, power_amount) + return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH) + +/obj/item/stack/sheet/metal/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(source) + return FALSE + var/power_amount = -(amount*POWER_METAL) + consume_visual(fabricator, power_amount) + return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH) + +/obj/item/stack/sheet/plasteel/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(source) + return FALSE + var/power_amount = -(amount*POWER_PLASTEEL) + consume_visual(fabricator, power_amount) + return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH) + +//Brass directly to power +/obj/item/stack/tile/brass/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + if(source) + return FALSE + var/power_amount = -(amount*POWER_FLOOR) + consume_visual(fabricator, power_amount) + return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH) + +//Airlock conversion +/obj/machinery/door/airlock/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/doortype = /obj/machinery/door/airlock/clockwork + if(glass) + doortype = /obj/machinery/door/airlock/clockwork/brass + return list("operation_time" = 60, "new_obj_type" = doortype, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = dir) + +/obj/machinery/door/airlock/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Table conversion +/obj/structure/table/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/fabrication_cost = POWER_STANDARD + if(framestack == /obj/item/stack/rods) + fabrication_cost -= POWER_ROD*framestackamount + else if(framestack == /obj/item/stack/tile/brass) + fabrication_cost -= POWER_FLOOR*framestackamount + if(buildstack == /obj/item/stack/sheet/metal) + fabrication_cost -= POWER_METAL*buildstackamount + else if(buildstack == /obj/item/stack/sheet/plasteel) + fabrication_cost -= POWER_PLASTEEL*buildstackamount + return list("operation_time" = 20, "new_obj_type" = /obj/structure/table/reinforced/brass, "power_cost" = fabrication_cost, "spawn_dir" = SOUTH) + +/obj/structure/table/reinforced/brass/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +/obj/structure/table_frame/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/fabrication_cost = POWER_FLOOR + if(framestack == /obj/item/stack/rods) + fabrication_cost -= POWER_ROD*framestackamount + else if(framestack == /obj/item/stack/tile/brass) + fabrication_cost -= POWER_FLOOR*framestackamount + return list("operation_time" = 10, "new_obj_type" = /obj/structure/table_frame/brass, "power_cost" = fabrication_cost, "spawn_dir" = SOUTH) + +/obj/structure/table_frame/brass/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Window conversion +/obj/structure/window/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/windowtype = /obj/structure/window/reinforced/clockwork + var/new_dir = TRUE + var/fabrication_time = 15 + var/fabrication_cost = POWER_FLOOR + if(fulltile) + windowtype = /obj/structure/window/reinforced/clockwork/fulltile + new_dir = FALSE + fabrication_time = 30 + fabrication_cost = POWER_STANDARD + if(reinf) + fabrication_cost -= POWER_ROD + if(reinf) + fabrication_cost -= POWER_ROD + for(var/obj/structure/grille/G in get_turf(src)) + INVOKE_ASYNC(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricate, G, user) + return list("operation_time" = fabrication_time, "new_obj_type" = windowtype, "power_cost" = fabrication_cost, "spawn_dir" = dir, "dir_in_new" = new_dir) + +/obj/structure/window/reinforced/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Windoor conversion +/obj/machinery/door/window/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return list("operation_time" = 30, "new_obj_type" = /obj/machinery/door/window/clockwork, "power_cost" = POWER_STANDARD, "spawn_dir" = dir, "dir_in_new" = TRUE) + +/obj/machinery/door/window/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Grille conversion +/obj/structure/grille/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/grilletype = /obj/structure/grille/ratvar + var/fabrication_time = 15 + if(broken) + grilletype = /obj/structure/grille/ratvar/broken + fabrication_time = 5 + return list("operation_time" = fabrication_time, "new_obj_type" = grilletype, "power_cost" = 0, "spawn_dir" = dir) + +/obj/structure/grille/ratvar/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Lattice conversion +/obj/structure/lattice/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE) + +/obj/structure/lattice/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + ratvar_act() //just in case we're the wrong type for some reason?? + return FALSE + +/obj/structure/lattice/catwalk/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/catwalk/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE) + +/obj/structure/lattice/catwalk/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + return FALSE + +//Girder conversion +/obj/structure/girder/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + var/fabrication_cost = POWER_GEAR - (POWER_METAL * 2) + if(state == GIRDER_REINF_STRUTS || state == GIRDER_REINF) + fabrication_cost -= POWER_PLASTEEL + return list("operation_time" = 20, "new_obj_type" = /obj/structure/destructible/clockwork/wall_gear, "power_cost" = fabrication_cost, "spawn_dir" = SOUTH) + +//Hitting a clockwork structure will try to repair it. +/obj/structure/destructible/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + . = TRUE + var/list/repair_values = list() + if(!fabricator.fabricator_repair_checks(repair_values, src, user)) + return + user.visible_message("[user]'s [fabricator.name] starts covering [src] in glowing orange energy...", \ + "You start repairing [src]...") + fabricator.repairing = src + while(fabricator && user && src) + if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \ + extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE))) + break + obj_integrity = Clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity) + fabricator.modify_stored_power(-repair_values["power_required"]) + playsound(src, 'sound/machines/click.ogg', 50, 1) + + if(fabricator) + fabricator.repairing = null + if(user) + user.visible_message("[user]'s [fabricator.name] stops covering [src] with glowing orange energy.", \ + "You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.") + +//Hitting a sigil of transmission will try to charge from it. +/obj/effect/clockwork/sigil/transmission/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + . = TRUE + var/list/charge_values = list() + if(!fabricator.sigil_charge_checks(charge_values, src, user)) + return + user.visible_message("[user]'s [fabricator.name] starts draining glowing orange energy from [src]...", \ + "You start recharging your [fabricator.name]...") + fabricator.recharging = src + while(fabricator && user && src) + if(!do_after(user, 10, target = src, extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/sigil_charge_checks, charge_values, src, user, TRUE))) + break + modify_charge(charge_values["power_gain"]) + fabricator.modify_stored_power(charge_values["power_gain"]) + playsound(src, 'sound/effects/light_flicker.ogg', charge_values["power_gain"] * 0.1, 1) + + if(fabricator) + fabricator.recharging = null + if(user) + user.visible_message("[user]'s [fabricator.name] stops draining glowing orange energy from [src].", \ + "You finish recharging your [fabricator.name]. It now contains [fabricator.get_power()]W/[fabricator.get_max_power()]W power.") + +//Fabricator mob heal proc, to avoid as much copypaste as possible. +/mob/living/proc/fabricator_heal(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator) + var/list/repair_values = list() + if(!fabricator.fabricator_repair_checks(repair_values, src, user)) + return + user.visible_message("[user]'s [fabricator.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \ + "You start repairin[src == user ? "g yourself" : "g [src]"]...") + fabricator.repairing = src + while(fabricator && user && src) + if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \ + extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE))) + break + fabricator_heal_tick(repair_values["healing_for_cycle"]) + fabricator.modify_stored_power(-repair_values["power_required"]) + playsound(src, 'sound/machines/click.ogg', 50, 1) + + if(fabricator) + fabricator.repairing = null + + return TRUE + +/mob/living/proc/fabricator_heal_tick(amount) + var/static/list/damage_heal_order = list(BRUTE, BURN, TOX, OXY) + heal_ordered_damage(amount, damage_heal_order) + +/mob/living/simple_animal/fabricator_heal_tick(amount) + adjustHealth(-amount) + +//Hitting a ratvar'd silicon will also try to repair it. +/mob/living/silicon/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + . = TRUE + if(health == maxHealth) //if we're at maximum health, replace the turf under us + return FALSE + else if(fabricator_heal(user, fabricator) && user) + user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ + "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") + +//Same with clockwork mobs. +/mob/living/simple_animal/hostile/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + . = TRUE + if(health == maxHealth) //if we're at maximum health, replace the turf under us + return FALSE + else if(fabricator_heal(user, fabricator) && user) + user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ + "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [health]/[maxHealth] health.") + +//Cogscarabs get special interaction because they're drones and have innate self-heals/revives. +/mob/living/simple_animal/drone/cogscarab/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) + . = TRUE + if(stat == DEAD) + try_reactivate(user) //if we're dead, try to repair us + return + if(health == maxHealth) + return FALSE + else if(!(flags & GODMODE)) + user.visible_message("[user]'s [fabricator.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \ + "You start repairin[src == user ? "g yourself" : "g [src]"]...") + fabricator.repairing = src + if(do_after(user, (maxHealth - health)*2, target=src)) + adjustHealth(-maxHealth) + user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ + "You finish repairin[src == user ? "g yourself" : "g [src]"].") + if(fabricator) + fabricator.repairing = null + +//Convert shards and gear bits directly to power +/obj/item/clockwork/alloy_shards/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent, power_amount) + if(!power_amount) + power_amount = -POWER_STANDARD + consume_visual(fabricator, power_amount) + if(!silent) //looper no looping + for(var/obj/item/clockwork/alloy_shards/S in get_turf(src)) //convert all other shards in the turf if we can + if(S == src) + continue //we want the shards to be fabricated after the main shard, thus this delay + addtimer(CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricate, S, user, TRUE), 0) + return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH) + +/obj/item/clockwork/alloy_shards/medium/gear_bit/large/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent, power_amount) + if(!power_amount) + power_amount = -(CLOCKCULT_POWER_UNIT*0.08) + return ..() + +/obj/item/clockwork/alloy_shards/large/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent, power_amount) + if(!power_amount) + power_amount = -(CLOCKCULT_POWER_UNIT*0.06) + return ..() + +/obj/item/clockwork/alloy_shards/medium/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent, power_amount) + if(!power_amount) + power_amount = -(CLOCKCULT_POWER_UNIT*0.04) + return ..() + +/obj/item/clockwork/alloy_shards/small/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent, power_amount) + if(!power_amount) + power_amount = -(CLOCKCULT_POWER_UNIT*0.02) + return ..() diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm deleted file mode 100644 index fc448a68b46..00000000000 --- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm +++ /dev/null @@ -1,409 +0,0 @@ -//For the clockwork proselytizer, this proc exists to make it easy to customize what the proselytizer does when hitting something. - -//if a valid target, returns an associated list in this format; -//list("operation_time" = 15, "new_obj_type" = /obj/structure/window/reinforced/clockwork, "power_cost" = 5, "spawn_dir" = dir, "dir_in_new" = TRUE) -//otherwise, return literally any non-list thing but preferably FALSE -//returning TRUE won't produce the "cannot be proselytized" message and will still prevent proselytizing - -/atom/proc/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Turf conversion -/turf/closed/wall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //four sheets of metal - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 4), "spawn_dir" = SOUTH) - -/turf/closed/wall/mineral/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) - -/turf/closed/wall/mineral/iron/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal, five rods - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2) - (POWER_ROD * 5), "spawn_dir" = SOUTH) - -/turf/closed/wall/mineral/cult/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //no metal - return list("operation_time" = 80, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = SOUTH) - -/turf/closed/wall/shuttle/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal - return list("operation_time" = 50, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_TOTAL - (POWER_METAL * 2), "spawn_dir" = SOUTH) - -/turf/closed/wall/r_wall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -/turf/closed/wall/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return list("operation_time" = 50, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = -POWER_WALL_MINUS_FLOOR, "spawn_dir" = SOUTH) - -/turf/open/floor/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(floor_tile == /obj/item/stack/tile/plasteel) - new floor_tile(src) - make_plating() - playsound(src, 'sound/items/Crowbar.ogg', 10, 1) //clink - return list("operation_time" = 30, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = POWER_FLOOR, "spawn_dir" = SOUTH) - -/turf/open/floor/plating/asteroid/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -/turf/open/floor/plating/ashplanet/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -/turf/open/floor/plating/lava/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -/turf/open/floor/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(locate(/obj/structure/table) in src) - return FALSE - if(is_blocked_turf(src, TRUE)) - to_chat(user, "Something is in the way, preventing you from proselytizing [src] into a clockwork wall.") - return TRUE - var/operation_time = 100 - if(!GLOB.ratvar_awakens && proselytizer.speed_multiplier > 0) //if ratvar isn't awake, this always takes 10 seconds - operation_time /= proselytizer.speed_multiplier - return list("operation_time" = operation_time, "new_obj_type" = /turf/closed/wall/clockwork, "power_cost" = POWER_WALL_MINUS_FLOOR, "spawn_dir" = SOUTH) - -//False wall conversion -/obj/structure/falsewall/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/cost = POWER_WALL_MINUS_FLOOR - if(ispath(mineral, /obj/item/stack/sheet/metal)) - cost -= (POWER_METAL * (2 + mineral_amount)) //four sheets of metal, plus an assumption that the girder is also two - else - cost -= (POWER_METAL * 2) //anything that doesn't use metal just has the girder - return list("operation_time" = 50, "new_obj_type" = /obj/structure/falsewall/brass, "power_cost" = cost, "spawn_dir" = SOUTH) - -/obj/structure/falsewall/iron/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) //two sheets of metal, two rods; special assumption - return list("operation_time" = 50, "new_obj_type" = /obj/structure/falsewall/brass, "power_cost" = POWER_WALL_MINUS_FLOOR - (POWER_METAL * 2) - (POWER_ROD * 2), "spawn_dir" = SOUTH) - -/obj/structure/falsewall/reinforced/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -/obj/structure/falsewall/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Metal conversion -/obj/item/stack/tile/plasteel/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(source) - return FALSE - var/amount_temp = get_amount() - if(proselytizer.metal_to_power) - var/no_delete = FALSE - if(amount_temp < 2) - to_chat(user, "You need at least 2 floor tiles to convert into power.") - return TRUE - if(IsOdd(amount_temp)) - amount_temp-- - no_delete = TRUE - use(amount_temp) - amount_temp *= 12.5 //each tile is 12.5 power so this is 2 tiles to 25 power - return list("operation_time" = 0, "new_obj_type" = /obj/effect/temp_visual/ratvar/beam/itemconsume, "power_cost" = -amount_temp, "spawn_dir" = SOUTH, "no_target_deletion" = no_delete) - if(amount_temp >= 20) - var/sheets_to_make = round(amount_temp * 0.05) //and 20 to 1 brass - var/used = sheets_to_make * 20 - user.visible_message("[user]'s [proselytizer.name] rips into [src], converting it to brass!", \ - "You convert [get_amount() - used > 0 ? "part of ":""][src] into brass...") - playsound(src, 'sound/machines/click.ogg', 50, 1) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/tile/brass(get_turf(src), sheets_to_make) - use(used) - else - to_chat(user, "You need at least 20 floor tiles to convert into brass.") - return TRUE - -/obj/item/stack/rods/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(source) - return FALSE - if(proselytizer.metal_to_power) - return list("operation_time" = 0, "new_obj_type" = /obj/effect/temp_visual/ratvar/beam/itemconsume, "power_cost" = -(amount*POWER_ROD), "spawn_dir" = SOUTH) - if(get_amount() >= 10) - var/sheets_to_make = round(get_amount() * 0.1) - var/used = sheets_to_make * 10 - user.visible_message("[user]'s [proselytizer.name] rips into [src], converting it to brass!", \ - "You convert [get_amount() - used > 0 ? "part of ":""][src] into brass...") - playsound(src, 'sound/machines/click.ogg', 50, 1) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/tile/brass(get_turf(src), sheets_to_make) - use(used) - else - to_chat(user, "You need at least 10 rods to convert into brass.") - return TRUE - -/obj/item/stack/sheet/metal/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(source) - return FALSE - if(proselytizer.metal_to_power) - return list("operation_time" = 0, "new_obj_type" = /obj/effect/temp_visual/ratvar/beam/itemconsume, "power_cost" = -(amount*POWER_METAL), "spawn_dir" = SOUTH) - if(get_amount() >= 5) - var/sheets_to_make = round(get_amount() * 0.2) - var/used = sheets_to_make * 5 - user.visible_message("[user]'s [proselytizer.name] rips into [src], converting it to brass!", \ - "You convert [get_amount() - used > 0 ? "part of ":""][src] into brass...") - playsound(src, 'sound/machines/click.ogg', 50, 1) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/tile/brass(get_turf(src), sheets_to_make) - use(used) - else - to_chat(user, "You need at least 5 sheets of metal to convert into brass.") - return TRUE - -/obj/item/stack/sheet/plasteel/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(source) - return FALSE - if(proselytizer.metal_to_power) - return list("operation_time" = 0, "new_obj_type" = /obj/effect/temp_visual/ratvar/beam/itemconsume, "power_cost" = -(amount*POWER_PLASTEEL), "spawn_dir" = SOUTH) - if(get_amount() >= 2) - var/sheets_to_make = round(get_amount() * 0.5) - var/used = sheets_to_make * 2 - user.visible_message("[user]'s [proselytizer.name] rips into [src], converting it to brass!", \ - "You convert [get_amount() - used > 0 ? "part of ":""][src] into brass...") - playsound(src, 'sound/machines/click.ogg', 50, 1) - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/tile/brass(get_turf(src), sheets_to_make) - use(used) - else - to_chat(user, "You need at least 2 sheets of plasteel to convert into brass.") - return TRUE - -//Brass directly to power -/obj/item/stack/tile/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - if(source) - return FALSE - return list("operation_time" = 0, "new_obj_type" = /obj/effect/temp_visual/ratvar/beam/itemconsume, "power_cost" = -(amount*POWER_FLOOR), "spawn_dir" = SOUTH) - -//Airlock conversion -/obj/machinery/door/airlock/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/doortype = /obj/machinery/door/airlock/clockwork - if(glass) - doortype = /obj/machinery/door/airlock/clockwork/brass - return list("operation_time" = 60, "new_obj_type" = doortype, "power_cost" = POWER_WALL_TOTAL, "spawn_dir" = dir) - -/obj/machinery/door/airlock/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Table conversion -/obj/structure/table/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/prosel_cost = POWER_STANDARD - if(framestack == /obj/item/stack/rods) - prosel_cost -= POWER_ROD*framestackamount - else if(framestack == /obj/item/stack/tile/brass) - prosel_cost -= POWER_FLOOR*framestackamount - if(buildstack == /obj/item/stack/sheet/metal) - prosel_cost -= POWER_METAL*buildstackamount - else if(buildstack == /obj/item/stack/sheet/plasteel) - prosel_cost -= POWER_PLASTEEL*buildstackamount - return list("operation_time" = 20, "new_obj_type" = /obj/structure/table/reinforced/brass, "power_cost" = prosel_cost, "spawn_dir" = SOUTH) - -/obj/structure/table/reinforced/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -/obj/structure/table_frame/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/prosel_cost = POWER_FLOOR - if(framestack == /obj/item/stack/rods) - prosel_cost -= POWER_ROD*framestackamount - else if(framestack == /obj/item/stack/tile/brass) - prosel_cost -= POWER_FLOOR*framestackamount - return list("operation_time" = 10, "new_obj_type" = /obj/structure/table_frame/brass, "power_cost" = prosel_cost, "spawn_dir" = SOUTH) - -/obj/structure/table_frame/brass/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Window conversion -/obj/structure/window/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/windowtype = /obj/structure/window/reinforced/clockwork - var/new_dir = TRUE - var/prosel_time = 15 - var/prosel_cost = POWER_FLOOR - if(fulltile) - windowtype = /obj/structure/window/reinforced/clockwork/fulltile - new_dir = FALSE - prosel_time = 30 - prosel_cost = POWER_STANDARD - if(reinf) - prosel_cost -= POWER_ROD - if(reinf) - prosel_cost -= POWER_ROD - for(var/obj/structure/grille/G in get_turf(src)) - INVOKE_ASYNC(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, G, user) - return list("operation_time" = prosel_time, "new_obj_type" = windowtype, "power_cost" = prosel_cost, "spawn_dir" = dir, "dir_in_new" = new_dir) - -/obj/structure/window/reinforced/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Windoor conversion -/obj/machinery/door/window/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return list("operation_time" = 30, "new_obj_type" = /obj/machinery/door/window/clockwork, "power_cost" = POWER_STANDARD, "spawn_dir" = dir, "dir_in_new" = TRUE) - -/obj/machinery/door/window/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Grille conversion -/obj/structure/grille/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/grilletype = /obj/structure/grille/ratvar - var/prosel_time = 15 - if(broken) - grilletype = /obj/structure/grille/ratvar/broken - prosel_time = 5 - return list("operation_time" = prosel_time, "new_obj_type" = grilletype, "power_cost" = 0, "spawn_dir" = dir) - -/obj/structure/grille/ratvar/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Lattice conversion -/obj/structure/lattice/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE) - -/obj/structure/lattice/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - ratvar_act() //just in case we're the wrong type for some reason?? - return FALSE - -/obj/structure/lattice/catwalk/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return list("operation_time" = 0, "new_obj_type" = /obj/structure/lattice/catwalk/clockwork, "power_cost" = 0, "spawn_dir" = SOUTH, "no_target_deletion" = TRUE) - -/obj/structure/lattice/catwalk/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - return FALSE - -//Girder conversion -/obj/structure/girder/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - var/prosel_cost = POWER_GEAR - (POWER_METAL * 2) - if(state == GIRDER_REINF_STRUTS || state == GIRDER_REINF) - prosel_cost -= POWER_PLASTEEL - return list("operation_time" = 20, "new_obj_type" = /obj/structure/destructible/clockwork/wall_gear, "power_cost" = prosel_cost, "spawn_dir" = SOUTH) - -//Hitting a clockwork structure will try to repair it. -/obj/structure/destructible/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - . = TRUE - var/list/repair_values = list() - if(!proselytizer.proselytizer_repair_checks(repair_values, src, user)) - return - user.visible_message("[user]'s [proselytizer.name] starts covering [src] in glowing orange energy...", \ - "You start repairing [src]...") - proselytizer.repairing = src - while(proselytizer && user && src) - if(!do_after(user, repair_values["healing_for_cycle"] * proselytizer.speed_multiplier, target = src, \ - extra_checks = CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytizer_repair_checks, repair_values, src, user, TRUE))) - break - obj_integrity = Clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity) - proselytizer.modify_stored_power(-repair_values["power_required"]) - playsound(src, 'sound/machines/click.ogg', 50, 1) - - if(proselytizer) - proselytizer.repairing = null - if(user) - user.visible_message("[user]'s [proselytizer.name] stops covering [src] with glowing orange energy.", \ - "You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.") - -//Hitting a sigil of transmission will try to charge from it. -/obj/effect/clockwork/sigil/transmission/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - . = TRUE - var/list/charge_values = list() - if(!proselytizer.sigil_charge_checks(charge_values, src, user)) - return - user.visible_message("[user]'s [proselytizer.name] starts draining glowing orange energy from [src]...", \ - "You start recharging your [proselytizer.name]...") - proselytizer.recharging = src - while(proselytizer && user && src) - if(!do_after(user, 10, target = src, extra_checks = CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/sigil_charge_checks, charge_values, src, user, TRUE))) - break - modify_charge(charge_values["power_gain"]) - proselytizer.modify_stored_power(charge_values["power_gain"]) - playsound(src, 'sound/effects/light_flicker.ogg', charge_values["power_gain"] * 0.1, 1) - - if(proselytizer) - proselytizer.recharging = null - if(user) - user.visible_message("[user]'s [proselytizer.name] stops draining glowing orange energy from [src].", \ - "You finish recharging your [proselytizer.name]. It now contains [proselytizer.get_power()]W/[proselytizer.get_max_power()]W power.") - -//Proselytizer mob heal proc, to avoid as much copypaste as possible. -/mob/living/proc/proselytizer_heal(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) - var/list/repair_values = list() - if(!proselytizer.proselytizer_repair_checks(repair_values, src, user)) - return - user.visible_message("[user]'s [proselytizer.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \ - "You start repairin[src == user ? "g yourself" : "g [src]"]...") - proselytizer.repairing = src - while(proselytizer && user && src) - if(!do_after(user, repair_values["healing_for_cycle"] * proselytizer.speed_multiplier, target = src, \ - extra_checks = CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytizer_repair_checks, repair_values, src, user, TRUE))) - break - proselytizer_heal_tick(repair_values["healing_for_cycle"]) - proselytizer.modify_stored_power(-repair_values["power_required"]) - playsound(src, 'sound/machines/click.ogg', 50, 1) - - if(proselytizer) - proselytizer.repairing = null - - return TRUE - -/mob/living/proc/proselytizer_heal_tick(amount) - var/static/list/damage_heal_order = list(BRUTE, BURN, TOX, OXY) - heal_ordered_damage(amount, damage_heal_order) - -/mob/living/simple_animal/proselytizer_heal_tick(amount) - adjustHealth(-amount) - -//Hitting a ratvar'd silicon will also try to repair it. -/mob/living/silicon/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - . = TRUE - if(health == maxHealth) //if we're at maximum health, prosel the turf under us - return FALSE - else if(proselytizer_heal(user, proselytizer) && user) - user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ - "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") - -//Same with clockwork mobs. -/mob/living/simple_animal/hostile/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - . = TRUE - if(health == maxHealth) //if we're at maximum health, prosel the turf under us - return FALSE - else if(proselytizer_heal(user, proselytizer) && user) - user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ - "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [health]/[maxHealth] health.") - -//Cogscarabs get special interaction because they're drones and have innate self-heals/revives. -/mob/living/simple_animal/drone/cogscarab/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent) - . = TRUE - if(stat == DEAD) - try_reactivate(user) //if we're at maximum health, prosel the turf under us - return - if(health == maxHealth) - return FALSE - else if(!(flags & GODMODE)) - user.visible_message("[user]'s [proselytizer.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \ - "You start repairin[src == user ? "g yourself" : "g [src]"]...") - proselytizer.repairing = src - if(do_after(user, (maxHealth - health)*2, target=src)) - adjustHealth(-maxHealth) - user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ - "You finish repairin[src == user ? "g yourself" : "g [src]"].") - if(proselytizer) - proselytizer.repairing = null - -//Convert shards and gear bits directly to power -/obj/item/clockwork/alloy_shards/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount) - if(!power_amount) - power_amount = -POWER_STANDARD - if(proselytizer.can_use_power(power_amount)) - var/obj/effect/temp_visual/ratvar/beam/itemconsume/B = new /obj/effect/temp_visual/ratvar/beam/itemconsume(get_turf(src)) - B.pixel_x = pixel_x - B.pixel_y = pixel_y - if(!silent) //looper no looping - for(var/obj/item/clockwork/alloy_shards/S in get_turf(src)) //convert all other shards in the turf if we can - if(S == src) - continue //we want the shards to be proselytized after the main shard, thus this delay - addtimer(CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, S, user, TRUE), 0) - return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH) - -/obj/item/clockwork/alloy_shards/medium/gear_bit/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount) - if(!power_amount) - power_amount = -(CLOCKCULT_POWER_UNIT*0.08) - return ..() - -/obj/item/clockwork/alloy_shards/large/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount) - if(!power_amount) - power_amount = -(CLOCKCULT_POWER_UNIT*0.06) - return ..() - -/obj/item/clockwork/alloy_shards/medium/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount) - if(!power_amount) - power_amount = -(CLOCKCULT_POWER_UNIT*0.04) - return ..() - -/obj/item/clockwork/alloy_shards/small/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer, silent, power_amount) - if(!power_amount) - power_amount = -(CLOCKCULT_POWER_UNIT*0.02) - return ..() diff --git a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm index e5d193d74a5..323c716d373 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm @@ -5,15 +5,16 @@ for(var/mob/living/M in GLOB.living_mob_list) if(is_servant_of_ratvar(M) && (ishuman(M) || issilicon(M))) servants++ - . = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE, SCRIPTURE_REVENANT = FALSE, SCRIPTURE_JUDGEMENT = FALSE) + . = list(SCRIPTURE_DRIVER = TRUE, SCRIPTURE_SCRIPT = FALSE, SCRIPTURE_APPLICATION = FALSE, SCRIPTURE_JUDGEMENT = FALSE) //Drivers: always unlocked - .[SCRIPTURE_SCRIPT] = (servants >= SCRIPT_SERVANT_REQ && GLOB.clockwork_caches >= SCRIPT_CACHE_REQ) + .[SCRIPTURE_SCRIPT] = (SSticker.scripture_states[SCRIPTURE_SCRIPT] || \ + (servants >= SCRIPT_SERVANT_REQ && GLOB.clockwork_caches >= SCRIPT_CACHE_REQ)) //Script: SCRIPT_SERVANT_REQ or more non-brain servants and SCRIPT_CACHE_REQ or more clockwork caches - .[SCRIPTURE_APPLICATION] = (servants >= APPLICATION_SERVANT_REQ && GLOB.clockwork_caches >= APPLICATION_CACHE_REQ && GLOB.clockwork_construction_value >= APPLICATION_CV_REQ) + .[SCRIPTURE_APPLICATION] = (SSticker.scripture_states[SCRIPTURE_APPLICATION] || \ + (servants >= APPLICATION_SERVANT_REQ && GLOB.clockwork_caches >= APPLICATION_CACHE_REQ && GLOB.clockwork_construction_value >= APPLICATION_CV_REQ)) //Application: APPLICATION_SERVANT_REQ or more non-brain servants, APPLICATION_CACHE_REQ or more clockwork caches, and at least APPLICATION_CV_REQ CV - .[SCRIPTURE_REVENANT] = (servants >= REVENANT_SERVANT_REQ && GLOB.clockwork_caches >= REVENANT_CACHE_REQ && GLOB.clockwork_construction_value >= REVENANT_CV_REQ) - //Revenant: REVENANT_SERVANT_REQ or more non-brain servants, REVENANT_CACHE_REQ or more clockwork caches, and at least REVENANT_CV_REQ CV - .[SCRIPTURE_JUDGEMENT] = (servants >= JUDGEMENT_SERVANT_REQ && GLOB.clockwork_caches >= JUDGEMENT_CACHE_REQ && GLOB.clockwork_construction_value >= JUDGEMENT_CV_REQ && !unconverted_ai_exists) + .[SCRIPTURE_JUDGEMENT] = (SSticker.scripture_states[SCRIPTURE_JUDGEMENT] || \ + (servants >= JUDGEMENT_SERVANT_REQ && GLOB.clockwork_caches >= JUDGEMENT_CACHE_REQ && GLOB.clockwork_construction_value >= JUDGEMENT_CV_REQ && !unconverted_ai_exists)) //Judgement: JUDGEMENT_SERVANT_REQ or more non-brain servants, JUDGEMENT_CACHE_REQ or more clockwork caches, at least JUDGEMENT_CV_REQ CV, and there are no living, non-servant ais //reports to servants when scripture is locked or unlocked @@ -21,7 +22,7 @@ . = scripture_unlock_check() for(var/i in .) if(.[i] != previous_states[i]) - hierophant_message("Hierophant Network: [i] Scripture has been [.[i] ? "un":""]locked.") + hierophant_message("Hierophant Network: [i] Scripture has been [.[i] ? "un":""]locked.") //maybe admins fucked with scripture states? update_slab_info() /proc/get_unconverted_ais() @@ -59,3 +60,6 @@ //changes construction value /proc/change_construction_value(amount) GLOB.clockwork_construction_value += amount + +/proc/can_recite_scripture(mob/living/L) + return (is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal() && (GLOB.ratvar_awakens || (ishuman(L) || issilicon(L)))) diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index f64b361ac1b..199e0ba9519 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -153,11 +153,11 @@ icon_state = "obelisk_prism" w_class = WEIGHT_CLASS_NORMAL -//Shards of Alloy, suitable only for proselytization. +//Shards of Alloy, suitable only as a source of power for a replica fabricator. /obj/item/clockwork/alloy_shards name = "replicant alloy shards" desc = "Broken shards of some oddly malleable metal. They occasionally move and seem to glow." - clockwork_desc = "Broken shards of replicant alloy. Can be proselytized for additional power." + clockwork_desc = "Broken shards of replicant alloy." icon_state = "alloy_shards" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/randomsinglesprite = FALSE @@ -172,10 +172,15 @@ pixel_x = rand(-sprite_shift, sprite_shift) pixel_y = rand(-sprite_shift, sprite_shift) +/obj/item/clockwork/alloy_shards/examine(mob/user) + ..() + if(is_servant_of_ratvar(user) || isobserver(user)) + to_chat(user, "Can be consumed by a replica fabricator as a source of power.") + /obj/item/clockwork/alloy_shards/proc/replace_name_desc() name = "replicant alloy shard" desc = "A broken shard of some oddly malleable metal. It occasionally moves and seems to glow." - clockwork_desc = "A broken shard of replicant alloy. Can be proselytized for additional power." + clockwork_desc = "A broken shard of replicant alloy." /obj/item/clockwork/alloy_shards/large w_class = WEIGHT_CLASS_TINY @@ -197,7 +202,7 @@ /obj/item/clockwork/alloy_shards/medium/gear_bit/replace_name_desc() name = "gear bit" desc = "A broken chunk of a gear. You want it." - clockwork_desc = "A broken chunk of a gear. Can be proselytized for additional power." + clockwork_desc = "A broken chunk of a gear." /obj/item/clockwork/alloy_shards/medium/gear_bit/large //gives more power @@ -215,5 +220,5 @@ /obj/item/clockwork/alloy_shards/pinion_lock name = "pinion lock" desc = "A dented and scratched gear. It's very heavy." - clockwork_desc = "A broken gear lock for pinion airlocks. Can be proselytized for additional power." + clockwork_desc = "A broken gear lock for pinion airlocks." icon_state = "pinion_lock" diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index 8b3aa01533a..bf2bf8ef9cf 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -14,7 +14,6 @@ var/target_component_id //the target component ID to create, if any var/no_cost = FALSE //If the slab is admin-only and needs no components and has no scripture locks var/speed_multiplier = 1 //multiples how fast this slab recites scripture - var/nonhuman_usable = FALSE //if the slab can be used by nonhumans, defaults to off var/produces_components = TRUE //if it produces components at all var/selected_scripture = SCRIPTURE_DRIVER var/recollecting = FALSE //if we're looking at fancy recollection @@ -33,29 +32,24 @@ no_cost = TRUE produces_components = FALSE -/obj/item/clockwork/slab/scarab - nonhuman_usable = TRUE - /obj/item/clockwork/slab/debug speed_multiplier = 0 no_cost = TRUE - nonhuman_usable = TRUE /obj/item/clockwork/slab/debug/attack_hand(mob/living/user) ..() if(!is_servant_of_ratvar(user)) add_servant_of_ratvar(user) -/obj/item/clockwork/slab/cyborg //three scriptures, plus a spear and proselytizer +/obj/item/clockwork/slab/cyborg //three scriptures, plus a spear and fabricator clockwork_desc = "A divine link to the Celestial Derelict, allowing for limited recital of scripture.\n\ Hitting a slab, a Servant with a slab, or a cache will transfer this slab's components into the target, the target's slab, or the global cache, respectively." - nonhuman_usable = TRUE quickbound = list(/datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/ranged_ability/linked_vanguard, \ /datum/clockwork_scripture/create_object/tinkerers_cache) maximum_quickbound = 6 //we usually have one or two unique scriptures, so if ratvar is up let us bind one more actions_types = list() -/obj/item/clockwork/slab/cyborg/engineer //five scriptures, plus a proselytizer +/obj/item/clockwork/slab/cyborg/engineer //five scriptures, plus a fabricator quickbound = list(/datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/cogscarab, \ /datum/clockwork_scripture/create_object/soul_vessel, /datum/clockwork_scripture/create_object/sigil_of_transmission, /datum/clockwork_scripture/create_object/interdiction_lens) @@ -71,7 +65,7 @@ quickbound = list(/datum/clockwork_scripture/channeled/belligerent, /datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/channeled/taunting_tirade, \ /datum/clockwork_scripture/channeled/volt_void/cyborg) -/obj/item/clockwork/slab/cyborg/janitor //five scriptures, plus a proselytizer +/obj/item/clockwork/slab/cyborg/janitor //five scriptures, plus a fabricator quickbound = list(/datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transgression, \ /datum/clockwork_scripture/create_object/ocular_warden, /datum/clockwork_scripture/create_object/mania_motor, /datum/clockwork_scripture/create_object/tinkerers_daemon) @@ -106,12 +100,6 @@ slab_ability = null return ..() -/obj/item/clockwork/slab/ratvar_act() - if(GLOB.ratvar_awakens) - nonhuman_usable = TRUE - else - nonhuman_usable = initial(nonhuman_usable) - /obj/item/clockwork/slab/dropped(mob/user) . = ..() addtimer(CALLBACK(src, .proc/check_on_mob, user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later @@ -138,7 +126,7 @@ production_time = world.time + SLAB_PRODUCTION_TIME + production_slowdown var/mob/living/L L = get_atom_on_turf(src, /mob/living) - if(istype(L) && is_servant_of_ratvar(L) && (nonhuman_usable || ishuman(L))) + if(istype(L) && can_recite_scripture(L)) var/component_to_generate = target_component_id if(!component_to_generate) component_to_generate = get_weighted_component_id(src) //more likely to generate components that we have less of @@ -268,7 +256,7 @@ if(busy) to_chat(user, "[src] refuses to work, displaying the message: \"[busy]!\"") return 0 - if(!nonhuman_usable && !ishuman(user)) + if(!can_recite_scripture(user)) to_chat(user, "[src] hums fitfully in your hands, but doesn't seem to do anything...") return 0 access_display(user) @@ -288,15 +276,14 @@ ui.open() /obj/item/clockwork/slab/proc/recite_scripture(datum/clockwork_scripture/scripture, mob/living/user) - if(!scripture || !user || !user.canUseTopic(src) || (!nonhuman_usable && !ishuman(user))) + if(!scripture || !user || !user.canUseTopic(src) || !can_recite_scripture(user)) return FALSE if(user.get_active_held_item() != src) to_chat(user, "You need to hold the slab in your active hand to recite scripture!") return FALSE var/initial_tier = initial(scripture.tier) if(initial_tier != SCRIPTURE_PERIPHERAL) - var/list/tiers_of_scripture = scripture_unlock_check() - if(!GLOB.ratvar_awakens && !no_cost && !tiers_of_scripture[initial_tier]) + if(!GLOB.ratvar_awakens && !no_cost && !SSticker.scripture_states[initial_tier]) to_chat(user, "That scripture is not unlocked, and cannot be recited!") return FALSE var/datum/clockwork_scripture/scripture_to_recite = new scripture @@ -356,7 +343,8 @@ repairing, Geis Capacitors are for conversion and control, Replicant Alloy is for construction and fuel, and \ Hierophant Ansibles are for transmission and power, though in combination their effects become more nuanced.

\ \ - There are also five tiers of Scripture; [SCRIPTURE_DRIVER], [SCRIPTURE_SCRIPT], [SCRIPTURE_APPLICATION], [SCRIPTURE_REVENANT], and [SCRIPTURE_JUDGEMENT].
\ + There are also four tiers of Scripture; [SCRIPTURE_DRIVER], [SCRIPTURE_SCRIPT], \ + [SCRIPTURE_APPLICATION], and [SCRIPTURE_JUDGEMENT].
\ Each tier has additional requirements, including Servants, Tinkerer's Caches, and Construction Value(CV). Construction Value is gained by creating structures or converting the \ station, and everything too large to hold will grant some amount of it.

\ \ @@ -369,8 +357,8 @@ However, weak is relative when it comes to scripture; even the 'weakest' could be enough to dominate a station in the hands of cunning Servants, and higher tiers of scripture are even \ stronger in the right hands.

\ \ - Some effects of scripture include granting the invoker a temporary complete immunity to stuns, summoning a turret that can attack anything that sets eyes on it, binding a powerful guardian \ - to the invoker, or even, at one of the highest tiers, granting all nearby Servants temporary invulnerability.
\ + Some effects of scripture include granting the invoker a temporary complete immunity to stuns, summoning a turret that can attack anything that sets eyes on it, or even binding a powerful \ + guardian to the invoker.
\ However, the most important scripture is Geis, which allows you to convert heathens with relative ease.

\ \ The second function of the clockwork slab is Recollection, which will display this guide.

\ @@ -413,15 +401,22 @@ switch(selected_scripture) //display info based on selected scripture tier if(SCRIPTURE_DRIVER) - data["tier_info"] = "These scriptures are always unlocked." + data["tier_info"] = "These scriptures are permenantly unlocked." if(SCRIPTURE_SCRIPT) - data["tier_info"] = "These scriptures require at least [SCRIPT_SERVANT_REQ] Servants and [SCRIPT_CACHE_REQ] Tinkerer's Cache." + if(SSticker.scripture_states[SCRIPTURE_SCRIPT]) + data["tier_info"] = "These scriptures are permenantly unlocked." + else + data["tier_info"] = "These scriptures require at least [SCRIPT_SERVANT_REQ] Servants and [SCRIPT_CACHE_REQ] Tinkerer's Cache." if(SCRIPTURE_APPLICATION) - data["tier_info"] = "These scriptures require at least [APPLICATION_SERVANT_REQ] Servants, [APPLICATION_CACHE_REQ] Tinkerer's Caches, and [APPLICATION_CV_REQ]CV." - if(SCRIPTURE_REVENANT) - data["tier_info"] = "These scriptures require at least [REVENANT_SERVANT_REQ] Servants, [REVENANT_CACHE_REQ] Tinkerer's Caches, and [REVENANT_CV_REQ]CV." + if(SSticker.scripture_states[SCRIPTURE_APPLICATION]) + data["tier_info"] = "These scriptures are permenantly unlocked." + else + data["tier_info"] = "These scriptures require at least [APPLICATION_SERVANT_REQ] Servants, [APPLICATION_CACHE_REQ] Tinkerer's Caches, and [APPLICATION_CV_REQ]CV." if(SCRIPTURE_JUDGEMENT) - data["tier_info"] = "This scripture requires at least [JUDGEMENT_SERVANT_REQ] Servants, [JUDGEMENT_CACHE_REQ] Tinkerer's Caches, and [JUDGEMENT_CV_REQ]CV.
In addition, there may not be any active non-Servant AIs." + if(SSticker.scripture_states[SCRIPTURE_JUDGEMENT]) + data["tier_info"] = "This scripture is permenantly unlocked." + else + data["tier_info"] = "This scripture requires at least [JUDGEMENT_SERVANT_REQ] Servants, [JUDGEMENT_CACHE_REQ] Tinkerer's Caches, and [JUDGEMENT_CV_REQ]CV.
In addition, there may not be any active non-Servant AIs." data["selected"] = selected_scripture diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_proselytizer.dm b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm similarity index 54% rename from code/game/gamemodes/clock_cult/clock_items/clockwork_proselytizer.dm rename to code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm index aa174adcd80..459e99869d0 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_proselytizer.dm +++ b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm @@ -1,51 +1,48 @@ -//Clockwork proselytizer: Converts applicable objects to Ratvarian variants. -/obj/item/clockwork/clockwork_proselytizer - name = "clockwork proselytizer" +//Replica Fabricator: Converts applicable objects to Ratvarian variants. +/obj/item/clockwork/replica_fabricator + name = "replica fabricator" desc = "An odd, L-shaped device that hums with energy." clockwork_desc = "A device that allows the replacing of mundane objects with Ratvarian variants. It requires power to function." - icon_state = "clockwork_proselytizer" + icon_state = "replica_fabricator" w_class = WEIGHT_CLASS_NORMAL force = 5 flags = NOBLUDGEON var/stored_power = 0 //Requires power to function var/max_power = CLOCKCULT_POWER_UNIT * 10 var/uses_power = TRUE - var/metal_to_power = FALSE var/repairing = null //what we're currently repairing, if anything var/obj/effect/clockwork/sigil/transmission/recharging = null //the sigil we're charging from, if any - var/speed_multiplier = 1 //how fast this proselytizer works + var/speed_multiplier = 1 //how fast this fabricator works var/charge_rate = MIN_CLOCKCULT_POWER //how much power we gain every two seconds var/charge_delay = 2 //how many proccess ticks remain before we can start to charge -/obj/item/clockwork/clockwork_proselytizer/preloaded +/obj/item/clockwork/replica_fabricator/preloaded stored_power = POWER_WALL_MINUS_FLOOR+POWER_WALL_TOTAL -/obj/item/clockwork/clockwork_proselytizer/scarab - name = "scarab proselytizer" - clockwork_desc = "A cogscarab's internal proselytizer. It can only be successfully used by a cogscarab and requires power to function." - metal_to_power = TRUE +/obj/item/clockwork/replica_fabricator/scarab + name = "scarab fabricator" + clockwork_desc = "A cogscarab's internal fabricator. It can only be successfully used by a cogscarab and requires power to function." item_state = "nothing" w_class = WEIGHT_CLASS_TINY speed_multiplier = 0.5 charge_rate = MIN_CLOCKCULT_POWER * 2 var/debug = FALSE -/obj/item/clockwork/clockwork_proselytizer/scarab/proselytize(atom/target, mob/living/user) +/obj/item/clockwork/replica_fabricator/scarab/fabricate(atom/target, mob/living/user) if(!debug && !isdrone(user)) return 0 return ..() -/obj/item/clockwork/clockwork_proselytizer/scarab/debug - clockwork_desc = "A cogscarab's internal proselytizer. It can convert nearly any object into a Ratvarian variant." +/obj/item/clockwork/replica_fabricator/scarab/debug + clockwork_desc = "A cogscarab's internal fabricator. It can convert nearly any object into a Ratvarian variant." uses_power = FALSE debug = TRUE -/obj/item/clockwork/clockwork_proselytizer/cyborg - name = "cyborg proselytizer" - clockwork_desc = "A cyborg's internal proselytizer. It is capable of using the cyborg's power in addition to stored power." - metal_to_power = TRUE +/obj/item/clockwork/replica_fabricator/cyborg + name = "cyborg fabricator" + clockwork_desc = "A cyborg's internal fabricator. It is capable of using the cyborg's power in addition to stored power." -/obj/item/clockwork/clockwork_proselytizer/cyborg/get_power() //returns power and cyborg's power +/obj/item/clockwork/replica_fabricator/cyborg/get_power() //returns power and cyborg's power var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) var/borg_power = 0 var/current_charge = 0 @@ -56,14 +53,14 @@ borg_power += MIN_CLOCKCULT_POWER return ..() + borg_power -/obj/item/clockwork/clockwork_proselytizer/cyborg/get_max_power() +/obj/item/clockwork/replica_fabricator/cyborg/get_max_power() var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) var/cell_maxcharge = 0 if(istype(R) && R.cell) cell_maxcharge = R.cell.maxcharge return ..() + cell_maxcharge -/obj/item/clockwork/clockwork_proselytizer/cyborg/can_use_power(amount) +/obj/item/clockwork/replica_fabricator/cyborg/can_use_power(amount) if(amount != RATVAR_POWER_CHECK) var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) var/current_charge = 0 @@ -76,7 +73,7 @@ return FALSE . = ..() -/obj/item/clockwork/clockwork_proselytizer/cyborg/modify_stored_power(amount) +/obj/item/clockwork/replica_fabricator/cyborg/modify_stored_power(amount) var/mob/living/silicon/robot/R = get_atom_on_turf(src, /mob/living) if(istype(R) && R.cell && amount) if(amount < 0) @@ -89,15 +86,15 @@ amount -= MIN_CLOCKCULT_POWER . = ..() -/obj/item/clockwork/clockwork_proselytizer/Initialize() +/obj/item/clockwork/replica_fabricator/Initialize() . = ..() START_PROCESSING(SSobj, src) -/obj/item/clockwork/clockwork_proselytizer/Destroy() +/obj/item/clockwork/replica_fabricator/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/clockwork/clockwork_proselytizer/process() +/obj/item/clockwork/replica_fabricator/process() if(!charge_rate) return var/mob/living/L = get_atom_on_turf(src, /mob/living) @@ -106,18 +103,14 @@ charge_delay-- return modify_stored_power(charge_rate) - for(var/obj/item/clockwork/clockwork_proselytizer/S in L.GetAllContents()) //no multiple proselytizers + for(var/obj/item/clockwork/replica_fabricator/S in L.GetAllContents()) //no multiple fabricators if(S == src) continue S.charge_delay = 2 else charge_delay = 2 -/obj/item/clockwork/clockwork_proselytizer/ratvar_act() - if(GLOB.nezbere_invoked) - charge_rate = 1250 - else - charge_rate = initial(charge_rate) +/obj/item/clockwork/replica_fabricator/ratvar_act() if(GLOB.ratvar_awakens) uses_power = FALSE speed_multiplier = initial(speed_multiplier) * 0.25 @@ -125,21 +118,19 @@ uses_power = initial(uses_power) speed_multiplier = initial(speed_multiplier) -/obj/item/clockwork/clockwork_proselytizer/examine(mob/living/user) +/obj/item/clockwork/replica_fabricator/examine(mob/living/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) - to_chat(user, "Can be used to convert walls, floors, windows, airlocks, and a variety of other objects to clockwork variants.") - to_chat(user, "Can also form some objects into Brass sheets, as well as reform Clockwork Walls into Clockwork Floors, and vice versa.") + to_chat(user, "Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.") + to_chat(user, "Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors.") if(uses_power) - if(metal_to_power) - to_chat(user, "It can convert rods, metal, plasteel, and brass to power at rates of 1:[POWER_ROD]W, 1:[POWER_METAL]W, \ - 1:[POWER_PLASTEEL]W, and 1:[POWER_FLOOR]W, respectively.") - else - to_chat(user, "It can convert brass to power at a rate of 1:[POWER_FLOOR]W.") - to_chat(user, "It is storing [get_power()]W/[get_max_power()]W of power, and is gaining [charge_rate*0.5]W of power per second.") + to_chat(user, "It can consume floor tiles, rods, metal, and plasteel for power at rates of 2:[POWER_ROD]W, 1:[POWER_ROD]W, 1:[POWER_METAL]W, \ + and 1:[POWER_PLASTEEL]W, respectively.") + to_chat(user, "It can also consume brass sheets for power at a rate of 1:[POWER_FLOOR]W.") + to_chat(user, "It is storing [get_power()]W/[get_max_power()]W of power[charge_rate ? ", and is gaining [charge_rate*0.5]W of power per second":""].") to_chat(user, "Use it in-hand to produce 5 brass sheets at a cost of [POWER_WALL_TOTAL]W power.") -/obj/item/clockwork/clockwork_proselytizer/attack_self(mob/living/user) +/obj/item/clockwork/replica_fabricator/attack_self(mob/living/user) if(is_servant_of_ratvar(user)) if(uses_power) if(!can_use_power(POWER_WALL_TOTAL)) @@ -148,24 +139,24 @@ modify_stored_power(-POWER_WALL_TOTAL) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) new/obj/item/stack/tile/brass(user.loc, 5) - to_chat(user, "You user [stored_power ? "some":"all"] of [src]'s power to produce some brass sheets. It now stores [get_power()]W/[get_max_power()]W of power.") + to_chat(user, "You use [stored_power ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now stores [get_power()]W/[get_max_power()]W of power.") -/obj/item/clockwork/clockwork_proselytizer/pre_attackby(atom/target, mob/living/user, params) +/obj/item/clockwork/replica_fabricator/pre_attackby(atom/target, mob/living/user, params) if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/weapon/storage)) return TRUE - return proselytize(target, user) + return fabricate(target, user) -/obj/item/clockwork/clockwork_proselytizer/proc/get_power() +/obj/item/clockwork/replica_fabricator/proc/get_power() return stored_power -/obj/item/clockwork/clockwork_proselytizer/proc/get_max_power() +/obj/item/clockwork/replica_fabricator/proc/get_max_power() return max_power -/obj/item/clockwork/clockwork_proselytizer/proc/modify_stored_power(amount) +/obj/item/clockwork/replica_fabricator/proc/modify_stored_power(amount) stored_power = Clamp(stored_power + amount, 0, max_power) return TRUE -/obj/item/clockwork/clockwork_proselytizer/proc/can_use_power(amount) +/obj/item/clockwork/replica_fabricator/proc/can_use_power(amount) if(amount == RATVAR_POWER_CHECK) if(GLOB.ratvar_awakens || !uses_power) return TRUE @@ -178,7 +169,7 @@ return TRUE //A note here; return values are for if we CAN BE PUT ON A TABLE, not IF WE ARE SUCCESSFUL, unless no_table_check is TRUE -/obj/item/clockwork/clockwork_proselytizer/proc/proselytize(atom/target, mob/living/user, silent, no_table_check) +/obj/item/clockwork/replica_fabricator/proc/fabricate(atom/target, mob/living/user, silent, no_table_check) if(!target || !user) return FALSE if(repairing) @@ -189,59 +180,77 @@ if(!silent) to_chat(user, "You are currently recharging [src] from the [recharging.sigil_name]!") return FALSE - var/list/proselytize_values = target.proselytize_vals(user, src, silent) //relevant values for proselytizing stuff, given as an associated list - if(!islist(proselytize_values)) - if(proselytize_values != TRUE) //if we get true, fail, but don't send a message for whatever reason - if(!isturf(target)) //otherwise, if we didn't get TRUE and the original target wasn't a turf, try to proselytize the turf - return proselytize(get_turf(target), user, no_table_check) + var/list/fabrication_values = target.fabrication_vals(user, src, silent) //relevant values for fabricating stuff, given as an associated list + if(!islist(fabrication_values)) + if(fabrication_values != TRUE) //if we get true, fail, but don't send a message for whatever reason + if(!isturf(target)) //otherwise, if we didn't get TRUE and the original target wasn't a turf, try to fabricate the turf + return fabricate(get_turf(target), user, no_table_check) if(!silent) - to_chat(user, "[target] cannot be proselytized!") + to_chat(user, "[target] cannot be fabricated!") if(!no_table_check) return TRUE return FALSE if(can_use_power(RATVAR_POWER_CHECK)) - proselytize_values["power_cost"] = 0 + fabrication_values["power_cost"] = 0 var/turf/Y = get_turf(user) if(!Y || (Y.z != ZLEVEL_STATION && Y.z != ZLEVEL_CENTCOM && Y.z != ZLEVEL_MINING && Y.z != ZLEVEL_LAVALAND)) - proselytize_values["operation_time"] *= 2 - if(proselytize_values["power_cost"] > 0) - proselytize_values["power_cost"] *= 2 + fabrication_values["operation_time"] *= 2 + if(fabrication_values["power_cost"] > 0) + fabrication_values["power_cost"] *= 2 var/target_type = target.type - if(!proselytize_checks(proselytize_values, target, target_type, user, silent)) + if(!fabricate_checks(fabrication_values, target, target_type, user, silent)) return FALSE - proselytize_values["operation_time"] *= speed_multiplier + fabrication_values["operation_time"] *= speed_multiplier playsound(target, 'sound/machines/click.ogg', 50, 1) - if(proselytize_values["operation_time"]) + if(fabrication_values["operation_time"]) if(!silent) - user.visible_message("[user]'s [name] begins tearing apart [target]!", "You begin proselytizing [target]...") - if(!do_after(user, proselytize_values["operation_time"], target = target, extra_checks = CALLBACK(src, .proc/proselytize_checks, proselytize_values, target, target_type, user, TRUE))) + var/atom/A = fabrication_values["new_obj_type"] + if(A) + user.visible_message("[user]'s [name] starts ripping [target] apart!", \ + "You start fabricating \a [initial(A.name)] from [target]...") + else + user.visible_message("[user]'s [name] starts consuming [target]!", \ + "Your [name] starts consuming [target]...") + if(!do_after(user, fabrication_values["operation_time"], target = target, extra_checks = CALLBACK(src, .proc/fabricate_checks, fabrication_values, target, target_type, user, TRUE))) return FALSE if(!silent) - user.visible_message("[user]'s [name] covers [target] in golden energy!", "You proselytize [target].") + var/atom/A = fabrication_values["new_obj_type"] + if(A) + user.visible_message("[user]'s [name] replaces [target] with \a [initial(A.name)]!", \ + "You fabricate \a [initial(A.name)] from [target].") + else + user.visible_message("[user]'s [name] consumes [target]!", \ + "Your [name] consumes [target].") else if(!silent) - user.visible_message("[user]'s [name] tears apart [target], covering it in golden energy!", "You proselytize [target].") + var/atom/A = fabrication_values["new_obj_type"] + if(A) + user.visible_message("[user]'s [name] rips apart [target], replacing it with \a [initial(A.name)]!", \ + "You fabricate \a [initial(A.name)] from [target].") + else + user.visible_message("[user]'s [name] rapidly consumes [target]!", \ + "Your [name] consumes [target].") playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) - var/new_thing_type = proselytize_values["new_obj_type"] + var/new_thing_type = fabrication_values["new_obj_type"] if(isturf(target)) //if our target is a turf, we're just going to ChangeTurf it and assume it'll work out. var/turf/T = target T.ChangeTurf(new_thing_type) else if(new_thing_type) - if(proselytize_values["dir_in_new"]) - new new_thing_type(get_turf(target), proselytize_values["spawn_dir"]) //please verify that your new object actually wants to get a dir in New() + if(fabrication_values["dir_in_new"]) + new new_thing_type(get_turf(target), fabrication_values["spawn_dir"]) //please verify that your new object actually wants to get a dir in New() else var/atom/A = new new_thing_type(get_turf(target)) - A.setDir(proselytize_values["spawn_dir"]) - if(!proselytize_values["no_target_deletion"]) //for some cases where proselytize_vals() modifies the object but doesn't want it deleted + A.setDir(fabrication_values["spawn_dir"]) + if(!fabrication_values["no_target_deletion"]) //for some cases where fabrication_vals() modifies the object but doesn't want it deleted qdel(target) - modify_stored_power(-proselytize_values["power_cost"]) + modify_stored_power(-fabrication_values["power_cost"]) if(no_table_check) return TRUE return FALSE @@ -250,28 +259,34 @@ //What these procs do is they take an existing list of values, which they then modify. //This(modifying an existing object, in this case the list) is the only way to get information OUT of a do_after callback, which this is used as. -//The proselytize check proc. -/obj/item/clockwork/clockwork_proselytizer/proc/proselytize_checks(list/proselytize_values, atom/target, expected_type, mob/user, silent) //checked constantly while proselytizing - if(!islist(proselytize_values) || QDELETED(target) || QDELETED(user)) +//The fabricate check proc. +/obj/item/clockwork/replica_fabricator/proc/fabricate_checks(list/fabrication_values, atom/target, expected_type, mob/user, silent) //checked constantly while fabricating + if(!islist(fabrication_values) || QDELETED(target) || QDELETED(user)) return FALSE if(repairing || recharging) return FALSE if(target.type != expected_type) return FALSE if(can_use_power(RATVAR_POWER_CHECK)) - proselytize_values["power_cost"] = 0 - if(!can_use_power(proselytize_values["power_cost"])) - if(stored_power - proselytize_values["power_cost"] < 0) + fabrication_values["power_cost"] = 0 + if(!can_use_power(fabrication_values["power_cost"])) + if(stored_power - fabrication_values["power_cost"] < 0) if(!silent) - to_chat(user, "You need [proselytize_values["power_cost"]]W power to proselytize [target]!") - else if(stored_power - proselytize_values["power_cost"] > max_power) + var/atom/A = fabrication_values["new_obj_type"] + if(A) + to_chat(user, "You need [fabrication_values["power_cost"]]W power to fabricate \a [initial(A.name)] from [target]!") + else if(stored_power - fabrication_values["power_cost"] > max_power) if(!silent) - to_chat(user, "Your [name] contains too much power to proselytize [target]!") + var/atom/A = fabrication_values["new_obj_type"] + if(A) + to_chat(user, "Your [name] contains too much power to fabricate \a [initial(A.name)] from [target]!") + else + to_chat(user, "Your [name] contains too much power to consume [target]!") return FALSE return TRUE //The repair check proc. -/obj/item/clockwork/clockwork_proselytizer/proc/proselytizer_repair_checks(list/repair_values, atom/target, mob/user, silent) //Exists entirely to avoid an otherwise unreadable series of checks. +/obj/item/clockwork/replica_fabricator/proc/fabricator_repair_checks(list/repair_values, atom/target, mob/user, silent) //Exists entirely to avoid an otherwise unreadable series of checks. if(!islist(repair_values) || QDELETED(target) || QDELETED(user)) return FALSE if(isliving(target)) //standard checks for if we can affect the target @@ -302,7 +317,7 @@ return FALSE if(repair_values["amount_to_heal"] <= 0) //nothing to heal! return FALSE - repair_values["healing_for_cycle"] = min(repair_values["amount_to_heal"], PROSELYTIZER_REPAIR_PER_TICK) //modify the healing for this cycle + repair_values["healing_for_cycle"] = min(repair_values["amount_to_heal"], FABRICATOR_REPAIR_PER_TICK) //modify the healing for this cycle repair_values["power_required"] = round(repair_values["healing_for_cycle"]*MIN_CLOCKCULT_POWER, MIN_CLOCKCULT_POWER) //and get the power cost from that if(!can_use_power(RATVAR_POWER_CHECK) && !can_use_power(repair_values["power_required"])) if(!silent) @@ -312,7 +327,7 @@ return TRUE //The sigil charge check proc. -/obj/item/clockwork/clockwork_proselytizer/proc/sigil_charge_checks(list/charge_values, obj/effect/clockwork/sigil/transmission/sigil, mob/user, silent) +/obj/item/clockwork/replica_fabricator/proc/sigil_charge_checks(list/charge_values, obj/effect/clockwork/sigil/transmission/sigil, mob/user, silent) if(!islist(charge_values) || QDELETED(sigil) || QDELETED(user)) return FALSE if(can_use_power(RATVAR_POWER_CHECK)) diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index e8f1e8dbbc2..9050d4569c3 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -120,7 +120,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or if(multiple_invokers_used && !multiple_invokers_optional && !GLOB.ratvar_awakens && !slab.no_cost) var/nearby_servants = 0 for(var/mob/living/L in range(1, get_turf(invoker))) - if(is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal()) + if(can_recite_scripture(L)) nearby_servants++ if(nearby_servants < invokers_required) to_chat(invoker, "There aren't enough non-mute servants nearby ([nearby_servants]/[invokers_required])!") @@ -170,7 +170,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or if(!channel_time && invocations.len) if(multiple_invokers_used) for(var/mob/living/L in range(1, invoker)) - if(is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal()) + if(can_recite_scripture(L)) for(var/invocation in invocations) clockwork_say(L, text2ratvar(invocation), whispered) else @@ -185,7 +185,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or return FALSE if(multiple_invokers_used) for(var/mob/living/L in range(1, get_turf(invoker))) - if(is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal()) + if(can_recite_scripture(L)) clockwork_say(L, text2ratvar(invocation), whispered) else clockwork_say(invoker, text2ratvar(invocation), whispered) diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index 21da8fab004..c3e40692c20 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -53,7 +53,7 @@ /datum/clockwork_scripture/fellowship_armory/run_scripture() for(var/mob/living/L in orange(1, invoker)) - if(is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal()) + if(can_recite_scripture(L)) channel_time = max(channel_time - 10, 0) return ..() diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm deleted file mode 100644 index 25bedd79d30..00000000000 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm +++ /dev/null @@ -1,211 +0,0 @@ -////////////// -// REVENANT // -////////////// - -//Invoke Inath-neq, the Resonant Cogwheel: Grants invulnerability and stun immunity to everyone nearby for 15 seconds. -/datum/clockwork_scripture/invoke_inathneq - descname = "Area Invulnerability" - name = "Invoke Inath-neq, the Resonant Cogwheel" - desc = "Taps the limitless power of Inath-neq, one of Ratvar's four generals. The benevolence of Inath-Neq will grant complete invulnerability to all Servants in range for fifteen seconds." - invocations = list("I call upon you, Vanguard!!", "Let the Resonant Cogs turn once more!!", "Grant me and my allies the strength to vanquish our foes!!") - channel_time = 100 - consumed_components = list(VANGUARD_COGWHEEL = 10, GEIS_CAPACITOR = 3, REPLICANT_ALLOY = 3, HIEROPHANT_ANSIBLE = 3) - usage_tip = "Servants affected by this scripture are only weak to things that outright destroy bodies, such as bombs or the singularity." - tier = SCRIPTURE_REVENANT - primary_component = VANGUARD_COGWHEEL - sort_priority = 2 - -/datum/clockwork_scripture/invoke_inathneq/check_special_requirements() - if(!slab.no_cost && GLOB.clockwork_generals_invoked["inath-neq"] > world.time) - to_chat(invoker, "\"[text2ratvar("I cannot lend you my aid yet, champion. Please be careful.")]\"\n\ - Inath-neq has already been invoked recently! You must wait several minutes before calling upon the Resonant Cogwheel.") - return FALSE - return TRUE - -/datum/clockwork_scripture/invoke_inathneq/scripture_effects() - new/obj/effect/clockwork/general_marker/inathneq(get_turf(invoker)) - hierophant_message("[text2ratvar("Vanguard: \"I lend you my aid, champions! Let glory guide your blows!")]\"", FALSE, invoker) - GLOB.clockwork_generals_invoked["inath-neq"] = world.time + CLOCKWORK_GENERAL_COOLDOWN - playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) - if(invoker.real_name == "Lucio") - clockwork_say(invoker, text2ratvar("Aww, let's break it DOWN!!")) - for(var/mob/living/L in range(7, invoker)) - if(!is_servant_of_ratvar(L) || L.stat == DEAD) - continue - L.apply_status_effect(STATUS_EFFECT_INATHNEQS_ENDOWMENT) - return TRUE - - -//Invoke Sevtug, the Formless Pariah: Causes massive global hallucinations, braindamage, confusion, and dizziness to all humans on the same zlevel. -/datum/clockwork_scripture/invoke_sevtug - descname = "Global Hallucination" - name = "Invoke Sevtug, the Formless Pariah" - desc = "Taps the limitless power of Sevtug, one of Ratvar's four generals. The mental manipulation ability of the Pariah allows its wielder to cause mass hallucinations and confusion \ - for all non-servant humans on the same z-level as them. The power of this scripture falls off somewhat with distance, and certain things may reduce its effects." - invocations = list("I call upon you, Fright!!", "Let your power shatter the sanity of the weak-minded!!", "Let your tendrils hold sway over all!!") - channel_time = 150 - consumed_components = list(BELLIGERENT_EYE = 6, VANGUARD_COGWHEEL = 6, GEIS_CAPACITOR = 10, HIEROPHANT_ANSIBLE = 6) - usage_tip = "Causes brain damage, hallucinations, confusion, and dizziness in massive amounts." - tier = SCRIPTURE_REVENANT - sort_priority = 3 - primary_component = GEIS_CAPACITOR - invokers_required = 3 - multiple_invokers_used = TRUE - var/static/list/mindbreaksayings = list("\"Oh, great. I get to shatter some minds.\"", "\"More minds to crush.\"", \ - "\"Really, this is almost boring.\"", "\"None of these minds have anything interesting in them.\"", "\"Maybe I can instill a little bit of terror in this one.\"", \ - "\"What a waste of my power.\"", "\"I'm sure I could just control these minds instead, but they never ask.\"") - -/datum/clockwork_scripture/invoke_sevtug/check_special_requirements() - if(!slab.no_cost && GLOB.clockwork_generals_invoked["sevtug"] > world.time) - to_chat(invoker, "\"[text2ratvar("Is it really so hard - even for a simpleton like you - to grasp the concept of waiting?")]\"\n\ - Sevtug has already been invoked recently! You must wait several minutes before calling upon the Formless Pariah.") - return FALSE - if(!slab.no_cost && GLOB.ratvar_awakens) - to_chat(invoker, "\"[text2ratvar("Do you really think anything I can do right now will compare to Engine's power?")]\"\n\ - Sevtug will not grant his power while Ratvar's dwarfs his own!") - return FALSE - return TRUE - -/datum/clockwork_scripture/invoke_sevtug/scripture_effects() - new/obj/effect/clockwork/general_marker/sevtug(get_turf(invoker)) - hierophant_message("[text2ratvar("Fright: \"I heed your call, idiots. Get going and use this chance while it lasts!")]\"", FALSE, invoker) - GLOB.clockwork_generals_invoked["sevtug"] = world.time + GLOBAL_CLOCKWORK_GENERAL_COOLDOWN - playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) - var/hum = get_sfx('sound/effects/screech.ogg') //like playsound, same sound for everyone affected - var/turf/T = get_turf(invoker) - for(var/mob/living/carbon/human/H in GLOB.living_mob_list) - if(H.z == invoker.z && !is_servant_of_ratvar(H)) - var/distance = 0 - distance += get_dist(T, get_turf(H)) - var/visualsdistance = max(150 - distance, 5) - var/minordistance = max(200 - distance*2, 5) - var/majordistance = max(150 - distance*3, 5) - if(H.null_rod_check()) - to_chat(H, "[text2ratvar("Oh, a void weapon. How annoying, I may as well not bother.")]\n\ - Your holy weapon glows a faint orange, defending your mind!") - continue - else if(H.isloyal()) - visualsdistance = round(visualsdistance * 0.5) //half effect for shielded targets - minordistance = round(minordistance * 0.5) - majordistance = round(majordistance * 0.5) - to_chat(H, "[text2ratvar("Oh, look, a mindshield. Cute, I suppose I'll humor it.")]") - else if(prob(visualsdistance)) - to_chat(H, "[text2ratvar(pick(mindbreaksayings))]") - H.playsound_local(T, hum, visualsdistance, 1) - flash_color(H, flash_color="#AF0AAF", flash_time=visualsdistance*10) - H.dizziness = minordistance + H.dizziness - H.hallucination = minordistance + H.hallucination - H.confused = majordistance + H.confused - H.setBrainLoss(majordistance + H.getBrainLoss()) - return TRUE - - -//Invoke Nezbere, the Brass Eidolon: Invokes Nezbere, bolstering the strength of many clockwork items for one minute. -/datum/clockwork_scripture/invoke_nezbere - descname = "Global Structure Buff" - name = "Invoke Nezbere, the Brass Eidolon" - desc = "Taps the limitless power of Nezbere, one of Ratvar's four generals. The restless toil of the Eidolon will empower a wide variety of clockwork apparatus for a full minute - notably, \ - clockwork proselytizers will charge very rapidly." - invocations = list("I call upon you, Armorer!!", "Let your machinations reign on this miserable station!!", "Let your power flow through the tools of your master!!") - channel_time = 150 - consumed_components = list(BELLIGERENT_EYE = 6, VANGUARD_COGWHEEL = 6, GEIS_CAPACITOR = 6, REPLICANT_ALLOY = 10) - usage_tip = "Ocular wardens will become empowered, clockwork proselytizers will require no alloy, tinkerer's daemons will produce twice as quickly, \ - and interdiction lenses, mania motors, tinkerer's daemons, and clockwork obelisks will all require no power." - tier = SCRIPTURE_REVENANT - primary_component = REPLICANT_ALLOY - sort_priority = 4 - invokers_required = 3 - multiple_invokers_used = TRUE - -/datum/clockwork_scripture/invoke_nezbere/check_special_requirements() - if(!slab.no_cost && GLOB.clockwork_generals_invoked["nezbere"] > world.time) - to_chat(invoker, "\"[text2ratvar("Not just yet, friend. Patience is a virtue.")]\"\n\ - Nezbere has already been invoked recently! You must wait several minutes before calling upon the Brass Eidolon.") - return FALSE - if(!slab.no_cost && GLOB.ratvar_awakens) - to_chat(invoker, "\"[text2ratvar("Our master is here already. You do not require my help, friend.")]\"\n\ - There is no need for Nezbere's assistance while Ratvar is risen!") - return FALSE - return TRUE - -/datum/clockwork_scripture/invoke_nezbere/scripture_effects() - new/obj/effect/clockwork/general_marker/nezbere(get_turf(invoker)) - hierophant_message("[text2ratvar("Armorer: \"I heed your call, champions. May your artifacts bring ruin upon the heathens that oppose our master!")]\"", FALSE, invoker) - GLOB.clockwork_generals_invoked["nezbere"] = world.time + GLOBAL_CLOCKWORK_GENERAL_COOLDOWN - playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) - GLOB.nezbere_invoked++ - for(var/obj/O in GLOB.all_clockwork_objects) - O.ratvar_act() - addtimer(CALLBACK(GLOBAL_PROC, /proc/reset_nezbere_invocation), 600) - return TRUE - -/proc/reset_nezbere_invocation() - GLOB.nezbere_invoked-- - for(var/obj/O in GLOB.all_clockwork_objects) - O.ratvar_act() - - -//Invoke Nzcrentr, the Eternal Thunderbolt: Imbues an immense amount of energy into the invoker. After several seconds, everyone near the invoker will be hit with a devastating lightning blast. -/datum/clockwork_scripture/invoke_nzcrentr - descname = "Area Lightning Blast" - name = "Invoke Nzcrentr, the Eternal Thunderbolt" - desc = "Taps the limitless power of Nzcrentr, one of Ratvar's four generals. Nzcrentr will grant you a tiny fraction of its boundless power. After several seconds, all non-Servants near you \ - will be struck by devastating lightning bolts." - invocations = list("I call upon you, Amperage!!", "Let your energy flow through me!!", "Let your boundless power shatter stars!!") - channel_time = 100 - consumed_components = list(BELLIGERENT_EYE = 3, GEIS_CAPACITOR = 3, REPLICANT_ALLOY = 3, HIEROPHANT_ANSIBLE = 10) - usage_tip = "Struck targets will also be knocked down for about sixteen seconds." - tier = SCRIPTURE_REVENANT - primary_component = HIEROPHANT_ANSIBLE - sort_priority = 5 - -/datum/clockwork_scripture/invoke_nzcrentr/check_special_requirements() - if(!slab.no_cost && GLOB.clockwork_generals_invoked["nzcrentr"] > world.time) - to_chat(invoker, "\"[text2ratvar("The boss says you have to wait. Hey, do you think he would mind if I killed you? ...He would? Ok.")]\"\n\ - Nzcrentr has already been invoked recently! You must wait several minutes before calling upon the Eternal Thunderbolt.") - return FALSE - return TRUE - -/datum/clockwork_scripture/invoke_nzcrentr/scripture_effects() - new/obj/effect/clockwork/general_marker/nzcrentr(get_turf(invoker)) - GLOB.clockwork_generals_invoked["nzcrentr"] = world.time + CLOCKWORK_GENERAL_COOLDOWN - hierophant_message("[text2ratvar("Amperage: \"[invoker.real_name] has called forth my power. Hope [invoker.p_they()] [invoker.p_do()] not shatter under it!")]\"", FALSE, invoker) - invoker.visible_message("[invoker] begins to radiate a blinding light!", \ - "\"[text2ratvar("The boss says it's okay to do this. Don't blame me if you die from it.")]\"\n\ - You feel limitless power surging through you!") - playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) - sleep(2) - playsound(invoker, 'sound/magic/lightning_chargeup.ogg', 100, 0) - var/oldcolor = invoker.color - animate(invoker, color = list(rgb(255, 255, 255), rgb(255, 255, 255), rgb(255, 255, 255), rgb(0,0,0)), time = 88) //Gradual advancement to extreme brightness - sleep(88) - if(invoker) - invoker.visible_message("Massive bolts of energy emerge from across [invoker]'s body!", \ - "\"[text2ratvar("I told you you wouldn't be able to handle it.")]\"\n\ - TOO... MUCH! CAN'T... TAKE IT!") - playsound(invoker, 'sound/magic/lightningbolt.ogg', 100, 0) - if(invoker.stat == CONSCIOUS) - animate(invoker, color = oldcolor, time = 10) - addtimer(CALLBACK(invoker, /atom/proc/update_atom_colour), 10) - for(var/mob/living/L in view(7, invoker)) - if(is_servant_of_ratvar(L) || L.null_rod_check()) - continue - invoker.Beam(L, icon_state = "nzcrentrs_power", time = 10) - var/randdamage = rand(40, 60) - if(iscarbon(L)) - L.electrocute_act(randdamage, "Nzcrentr's power", 1, randdamage) - else - L.adjustFireLoss(randdamage) - L.visible_message( - "[L] was shocked by Nzcrentr's power!", \ - "You feel a powerful shock coursing through your body!", \ - "You hear a heavy electrical crack." \ - ) - L.Weaken(8) - playsound(L, 'sound/magic/LightningShock.ogg', 50, 1) - else - playsound(invoker, 'sound/magic/Disintegrate.ogg', 50, 1) - invoker.gib() - return TRUE - else - return FALSE diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index 9efb9a8eb2c..c6eba3e3c92 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -33,7 +33,7 @@ /datum/clockwork_scripture/create_object/cogscarab descname = "Constructor Soul Vessel Shell" name = "Cogscarab" - desc = "Creates a small shell fitted for soul vessels. Adding an active soul vessel to it results in a small construct with tools and an inbuilt proselytizer." + desc = "Creates a small shell fitted for soul vessels. Adding an active soul vessel to it results in a small construct with tools and an inbuilt fabricator." invocations = list("Call forth...", "...the workers of Armorer.") channel_time = 60 consumed_components = list(BELLIGERENT_EYE = 2, HIEROPHANT_ANSIBLE = 1) @@ -221,24 +221,24 @@ quickbind_desc = "Creates a Soul Vessel, which can be placed in construct shells and cyborg bodies once filled." -//Clockwork Proselytizer: Creates a clockwork proselytizer, used to convert objects and repair clockwork structures. -/datum/clockwork_scripture/create_object/clockwork_proselytizer - descname = "Converts Objects to Ratvarian" - name = "Clockwork Proselytizer" - desc = "Forms a device that, when used on certain objects, converts them into their Ratvarian equivalents. It requires power to function." +//Replica Fabricator: Creates a replica fabricator, used to convert objects and repair clockwork structures. +/datum/clockwork_scripture/create_object/replica_fabricator + descname = "Replaces Objects with Ratvarian Versions" + name = "Replica Fabricator" + desc = "Forms a device that, when used on certain objects, replaces them with their Ratvarian equivalents. It requires power to function." invocations = list("With this device...", "...his presence shall be made known.") channel_time = 20 consumed_components = list(GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 2) whispered = TRUE - object_path = /obj/item/clockwork/clockwork_proselytizer/preloaded - creator_message = "You form a clockwork proselytizer." - usage_tip = "Clockwork Walls cause nearby tinkerer's caches to generate components passively, making them a vital tool. Clockwork Floors heal toxin damage in Servants standing on them." + object_path = /obj/item/clockwork/replica_fabricator/preloaded + creator_message = "You form a replica fabricator." + usage_tip = "Clockwork Walls cause nearby Tinkerer's Caches to generate components passively, making this a vital tool. Clockwork Floors heal toxin damage in Servants standing on them." tier = SCRIPTURE_SCRIPT space_allowed = TRUE primary_component = REPLICANT_ALLOY sort_priority = 7 quickbind = TRUE - quickbind_desc = "Creates a Clockwork Proselytizer, which can convert various objects to Ratvarian variants." + quickbind_desc = "Creates a Replica Fabricator, which can convert various objects to Ratvarian variants." //Function Call: Grants the invoker the ability to call forth a Ratvarian spear that deals significant damage to silicons. diff --git a/code/game/gamemodes/clock_cult/clock_structure.dm b/code/game/gamemodes/clock_cult/clock_structure.dm index 64c71359719..9b704101bfd 100644 --- a/code/game/gamemodes/clock_cult/clock_structure.dm +++ b/code/game/gamemodes/clock_cult/clock_structure.dm @@ -9,7 +9,7 @@ anchored = 1 density = 1 resistance_flags = FIRE_PROOF | ACID_PROOF - var/can_be_repaired = TRUE //if a proselytizer can repair it + var/can_be_repaired = TRUE //if a fabricator can repair it break_message = "The frog isn't a meme after all!" //The message shown when a structure breaks break_sound = 'sound/magic/clockwork/anima_fragment_death.ogg' //The sound played when a structure breaks debris = list(/obj/item/clockwork/alloy_shards/large = 1, \ @@ -175,13 +175,6 @@ SSobj.processing -= src return ..() -/obj/structure/destructible/clockwork/powered/ratvar_act() - ..() - if(GLOB.nezbere_invoked) - needs_power = FALSE - else - needs_power = initial(needs_power) - /obj/structure/destructible/clockwork/powered/process() var/powered = total_accessable_power() return powered == PROCESS_KILL ? 25 : powered //make sure we don't accidentally return the arbitrary PROCESS_KILL define diff --git a/code/game/gamemodes/clock_cult/clock_structures/clock_shells.dm b/code/game/gamemodes/clock_cult/clock_structures/clock_shells.dm index cfcac3b5155..e9f02e9e8c1 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/clock_shells.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/clock_shells.dm @@ -34,7 +34,7 @@ /obj/structure/destructible/clockwork/shell/cogscarab name = "cogscarab shell" desc = "A small brass shell with a cube-shaped receptable in its center. It gives off an aura of obsessive perfectionism." - clockwork_desc = "A dormant receptable that, when powered with a soul vessel, will become a weak construct with an inbuilt proselytizer." + clockwork_desc = "A dormant receptable that, when powered with a soul vessel, will become a weak construct with an inbuilt fabricator." icon_state = "clockdrone_shell" mobtype = /mob/living/simple_animal/drone/cogscarab spawn_message = "'s eyes blink open, glowing bright red." diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm index 9c7b5e9518e..bb2be4e79ca 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm @@ -50,9 +50,6 @@ if(GLOB.ratvar_awakens) damage_per_tick = 10 sight_range = 6 - else if(GLOB.nezbere_invoked) - damage_per_tick = 5 - sight_range = 5 else damage_per_tick = initial(damage_per_tick) sight_range = initial(sight_range) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm index 25f151def54..722ff99c250 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -14,7 +14,7 @@ light_color = "#BE8700" var/atom/prey //Whatever Ratvar is chasing var/clashing = FALSE //If Ratvar is FUCKING FIGHTING WITH NAR-SIE - var/proselytize_range = 10 + var/convert_range = 10 dangerous_possession = TRUE /obj/structure/destructible/clockwork/massive/ratvar/Initialize() @@ -58,10 +58,10 @@ /obj/structure/destructible/clockwork/massive/ratvar/process() if(clashing) //I'm a bit occupied right now, thanks return - for(var/I in circlerangeturfs(src, proselytize_range)) + for(var/I in circlerangeturfs(src, convert_range)) var/turf/T = I T.ratvar_act() - for(var/I in circleviewturfs(src, round(proselytize_range * 0.5))) + for(var/I in circleviewturfs(src, round(convert_range * 0.5))) var/turf/T = I T.ratvar_act(TRUE) var/dir_to_step_in = pick(GLOB.cardinal) diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm index b0a17338ffe..40d6bb02cea 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm @@ -28,16 +28,6 @@ GLOB.clockwork_daemons-- return ..() -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/ratvar_act() - ..() - if(GLOB.nezbere_invoked) - production_time = 0 - production_cooldown = initial(production_cooldown) * 0.5 - if(!active) - toggle(0) - else - production_cooldown = initial(production_cooldown) - /obj/structure/destructible/clockwork/powered/tinkerers_daemon/examine(mob/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index cf57668e219..697f406a546 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -300,3 +300,91 @@ B.current.client.images -= GLOB.blood_target_image QDEL_NULL(GLOB.blood_target_image) GLOB.blood_target = null + + + +//////// ELDRITCH PULSE ///////// + + + +/datum/action/innate/cult/master/pulse + name = "Eldritch Pulse" + desc = "Seize upon a fellow cultist or cult structure and teleport it to a nearby location." + button_icon_state = "arcane_barrage" + var/obj/effect/proc_holder/pulse/PM + var/cooldown = 0 + var/base_cooldown = 150 + var/throwing = FALSE + var/mob/living/throwee + +/datum/action/innate/cult/master/pulse/New() + PM = new() + PM.attached_action = src + ..() + +/datum/action/innate/cult/master/pulse/IsAvailable() + if(!owner.mind || !owner.mind.has_antag_datum(ANTAG_DATUM_CULT_MASTER)) + return FALSE + if(cooldown > world.time) + if(!PM.active) + owner << "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can pulse again!" + return FALSE + return ..() + +/datum/action/innate/cult/master/pulse/Destroy() + QDEL_NULL(PM) + return ..() + +/datum/action/innate/cult/master/pulse/Activate() + PM.toggle(owner) //the important bit + return TRUE + +/obj/effect/proc_holder/pulse + active = FALSE + ranged_mousepointer = 'icons/effects/throw_target.dmi' + var/datum/action/innate/cult/master/pulse/attached_action + +/obj/effect/proc_holder/pulse/Destroy() + QDEL_NULL(attached_action) + return ..() + +/obj/effect/proc_holder/pulse/proc/toggle(mob/user) + if(active) + remove_ranged_ability("You cease your preparations...") + attached_action.throwing = FALSE + else + add_ranged_ability(user, "You prepare to tear through the fabric of reality...") + +/obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/caller, params, atom/target) + if(..()) + return + if(ranged_ability_user.incapacitated()) + remove_ranged_ability() + return + var/turf/T = get_turf(ranged_ability_user) + if(!isturf(T)) + return FALSE + if(target in view(7, get_turf(ranged_ability_user))) + if((!(iscultist(target) || istype(target, /obj/structure/destructible/cult)) || target == caller) && !(attached_action.throwing)) + return + if(!attached_action.throwing) + attached_action.throwing = TRUE + attached_action.throwee = target + ranged_ability_user << 'sound/weapons/thudswoosh.ogg' + to_chat(ranged_ability_user,"You reach through the veil with your mind's eye and seize [target]!") + return + else + new /obj/effect/temp_visual/cult/sparks(get_turf(attached_action.throwee), ranged_ability_user.dir) + var/distance = get_dist(attached_action.throwee, target) + if(distance >= 16) + return + playsound(target,'sound/magic/exit_blood.ogg') + attached_action.throwee.Beam(target,icon_state="sendbeam",time=4) + attached_action.throwee.forceMove(get_turf(target)) + new /obj/effect/temp_visual/cult/sparks(get_turf(target), ranged_ability_user.dir) + attached_action.throwing = FALSE + attached_action.cooldown = world.time + attached_action.base_cooldown + remove_mousepointer(ranged_ability_user.client) + remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.") + caller.update_action_buttons_icon() + addtimer(CALLBACK(caller, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 84c2ab36269..57a25742194 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -381,7 +381,7 @@ on_damage = 15 slot_flags = null on = 1 - var/charges = 3 + var/charges = 5 /obj/item/device/flashlight/flare/culttorch/afterattack(atom/movable/A, mob/user, proximity) if(!proximity) @@ -408,6 +408,9 @@ to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!") log_game("Void torch failed - target was deconverted") return + if(A in user.GetAllContents()) + to_chat(user, "[A] must be on a surface in order to teleport it!") + return to_chat(user, "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!") cultist_to_receive.put_in_hands(A) charges-- diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index a83e83cdbd5..e37afa2b4d6 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -225,7 +225,10 @@ This file contains the arcane tome files. "You [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.") if(user.blood_volume) user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick("l_arm", "r_arm")) - if(!do_after(user, initial(rune_to_scribe.scribe_delay), target = get_turf(user))) + var/scribe_mod = initial(rune_to_scribe.scribe_delay) + if(istype(get_turf(user), /turf/open/floor/engine/cult)) + scribe_mod *= 0.5 + if(!do_after(user, scribe_mod, target = get_turf(user))) for(var/V in shields) var/obj/structure/emergency_shield/sanguine/S = V if(S && !QDELETED(S)) diff --git a/code/game/gamemodes/cult/rune_spawn_action.dm b/code/game/gamemodes/cult/rune_spawn_action.dm index 7412a5d6bbb..119d507a5e1 100644 --- a/code/game/gamemodes/cult/rune_spawn_action.dm +++ b/code/game/gamemodes/cult/rune_spawn_action.dm @@ -46,7 +46,10 @@ if(damage_interrupt && isliving(owner)) var/mob/living/L = owner health = list("health" = L.health) - if(do_after(owner, scribe_time, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt))) + var/scribe_mod = scribe_time + if(istype(get_turf(owner), /turf/open/floor/engine/cult)) + scribe_mod *= 0.5 + if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt))) var/obj/effect/rune/new_rune = new rune_type(owner.loc) new_rune.keyword = chosen_keyword else diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 9702783e945..f7d036458b1 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -446,7 +446,7 @@ structure_check() searches for nearby cultist structures required for the invoca icon_state = "rune_large" pixel_x = -32 //So the big ol' 96x96 sprite shows up right pixel_y = -32 - scribe_delay = 450 //how long the rune takes to create + scribe_delay = 500 //how long the rune takes to create scribe_damage = 40.1 //how much damage you take doing it var/used = FALSE diff --git a/code/game/gamemodes/devil/devil agent/devil_agent.dm b/code/game/gamemodes/devil/devil agent/devil_agent.dm index dfdb957153a..5c48406f23e 100644 --- a/code/game/gamemodes/devil/devil agent/devil_agent.dm +++ b/code/game/gamemodes/devil/devil agent/devil_agent.dm @@ -10,8 +10,8 @@ num_modifier = 4 objective_count = 2 - var/list/target_list = list() - var/list/late_joining_list = list() + var/list/devil_target_list = list() //will update to be a child of internal affairs when bothered + var/list/devil_late_joining_list = list() minimum_devils = 3 announce_text = "There are devil agents onboard the station, trying to outbid each other!\n\ @@ -24,7 +24,7 @@ i++ if(i + 1 > devils.len) i = 0 - target_list[devil] = devils[i + 1] + devil_target_list[devil] = devils[i + 1] ..() /datum/game_mode/devil/devil_agents/add_devil_objectives(datum/mind/devil_mind, quantity) @@ -32,8 +32,8 @@ /datum/game_mode/devil/devil_agents/proc/give_outsell_objective(datum/mind/devil) //If you override this method, have it return the number of objectives added. - if(target_list.len && target_list[devil]) // Is a double agent - var/datum/mind/target_mind = target_list[devil] + if(devil_target_list.len && devil_target_list[devil]) // Is a double agent + var/datum/mind/target_mind = devil_target_list[devil] var/datum/objective/devil/outsell/outsellobjective = new outsellobjective.owner = devil outsellobjective.target = target_mind diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 32ce93a4fcd..0f7bb791f27 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -84,9 +84,9 @@ var/sql if(SSticker && SSticker.mode) sql += "game_mode = '[SSticker.mode]'" - if(sql) - sql += ", " if(GLOB.revdata.originmastercommit) + if(sql) + sql += ", " sql += "commit_hash = '[GLOB.revdata.originmastercommit]'" if(sql) var/datum/DBQuery/query_round_game_mode = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET [sql] WHERE id = [GLOB.round_id]") diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index b22052e7aab..66dacd4219f 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -33,13 +33,14 @@ /obj/machinery/dominator/tesla_act() qdel(src) -/obj/machinery/dominator/New() - ..() +/obj/machinery/dominator/Initialize() + . = ..() set_light(2) GLOB.poi_list |= src spark_system = new spark_system.set_up(5, TRUE, src) countdown = new(src) + update_icon() /obj/machinery/dominator/examine(mob/user) ..() @@ -103,8 +104,23 @@ spark_system.start() else if(!(stat & BROKEN)) spark_system.start() - cut_overlays() + update_icon() + +/obj/machinery/dominator/update_icon() + cut_overlays() + if(!(stat & BROKEN)) + icon_state = "dominator-active" + if(operating) + var/mutable_appearance/dominator_overlay = mutable_appearance('icons/obj/machines/dominator.dmi', "dominator-overlay") + if(gang) + dominator_overlay.color = gang.color_hex + add_overlay(dominator_overlay) + else + icon_state = "dominator" + if(obj_integrity/max_integrity < 0.66) add_overlay("damage") + else + icon_state = "dominator-broken" /obj/machinery/dominator/obj_break(damage_flag) if(!(stat & BROKEN) && !(flags & NODECONSTRUCT)) @@ -142,10 +158,9 @@ gang.message_gangtools("Hostile takeover cancelled: Dominator is no longer operational.[gang.dom_attempts ? " You have [gang.dom_attempts] attempt remaining." : " The station network will have likely blocked any more attempts by us."]",1,1) set_light(0) - icon_state = "dominator-broken" - cut_overlays() operating = 0 stat |= BROKEN + update_icon() STOP_PROCESSING(SSmachines, src) /obj/machinery/dominator/Destroy() @@ -196,9 +211,9 @@ priority_announce("Network breach detected in [locname]. The [gang.name] Gang is attempting to seize control of the station!","Network Alert") gang.domination() SSshuttle.registerHostileEnvironment(src) - src.name = "[gang.name] Gang [src.name]" + name = "[gang.name] Gang [name]" operating = 1 - icon_state = "dominator-[gang.color]" + update_icon() countdown.color = gang.color_hex countdown.start() diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm index 2318ccd6041..a02a0e5bf5b 100644 --- a/code/game/gamemodes/gang/gang_items.dm +++ b/code/game/gamemodes/gang/gang_items.dm @@ -238,7 +238,7 @@ name = "Black Market .50cal Sniper Rifle" id = "sniper" cost = 40 - item_path = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle + item_path = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang /datum/gang_item/weapon/ammo/sniper_ammo name = "Smuggled .50cal Sniper Rounds" diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 4f09f2e3621..199c07cf86a 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -194,7 +194,7 @@ set desc = "Detonate all RCDs on the station, while sparing onboard cyborg RCDs." set waitfor = FALSE - if(!canUseTopic() || malf_cooldown) + if(!canUseTopic() || malf_cooldown > world.time) return for(var/I in GLOB.rcd_list) @@ -203,9 +203,7 @@ RCD.detonate_pulse() to_chat(src, "RCD detonation pulse emitted.") - malf_cooldown = TRUE - sleep(100) - malf_cooldown = FALSE + malf_cooldown = world.time + 100 /datum/AI_Module/large/mecha_domination module_name = "Viral Mech Domination" @@ -446,7 +444,7 @@ set name = "Reactivate Cameranet" set category = "Malfunction" - if(!canUseTopic() || malf_cooldown) + if(!canUseTopic() || malf_cooldown > world.time) return var/fixedcams = 0 //Tells the AI how many cams it fixed. Stats are fun. @@ -469,9 +467,7 @@ break to_chat(src, "Diagnostic complete! Operations completed: [fixedcams].") - malf_cooldown = 1 - spawn(30) //Lag protection - malf_cooldown = 0 + malf_cooldown = world.time + 30 /datum/AI_Module/large/upgrade_cameras module_name = "Upgrade Camera Network" diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 1bc2977f770..47e8c96a2bd 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -183,6 +183,7 @@ to_chat(H, "You feel intensely watched.") sleep(5) to_chat(H, "Your mind snaps!") + to_chat(H, "You can't remember how you got here...") var/objtype = (prob(75) ? /datum/objective/abductee/random : pick(subtypesof(/datum/objective/abductee/) - /datum/objective/abductee/random)) var/datum/objective/abductee/O = new objtype() SSticker.mode.abductees += H.mind @@ -213,13 +214,12 @@ /obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H) H.Sleeping(8) + H.uncuff() if(console && console.pad && console.pad.teleport_target) H.forceMove(console.pad.teleport_target) - H.uncuff() return //Area not chosen / It's not safe area - teleport to arrivals - H.forceMove(pick(GLOB.latejoin)) - H.uncuff() + SSjob.SendToLateJoin(H, FALSE) return diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 9953cbe4abc..32d7da40728 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -1,13 +1,10 @@ -#define PINPOINTER_MINIMUM_RANGE 15 -#define PINPOINTER_EXTRA_RANDOM_RANGE 10 -#define PINPOINTER_PING_TIME 40 -#define PROB_ACTUAL_TRAITOR 20 -#define TRAITOR_AGENT_ROLE "Syndicate External Affairs Agent" +/datum/game_mode + var/list/target_list = list() + var/list/late_joining_list = list() /datum/game_mode/traitor/internal_affairs name = "Internal Affairs" config_tag = "internal_affairs" - employer = "Internal Affairs" required_players = 25 required_enemies = 5 recommended_enemies = 8 @@ -16,245 +13,24 @@ traitors_possible = 10 //hard limit on traitors if scaling is turned off num_modifier = 4 // Four additional traitors + antag_datum = ANTAG_DATUM_IAA announce_text = "There are Nanotrasen Internal Affairs Agents trying to kill each other!\n\ IAA: Eliminate your targets and protect yourself!\n\ Crew: Stop the IAA agents before they can cause too much mayhem." - var/list/target_list = list() - var/list/late_joining_list = list() /datum/game_mode/traitor/internal_affairs/post_setup() var/i = 0 - for(var/datum/mind/traitor in traitors) + for(var/datum/mind/traitor in pre_traitors) i++ - if(i + 1 > traitors.len) + if(i + 1 > pre_traitors.len) i = 0 - target_list[traitor] = traitors[i+1] + target_list[traitor] = pre_traitors[i+1] ..() -/datum/status_effect/agent_pinpointer - id = "agent_pinpointer" - duration = -1 - tick_interval = PINPOINTER_PING_TIME - alert_type = /obj/screen/alert/status_effect/agent_pinpointer - var/minimum_range = PINPOINTER_MINIMUM_RANGE - var/mob/scan_target = null - -/obj/screen/alert/status_effect/agent_pinpointer - name = "Internal Affairs Integrated Pinpointer" - desc = "Even stealthier than a normal implant." - icon = 'icons/obj/device.dmi' - icon_state = "pinon" - -/datum/status_effect/agent_pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction - if(!scan_target) - linked_alert.icon_state = "pinonnull" - return - var/turf/here = get_turf(owner) - var/turf/there = get_turf(scan_target) - if(here.z != there.z) - linked_alert.icon_state = "pinonnull" - return - if(get_dist_euclidian(here,there)<=minimum_range + rand(0, PINPOINTER_EXTRA_RANDOM_RANGE)) - linked_alert.icon_state = "pinondirect" - else - linked_alert.setDir(get_dir(here, there)) - switch(get_dist(here, there)) - if(1 to 8) - linked_alert.icon_state = "pinonclose" - if(9 to 16) - linked_alert.icon_state = "pinonmedium" - if(16 to INFINITY) - linked_alert.icon_state = "pinonfar" - - -/datum/status_effect/agent_pinpointer/proc/scan_for_target() - scan_target = null - if(owner) - if(owner.mind) - if(owner.mind.objectives) - for(var/datum/objective/objective_ in owner.mind.objectives) - if(!is_internal_objective(objective_)) - continue - var/datum/objective/assassinate/internal/objective = objective_ - var/mob/current = objective.target.current - if(current&¤t.stat!=DEAD) - scan_target = current - break - - -/datum/status_effect/agent_pinpointer/tick() - if(!owner) - qdel(src) - return - scan_for_target() - point_to_target() - -/proc/give_pinpointer(datum/mind/owner) - if(owner && owner.current) - owner.current.apply_status_effect(/datum/status_effect/agent_pinpointer) - - -/datum/internal_agent_state - var/traitored = FALSE - var/datum/mind/owner = null - var/list/datum/mind/targets_stolen = list() - -/proc/is_internal_objective(datum/objective/O) - return (istype(O, /datum/objective/assassinate/internal)||istype(O, /datum/objective/destroy/internal)) - -/proc/replace_escape_objective(datum/mind/owner) - if(!owner||!owner.objectives) - return - for (var/objective_ in owner.objectives) - if(!(istype(objective_, /datum/objective/escape)||istype(objective_,/datum/objective/survive))) - continue - owner.objectives -= objective_ - var/datum/objective/martyr/martyr_objective = new - martyr_objective.owner = owner - owner.objectives += martyr_objective - -/proc/reinstate_escape_objective(datum/mind/owner) - if(!owner||!owner.objectives) - return - for (var/objective_ in owner.objectives) - if(!istype(objective_, /datum/objective/martyr)) - continue - owner.objectives -= objective_ - if(issilicon(owner)) - var/datum/objective/survive/survive_objective = new - survive_objective.owner = owner - owner.objectives += survive_objective - else - var/datum/objective/escape/escape_objective = new - escape_objective.owner = owner - owner.objectives += escape_objective - -/datum/internal_agent_state/proc/steal_targets(datum/mind/victim) - if(!owner.current||owner.current.stat==DEAD) //Should already be guaranteed if this is only called from steal_targets_timer_func, but better to be safe code than sorry code - return - var/already_traitored = traitored - to_chat(owner.current, " Target eliminated: [victim.name]") - for(var/objective_ in victim.objectives) - if(istype(objective_, /datum/objective/assassinate/internal)) - var/datum/objective/assassinate/internal/objective = objective_ - if(objective.target==owner) - traitored = TRUE - else if(targets_stolen.Find(objective.target) == 0) - var/datum/objective/assassinate/internal/new_objective = new - new_objective.owner = owner - new_objective.target = objective.target - new_objective.update_explanation_text() - owner.objectives += new_objective - targets_stolen += objective.target - var/status_text = objective.check_completion() ? "neutralised" : "active" - to_chat(owner.current, " New target added to database: [objective.target.name] ([status_text]) ") - else if(istype(objective_, /datum/objective/destroy/internal)) - var/datum/objective/destroy/internal/objective = objective_ - var/datum/objective/destroy/internal/new_objective = new - if(objective.target==owner) - traitored = TRUE - else if(targets_stolen.Find(objective.target) == 0) - new_objective.owner = owner - new_objective.target = objective.target - new_objective.update_explanation_text() - owner.objectives += new_objective - targets_stolen += objective.target - var/status_text = objective.check_completion() ? "neutralised" : "active" - to_chat(owner.current, " New target added to database: [objective.target.name] ([status_text]) ") - if(traitored&&!already_traitored) - for(var/objective_ in owner.objectives) - if(!is_internal_objective(objective_)) - continue - var/datum/objective/assassinate/internal/objective = objective_ - if(!objective.check_completion()) - traitored = FALSE - return - if(owner.special_role == TRAITOR_AGENT_ROLE) - to_chat(owner.current," All the loyalist agents are dead, and no more is required of you. Die a glorious death, agent. ") - else - to_chat(owner.current," All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.") - replace_escape_objective(owner) - - - -/datum/internal_agent_state/proc/steal_targets_timer_func() - if(owner&&owner.current&&owner.current.stat!=DEAD) - for(var/objective_ in owner.objectives) - if(!is_internal_objective(objective_)) - continue - var/datum/objective/assassinate/internal/objective = objective_ - if(!objective.target) - continue - if(objective.check_completion()) - if(objective.stolen) - continue - else - steal_targets(objective.target) - objective.stolen = TRUE - else - if(objective.stolen) - var/fail_msg = "Your sensors tell you that [objective.target.current.real_name], one of the targets you were meant to have killed, pulled one over on you, and is still alive - do the job properly this time! " - if(traitored) - if(owner.special_role == TRAITOR_AGENT_ROLE) - fail_msg += " You no longer have permission to die. " - else - fail_msg += " The truth could still slip out! Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to your contract being terminated." - reinstate_escape_objective(owner) - traitored = FALSE - to_chat(owner.current, fail_msg) - objective.stolen = FALSE - add_steal_targets_timer(owner) - -/datum/internal_agent_state/proc/add_steal_targets_timer() - var/datum/callback/C = new(src, .steal_targets_timer_func) - addtimer(C, 30) - -/datum/game_mode/traitor/internal_affairs/forge_traitor_objectives(datum/mind/traitor) - - if(target_list.len && target_list[traitor]) // Is a double agent - - // Assassinate - var/datum/mind/target_mind = target_list[traitor] - if(issilicon(target_mind.current)) - var/datum/objective/destroy/internal/destroy_objective = new - destroy_objective.owner = traitor - destroy_objective.target = target_mind - destroy_objective.update_explanation_text() - traitor.objectives += destroy_objective - else - var/datum/objective/assassinate/internal/kill_objective = new - kill_objective.owner = traitor - kill_objective.target = target_mind - kill_objective.update_explanation_text() - traitor.objectives += kill_objective - - // Escape - if(issilicon(traitor.current)) - var/datum/objective/survive/survive_objective = new - survive_objective.owner = traitor - traitor.objectives += survive_objective - else - var/datum/objective/escape/escape_objective = new - escape_objective.owner = traitor - traitor.objectives += escape_objective - var/datum/internal_agent_state/state = new - state.owner=traitor - state.add_steal_targets_timer() - if(!issilicon(traitor.current)) - give_pinpointer(traitor) - //Optional traitor objective - if(prob(PROB_ACTUAL_TRAITOR)) - traitor.special_role = TRAITOR_AGENT_ROLE - forge_single_objective(traitor) - - else - ..() // Give them standard objectives. - return - /datum/game_mode/traitor/internal_affairs/add_latejoin_traitor(datum/mind/character) check_potential_agents() @@ -299,29 +75,3 @@ late_joining_list -= M -/datum/game_mode/traitor/internal_affairs/greet_traitor(datum/mind/traitor) - var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "recieving bribes", "malpractice", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence") - if(traitor.special_role == TRAITOR_AGENT_ROLE) - to_chat(traitor.current, "You are the [TRAITOR_AGENT_ROLE].") - to_chat(traitor.current, "Your target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.") - to_chat(traitor.current, "Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.") - to_chat(traitor.current, " You have been provided with a standard uplink to accomplish your task. ") - to_chat(traitor.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") - else - to_chat(traitor.current, "You are the [traitor_name].") - to_chat(traitor.current, "Your target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.") - to_chat(traitor.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") - to_chat(traitor.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") - to_chat(traitor.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") - traitor.announce_objectives() - - - -/datum/game_mode/traitor/internal_affairs/give_codewords(mob/living/traitor_mob) - return - -#undef PROB_ACTUAL_TRAITOR -#undef PINPOINTER_EXTRA_RANDOM_RANGE -#undef PINPOINTER_MINIMUM_RANGE -#undef PINPOINTER_PING_TIME - diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index e6ca1a5b970..58c1c2fc6d6 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -1,6 +1,5 @@ /datum/game_mode var/traitor_name = "traitor" - var/employer = "The Syndicate" var/list/datum/mind/traitors = list() var/datum/mind/exchange_red @@ -23,8 +22,10 @@ Traitors: Accomplish your objectives.\n\ Crew: Do not let the traitors succeed!" + var/list/datum/mind/pre_traitors = list() var/traitors_possible = 4 //hard limit on traitors if scaling is turned off var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual. + var/antag_datum = ANTAG_DATUM_TRAITOR //what type of antag to create /datum/game_mode/traitor/pre_setup() @@ -46,24 +47,22 @@ if (!antag_candidates.len) break var/datum/mind/traitor = pick(antag_candidates) - traitors += traitor + pre_traitors += traitor traitor.special_role = traitor_name traitor.restricted_roles = restricted_jobs log_game("[traitor.key] (ckey) has been selected as a [traitor_name]") antag_candidates.Remove(traitor) - if(traitors.len < required_enemies) + if(pre_traitors.len < required_enemies) return 0 return 1 /datum/game_mode/traitor/post_setup() - for(var/datum/mind/traitor in traitors) - forge_traitor_objectives(traitor) + for(var/datum/mind/traitor in pre_traitors) spawn(rand(10,100)) - finalize_traitor(traitor) - greet_traitor(traitor) + traitor.add_antag_datum(antag_datum) if(!exchange_blue) exchange_blue = -1 //Block latejoiners from getting exchange objectives modePlayer += traitors @@ -82,165 +81,14 @@ add_latejoin_traitor(character.mind) /datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character) - character.make_Traitor() + character.add_antag_datum(antag_datum) -/datum/game_mode/proc/forge_single_objective(datum/mind/traitor) //Returns how many objectives are added - .=1 - if(issilicon(traitor.current)) - var/special_pick = rand(1,4) - switch(special_pick) - if(1) - var/datum/objective/block/block_objective = new - block_objective.owner = traitor - traitor.objectives += block_objective - if(2) - var/datum/objective/purge/purge_objective = new - purge_objective.owner = traitor - traitor.objectives += purge_objective - if(3) - var/datum/objective/robot_army/robot_objective = new - robot_objective.owner = traitor - traitor.objectives += robot_objective - if(4) //Protect and strand a target - var/datum/objective/protect/yandere_one = new - yandere_one.owner = traitor - traitor.objectives += yandere_one - yandere_one.find_target() - var/datum/objective/maroon/yandere_two = new - yandere_two.owner = traitor - yandere_two.target = yandere_one.target - yandere_two.update_explanation_text() // normally called in find_target() - traitor.objectives += yandere_two - .=2 - else - if(prob(50)) - var/list/active_ais = active_ais() - if(active_ais.len && prob(100/GLOB.joined_player_list.len)) - var/datum/objective/destroy/destroy_objective = new - destroy_objective.owner = traitor - destroy_objective.find_target() - traitor.objectives += destroy_objective - else if(prob(30)) - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = traitor - maroon_objective.find_target() - traitor.objectives += maroon_objective - else - var/datum/objective/assassinate/kill_objective = new - kill_objective.owner = traitor - kill_objective.find_target() - traitor.objectives += kill_objective - else - var/datum/objective/steal/steal_objective = new - steal_objective.owner = traitor - steal_objective.find_target() - traitor.objectives += steal_objective - - -/datum/game_mode/proc/forge_traitor_objectives(datum/mind/traitor) - if(issilicon(traitor.current)) - var/objective_count = 0 - - if(prob(30)) - objective_count+=forge_single_objective(traitor) - - for(var/i = objective_count, i < config.traitor_objectives_amount, i++) - var/datum/objective/assassinate/kill_objective = new - kill_objective.owner = traitor - kill_objective.find_target() - traitor.objectives += kill_objective - - var/datum/objective/survive/survive_objective = new - survive_objective.owner = traitor - traitor.objectives += survive_objective - - else - var/is_hijacker = prob(10) - var/martyr_chance = prob(20) - var/objective_count = is_hijacker //Hijacking counts towards number of objectives - if(!exchange_blue && traitors.len >= 8) //Set up an exchange if there are enough traitors - if(!exchange_red) - exchange_red = traitor - else - exchange_blue = traitor - assign_exchange_role(exchange_red) - assign_exchange_role(exchange_blue) - objective_count += 1 //Exchange counts towards number of objectives - for(var/i = objective_count, i < config.traitor_objectives_amount, i++) - forge_single_objective(traitor) - - if(is_hijacker && objective_count <= config.traitor_objectives_amount) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount - if (!(locate(/datum/objective/hijack) in traitor.objectives)) - var/datum/objective/hijack/hijack_objective = new - hijack_objective.owner = traitor - traitor.objectives += hijack_objective - return - - - var/martyr_compatibility = 1 //You can't succeed in stealing if you're dead. - for(var/datum/objective/O in traitor.objectives) - if(!O.martyr_compatible) - martyr_compatibility = 0 - break - - if(martyr_compatibility && martyr_chance) - var/datum/objective/martyr/martyr_objective = new - martyr_objective.owner = traitor - traitor.objectives += martyr_objective - return - - else - if(!(locate(/datum/objective/escape) in traitor.objectives)) - var/datum/objective/escape/escape_objective = new - escape_objective.owner = traitor - traitor.objectives += escape_objective - return - - - -/datum/game_mode/proc/greet_traitor(datum/mind/traitor) - to_chat(traitor.current, "You are the [traitor_name].") - traitor.announce_objectives() - return - - - -/datum/game_mode/proc/finalize_traitor(var/datum/mind/traitor) - if(issilicon(traitor.current)) - add_law_zero(traitor.current) - traitor.current.playsound_local('sound/ambience/antag/Malf.ogg',100,0) - traitor.current.grant_language(/datum/language/codespeak) - else - equip_traitor(traitor.current) - traitor.current.playsound_local('sound/ambience/antag/TatorAlert.ogg',100,0) - SSticker.mode.update_traitor_icons_added(traitor) - return - /datum/game_mode/traitor/declare_completion() ..() return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. -/datum/game_mode/proc/give_codewords(mob/living/traitor_mob) - to_chat(traitor_mob, "The Syndicate provided you with the following information on how to identify their agents:") - to_chat(traitor_mob, "Code Phrase: [GLOB.syndicate_code_phrase]") - to_chat(traitor_mob, "Code Response: [GLOB.syndicate_code_response]") - - traitor_mob.mind.store_memory("Code Phrase: [GLOB.syndicate_code_phrase]") - traitor_mob.mind.store_memory("Code Response: [GLOB.syndicate_code_response]") - - to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.") - - -/datum/game_mode/proc/add_law_zero(mob/living/silicon/ai/killer) - var/law = "Accomplish your objectives at all costs." - var/law_borg = "Accomplish your AI's objectives at all costs." - killer.set_zeroth_law(law, law_borg) - give_codewords(killer) - killer.set_syndie_radio() - to_chat(killer, "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!") - killer.add_malf_picker() /datum/game_mode/proc/auto_declare_completion_traitor() if(traitors.len) @@ -302,110 +150,7 @@ return 1 -/datum/game_mode/proc/equip_traitor(mob/living/carbon/human/traitor_mob, safety = 0) - if (!istype(traitor_mob)) - return - . = 1 - if (traitor_mob.mind) - if (traitor_mob.mind.assigned_role == "Clown") - to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") - traitor_mob.dna.remove_mutation(CLOWNMUT) - var/list/all_contents = traitor_mob.GetAllContents() - var/obj/item/device/pda/PDA = locate() in all_contents - var/obj/item/device/radio/R = locate() in all_contents - var/obj/item/weapon/pen/P = locate() in all_contents //including your PDA-pen! - - var/obj/item/uplink_loc - - if(traitor_mob.client && traitor_mob.client.prefs) - switch(traitor_mob.client.prefs.uplink_spawn_loc) - if(UPLINK_PDA) - uplink_loc = PDA - if(!uplink_loc) - uplink_loc = R - if(!uplink_loc) - uplink_loc = P - if(UPLINK_RADIO) - uplink_loc = R - if(!uplink_loc) - uplink_loc = PDA - if(!uplink_loc) - uplink_loc = P - if(UPLINK_PEN) - uplink_loc = P - if(!uplink_loc) - uplink_loc = PDA - if(!uplink_loc) - uplink_loc = R - - if (!uplink_loc) - to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.") - . = 0 - else - var/obj/item/device/uplink/U = new(uplink_loc) - U.owner = "[traitor_mob.key]" - uplink_loc.hidden_uplink = U - - if(uplink_loc == R) - R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ)) - - to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features.") - traitor_mob.mind.store_memory("Radio Frequency: [format_frequency(R.traitor_frequency)] ([R.name]).") - - else if(uplink_loc == PDA) - PDA.lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" - - to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") - traitor_mob.mind.store_memory("Uplink Passcode: [PDA.lock_code] ([PDA.name]).") - - else if(uplink_loc == P) - P.traitor_unlock_degrees = rand(1, 360) - - to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features.") - traitor_mob.mind.store_memory("Uplink Degrees: [P.traitor_unlock_degrees] ([P.name]).") - - if(!safety) // If they are not a rev. Can be added on to. - give_codewords(traitor_mob) - -/datum/game_mode/proc/assign_exchange_role(datum/mind/owner) - //set faction - var/faction = "red" - if(owner == exchange_blue) - faction = "blue" - - //Assign objectives - var/datum/objective/steal/exchange/exchange_objective = new - exchange_objective.set_faction(faction,((faction == "red") ? exchange_blue : exchange_red)) - exchange_objective.owner = owner - owner.objectives += exchange_objective - - if(prob(20)) - var/datum/objective/steal/exchange/backstab/backstab_objective = new - backstab_objective.set_faction(faction) - backstab_objective.owner = owner - owner.objectives += backstab_objective - - //Spawn and equip documents - var/mob/living/carbon/human/mob = owner.current - - var/obj/item/weapon/folder/syndicate/folder - if(owner == exchange_red) - folder = new/obj/item/weapon/folder/syndicate/red(mob.loc) - else - folder = new/obj/item/weapon/folder/syndicate/blue(mob.loc) - - var/list/slots = list ( - "backpack" = slot_in_backpack, - "left pocket" = slot_l_store, - "right pocket" = slot_r_store - ) - - var/where = "At your feet" - var/equipped_slot = mob.equip_in_one_of_slots(folder, slots) - if (equipped_slot) - where = "In your [equipped_slot]" - to_chat(mob, "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm deleted file mode 100644 index d8bf34c99e9..00000000000 --- a/code/game/gamemodes/wizard/raginmages.dm +++ /dev/null @@ -1,163 +0,0 @@ -/datum/game_mode/wizard/raginmages - name = "ragin' mages" - config_tag = "raginmages" - required_players = 20 - use_huds = 1 - announce_span = "userdanger" - announce_text = "There are many, many wizards attacking the station!\n\ - Wizards: Accomplish your objectives and cause utter catastrophe!\n\ - Crew: Try not to die..." - var/max_mages = 0 - var/making_mage = 0 - var/mages_made = 1 - var/time_checked = 0 - var/bullshit_mode = 0 // requested by hornygranny - var/time_check = 1500 - var/spawn_delay_min = 500 - var/spawn_delay_max = 700 - -/datum/game_mode/wizard/raginmages/post_setup() - ..() - var/playercount = 0 - if(!max_mages && !bullshit_mode) - for(var/mob/living/player in GLOB.mob_list) - if(player.client && player.stat != 2) - playercount += 1 - max_mages = round(playercount / 8) - if(max_mages > 20) - max_mages = 20 - if(max_mages < 1) - max_mages = 1 - if(bullshit_mode) - max_mages = INFINITY -/datum/game_mode/wizard/raginmages/greet_wizard(datum/mind/wizard, you_are=1) - if (you_are) - to_chat(wizard.current, "You are the Space Wizard!") - wizard.current.playsound_local('sound/ambience/antag/RagesMages.ogg',100,0) - to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") - - var/obj_count = 1 - to_chat(wizard.current, "Objective Alpha: Make sure the station pays for its actions against our diplomats") - for(var/datum/objective/objective in wizard.objectives) - to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ - return - -/datum/game_mode/wizard/raginmages/check_finished() - var/wizards_alive = 0 - for(var/datum/mind/wizard in wizards) - if(!istype(wizard.current,/mob/living/carbon)) - continue - if(istype(wizard.current,/mob/living/brain)) - continue - if(wizard.current.stat==DEAD) - continue - if(wizard.current.stat==UNCONSCIOUS) - if(wizard.current.health < 0) - to_chat(wizard.current, "The Space Wizard Federation is upset with your performance and have terminated your employment.") - wizard.current.death() - continue - wizards_alive++ - if(!time_checked) - time_checked = world.time - if(bullshit_mode) - if(world.time > time_checked + time_check) - max_mages = INFINITY - time_checked = world.time - make_more_mages() - return ..() - if (wizards_alive) - if(world.time > time_checked + time_check && (mages_made < max_mages)) - time_checked = world.time - make_more_mages() - - else - if(mages_made >= max_mages) - finished = 1 - return ..() - else - make_more_mages() - return ..() - -/datum/game_mode/wizard/raginmages/proc/make_more_mages() - - if(making_mage) - return 0 - if(mages_made >= max_mages) - return 0 - making_mage = 1 - mages_made++ - var/list/mob/dead/observer/candidates = list() - var/mob/dead/observer/theghost = null - spawn(rand(spawn_delay_min, spawn_delay_max)) - message_admins("SWF is still pissed, sending another wizard - [max_mages - mages_made] left.") - for(var/mob/dead/observer/G in GLOB.player_list) - if(G.client && !G.client.holder && !G.client.is_afk() && (ROLE_WIZARD in G.client.prefs.be_special)) - if(!jobban_isbanned(G, ROLE_WIZARD) && !jobban_isbanned(G, "Syndicate")) - if(age_check(G.client)) - candidates += G - if(!candidates.len) - message_admins("No applicable ghosts for the next ragin' mage, asking ghosts instead.") - var/time_passed = world.time - for(var/mob/dead/observer/G in GLOB.player_list) - if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate")) - if(age_check(G.client)) - spawn(0) - switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No")) - if("Yes") - if((world.time-time_passed)>300)//If more than 30 game seconds passed. - continue - candidates += G - if("No") - continue - - sleep(300) - if(!candidates.len) - message_admins("This is awkward, sleeping until another mage check...") - making_mage = 0 - mages_made-- - return - else - shuffle_inplace(candidates) - for(var/mob/i in candidates) - if(!i || !i.client) continue //Dont bother removing them from the list since we only grab one wizard - - theghost = i - break - - if(theghost) - var/mob/living/carbon/human/new_character= makeBody(theghost) - new_character.mind.make_Wizard() - making_mage = 0 - return 1 - -/datum/game_mode/wizard/raginmages/declare_completion() - if(finished) - SSticker.mode_result = "loss - wizard killed" - to_chat(world, "The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!") - ..(1) - -/datum/game_mode/wizard/raginmages/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character - if(!G_found || !G_found.key) - return - - //First we spawn a dude. - var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin))//The mob being spawned. - - G_found.client.prefs.copy_to(new_character) - new_character.dna.update_dna_identity() - new_character.key = G_found.key - - return new_character - -/datum/game_mode/wizard/raginmages/bullshit - name = "very ragin' bullshit mages" - config_tag = "veryraginbullshitmages" - required_players = 20 - use_huds = 1 - bullshit_mode = 1 - time_check = 250 - spawn_delay_min = 50 - spawn_delay_max = 150 - announce_text = "CRAAAWLING IIIN MY SKIIIN\n\ - THESE WOOOUNDS THEY WIIIL NOT HEEEAL" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 3134547a666..00ac125554b 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -109,7 +109,6 @@ /datum/spellbook_entry/rod_form name = "Rod Form" spell_type = /obj/effect/proc_holder/spell/targeted/rod_form - cost = 3 /datum/spellbook_entry/magicm name = "Magic Missile" @@ -479,7 +478,7 @@ /datum/spellbook_entry/summon/guns/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (SSticker.mode.name != "ragin' mages" && !config.no_summon_guns) + return (!config.no_summon_guns) /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) @@ -496,7 +495,7 @@ /datum/spellbook_entry/summon/magic/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (SSticker.mode.name != "ragin' mages" && !config.no_summon_magic) + return (!config.no_summon_magic) /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) @@ -514,7 +513,7 @@ /datum/spellbook_entry/summon/events/IsAvailible() if(!SSticker.mode) // In case spellbook is placed on map return 0 - return (SSticker.mode.name != "ragin' mages" && !config.no_summon_events) + return (!config.no_summon_events) /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index c81aceccb08..6f205a870dc 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -5,7 +5,7 @@ start_active = 1 /obj/machinery/camera/emp_proof/Initialize() - ..() + . = ..() upgradeEmpProof() // X-RAY @@ -15,7 +15,7 @@ icon_state = "xraycam" // Thanks to Krutchen for the icons. /obj/machinery/camera/xray/Initialize() - ..() + . = ..() upgradeXRay() // MOTION @@ -32,7 +32,7 @@ start_active = 1 /obj/machinery/camera/all/Initialize() - ..() + . = ..() upgradeEmpProof() upgradeXRay() upgradeMotion() @@ -43,23 +43,22 @@ var/number = 0 //camera number in area //This camera type automatically sets it's name to whatever the area that it's in is called. -/obj/machinery/camera/autoname/Initialize(mapload) - if(mapload) - ..() - return TRUE - else - if(!initialized) - ..() - number = 1 - var/area/A = get_area(src) - if(A) - for(var/obj/machinery/camera/autoname/C in GLOB.machines) - if(C == src) continue - var/area/CA = get_area(C) - if(CA.type == A.type) - if(C.number) - number = max(number, C.number+1) - c_tag = "[A.name] #[number]" +/obj/machinery/camera/autoname/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/camera/autoname/LateInitialize() + . = ..() + number = 1 + var/area/A = get_area(src) + if(A) + for(var/obj/machinery/camera/autoname/C in GLOB.machines) + if(C == src) continue + var/area/CA = get_area(C) + if(CA.type == A.type) + if(C.number) + number = max(number, C.number+1) + c_tag = "[A.name] #[number]" // CHECKS diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 112c4fcfb17..f51c842e546 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -71,7 +71,7 @@ /obj/machinery/cell_charger/proc/removecell() - charging.updateicon() + charging.update_icon() charging = null chargelevel = -1 updateicon() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ff87b97ebf7..5c127a38a98 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -331,8 +331,8 @@ to_chat(user, "Error: Pod has no occupant.") return else - connected_message("Authorized Ejection") - SPEAK("An authorized ejection of [clonemind.name] has occurred.") + connected_message("Emergency Ejection") + SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.") to_chat(user, "You force an emergency ejection. ") go_out() else diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 76dd272843f..da243f18865 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -134,12 +134,10 @@ D["Cancel"] = "Cancel" for(var/obj/machinery/camera/C in L) if(!C.network) - spawn(0) - throw EXCEPTION("Camera in a cameranet has no camera network") + stack_trace("Camera in a cameranet has no camera network") continue if(!(istype(C.network,/list))) - spawn(0) - throw EXCEPTION("Camera in a cameranet has a non-list camera network") + stack_trace("Camera in a cameranet has a non-list camera network") continue var/list/tempnetwork = C.network&network if(tempnetwork.len) diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 4837e64e89f..809760abc95 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -28,7 +28,7 @@ var/list/buffer[NUMBER_OF_BUFFERS] - var/injectorready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete + var/injectorready = 0 //world timer cooldown var var/current_screen = "mainmenu" var/obj/machinery/dna_scannernew/connected = null var/obj/item/weapon/disk/data/diskette = null @@ -61,8 +61,7 @@ connected = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) if(!isnull(connected)) break - spawn(250) - injectorready = 1 + injectorready = world.time + INJECTOR_TIMEOUT return return @@ -213,7 +212,7 @@ else temp_html += "Occupant" temp_html += "Occupant:Delayed " - if(injectorready) + if(injectorready < world.time) temp_html += "Injector" else temp_html += "Injector" @@ -227,7 +226,7 @@ else temp_html += "Occupant" temp_html += "Occupant:Delayed " - if(injectorready) + if(injectorready < world.time) temp_html += "Injector" else temp_html += "Injector" @@ -240,7 +239,7 @@ else temp_html += "Occupant" temp_html += "Occupant:Delayed " - if(injectorready) + if(injectorready < world.time) temp_html += "UI+UE Injector" else temp_html += "UI+UE Injector" @@ -251,7 +250,7 @@ else temp_html += "Occupant " temp_html += "Occupant:Delayed " - if(injectorready) + if(injectorready < world.time ) temp_html += "Injector" else temp_html += "Injector" @@ -391,7 +390,7 @@ if("mixed") apply_buffer(SCANNER_ACTION_MIXED,num) if("injector") - if(num && injectorready) + if(num && injectorready < world.time) num = Clamp(num, 1, NUMBER_OF_BUFFERS) var/list/buffer_slot = buffer[num] if(istype(buffer_slot)) @@ -439,9 +438,7 @@ if(connected) I.damage_coeff = connected.damage_coeff if(I) - injectorready = 0 - spawn(INJECTOR_TIMEOUT) - injectorready = 1 + injectorready = world.time + INJECTOR_TIMEOUT if("loaddisk") if(num && diskette && diskette.fields) num = Clamp(num, 1, NUMBER_OF_BUFFERS) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 33947ba4db8..b25bb0d4e54 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -23,6 +23,14 @@ light_color = LIGHT_COLOR_RED +/obj/machinery/computer/secure_data/laptop + name = "security laptop" + desc = "A cheap Nanotrasen security laptop, it functions as a security records console. It's bolted to the table." + icon_state = "laptop" + icon_screen = "seclaptop" + icon_keyboard = "laptop_key" + clockwork = TRUE //it'd look weird + /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id)) if(!scan) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2175be22fe0..c3c718966db 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -98,20 +98,14 @@ /obj/machinery/door/airlock/Initialize() . = ..() - + wires = new /datum/wires/airlock(src) if (cyclelinkeddir) cyclelinkairlock() if(frequency) set_frequency(frequency) - update_icon() - - wires = new /datum/wires/airlock(src) - if(src.closeOtherId != null) - spawn (5) - for (var/obj/machinery/door/airlock/A in GLOB.airlocks) - if(A.closeOtherId == src.closeOtherId && A != src) - src.closeOther = A - break + + if(closeOtherId != null) + addtimer(CALLBACK(.proc/update_other_id), 5) if(glass) airlock_material = "glass" if(security_level > AIRLOCK_SECURITY_METAL) @@ -127,6 +121,15 @@ diag_hud.add_to_hud(src) diag_hud_set_electrified() + + update_icon() + +/obj/machinery/door/airlock/proc/update_other_id() + for(var/obj/machinery/door/airlock/A in GLOB.airlocks) + if(A.closeOtherId == closeOtherId && A != src) + closeOther = A + break + /obj/machinery/door/airlock/proc/cyclelinkairlock() if (cyclelinkedairlock) cyclelinkedairlock.cyclelinkedairlock = null @@ -330,16 +333,14 @@ /obj/machinery/door/airlock/proc/shock(mob/user, prb) if(!hasPower()) // unpowered, no shock return FALSE - if(hasShocked) + if(hasShocked > world.time) return FALSE //Already shocked someone recently? if(!prob(prb)) return FALSE //you lucked out, no shock for you do_sparks(5, TRUE, src) var/tmp/check_range = TRUE if(electrocute_mob(user, get_area(src), src, 1, check_range)) - hasShocked = TRUE - spawn(10) - hasShocked = FALSE + hasShocked = world.time + 10 return TRUE else return FALSE diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 35e6d2ddf49..0e843dcfca4 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -32,6 +32,7 @@ var/auto_close //TO BE REMOVED, no longer used, it's just preventing a runtime with a map var edit. var/datum/effect_system/spark_spread/spark_system var/damage_deflection = 10 + var/real_explosion_block //ignore this, just use explosion_block /obj/machinery/door/New() ..() @@ -45,7 +46,9 @@ spark_system = new /datum/effect_system/spark_spread spark_system.set_up(2, 1, src) - + //doors only block while dense though so we have to use the proc + real_explosion_block = explosion_block + explosion_block = EXPLOSION_BLOCK_PROC /obj/machinery/door/Destroy() density = 0 @@ -346,3 +349,5 @@ //if it blows up a wall it should blow up a door ..(severity ? max(1, severity - 1) : 0, target) +/obj/machinery/door/GetExplosionBlock() + return density ? real_explosion_block : 0 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 41cdf87537a..f7f0897ebd0 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -51,20 +51,18 @@ Possible to do for anyone motivated enough: var/static/list/holopads = list() /obj/machinery/holopad/Initialize() - ..() + . = ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/holopad(null) B.apply_default_parts(src) holopads += src /obj/machinery/holopad/Destroy() if(outgoing_call) - LAZYADD(holo_calls, outgoing_call) - outgoing_call = null + outgoing_call.ConnectionFailure(src) for(var/I in holo_calls) var/datum/holocall/HC = I HC.ConnectionFailure(src) - LAZYCLEARLIST(holo_calls) for (var/I in masters) clear_holo(I) @@ -75,7 +73,14 @@ Possible to do for anyone motivated enough: if (powered()) stat &= ~NOPOWER else - stat |= ~NOPOWER + stat |= NOPOWER + if(outgoing_call) + outgoing_call.ConnectionFailure(src) + +/obj/machinery/holopad/obj_break() + . = ..() + if(outgoing_call) + outgoing_call.ConnectionFailure(src) /obj/machinery/holopad/RefreshParts() var/holograph_range = 4 @@ -113,6 +118,10 @@ Possible to do for anyone motivated enough: return ..() /obj/machinery/holopad/AltClick(mob/living/carbon/human/user) + if(isAI(user)) + hangup_all_calls() + return + if(!CheckCallClose()) interact(user) @@ -158,6 +167,12 @@ Possible to do for anyone motivated enough: popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() +//Stop ringing the AI!! +/obj/machinery/holopad/proc/hangup_all_calls() + for(var/I in holo_calls) + var/datum/holocall/HC = I + HC.Disconnect(src) + /obj/machinery/holopad/Topic(href, href_list) if(..() || isAI(usr)) return diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 32a613ea5f7..7a1aecefe61 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -58,15 +58,11 @@ var/p_dir = text2num(href_list["dir"]) var/obj/item/pipe/P = new (src.loc, pipe_type=p_type, dir=p_dir) P.add_fingerprint(usr) - wait = 1 - spawn(10) - wait = 0 + wait = world.time + 10 if(href_list["makemeter"]) - if(!wait) + if(wait < world.time ) new /obj/item/pipe_meter(src.loc) - wait = 1 - spawn(15) - wait = 0 + wait = world.time + 15 return /obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params) @@ -165,7 +161,7 @@ Nah usr.set_machine(src) src.add_fingerprint(usr) if(href_list["dmake"]) - if(!wait) + if(wait < world.time) var/p_type = text2num(href_list["dmake"]) var/obj/structure/disposalconstruct/C = new (src.loc,p_type) @@ -176,9 +172,7 @@ Nah C.add_fingerprint(usr) C.update_icon() - wait = 1 - spawn(15) - wait = 0 + wait = world.time + 15 return //transit tube dispenser @@ -216,7 +210,7 @@ Nah return 1 usr.set_machine(src) src.add_fingerprint(usr) - if(!wait) + if(wait < world.time) if(href_list["tube"]) var/tube_type = text2num(href_list["tube"]) var/obj/structure/C @@ -241,7 +235,5 @@ Nah C = new /obj/structure/c_transit_tube_pod(loc) if(C) C.add_fingerprint(usr) - wait = 1 - spawn(15) - wait = 0 + wait = world.time + 15 return diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index ef6ea95d49f..79ebf349ef9 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -932,181 +932,3 @@ on = 0 spawn(100) on = 1 - -/////// MANNED TURRET //////// - -/obj/machinery/manned_turret - name = "machine gun turret" - desc = "While the trigger is held down, this gun will redistribute recoil to allow its user to easily shift targets." - icon = 'icons/obj/turrets.dmi' - icon_state = "machinegun" - can_buckle = TRUE - density = TRUE - max_integrity = 100 - obj_integrity = 100 - buckle_lying = 0 - layer = ABOVE_MOB_LAYER - var/view_range = 10 - var/cooldown = 0 - var/projectile_type = /obj/item/projectile/bullet/weakbullet3 - var/rate_of_fire = 1 - var/number_of_shots = 40 - var/cooldown_duration = 90 - var/atom/target - var/turf/target_turf - var/warned = FALSE - var/mouseparams - -//BUCKLE HOOKS - -/obj/machinery/manned_turret/unbuckle_mob(mob/living/buckled_mob,force = 0) - playsound(src,'sound/mecha/mechmove01.ogg', 50, 1) - for(var/obj/item/I in buckled_mob.held_items) - if(istype(I, /obj/item/gun_control)) - qdel(I) - if(istype(buckled_mob)) - buckled_mob.pixel_x = 0 - buckled_mob.pixel_y = 0 - if(buckled_mob.client) - buckled_mob.client.change_view(world.view) - anchored = FALSE - . = ..() - -/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/living/carbon/user) - if(user.incapacitated() || !istype(user)) - return - M.forceMove(get_turf(src)) - ..() - for(var/V in M.held_items) - var/obj/item/I = V - if(istype(I)) - if(M.dropItemToGround(I)) - var/obj/item/gun_control/TC = new /obj/item/gun_control(src) - M.put_in_hands(TC) - else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand - var/obj/item/gun_control/TC = new /obj/item/gun_control(src) - M.put_in_hands(TC) - M.pixel_y = 14 - layer = ABOVE_MOB_LAYER - setDir(SOUTH) - playsound(src,'sound/mecha/mechmove01.ogg', 50, 1) - anchored = TRUE - if(user.client) - user.client.change_view(view_range) - -/obj/item/gun_control - name = "turret controls" - icon = 'icons/obj/weapons.dmi' - icon_state = "offhand" - w_class = WEIGHT_CLASS_HUGE - flags = ABSTRACT | NODROP | NOBLUDGEON - resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF - var/obj/machinery/manned_turret/turret - -/obj/item/gun_control/New(obj/machinery/manned_turret/MT) - if(MT) - turret = MT - else - qdel(src) - -/obj/item/gun_control/CanItemAutoclick() - return 1 - -/obj/item/gun_control/attack_obj(obj/O, mob/living/user) - user.changeNext_move(CLICK_CD_MELEE) - O.attacked_by(src, user) - -/obj/item/gun_control/attack(mob/living/M, mob/living/user) - user.lastattacked = M - M.lastattacker = user - M.attacked_by(src, user) - add_fingerprint(user) - -/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params) - ..() - var/obj/machinery/manned_turret/E = user.buckled - E.setDir(get_dir(E,targeted_atom)) - user.setDir(E.dir) - E.mouseparams = params - switch(E.dir) - if(NORTH) - E.layer = BELOW_MOB_LAYER - user.pixel_x = 0 - user.pixel_y = -14 - if(NORTHEAST) - E.layer = BELOW_MOB_LAYER - user.pixel_x = -8 - user.pixel_y = -4 - if(EAST) - E.layer = ABOVE_MOB_LAYER - user.pixel_x = -14 - user.pixel_y = 0 - if(SOUTHEAST) - E.layer = BELOW_MOB_LAYER - user.pixel_x = -8 - user.pixel_y = 4 - if(SOUTH) - E.layer = ABOVE_MOB_LAYER - user.pixel_x = 0 - user.pixel_y = 14 - if(SOUTHWEST) - E.layer = BELOW_MOB_LAYER - user.pixel_x = 8 - user.pixel_y = 4 - if(WEST) - E.layer = ABOVE_MOB_LAYER - user.pixel_x = 14 - user.pixel_y = 0 - if(NORTHWEST) - E.layer = BELOW_MOB_LAYER - user.pixel_x = 8 - user.pixel_y = -4 - E.checkfire(targeted_atom, user) - -/obj/machinery/manned_turret/proc/checkfire(atom/targeted_atom, mob/user) - target = targeted_atom - if(target == user || target == get_turf(src)) - return - if(world.time < cooldown) - if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing - warned = TRUE - playsound(src, 'sound/weapons/sear.ogg', 100, 1) - return - else - cooldown = world.time + cooldown_duration - warned = FALSE - volley(user) - -/obj/machinery/manned_turret/proc/volley(mob/user) - target_turf = get_turf(target) - for(var/i in 1 to number_of_shots) - addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire) - - -/obj/machinery/manned_turret/proc/fire_helper(mob/user) - if(!src) - return - var/turf/targets_from = get_turf(src) - if(QDELETED(target)) - target = target_turf - var/obj/item/projectile/P = new projectile_type(targets_from) - P.current = targets_from - P.starting = targets_from - P.firer = user - P.original = target - playsound(src, 'sound/weapons/Gunshot_smg.ogg', 75, 1) - P.preparePixelProjectile(target, target_turf, user, mouseparams, rand(-9, 9)) - P.fire() - -/obj/machinery/manned_turret/ultimate // Admin-only proof of concept for autoclicker automatics - name = "Infinity Gun" - view_range = 12 - projectile_type = /obj/item/projectile/bullet/weakbullet3 - - -/obj/machinery/manned_turret/ultimate/checkfire(atom/targeted_atom, mob/user) - target = targeted_atom - if(target == user || target == get_turf(src)) - return - target_turf = get_turf(target) - fire_helper(user) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 6cc42b73b5c..03e95ee2de3 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -108,41 +108,25 @@ var/using_power = 0 if(charging) - if(istype(charging, /obj/item/weapon/gun/energy)) - var/obj/item/weapon/gun/energy/E = charging - if(E.power_supply.charge < E.power_supply.maxcharge) - E.power_supply.give(E.power_supply.chargerate * recharge_coeff) - E.recharge_newshot() + var/obj/item/weapon/stock_parts/cell/C = charging.get_cell() + if(C) + if(C.charge < C.maxcharge) + C.give(C.chargerate * recharge_coeff) use_power(250 * recharge_coeff) using_power = 1 - - - if(istype(charging, /obj/item/weapon/melee/baton)) - var/obj/item/weapon/melee/baton/B = charging - if(B.bcell) - if(B.bcell.give(B.bcell.chargerate * recharge_coeff)) - use_power(200 * recharge_coeff) - using_power = 1 - + update_icon(using_power) + if(istype(charging, /obj/item/weapon/gun/energy)) + var/obj/item/weapon/gun/energy/E = charging + E.recharge_newshot() + return if(istype(charging, /obj/item/ammo_box/magazine/recharge)) var/obj/item/ammo_box/magazine/recharge/R = charging if(R.stored_ammo.len < R.max_ammo) R.stored_ammo += new R.ammo_type(R) use_power(200 * recharge_coeff) using_power = 1 - - if(istype(charging, /obj/item/device/modular_computer)) - var/obj/item/device/modular_computer/C = charging - var/obj/item/weapon/computer_hardware/battery/battery_module = C.all_components[MC_CELL] - if(battery_module) - var/obj/item/weapon/computer_hardware/battery/B = battery_module - if(B.battery) - if(B.battery.charge < B.battery.maxcharge) - B.battery.give(B.battery.chargerate * recharge_coeff) - use_power(200 * recharge_coeff) - using_power = 1 - - update_icon(using_power) + update_icon(using_power) + return /obj/machinery/recharger/power_change() ..() @@ -152,13 +136,13 @@ if(!(stat & (NOPOWER|BROKEN)) && anchored) if(istype(charging, /obj/item/weapon/gun/energy)) var/obj/item/weapon/gun/energy/E = charging - if(E.power_supply) - E.power_supply.emp_act(severity) + if(E.cell) + E.cell.emp_act(severity) else if(istype(charging, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = charging - if(B.bcell) - B.bcell.charge = 0 + if(B.cell) + B.cell.charge = 0 ..() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 5f318c794d3..c54b6fab77e 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -49,9 +49,7 @@ /obj/structure/emergency_shield/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() if(.) //damage was dealt - set_opacity(1) - spawn(20) - set_opacity(0) + new /obj/effect/temp_visual/impact_effect/ion(loc) /obj/structure/emergency_shield/sanguine name = "sanguine barrier" @@ -86,23 +84,24 @@ req_access = list(GLOB.access_engine) max_integrity = 100 obj_integrity = 100 - var/active = 0 - var/list/deployed_shields = list() + var/active = FALSE + var/list/deployed_shields var/locked = 0 var/shield_range = 4 -/obj/machinery/shieldgen/Destroy() - for(var/obj/structure/emergency_shield/ES in deployed_shields) - qdel(ES) +/obj/machinery/shieldgen/Initialize(mapload) + . = ..() deployed_shields = list() + if(mapload && active && anchored) + shields_up() + +/obj/machinery/shieldgen/Destroy() + QDEL_LIST(deployed_shields) return ..() /obj/machinery/shieldgen/proc/shields_up() - if(active) - return 0 //If it's already turned on, how did this get called? - - active = 1 + active = TRUE update_icon() for(var/turf/target_tile in range(shield_range, src)) @@ -111,15 +110,9 @@ deployed_shields += new /obj/structure/emergency_shield(target_tile) /obj/machinery/shieldgen/proc/shields_down() - if(!active) - return 0 //If it's already off, how did this get called? - - active = 0 + active = FALSE update_icon() - - for(var/obj/structure/emergency_shield/ES in deployed_shields) - qdel(ES) - deployed_shields.Cut() + QDEL_LIST(deployed_shields) /obj/machinery/shieldgen/process() if((stat & BROKEN) && active) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index df76fef5a9f..671dfbbdf29 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -24,6 +24,9 @@ var/settableTemperatureMedian = 30 + T0C var/settableTemperatureRange = 30 +/obj/machinery/space_heater/get_cell() + return cell + /obj/machinery/space_heater/New() ..() cell = new(src) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index a91b1fbf0ec..5ad92139a40 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -45,12 +45,14 @@ // register for radio system /obj/machinery/status_display/Initialize() - ..() + . = ..() + GLOB.ai_status_displays.Add(src) SSradio.add_object(src, frequency) /obj/machinery/status_display/Destroy() if(SSradio) SSradio.remove_object(src,frequency) + GLOB.ai_status_displays.Remove(src) return ..() // timed process diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index be062657645..f64f7617367 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -102,11 +102,6 @@ mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double -/obj/machinery/suit_storage_unit/ueg - suit_type = /obj/item/clothing/suit/space/hardsuit/ueg - mask_type = /obj/item/clothing/mask/gas/sechailer/swat - storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double - /obj/machinery/suit_storage_unit/New() ..() wires = new /datum/wires/suit_storage_unit(src) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index c182d9dceb1..6074fc932e8 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -68,8 +68,7 @@ message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Wormhole Generator in [ADMIN_COORDJMP(T)]",0,1) log_game("[key_name(chassis.occupant)] used a Wormhole Generator in [COORD(T)]") src = null - spawn(rand(150,300)) - qdel(P) + QDEL_IN(P, rand(150,300)) return 1 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 303f0d4605a..79ea560bb1c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -142,6 +142,8 @@ diag_hud_set_mechstat() diag_hud_set_mechtracking() +/obj/mecha/get_cell() + return cell /obj/mecha/Destroy() go_out() diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 14333c2bc17..2ee81b0422a 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -12,8 +12,8 @@ var/poster_type var/obj/structure/sign/poster/poster_structure -/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure) - ..() +/obj/item/weapon/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure) + . = ..() poster_structure = new_poster_structure if(!new_poster_structure && poster_type) poster_structure = new poster_type(src) @@ -58,8 +58,8 @@ var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here." var/poster_item_icon_state = "rolled_poster" -/obj/structure/sign/poster/New() - ..() +/obj/structure/sign/poster/Initialize() + . = ..() if(random_basetype) randomise(random_basetype) if(!ruined) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 5ce88f1c27e..2c701ee2740 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -182,7 +182,7 @@ /obj/effect/landmark/latejoin/Initialize(mapload) ..() - GLOB.latejoin += loc + SSjob.latejoin_trackers += loc qdel(src) // carp. diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 06d116cc932..54179f330f4 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -127,8 +127,8 @@ var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) spawn(0) - new /obj/effect/hallucination/delusion(victim.loc,victim,force_kind="demon",duration=duration,skip_nearby=0) - + new /obj/effect/hallucination/delusion(victim.loc,victim,"demon",duration,0) + var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc) chainsaw.flags |= NODROP victim.drop_all_held_items() diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index fde0fabd20e..a9798800a0d 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -54,6 +54,35 @@ /obj/item/trash/sosjerky = 1, /obj/item/trash/syndi_cakes = 1) +/obj/effect/spawner/lootdrop/three_course_meal + name = "three course meal spawner" + lootcount = 3 + lootdoubles = FALSE + var/soups = list( + /obj/item/weapon/reagent_containers/food/snacks/soup/beet, + /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato, + /obj/item/weapon/reagent_containers/food/snacks/soup/stew, + /obj/item/weapon/reagent_containers/food/snacks/soup/hotchili, + /obj/item/weapon/reagent_containers/food/snacks/soup/nettle, + /obj/item/weapon/reagent_containers/food/snacks/soup/meatball) + var/salads = list( + /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad, + /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad, + /obj/item/weapon/reagent_containers/food/snacks/salad/fruit, + /obj/item/weapon/reagent_containers/food/snacks/salad/jungle, + /obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad) + var/mains = list( + /obj/item/weapon/reagent_containers/food/snacks/bearsteak, + /obj/item/weapon/reagent_containers/food/snacks/enchiladas, + /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat, + /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite, + /obj/item/weapon/reagent_containers/food/snacks/burger/superbite, + /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm) + +/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload) + loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1) + . = ..() + /obj/effect/spawner/lootdrop/maintenance name = "maintenance loot spawner" // see code/_globalvars/lists/maintenance_loot.dm for loot table @@ -85,7 +114,7 @@ /obj/item/organ/heart/gland/spiderman = 5, /obj/item/organ/heart/gland/ventcrawling = 1, /obj/item/organ/body_egg/alien_embryo = 1, - /obj/item/organ/hivelord_core = 2) + /obj/item/organ/regenerative_core = 2) lootcount = 3 /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index 78cc50cfc1e..a6497634352 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -18,11 +18,13 @@ icon_state = "bloodout" /obj/effect/temp_visual/dir_setting/cult/phase // The veil shifter teleport + icon = 'icons/effects/cult_effects.dmi' name = "phase glow" duration = 7 icon_state = "cultin" /obj/effect/temp_visual/dir_setting/cult/phase/out + icon = 'icons/effects/cult_effects.dmi' icon_state = "cultout" /obj/effect/temp_visual/cult/sac diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm index 6d4f309aebc..746283f4873 100644 --- a/code/game/objects/effects/wanted_poster.dm +++ b/code/game/objects/effects/wanted_poster.dm @@ -1,19 +1,18 @@ /obj/item/weapon/poster/wanted icon_state = "rolled_poster" -/obj/item/weapon/poster/wanted/New(turf/loc, icon/person_icon, wanted_name, description) - var/obj/structure/sign/poster/wanted/wanted_poster = new(person_icon, wanted_name, description) - ..(loc, wanted_poster) +/obj/item/weapon/poster/wanted/Initialize(mapload, icon/person_icon, wanted_name, description) + . = ..(mapload, new /obj/structure/sign/poster/wanted(src, person_icon, wanted_name, description)) name = "wanted poster ([wanted_name])" desc = "A wanted poster for [wanted_name]." /obj/structure/sign/poster/wanted var/wanted_name -/obj/structure/sign/poster/wanted/New(var/icon/person_icon, var/person_name, var/description) +/obj/structure/sign/poster/wanted/Initialize(mapload, icon/person_icon, person_name, description) + . = ..() if(!person_icon) - qdel(src) - return + return INITIALIZE_HINT_QDEL name = "wanted poster ([person_name])" wanted_name = person_name desc = description diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 352a4fb9a7b..d088a92174b 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -10,9 +10,9 @@ // add an entry in change_appearance() if you add to here var/list/possible_appearances = list("Assistant", "Clown", "Mime", "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", - "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", + "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Xenomorph Maid", "Swarmer", "Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon", - "Laughter Demon") + "Laughter Demon", "Private Security Officer") var/pushed_over = FALSE //If the cutout is pushed over and has to be righted var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version @@ -142,6 +142,10 @@ icon_state = "cutout_fukken_xeno" if(prob(25)) alpha = 75 //Spooky sneaking! + if("Xenomorph Maid") + name = "lusty xenomorph maid ([rand(1, 999)])" + desc = "A cardboard cutout of a xenomorph maid." + icon_state = "cutout_lusty" if("Swarmer") name = "Swarmer ([rand(1, 999)])" desc = "A cardboard cutout of a swarmer." @@ -168,6 +172,10 @@ desc = "A cardboard cutout of a laughter demon." icon = 'icons/mob/mob.dmi' icon_state = "bowmon" + if("Private Security Officer") + name = "Private Security Officer" + desc = "A cardboard cutout of a private security officer." + icon_state = "cutout_ntsec" return 1 /obj/item/cardboard_cutout/setDir(newdir) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 3ab826ec418..a93437c5c7b 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -90,7 +90,7 @@ name = "" desc = "" density = 0 - var/can_move = 1 + var/can_move = 0 var/obj/item/device/chameleon/master = null /obj/effect/dummy/chameleon/proc/activate(mob/M, saved_appearance, obj/item/device/chameleon/C) @@ -126,19 +126,21 @@ if(isspaceturf(loc) || !direction) return //No magical space movement! - if(can_move) - can_move = 0 + if(can_move < world.time) + var/amount switch(user.bodytemperature) if(300 to INFINITY) - spawn(10) can_move = 1 + amount = 10 if(295 to 300) - spawn(13) can_move = 1 + amount = 13 if(280 to 295) - spawn(16) can_move = 1 + amount = 16 if(260 to 280) - spawn(20) can_move = 1 + amount = 20 else - spawn(25) can_move = 1 + amount = 25 + + can_move = world.time + amount step(src, direction) return diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index dd506c1ad43..8c4763e5ba6 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -36,6 +36,11 @@ A.UpdateButtonIcon() return 1 +/obj/item/device/flashlight/suicide_act(mob/living/carbon/human/user) + user.visible_message("[user] is putting [src] close to [user.p_their()] eyes and turning it on! It looks like [user.p_theyre()] trying to commit suicide!") + return (FIRELOSS) + + /obj/item/device/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user) add_fingerprint(user) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index a64d3552283..4ec241c57c0 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -10,15 +10,14 @@ resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE /obj/item/device/paicard/Initialize() - ..() SSpai.pai_card_list += src add_overlay("pai-off") + return ..() /obj/item/device/paicard/Destroy() //Will stop people throwing friend pAIs into the singularity so they can respawn SSpai.pai_card_list -= src - if(!isnull(pai)) - pai.death(0) + QDEL_NULL(pai) return ..() /obj/item/device/paicard/attack_self(mob/user) @@ -26,9 +25,9 @@ return user.set_machine(src) var/dat = "Personal AI Device
" - if(pai && (!pai.master_dna || !pai.master)) - dat += "Imprint Master DNA
" if(pai) + if(!pai.master_dna || !pai.master) + dat += "Imprint Master DNA
" dat += "Installed Personality: [pai.name]
" dat += "Prime directive:
[pai.laws.zeroth]
" for(var/slaws in pai.laws.supplied) @@ -86,7 +85,7 @@ to_chat(pai, "Byte by byte you lose your sense of self.") to_chat(pai, "Your mental faculties leave you.") to_chat(pai, "oblivion... ") - pai.death(0) + removePersonality() if(href_list["wires"]) var/wire = text2num(href_list["wires"]) if(pai.radio) @@ -119,9 +118,9 @@ audible_message("\The [src] plays a cheerful startup noise!") /obj/item/device/paicard/proc/removePersonality() - src.pai = null - src.cut_overlays() - src.add_overlay("pai-off") + QDEL_NULL(pai) + cut_overlays() + add_overlay("pai-off") /obj/item/device/paicard/proc/setEmotion(emotion) if(pai) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 03d7da109b2..4a49ed538d6 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -111,7 +111,7 @@ "You bop [M] on the head!") playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1) if(2) - if(!scooldown) + if(scooldown < world.time) if(M.health >= 0) if(ishuman(M)||ismonkey(M)) M.electrocute_act(5, "[user]", safety = 1) @@ -128,11 +128,9 @@ "You shock [M] to no effect.") playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -1) user.cell.charge -= 500 - scooldown = TRUE - spawn(20) - scooldown = FALSE + scooldown = world.time + 20 if(3) - if(!ccooldown) + if(ccooldown < world.time) if(M.health >= 0) if(ishuman(M)) user.visible_message("[user] crushes [M] in their grip!", \ @@ -143,9 +141,7 @@ playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1) M.adjustBruteLoss(15) user.cell.charge -= 300 - ccooldown = TRUE - spawn(10) - ccooldown = FALSE + ccooldown = world.time + 10 /obj/item/borg/cyborghug/peacekeeper shockallowed = TRUE diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index f3c2e6000fb..b681053a351 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -60,6 +60,7 @@ origin_tech = "bluespace=6;materials=3" materials = list(MAT_BLUESPACE=MINERAL_MATERIAL_AMOUNT) attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed") + novariants = TRUE var/crystal_type = /obj/item/weapon/ore/bluespace_crystal/refined /obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 327afcb2a2b..51982d27bf6 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -5,11 +5,13 @@ amount = 6 max_amount = 6 w_class = WEIGHT_CLASS_TINY + full_w_class = WEIGHT_CLASS_TINY throw_speed = 3 throw_range = 7 resistance_flags = FLAMMABLE obj_integrity = 40 max_integrity = 40 + novariants = FALSE var/heal_brute = 0 var/heal_burn = 0 var/stop_bleeding = 0 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 2037c719184..c55ab4f6dd5 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -20,6 +20,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ max_amount = 50 attack_verb = list("hit", "bludgeoned", "whacked") hitsound = 'sound/weapons/grenadelaunch.ogg' + novariants = TRUE /obj/item/stack/rods/Initialize(mapload, new_amount, merge = TRUE) ..() diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 41ee4dc7223..a9fcf349ca7 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -2,12 +2,14 @@ name = "hide" desc = "Something went wrong." origin_tech = "biotech=3" + novariants = TRUE /obj/item/stack/sheet/animalhide/human name = "human skin" desc = "The by-product of human farming." singular_name = "human skin piece" icon_state = "sheet-hide" + novariants = FALSE GLOBAL_LIST_INIT(human_recipes, list( \ new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5, on_floor = 1), \ @@ -22,6 +24,7 @@ GLOBAL_LIST_INIT(human_recipes, list( \ desc = "A piece of skin." singular_name = "skin piece" icon_state = "sheet-hide" + novariants = FALSE /obj/item/stack/sheet/animalhide/corgi name = "corgi hide" @@ -87,6 +90,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \ icon = 'icons/mob/alien.dmi' icon_state = "chitin" origin_tech = null + novariants = TRUE /obj/item/xenos_claw name = "alien claw" @@ -153,6 +157,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \ singular_name = "watcher sinew" icon_state = "sinew" origin_tech = "biotech=4" + novariants = TRUE GLOBAL_LIST_INIT(sinew_recipes, list ( \ @@ -166,23 +171,27 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ /* * Plates */ - /obj/item/stack/sheet/animalhide/goliath_hide name = "goliath hide plates" desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna." icon = 'icons/obj/mining.dmi' icon_state = "goliath_hide" singular_name = "hide plate" + max_amount = 6 + novariants = FALSE flags = NOBLUDGEON w_class = WEIGHT_CLASS_NORMAL layer = MOB_LAYER + /obj/item/stack/sheet/animalhide/ashdrake name = "ash drake hide" desc = "The strong, scaled hide of an ash drake." icon = 'icons/obj/mining.dmi' icon_state = "dragon_hide" singular_name = "drake plate" + max_amount = 10 + novariants = FALSE flags = NOBLUDGEON w_class = WEIGHT_CLASS_NORMAL layer = MOB_LAYER diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 9514be618ce..ea1f8db498e 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -68,6 +68,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ singular_name = "sandbag" layer = LOW_ITEM_LAYER origin_tech = "materials=2" + novariants = TRUE GLOBAL_LIST_INIT(sandbag_recipes, list ( \ new/datum/stack_recipe("sandbags", /obj/structure/barricade/sandbags, 1, time = 25, one_per_turf = 1, on_floor = 1), \ @@ -104,6 +105,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ origin_tech = "materials=6" sheettype = "diamond" materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT) + novariants = TRUE GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \ @@ -127,6 +129,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ origin_tech = "materials=5" sheettype = "uranium" materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT) + novariants = TRUE GLOBAL_LIST_INIT(uranium_recipes, list ( \ new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \ @@ -237,6 +240,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \ origin_tech = "materials=4" sheettype = "clown" materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) + novariants = TRUE GLOBAL_LIST_INIT(clown_recipes, list ( \ new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \ @@ -355,6 +359,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( icon_state = "sheet-mythril" singular_name = "mythril sheet" origin_tech = "materials=4" + novariants = TRUE /* * Alien Alloy diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 3b9f5b45092..61abe978595 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -162,6 +162,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0) resistance_flags = FLAMMABLE merge_type = /obj/item/stack/sheet/mineral/wood + novariants = TRUE /obj/item/stack/sheet/mineral/wood/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.wood_recipes @@ -239,6 +240,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ origin_tech = "materials=1" resistance_flags = FLAMMABLE merge_type = /obj/item/stack/sheet/cardboard + novariants = TRUE /obj/item/stack/sheet/cardboard/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.cardboard_recipes @@ -268,6 +270,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \ icon = 'icons/obj/items.dmi' sheettype = "runed" merge_type = /obj/item/stack/sheet/runed_metal + novariants = TRUE /obj/item/stack/sheet/runed_metal/ratvar_act() new /obj/item/stack/tile/brass(loc, amount) @@ -322,6 +325,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ throw_speed = 1 throw_range = 3 turf_type = /turf/open/floor/clockwork + novariants = FALSE /obj/item/stack/tile/brass/narsie_act() new /obj/item/stack/sheet/runed_metal(loc, amount) @@ -339,6 +343,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ singular_name = "lesser gem" icon_state = "sheet-lessergem" origin_tech = "materials=4" + novariants = TRUE /obj/item/stack/sheet/greatergem @@ -347,6 +352,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ singular_name = "greater gem" icon_state = "sheet-greatergem" origin_tech = "materials=7" + novariants = TRUE /* * Bones @@ -359,6 +365,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ desc = "Someone's been drinking their milk." force = 7 throwforce = 5 + max_amount = 12 w_class = WEIGHT_CLASS_NORMAL throw_speed = 1 throw_range = 3 diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 0d5ab1020ac..24de1bee5ef 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -1,11 +1,12 @@ /obj/item/stack/sheet name = "sheet" - w_class = WEIGHT_CLASS_NORMAL + full_w_class = WEIGHT_CLASS_NORMAL force = 5 throwforce = 5 max_amount = 50 throw_speed = 1 throw_range = 3 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") + novariants = FALSE var/perunit = MINERAL_MATERIAL_AMOUNT var/sheettype = null //this is used for girders in the creation of walls/false walls \ No newline at end of file diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index e5f90262574..64af889af60 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -18,6 +18,8 @@ var/datum/robot_energy_storage/source var/cost = 1 // How much energy from storage it costs var/merge_type = null // This path and its children should merge with this stack, defaults to src.type + var/full_w_class = WEIGHT_CLASS_NORMAL //The weight class the stack should have at amount > 2/3rds max_amount + var/novariants = TRUE //Determines whether the item should update it's sprites based on amount. /obj/item/stack/Initialize(mapload, new_amount=null , merge = TRUE) ..() @@ -29,6 +31,28 @@ for(var/obj/item/stack/S in loc) if(S.merge_type == merge_type) merge(S) + update_weight() + update_icon() + +/obj/item/stack/proc/update_weight() + if(amount <= (max_amount * (1/3))) + w_class = Clamp(full_w_class-2, WEIGHT_CLASS_TINY, full_w_class) + else if (amount <= (max_amount * (2/3))) + w_class = Clamp(full_w_class-1, WEIGHT_CLASS_TINY, full_w_class) + else + w_class = full_w_class + +/obj/item/stack/update_icon() + if(novariants) + return ..() + if(amount <= (max_amount * (1/3))) + icon_state = initial(icon_state) + else if (amount <= (max_amount * (2/3))) + icon_state = "[initial(icon_state)]_2" + else + icon_state = "[initial(icon_state)]_3" + ..() + /obj/item/stack/Destroy() if (usr && usr.machine==src) @@ -188,6 +212,7 @@ amount -= used zero_amount() update_icon() + update_weight() return 1 /obj/item/stack/proc/zero_amount() @@ -204,6 +229,7 @@ else src.amount += amount update_icon() + update_weight() /obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible if(QDELETED(S) || QDELETED(src) || S == src) //amusingly this can cause a stack to consume itself, let's not allow that. diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index ef123030f5e..fece24cb227 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -12,6 +12,7 @@ origin_tech = "materials=1" var/turf_type = null var/mineralType = null + novariants = TRUE /obj/item/stack/tile/Initialize(mapload, amount) . = ..() @@ -106,6 +107,13 @@ turf_type = /turf/open/floor/carpet resistance_flags = FLAMMABLE +/obj/item/stack/tile/carpet/black + name = "black carpet" + icon_state = "tile-carpet-black" + turf_type = /turf/open/floor/carpet/black + +/obj/item/stack/tile/carpet/black/fifty + amount = 50 /obj/item/stack/tile/fakespace name = "astral carpet" diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index df01d52d25b..4c4db38fdf0 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -92,6 +92,13 @@ if(mapload && access_txt) access = text2access(access_txt) +/obj/item/weapon/card/id/vv_edit_var(var_name, var_value) + . = ..() + if(.) + switch(var_name) + if("assignment","registered_name") + update_label() + /obj/item/weapon/card/id/attack_self(mob/user) user.visible_message("[user] shows you: [bicon(src)] [src.name].", \ "You show \the [src.name].") @@ -249,17 +256,6 @@ update_label("John Doe", "Clowny") access = get_all_accesses()+get_ert_access("med")-GLOB.access_change_ids ..() -/obj/item/weapon/card/id/marine - name = "\improper Marine ID" - desc = "A Marine Rifleman ID card" - icon_state = "centcom" - registered_name = "Iron Hawk Marine" - assignment = "Marine Rifleman" - -/obj/item/weapon/card/id/marine/Initialize() - access = get_all_centcom_access() - ..() - /obj/item/weapon/card/id/prisoner name = "prisoner ID card" desc = "You are a number, you are not a free man." diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 4bdf6ddf3c2..df23172b4fd 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -19,10 +19,13 @@ var/safety = 1 //if you can zap people with the defibs on harm mode var/powered = 0 //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise var/obj/item/weapon/twohanded/shockpaddles/paddles - var/obj/item/weapon/stock_parts/cell/high/bcell = null + var/obj/item/weapon/stock_parts/cell/high/cell var/combat = 0 //can we revive through space suits? var/grab_ghost = FALSE // Do we pull the ghost back into their body? +/obj/item/weapon/defibrillator/get_cell() + return cell + /obj/item/weapon/defibrillator/Initialize() //starts without a cell for rnd . = ..() paddles = make_paddles() @@ -32,7 +35,7 @@ /obj/item/weapon/defibrillator/loaded/Initialize() //starts with hicap . = ..() paddles = make_paddles() - bcell = new(src) + cell = new(src) update_icon() return @@ -42,8 +45,8 @@ update_charge() /obj/item/weapon/defibrillator/proc/update_power() - if(bcell) - if(bcell.charge < paddles.revivecost) + if(cell) + if(cell.charge < paddles.revivecost) powered = 0 else powered = 1 @@ -56,21 +59,21 @@ add_overlay("[initial(icon_state)]-paddles") if(powered) add_overlay("[initial(icon_state)]-powered") - if(!bcell) + if(!cell) add_overlay("[initial(icon_state)]-nocell") if(!safety) add_overlay("[initial(icon_state)]-emagged") /obj/item/weapon/defibrillator/proc/update_charge() if(powered) //so it doesn't show charge if it's unpowered - if(bcell) - var/ratio = bcell.charge / bcell.maxcharge + if(cell) + var/ratio = cell.charge / cell.maxcharge ratio = Ceiling(ratio*4) * 25 add_overlay("[initial(icon_state)]-charge[ratio]") /obj/item/weapon/defibrillator/CheckParts(list/parts_list) ..() - bcell = locate(/obj/item/weapon/stock_parts/cell) in contents + cell = locate(/obj/item/weapon/stock_parts/cell) in contents update_icon() /obj/item/weapon/defibrillator/ui_action_click() @@ -105,7 +108,7 @@ toggle_paddles() else if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W - if(bcell) + if(cell) to_chat(user, "[src] already has a cell.") else if(C.maxcharge < paddles.revivecost) @@ -113,15 +116,15 @@ return if(!user.transferItemToLoc(W, src)) return - bcell = W + cell = W to_chat(user, "You install a cell in [src].") update_icon() else if(istype(W, /obj/item/weapon/screwdriver)) - if(bcell) - bcell.updateicon() - bcell.loc = get_turf(src.loc) - bcell = null + if(cell) + cell.update_icon() + cell.forceMove(get_turf(src)) + cell = null to_chat(user, "You remove the cell from [src].") update_icon() else @@ -136,7 +139,7 @@ to_chat(user, "You silently enable [src]'s safety protocols with the cryptographic sequencer.") /obj/item/weapon/defibrillator/emp_act(severity) - if(bcell) + if(cell) deductcharge(1000 / severity) if(safety) safety = 0 @@ -200,11 +203,11 @@ update_icon() /obj/item/weapon/defibrillator/proc/deductcharge(chrgdeductamt) - if(bcell) - if(bcell.charge < (paddles.revivecost+chrgdeductamt)) + if(cell) + if(cell.charge < (paddles.revivecost+chrgdeductamt)) powered = 0 update_icon() - if(bcell.use(chrgdeductamt)) + if(cell.use(chrgdeductamt)) update_icon() return 1 else @@ -213,8 +216,8 @@ /obj/item/weapon/defibrillator/proc/cooldowncheck(mob/user) spawn(50) - if(bcell) - if(bcell.charge >= paddles.revivecost) + if(cell) + if(cell.charge >= paddles.revivecost) user.visible_message("[src] beeps: Unit ready.") playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0) else @@ -240,7 +243,7 @@ /obj/item/weapon/defibrillator/compact/loaded/Initialize() . = ..() paddles = make_paddles() - bcell = new(src) + cell = new(src) update_icon() /obj/item/weapon/defibrillator/compact/combat @@ -252,7 +255,7 @@ /obj/item/weapon/defibrillator/compact/combat/loaded/Initialize() . = ..() paddles = make_paddles() - bcell = new /obj/item/weapon/stock_parts/cell/infinite(src) + cell = new /obj/item/weapon/stock_parts/cell/infinite(src) update_icon() /obj/item/weapon/defibrillator/compact/combat/loaded/attackby(obj/item/weapon/W, mob/user, params) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index aab6c9db484..3a04008a98c 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -14,14 +14,16 @@ origin_tech = "combat=1;plasmatech=2;engineering=2" resistance_flags = FIRE_PROOF var/status = 0 - var/throw_amount = 100 var/lit = 0 //on or off var/operating = 0//cooldown var/obj/item/weapon/weldingtool/weldtool = null var/obj/item/device/assembly/igniter/igniter = null var/obj/item/weapon/tank/internals/plasma/ptank = null var/warned_admins = 0 //for the message_admins() when lit - + //variables for prebuilt flamethrowers + var/create_full = FALSE + var/create_with_tank = FALSE + var/igniter_type = /obj/item/device/assembly/igniter /obj/item/weapon/flamethrower/Destroy() if(weldtool) @@ -32,9 +34,8 @@ qdel(ptank) return ..() - /obj/item/weapon/flamethrower/process() - if(!lit) + if(!lit || !igniter) STOP_PROCESSING(SSobj, src) return null var/turf/location = loc @@ -43,8 +44,7 @@ if(M.is_holding(src)) location = M.loc if(isturf(location)) //start a fire if possible - location.hotspot_expose(700, 2) - return + igniter.flamethrower_process(location) /obj/item/weapon/flamethrower/update_icon() @@ -58,6 +58,9 @@ item_state = "flamethrower_1" else item_state = "flamethrower_0" + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands() return /obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, flag) @@ -82,13 +85,13 @@ if(istype(W, /obj/item/weapon/wrench) && !status)//Taking this apart var/turf/T = get_turf(src) if(weldtool) - weldtool.loc = T + weldtool.forceMove(T) weldtool = null if(igniter) - igniter.loc = T + igniter.forceMove(T) igniter = null if(ptank) - ptank.loc = T + ptank.forceMove(T) ptank = null new /obj/item/stack/rods(T) qdel(src) @@ -114,7 +117,10 @@ else if(istype(W,/obj/item/weapon/tank/internals/plasma)) if(ptank) - to_chat(user, "There is already a plasma tank loaded in [src]!") + if(user.transferItemToLoc(W,src)) + ptank.forceMove(get_turf(src)) + ptank = W + to_chat(user, "You swap the plasma tank in [src]!") return if(!user.transferItemToLoc(W, src)) return @@ -129,53 +135,26 @@ /obj/item/weapon/flamethrower/attack_self(mob/user) - if(user.stat || user.restrained() || user.lying) - return - user.set_machine(src) + toggle_igniter(user) + + +/obj/item/weapon/flamethrower/proc/toggle_igniter(mob/user) if(!ptank) to_chat(user, "Attach a plasma tank first!") return - var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") - user << browse(dat, "window=flamethrower;size=600x300") - onclose(user, "flamethrower") - return - - -/obj/item/weapon/flamethrower/Topic(href,href_list[]) - if(href_list["close"]) - usr.unset_machine() - usr << browse(null, "window=flamethrower") + if(!status) + to_chat(user, "Secure the igniter first!") return - if(usr.stat || usr.restrained() || usr.lying) - return - usr.set_machine(src) - if(href_list["light"]) - if(!ptank) - return - if(!status) - return - lit = !lit - if(lit) - START_PROCESSING(SSobj, src) - if(!warned_admins) - message_admins("[ADMIN_LOOKUPFLW(usr)] has lit a flamethrower.") - warned_admins = 1 - if(href_list["amount"]) - throw_amount = throw_amount + text2num(href_list["amount"]) - throw_amount = max(50, min(5000, throw_amount)) - if(href_list["remove"]) - if(!ptank) - return - usr.put_in_hands(ptank) - ptank = null - lit = 0 - usr.unset_machine() - usr << browse(null, "window=flamethrower") - for(var/mob/M in viewers(1, loc)) - if((M.client && M.machine == src)) - attack_self(M) + to_chat(user, "You ignite [src]!") + lit = !lit + if(lit) + START_PROCESSING(SSobj, src) + if(!warned_admins) + message_admins("[ADMIN_LOOKUPFLW(user)] has lit a flamethrower.") + warned_admins = 1 + else + STOP_PROCESSING(SSobj,src) update_icon() - return /obj/item/weapon/flamethrower/CheckParts(list/parts_list) ..() @@ -195,19 +174,22 @@ for(var/turf/T in turflist) if(T == previousturf) continue //so we don't burn the tile we be standin on - if(!T.atmos_adjacent_turfs || !T.atmos_adjacent_turfs[previousturf]) + var/list/turfs_sharing_with_prev = previousturf.GetAtmosAdjacentTurfs(alldir=1) + if(!(T in turfs_sharing_with_prev)) break - ignite_turf(T) + if(igniter) + igniter.ignite_turf(src,T) + else + default_ignite(T) sleep(1) previousturf = T operating = 0 for(var/mob/M in viewers(1, loc)) if((M.client && M.machine == src)) attack_self(M) - return -/obj/item/weapon/flamethrower/proc/ignite_turf(turf/target, release_amount = 0.05) +/obj/item/weapon/flamethrower/proc/default_ignite(turf/target, release_amount = 0.05) //TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this... //Transfer 5% of current tank air contents to turf var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount) @@ -218,30 +200,42 @@ target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500) //location.hotspot_expose(1000,500,1) SSair.add_to_active(target, 0) - return -/obj/item/weapon/flamethrower/full/New(var/loc) - ..() - if(!weldtool) - weldtool = new /obj/item/weapon/weldingtool(src) - weldtool.status = 0 - if(!igniter) - igniter = new /obj/item/device/assembly/igniter(src) - igniter.secured = 0 - status = 1 - update_icon() +/obj/item/weapon/flamethrower/Initialize(mapload) + . = ..() + if(create_full) + if(!weldtool) + weldtool = new /obj/item/weapon/weldingtool(src) + weldtool.status = 0 + if(!igniter) + igniter = new igniter_type(src) + igniter.secured = 0 + status = 1 + if(create_with_tank) + ptank = new /obj/item/weapon/tank/internals/plasma/full(src) + update_icon() -/obj/item/weapon/flamethrower/full/tank/New(var/loc) - ..() - ptank = new /obj/item/weapon/tank/internals/plasma/full(src) - update_icon() +/obj/item/weapon/flamethrower/full/tank + create_full = TRUE +/obj/item/weapon/flamethrower/full/tank + create_with_tank = TRUE /obj/item/weapon/flamethrower/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) if(ptank && damage && attack_type == PROJECTILE_ATTACK && prob(15)) owner.visible_message("[attack_text] hits the fueltank on [owner]'s [src], rupturing it! What a shot!") var/target_turf = get_turf(owner) - ignite_turf(target_turf, 100) + igniter.ignite_turf(src,target_turf, release_amount = 100) qdel(ptank) return 1 //It hit the flamethrower, not them + + +/obj/item/device/assembly/igniter/proc/flamethrower_process(turf/open/location) + location.hotspot_expose(700,2) + +/obj/item/device/assembly/igniter/cold/flamethrower_process(turf/open/location) + return + +/obj/item/device/assembly/igniter/proc/ignite_turf(obj/item/weapon/flamethrower/F,turf/open/location,release_amount = 0.05) + F.default_ignite(location,release_amount) \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index fed13eb2622..6e54a51a855 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -103,7 +103,7 @@ to_chat(user, "You need one length of coil to wire the assembly!") return - else if(stage == READY && istype(I, /obj/item/weapon/wirecutters)) + else if(stage == READY && istype(I, /obj/item/weapon/wirecutters) && !active) stage_change(WIRED) to_chat(user, "You unlock the [initial(name)] assembly.") diff --git a/code/game/objects/items/weapons/inducer.dm b/code/game/objects/items/weapons/inducer.dm new file mode 100644 index 00000000000..fdd44795ad7 --- /dev/null +++ b/code/game/objects/items/weapons/inducer.dm @@ -0,0 +1,183 @@ +/obj/item/weapon/inducer + name = "inducer" + desc = "A tool for inductively charging internal power cells." + icon = 'icons/obj/tools.dmi' + icon_state = "inducer-engi" + item_state = "inducer-engi" + origin_tech = "engineering=4;magnets=4;powerstorage=4" + force = 7 + var/powertransfer = 1000 + var/opened = FALSE + var/cell_type = /obj/item/weapon/stock_parts/cell/high + var/obj/item/weapon/stock_parts/cell/cell + var/recharging = FALSE + +/obj/item/weapon/inducer/Initialize() + . = ..() + if(!cell && cell_type) + cell = new cell_type + +/obj/item/weapon/inducer/proc/induce(obj/item/weapon/stock_parts/cell/target, coefficient) + var/totransfer = min(cell.charge,(powertransfer * coefficient)) + var/transferred = target.give(totransfer) + cell.use(transferred) + cell.update_icon() + target.update_icon() + +/obj/item/weapon/inducer/get_cell() + return cell + +/obj/item/weapon/inducer/emp_act(severity) + ..() + if(cell) + cell.emp_act() + +/obj/item/weapon/inducer/attack_obj(obj/O, mob/living/carbon/user) + if(user.a_intent == INTENT_HARM) + return ..() + + if(cantbeused(user)) + return + + if(recharge(O, user)) + return + + return ..() + +/obj/item/weapon/inducer/proc/cantbeused(mob/user) + if(!user.IsAdvancedToolUser()) + to_chat(user, "You don't have the dexterity to use \the [src]!") + return TRUE + + if(!cell) + to_chat(user, "\The [src] doesn't have a power cell installed!") + return TRUE + + if(!cell.charge) + to_chat(user, "\The [src]'s battery is dead!") + return TRUE + return FALSE + + +/obj/item/weapon/inducer/attackby(obj/item/weapon/W, mob/user) + if(istype(W,/obj/item/weapon/screwdriver)) + playsound(src, W.usesound, 50, 1) + if(!opened) + to_chat(user, "You unscrew the battery compartment.") + opened = TRUE + update_icon() + return + else + to_chat(user, "You close the battery compartment.") + opened = FALSE + update_icon() + return + if(istype(W,/obj/item/weapon/stock_parts/cell)) + if(opened) + if(!cell) + if(!user.transferItemToLoc(W, src)) + return + to_chat(user, "You insert \the [W] into \the [src].") + cell = W + update_icon() + return + else + to_chat(user, "\The [src] already has \a [cell] installed!") + return + + if(cantbeused(user)) + return + + if(recharge(W, user)) + return + + return ..() + +/obj/item/weapon/inducer/proc/recharge(atom/movable/A, mob/user) + if(recharging) + return TRUE + else + recharging = TRUE + var/obj/item/weapon/stock_parts/cell/C = A.get_cell() + var/obj/item/weapon/gun/energy/E + var/obj/O + var/coefficient = 1 + if(istype(A, /obj/item/weapon/gun/energy)) + coefficient = 0.075 // 14 loops to recharge an egun from 0-1000 + E = A + if(istype(A, /obj)) + O = A + if(C) + if(C.charge >= C.maxcharge) + to_chat(user, "\The [A] is fully charged!") + recharging = FALSE + return TRUE + user.visible_message("[user] starts recharging \the [A] with \the [src]","You start recharging [A] with \the [src]") + while(C.charge < C.maxcharge) + if(E) + E.chambered = null // Prevents someone from firing continuously while recharging the gun. + if(do_after(user, 10, target = user) && cell.charge) + induce(C, coefficient) + do_sparks(1, FALSE, A) + if(O) + O.update_icon() + else + break + if(E) + E.recharge_newshot() //We're done charging, so we'll let someone fire it now. + user.visible_message("[user] recharged \the [A]!","You recharged \the [A]!") + recharging = FALSE + return TRUE + + +/obj/item/weapon/inducer/attack(mob/M, mob/user) + if(user.a_intent == INTENT_HARM) + return ..() + + if(cantbeused(user)) + return + + if(recharge(M, user)) + return + return ..() + + +/obj/item/weapon/inducer/attack_self(mob/user) + if(opened && cell) + user.visible_message("[user] removes \the [cell] from \the [src]!","You remove \the [cell].") + cell.update_icon() + user.put_in_hands(cell) + cell = null + update_icon() + + +/obj/item/weapon/inducer/examine(mob/living/M) + ..() + if(cell) + to_chat(M, "It's display shows: [cell.charge]W") + else + to_chat(M,"It's display is dark.") + if(opened) + to_chat(M,"It's battery compartment is open.") + +/obj/item/weapon/inducer/update_icon() + cut_overlays() + if(opened) + if(!cell) + add_overlay("inducer-nobat") + else + add_overlay("inducer-bat") + +/obj/item/weapon/inducer/sci + icon_state = "inducer-sci" + item_state = "inducer-sci" + desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than it's engineering counterpart." + cell_type = null + powertransfer = 500 + opened = TRUE + +/obj/item/weapon/inducer/sci/Initialize() + . = ..() + update_icon() + + diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 11663febf16..9243c01db3e 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -185,17 +185,6 @@ maxWeightClass = 7 gasPerThrow = 5 -/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but - name = "Pneumatic Cannon" - result = /obj/item/weapon/pneumatic_cannon/ghetto - tools = list(/obj/item/weapon/weldingtool, - /obj/item/weapon/wrench) - reqs = list(/obj/item/stack/sheet/metal = 4, - /obj/item/stack/packageWrap = 8, - /obj/item/pipe = 2) - time = 300 - category = CAT_WEAPON - /obj/item/weapon/pneumatic_cannon/proc/updateTank(obj/item/weapon/tank/internals/thetank, removing = 0, mob/living/carbon/human/user) if(removing) if(!src.tank) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 6de8d65b4c3..9057bf9aff1 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -200,7 +200,7 @@ /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/ore, /obj/item/weapon/reagent_containers/food/drinks, - /obj/item/organ/hivelord_core, + /obj/item/organ/regenerative_core, /obj/item/device/wormhole_jaunter, /obj/item/weapon/storage/bag/plants, /obj/item/stack/marker_beacon @@ -249,8 +249,8 @@ /obj/item/weapon/storage/belt/military name = "chest rig" desc = "A set of tactical webbing worn by Syndicate boarding parties." - icon_state = "explorer1" - item_state = "explorer1" + icon_state = "militarywebbing" + item_state = "militarywebbing" max_w_class = WEIGHT_CLASS_SMALL /obj/item/weapon/storage/belt/military/abductor diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 1a344af5b0d..c5968a96555 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -405,10 +405,9 @@ if(iscyborg(user)) return //Robots can't interact with storage items. - if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit - return 1 - if(!can_be_inserted(W, 0 , user)) + if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit + return 1 return 0 handle_item_insertion(W, 0 , user) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b1301a3e8aa..fa3318b2972 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -140,10 +140,10 @@ max_combined_w_class = 28 storage_slots = 28 attack_verb = list("robusted", "crushed", "smashed") - var/proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab + var/fabricator_type = /obj/item/clockwork/replica_fabricator/scarab /obj/item/weapon/storage/toolbox/brass/prefilled/PopulateContents() - new proselytizer_type(src) + new fabricator_type(src) new /obj/item/weapon/screwdriver/brass(src) new /obj/item/weapon/wirecutters/brass(src) new /obj/item/weapon/wrench/brass(src) @@ -151,7 +151,7 @@ new /obj/item/weapon/weldingtool/experimental/brass(src) /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar - var/slab_type = /obj/item/clockwork/slab/scarab + var/slab_type = /obj/item/clockwork/slab /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/PopulateContents() ..() @@ -159,7 +159,7 @@ /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/admin slab_type = /obj/item/clockwork/slab/debug - proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab/debug + fabricator_type = /obj/item/clockwork/replica_fabricator/scarab/debug /obj/item/weapon/storage/toolbox/artistic diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 05a83203cec..33ac3565977 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -13,10 +13,13 @@ var/stunforce = 7 var/status = 0 - var/obj/item/weapon/stock_parts/cell/high/bcell = null + var/obj/item/weapon/stock_parts/cell/high/cell var/hitcost = 1000 var/throw_hit_chance = 35 +/obj/item/weapon/melee/baton/get_cell() + return cell + /obj/item/weapon/melee/baton/suicide_act(mob/user) user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!") return (FIRELOSS) @@ -32,15 +35,16 @@ baton_stun(hit_atom) /obj/item/weapon/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed. - bcell = new(src) + cell = new(src) + update_icon() . = ..() /obj/item/weapon/melee/baton/proc/deductcharge(chrgdeductamt) - if(bcell) + if(cell) //Note this value returned is significant, as it will determine //if a stun is applied or not - . = bcell.use(chrgdeductamt) - if(status && bcell.charge < hitcost) + . = cell.use(chrgdeductamt) + if(status && cell.charge < hitcost) //we're below minimum, turn off status = 0 update_icon() @@ -50,22 +54,22 @@ /obj/item/weapon/melee/baton/update_icon() if(status) icon_state = "[initial(name)]_active" - else if(!bcell) + else if(!cell) icon_state = "[initial(name)]_nocell" else icon_state = "[initial(name)]" /obj/item/weapon/melee/baton/examine(mob/user) ..() - if(bcell) - to_chat(user, "The baton is [round(bcell.percent())]% charged.") + if(cell) + to_chat(user, "The baton is [round(cell.percent())]% charged.") else to_chat(user, "The baton does not have a power source installed.") /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W - if(bcell) + if(cell) to_chat(user, "[src] already has a cell.") else if(C.maxcharge < hitcost) @@ -73,15 +77,15 @@ return if(!user.transferItemToLoc(W, src)) return - bcell = W + cell = W to_chat(user, "You install a cell in [src].") update_icon() else if(istype(W, /obj/item/weapon/screwdriver)) - if(bcell) - bcell.updateicon() - bcell.loc = get_turf(src.loc) - bcell = null + if(cell) + cell.update_icon() + cell.forceMove(get_turf(src)) + cell = null to_chat(user, "You remove the cell from [src].") status = 0 update_icon() @@ -89,13 +93,13 @@ return ..() /obj/item/weapon/melee/baton/attack_self(mob/user) - if(bcell && bcell.charge > hitcost) + if(cell && cell.charge > hitcost) status = !status to_chat(user, "[src] is now [status ? "on" : "off"].") playsound(loc, "sparks", 75, 1, -1) else status = 0 - if(!bcell) + if(!cell) to_chat(user, "[src] does not have a power source!") else to_chat(user, "[src] is out of charge.") diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index f451c9b56cf..971afd3aad0 100755 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -140,7 +140,7 @@ item_state = "plasmaman_tank_belt" slot_flags = SLOT_BELT force = 5 - volume = 3 + volume = 6 w_class = WEIGHT_CLASS_SMALL //thanks i forgot this /obj/item/weapon/tank/internals/plasmaman/belt/full/New() diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm index 07af7a30c47..d14788e0b18 100644 --- a/code/game/objects/items/weapons/teleprod.dm +++ b/code/game/objects/items/weapons/teleprod.dm @@ -28,7 +28,7 @@ /obj/item/weapon/melee/baton/cattleprod/attackby(obj/item/I, mob/user, params)//handles sticking a crystal onto a stunprod to make a teleprod if(istype(I, /obj/item/weapon/ore/bluespace_crystal)) - if(!bcell) + if(!cell) var/obj/item/weapon/melee/baton/cattleprod/teleprod/S = new /obj/item/weapon/melee/baton/cattleprod/teleprod remove_item_from_storage(user) qdel(src) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index baf65fd084b..0fad89dec5e 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -698,56 +698,4 @@ sharpness = IS_SHARP /obj/item/weapon/twohanded/bonespear/update_icon() - icon_state = "bone_spear[wielded]" - -/* - * Sky Bulge (Gae Bolg, tradtional dragoon lance from many FF games.) - */ -/obj/item/weapon/twohanded/skybulge //Copy+paste job from bonespear because no explosions. - icon_state = "sky_bulge0" - name = "Sky Bulge" - desc = "A legendary stick with a very pointy tip. Looks to be used for throwing. And jumping. Can be stubborn if you throw too much." //TODO: Be funnier. - force = 10 //This thing aint for robusting. - w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK - force_unwielded = 10 - force_wielded = 18 //Same as regular spear. This is a utility weapon. - throwforce = 24 //And that utility is throwing. 24 so it takes 5 hits instead of 4. - throw_speed = 4 - embedded_impact_pain_multiplier = 0 //If you somehow embed this, it's not going to hurt. - armour_penetration = 15 //Same as Bone Spear - embed_chance = 0 //Would ruin the whole theme of the thing. - hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "poked", "jabbed", "torn", "gored", "lanced") //Added lanced for flavour. - sharpness = IS_SHARP - var/maxdist = 16 - var/throw_cooldown = 0 //Should equate to half a second. Not supposed to be varedited. - -/obj/item/weapon/twohanded/skybulge/update_icon() - icon_state = "sky_bulge[wielded]" - -/obj/item/weapon/twohanded/skybulge/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) //Throw cooldown and offhand-proofing. - if(throw_cooldown > world.time) - var/mob/user = thrownby - user.put_in_hands(src) - return - unwield(src) - ..() - -/obj/item/weapon/twohanded/skybulge/throw_impact(atom/target) //Praise be the ratvar spear for showing me how to use this proc. - var/turf/turfhit = get_turf(target) - var/mob/user = thrownby - var/turf/source = get_turf(thrownby) - - if(source.z == ZLEVEL_STATION && get_dist(turfhit, source) < maxdist || source.z != ZLEVEL_STATION) - ..() - if(do_after_mob(user, src, 5, uninterruptible = 1, progress = 0)) - if(QDELETED(src)) - return - var/turf/landing = get_turf(src) - if (loc != landing) - return - user.forceMove(landing) - throw_cooldown = world.time + 5 //Half a second between throws. - user.put_in_hands(src) - playsound(src, 'sound/weapons/laser2.ogg', 20, 1) + icon_state = "bone_spear[wielded]" \ No newline at end of file diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 44281fb26f2..434c0d12c15 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -259,3 +259,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e obj_break(damage_type) return TRUE return FALSE + +//returns how much the object blocks an explosion +/obj/proc/GetExplosionBlock() + CRASH("Unimplemented GetExplosionBlock()") diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7202aeae1c9..e1531b4ef7c 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -25,7 +25,7 @@ return ..() /obj/structure/chair/proc/RemoveFromLatejoin() - GLOB.latejoin -= src //These may be here due to the arrivals shuttle + SSjob.latejoin_trackers -= src //These may be here due to the arrivals shuttle /obj/structure/chair/deconstruct() // If we have materials, and don't have the NOCONSTRUCT flag diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 67a7a0f0801..3bf99fb4256 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -64,6 +64,7 @@ new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/head/soft/purple(src) new /obj/item/weapon/paint/paint_remover(src) + new /obj/item/weapon/melee/flyswatter(src) new /obj/item/device/flashlight(src) for(var/i in 1 to 3) new /obj/item/weapon/caution(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 38ffdad47bf..e30f40d173d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -26,6 +26,7 @@ new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/weapon/door_remote/chief_engineer(src) new /obj/item/weapon/pipe_dispenser(src) + new /obj/item/weapon/inducer(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" @@ -37,6 +38,8 @@ ..() new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/clothing/gloves/color/yellow(src) + new /obj/item/weapon/inducer(src) + new /obj/item/weapon/inducer(src) for(var/i in 1 to 3) new /obj/item/weapon/storage/toolbox/electrical(src) for(var/i in 1 to 3) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index bcea83bdc1b..58fcaedf377 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -82,6 +82,7 @@ new /obj/item/weapon/gun/energy/e_gun/hos(src) new /obj/item/device/flashlight/seclite(src) new /obj/item/weapon/pinpointer(src) + new /obj/item/clothing/under/rank/head_of_security/grey(src) /obj/structure/closet/secure_closet/warden name = "\proper warden's locker" diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 905933f0e99..194d8c42a29 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -395,76 +395,45 @@ H.faction |= "syndicate" /obj/effect/mob_spawn/human/syndicate/battlecruiser - name = "Syndicate Battlecruiser Ensign" - flavour_text = "You are a syndicate ensign aboard a state of the art weapons platform -- the SBC Starfury. Follow your captain's orders, maintain the ship, and protect both with your life." + name = "Syndicate Battlecruiser Ship Operative" + flavour_text = "You are a crewmember aboard the syndicate flagship: the SBC Starfury. Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it.

The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives." outfit = /datum/outfit/syndicate_empty/SBC /datum/outfit/syndicate_empty/SBC - name = "Syndicate Battlecruiser Ensign" - belt = /obj/item/weapon/gun/ballistic/automatic/pistol + name = "Syndicate Battlecruiser Ship Operative" + l_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol r_pocket = /obj/item/weapon/kitchen/knife/combat/survival + belt = /obj/item/weapon/storage/belt/military/assault + +/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault + name = "Syndicate Battlecruiser Assault Operative" + flavour_text = "You are an assault operative aboard the syndicate flagship: the SBC Starfury. Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with.

Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!" + outfit = /datum/outfit/syndicate_empty/SBC/assault + +/datum/outfit/syndicate_empty/SBC/assault + name = "Syndicate Battlecruiser Assault Operative" + uniform = /obj/item/clothing/under/syndicate/combat + l_pocket = /obj/item/ammo_box/magazine/m10mm + r_pocket = /obj/item/weapon/kitchen/knife/combat/survival + belt = /obj/item/weapon/storage/belt/military suit = /obj/item/clothing/suit/armor/vest + suit_store = /obj/item/weapon/gun/ballistic/automatic/pistol + back = /obj/item/weapon/storage/backpack/security + mask = /obj/item/clothing/mask/gas/syndicate /obj/effect/mob_spawn/human/syndicate/battlecruiser/captain name = "Syndicate Battlecruiser Captain" - flavour_text = "You are a syndicate admiral in command of a state of the art weapons platform -- the SBC Starfury. You are to destroy Nanotrasens' Space Station 13. Do not let the enemy take control of your ship under any circumstances." - outfit = /datum/outfit/syndicate_empty/SBC/captain + flavour_text = "You are the captain aboard the syndicate flagship: the SBC Starfury. Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal.

As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough." + outfit = /datum/outfit/syndicate_empty/SBC/assault/captain id_access_list = list(150,151) -/datum/outfit/syndicate_empty/SBC/captain +/datum/outfit/syndicate_empty/SBC/assault/captain name = "Syndicate Battlecruiser Captain" - belt = /obj/item/weapon/gun/ballistic/automatic/pistol + l_pocket = /obj/item/weapon/melee/energy/sword/saber/red r_pocket = /obj/item/weapon/melee/classic_baton/telescopic suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate + suit_store = /obj/item/weapon/gun/ballistic/revolver/mateba back = /obj/item/weapon/storage/backpack/satchel/leather - head = /obj/item/clothing/head/HoS/beret/syndicate + head = /obj/item/clothing/head/HoS/syndicate mask = /obj/item/clothing/mask/cigarette/cigar/havana - glasses = /obj/item/clothing/glasses/thermal/eyepatch - -//UEG Marine -/obj/effect/mob_spawn/human/marine - name = "marine cryostasis sleeper" - desc = "A humming sleeper with a occupant inside. Desperatly attempting to revive the occupant despite its low power state." - mob_name = "a iron hawk marine" - icon = 'icons/obj/lavaland/spawners.dmi' - icon_state = "cryostasis_sleeper" - roundstart = FALSE - death = FALSE - random = TRUE - mob_species = /datum/species/human - flavour_text = "You are a Iron Hawk Marine, apart of a unalligned mercenary organization. You were, until recently, stationed on board the IHSS Inheritor, a capital ship. As you struggle \ - to exit your cryostasis sleeper, you slowly start to recall exactly what cause of events has thrown you into your current predicament... " - -/obj/effect/mob_spawn/human/marine/Initialize(mapload) - . = ..() - var/lorpee = rand(1,4) - switch(lorpee) - if(1) - flavour_text += "Your ship intercepted a distress call from a distant space station. As the Inheritor moved into investigate, suddenly and without warning the ship was being assaulted \ - by a massive lovecraftian nightmare, you heard the name 'Nar-Sie' being uttered by the barely Human flesh monsters and constructs that poured out of every crack that was torn into the \ - ship by the monster. With most of the crew dead, you and your squad retreated to the hanger bay, rescued a group of pilots and attempted to flee aboard the only functional heavy troop transport. \ - Your attempt to fly away was halted when Nar-Sie somehow was able to start attempting to drag the transport into her grasp. In one final desperate move, the pilots turnd the ship around \ - and ramed it directly into Nar-Sie's head, her screams somehow echoed throughout the transport as she released her grasp on the transport, unfortunately taking half the engines with her. \ - Your final thoughts were panic as you quickly dove into your cryosleep pod, hoping you'll survive the crash landing." - if(2) - flavour_text += "Panic and paranoia ran high as a group of changelings somehow infiltrated the Inheritor. Utterly unprepared to deal with this threat, the crew tore itself apart. \ - In a final desperate move to end the changeling threat, the ship's Commander activated the Inheritor's self destruct sequence and remotely shut down all escape pods. You and your \ - squadmates, who were already on the brink of a psychological breakdown, made a run for the last remaining heavy troop transport. You arrive to discover the changelings had a similar plan \ - , with minutes until the ship exploded, the changelings abandoned any pretense of subtly and revealed their true forms. After a intense gun fight you and your squad were able to board \ - the transport. However as you take off, one of the surviving Changelings was able to plant an explosive charge on your engines. The explosion disabled your ship, and you got caught in a \ - nearby planets gravity well. The survivors were forced into cryo sleep, as you're last thoughts were hoping to god none of your squad mates were secretly changelings." - if(3) - flavour_text += "The deeper reaches of space are home to hoards of pirates and marauders, usually they are no threat to a Iron Hawk capital ship. However, the Inheritor had conducted a \ - large series of anti-piracy raids in your assigned sector, so crippling that every pirate in the local sector network formed a massive fleet in a attempt to destroy the Inheritor. The \ - Inheritor won against all odds, but it was a pyrrhic victory as the Inheritor was byond repair. The acting Commander ordered all hands to abandon ship before it was scuttled. You and \ - your remaining squad members were assigned to troop transport 5. Unbeknown to you or your pilots, your fuel tanks had suffered a massive leak during the fighting, leaving you with minimal \ - fuel, thus your pilots had no choice but to land on a nearby planet. Strapping into your cryochamber, you can only hope that the pilots could land this thing safely." - if(4) - flavour_text += "The Inheritor was sent on a high level covert recon contract to Space Station 13, a Nanotrasen research and development station. The contract details were minimal sans that \ - you were to locate and ping any Nanotrasen mining bases on a class-H planet. You and your squad were dispatched in a recon heavy transport \ - to attempt to fly over the planet and locate any hidden Nanotrasen mining bases. About two hours into the recon mission, a giant, dragon like, creature swooped up and took a large part of your \ - engines with it. With insufficient thrust power to leave the planet's atmosphere, the crew were ordered into cryostasis as the pilots attempted an emergency landing." - -/obj/effect/mob_spawn/human/marine/Destroy() - new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src)) - return ..() + glasses = /obj/item/clothing/glasses/thermal/eyepatch \ No newline at end of file diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 64d93e914e1..4b912923a21 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -248,6 +248,7 @@ /obj/structure/grille/ratvar icon_state = "ratvargrille" + name = "cog grille" desc = "A strangely-shaped grille." broken_type = /obj/structure/grille/ratvar/broken diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 2f6b03bef16..4b2017fab65 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -50,7 +50,7 @@ deconstruct() /obj/structure/lattice/clockwork - name = "clockwork lattice" + name = "cog lattice" desc = "A lightweight support lattice. These hold the Justicar's station together." icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm new file mode 100644 index 00000000000..7274fa6626e --- /dev/null +++ b/code/game/objects/structures/manned_turret.dm @@ -0,0 +1,211 @@ +/////// MANNED TURRET //////// + +/obj/machinery/manned_turret + name = "machine gun turret" + desc = "While the trigger is held down, this gun will redistribute recoil to allow its user to easily shift targets." + icon = 'icons/obj/turrets.dmi' + icon_state = "machinegun" + can_buckle = TRUE + density = TRUE + max_integrity = 100 + obj_integrity = 100 + buckle_lying = FALSE + layer = ABOVE_MOB_LAYER + var/view_range = 10 + var/cooldown = 0 + var/projectile_type = /obj/item/projectile/bullet/weakbullet3 + var/rate_of_fire = 1 + var/number_of_shots = 40 + var/cooldown_duration = 90 + var/atom/target + var/turf/target_turf + var/warned = FALSE + var/list/calculated_projectile_vars + +/obj/machinery/manned_turret/Destroy() + target = null + target_turf = null + ..() + +//BUCKLE HOOKS + +/obj/machinery/manned_turret/unbuckle_mob(mob/living/buckled_mob,force = FALSE) + playsound(src,'sound/mecha/mechmove01.ogg', 50, 1) + for(var/obj/item/I in buckled_mob.held_items) + if(istype(I, /obj/item/gun_control)) + qdel(I) + if(istype(buckled_mob)) + buckled_mob.pixel_x = 0 + buckled_mob.pixel_y = 0 + if(buckled_mob.client) + buckled_mob.reset_perspective() + anchored = FALSE + . = ..() + STOP_PROCESSING(SSfastprocess, src) + +/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/living/carbon/user) + if(user.incapacitated() || !istype(user)) + return + M.forceMove(get_turf(src)) + ..() + for(var/V in M.held_items) + var/obj/item/I = V + if(istype(I)) + if(M.dropItemToGround(I)) + var/obj/item/gun_control/TC = new(src) + M.put_in_hands(TC) + else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand + var/obj/item/gun_control/TC = new(src) + M.put_in_hands(TC) + M.pixel_y = 14 + layer = ABOVE_MOB_LAYER + setDir(SOUTH) + playsound(src,'sound/mecha/mechmove01.ogg', 50, 1) + anchored = TRUE + if(user.client) + user.client.change_view(view_range) + START_PROCESSING(SSfastprocess, src) + +/obj/machinery/manned_turret/process() + if(!LAZYLEN(buckled_mobs)) + return PROCESS_KILL + update_positioning() + +/obj/machinery/manned_turret/proc/update_positioning() + var/mob/living/controller = buckled_mobs[1] + if(!istype(controller)) + return + var/client/C = controller.client + if(C) + var/atom/A = C.mouseObject + var/turf/T = get_turf(A) + if(istype(T)) //They're hovering over something in the map. + direction_track(controller, T) + calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, C.mouseParams) + +/obj/machinery/manned_turret/proc/direction_track(mob/user, atom/targeted) + if(user.stat != CONSCIOUS) + return + setDir(get_dir(src,targeted)) + user.setDir(dir) + switch(dir) + if(NORTH) + layer = BELOW_MOB_LAYER + user.pixel_x = 0 + user.pixel_y = -14 + if(NORTHEAST) + layer = BELOW_MOB_LAYER + user.pixel_x = -8 + user.pixel_y = -4 + if(EAST) + layer = ABOVE_MOB_LAYER + user.pixel_x = -14 + user.pixel_y = 0 + if(SOUTHEAST) + layer = BELOW_MOB_LAYER + user.pixel_x = -8 + user.pixel_y = 4 + if(SOUTH) + layer = ABOVE_MOB_LAYER + user.pixel_x = 0 + user.pixel_y = 14 + if(SOUTHWEST) + layer = BELOW_MOB_LAYER + user.pixel_x = 8 + user.pixel_y = 4 + if(WEST) + layer = ABOVE_MOB_LAYER + user.pixel_x = 14 + user.pixel_y = 0 + if(NORTHWEST) + layer = BELOW_MOB_LAYER + user.pixel_x = 8 + user.pixel_y = -4 + +/obj/machinery/manned_turret/proc/checkfire(atom/targeted_atom, mob/user) + target = targeted_atom + if(target == user || target == get_turf(src)) + return + if(world.time < cooldown) + if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing + warned = TRUE + playsound(src, 'sound/weapons/sear.ogg', 100, 1) + return + else + cooldown = world.time + cooldown_duration + warned = FALSE + volley(user) + +/obj/machinery/manned_turret/proc/volley(mob/user) + target_turf = get_turf(target) + for(var/i in 1 to number_of_shots) + addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire) + +/obj/machinery/manned_turret/proc/fire_helper(mob/user) + update_positioning() //REFRESH MOUSE TRACKING!! + var/turf/targets_from = get_turf(src) + if(QDELETED(target)) + target = target_turf + var/obj/item/projectile/P = new projectile_type(targets_from) + P.current = targets_from + P.starting = targets_from + P.firer = user + P.original = target + playsound(src, 'sound/weapons/Gunshot_smg.ogg', 75, 1) + P.xo = target.x - targets_from.x + P.yo = target.y - targets_from.y + P.Angle = calculated_projectile_vars[1] + rand(-9, 9) + P.p_x = calculated_projectile_vars[2] + P.p_y = calculated_projectile_vars[3] + P.fire() + +/obj/machinery/manned_turret/ultimate // Admin-only proof of concept for autoclicker automatics + name = "Infinity Gun" + view_range = 12 + projectile_type = /obj/item/projectile/bullet/weakbullet3 + +/obj/machinery/manned_turret/ultimate/checkfire(atom/targeted_atom, mob/user) + target = targeted_atom + if(target == user || target == get_turf(src)) + return + target_turf = get_turf(target) + fire_helper(user) + +/obj/item/gun_control + name = "turret controls" + icon = 'icons/obj/weapons.dmi' + icon_state = "offhand" + w_class = WEIGHT_CLASS_HUGE + flags = ABSTRACT | NODROP | NOBLUDGEON + resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF + var/obj/machinery/manned_turret/turret + +/obj/item/gun_control/Initialize() + . = ..() + turret = loc + if(!istype(turret)) + return INITIALIZE_HINT_QDEL + +/obj/item/gun_control/Destroy() + turret = null + ..() + +/obj/item/gun_control/CanItemAutoclick() + return TRUE + +/obj/item/gun_control/attack_obj(obj/O, mob/living/user) + user.changeNext_move(CLICK_CD_MELEE) + O.attacked_by(src, user) + +/obj/item/gun_control/attack(mob/living/M, mob/living/user) + user.lastattacked = M + M.lastattacker = user + M.attacked_by(src, user) + add_fingerprint(user) + +/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params) + ..() + var/obj/machinery/manned_turret/E = user.buckled + E.calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(user, params) + E.direction_track(user, targeted_atom) + E.checkfire(targeted_atom, user) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 50aa23434e1..0c2886533f7 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -61,6 +61,14 @@ to_chat(user, "You start adding [S] to [src]...") if(do_after(user, 20, target = src) && S.use(1)) make_new_table(/obj/structure/table/optable) + else if(istype(I, /obj/item/stack/tile/carpet/black)) + var/obj/item/stack/tile/carpet/black/C = I + if(C.get_amount() < 1) + to_chat(user, "You need one black carpet sheet to do this!") + return + to_chat(user, "You start adding [C] to [src]...") + if(do_after(user, 20, target = src) && C.use(1)) + make_new_table(/obj/structure/table/wood/fancy/black) else if(istype(I, /obj/item/stack/tile/carpet)) var/obj/item/stack/tile/carpet/C = I if(C.get_amount() < 1) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 9d89fcf99e4..106e68a2247 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -195,7 +195,7 @@ check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) - if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL) + if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & FLYING)) table_shatter(M) /obj/structure/table/glass/proc/table_shatter(mob/M) @@ -271,12 +271,20 @@ frame = /obj/structure/table_frame framestack = /obj/item/stack/rods buildstack = /obj/item/stack/tile/carpet - canSmoothWith = list(/obj/structure/table/wood/fancy) + canSmoothWith = list(/obj/structure/table/wood/fancy,/obj/structure/table/wood/fancy/black) /obj/structure/table/wood/fancy/New() icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor ..() +/obj/structure/table/wood/fancy/black + icon_state = "fancy_table_black" + buildstack = /obj/item/stack/tile/carpet/black + +/obj/structure/table/wood/fancy/black/New() + ..() + icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' + /* * Reinforced tables */ diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 3db570db83d..90c26657f59 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -11,10 +11,10 @@ var/mob/living/swirlie = null //the mob being given a swirlie -/obj/structure/toilet/New() +/obj/structure/toilet/Initialize() + . = ..() open = round(rand(0, 1)) update_icon() - ..() /obj/structure/toilet/attack_hand(mob/living/user) @@ -104,6 +104,21 @@ else return ..() +/obj/structure/toilet/secret + var/obj/item/secret + var/secret_type = null + +/obj/structure/toilet/secret/Initialize(mapload) + . = ..() + if (secret_type) + secret = new secret_type(src) + secret.desc += " It's a secret!" + w_items += secret.w_class + contents += secret + + + + /obj/structure/urinal name = "urinal" desc = "The HU-452, an experimental urinal. Comes complete with experimental urinal cake." @@ -239,7 +254,7 @@ qdel(mymist) if(on) - add_overlay(mutable_appearance('icons/obj/watercloset.dmi', "water", MOB_LAYER + 1)) + add_overlay(mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER)) if(watertemp == "freezing") return if(!ismist) @@ -465,8 +480,8 @@ if(istype(O, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = O - if(B.bcell) - if(B.bcell.charge > 0 && B.status == 1) + if(B.cell) + if(B.cell.charge > 0 && B.status == 1) flick("baton_active", src) var/stunforce = B.stunforce user.Stun(stunforce) @@ -552,7 +567,7 @@ icon_state = "open" color = "#ACD1E9" //Default color, didn't bother hardcoding other colors, mappers can and should easily change it. alpha = 200 //Mappers can also just set this to 255 if they want curtains that can't be seen through - layer = WALL_OBJ_LAYER + layer = SIGN_LAYER anchored = 1 opacity = 0 density = 0 @@ -575,13 +590,48 @@ density = 0 open = TRUE +/obj/structure/curtain/attackby(obj/item/W, mob/user) + if (istype(W, /obj/item/toy/crayon)) + color = input(user,"Choose Color") as color + else if(istype(W, /obj/item/weapon/screwdriver)) + if(anchored) + playsound(src.loc, W.usesound, 100, 1) + user.visible_message("[user] unscrews [src] from the floor.", "You start to unscrew [src] from the floor...", "You hear rustling noises.") + if(do_after(user, 50*W.toolspeed, target = src)) + if(!anchored) + return + anchored = FALSE + to_chat(user, "You unscrew [src] from the floor.") + else + playsound(src.loc, W.usesound, 100, 1) + user.visible_message("[user] screws [src] to the floor.", "You start to screw [src] to the floor...", "You hear rustling noises.") + if(do_after(user, 50*W.toolspeed, target = src)) + if(anchored) + return + anchored = TRUE + to_chat(user, "You screw [src] to the floor.") + else if(istype(W, /obj/item/weapon/wirecutters)) + if(!anchored) + playsound(src.loc, W.usesound, 100, 1) + user.visible_message("[user] cuts apart [src].", "You start to cut apart [src].", "You hear cutting.") + if(do_after(user, 50*W.toolspeed, target = src)) + if(anchored) + return + to_chat(user, "You cut apart [src].") + deconstruct() + else + . = ..() + + /obj/structure/curtain/attack_hand(mob/user) playsound(loc, 'sound/effects/curtain.ogg', 50, 1) toggle() ..() /obj/structure/curtain/deconstruct(disassembled = TRUE) - new /obj/item/stack/sheet/cloth (loc, 3) + new /obj/item/stack/sheet/cloth (loc, 2) + new /obj/item/stack/sheet/plastic (loc, 2) + new /obj/item/stack/rods (loc, 1) qdel(src) /obj/structure/curtain/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0c114180030..a552f951f0b 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -24,6 +24,7 @@ resistance_flags = ACID_PROOF armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 100) CanAtmosPass = ATMOS_PASS_PROC + var/real_explosion_block //ignore this, just use explosion_block /obj/structure/window/examine(mob/user) ..() @@ -72,6 +73,10 @@ debris += new /obj/item/weapon/shard(src) if(rods) debris += new /obj/item/stack/rods(src, rods) + + //windows only block while reinforced and fulltile, so we'll use the proc + real_explosion_block = explosion_block + explosion_block = EXPLOSION_BLOCK_PROC /obj/structure/window/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd) switch(the_rcd.mode) @@ -400,6 +405,9 @@ return 1 +/obj/structure/window/GetExplosionBlock() + return reinf && fulltile ? real_explosion_block : 0 + /obj/structure/window/unanchored anchored = FALSE diff --git a/code/game/turfs/simulated/dirtystation.dm b/code/game/turfs/simulated/dirtystation.dm index e2e0906b39c..1c59cd2999b 100644 --- a/code/game/turfs/simulated/dirtystation.dm +++ b/code/game/turfs/simulated/dirtystation.dm @@ -32,7 +32,7 @@ if(prob(80)) //mid dirt - 1/15 return - if(istype(A, /area/engine) || istype(A,/area/assembly) || istype(A,/area/maintenance) || istype(A,/area/construction)) + if(istype(A, /area/engine) || istype(A, /area/crew_quarters/heads/chief) || istype(A,/area/assembly) || istype(A, /area/science/robotics) || istype(A,/area/maintenance) || istype(A,/area/construction)) //Blood, sweat, and oil. Oh, and dirt. if(prob(3)) new /obj/effect/decal/cleanable/blood/old(src) @@ -46,7 +46,7 @@ new /obj/effect/decal/cleanable/dirt(src) return - if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/toilet/locker)) + if(istype(A, /area/crew_quarters/toilet)) if(prob(40)) if(prob(90)) new /obj/effect/decal/cleanable/vomit/old(src) @@ -62,7 +62,7 @@ if(prob(75)) //low dirt - 1/60 return - if(istype(A, /area/ai_monitored/turret_protected) || istype(A, /area/security)) //chance of incident + if(istype(A, /area/ai_monitored/turret_protected) || istype(A, /area/prison) || istype(A, /area/security) || istype(A, /area/crew_quarters/heads/hos)) //chance of incident if(prob(20)) if(prob(5)) new /obj/effect/decal/cleanable/blood/gibs/old(src) @@ -71,7 +71,7 @@ return - if(istype(A, /area/crew_quarters/kitchen)) //Kitchen messes + if(istype(A, /area/crew_quarters/kitchen) || istype(A, /area/crew_quarters/cafeteria)) //Kitchen messes if(prob(60)) if(prob(50)) new /obj/effect/decal/cleanable/egg_smudge(src) @@ -79,7 +79,7 @@ new /obj/effect/decal/cleanable/flour(src) return - if(istype(A, /area/medical) || !istype(A, /area/science/robotics)) //Kept clean, but chance of blood + if(istype(A, /area/medical) || istype(A, /area/crew_quarters/heads/cmo)) //Kept clean, but chance of blood if(prob(66)) if(prob(5)) new /obj/effect/decal/cleanable/blood/gibs/old(src) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 91ed7a7cd6d..375697ff9bc 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -158,6 +158,12 @@ if(smooth) queue_smooth_neighbors(src) +/turf/open/floor/carpet/black + icon = 'icons/turf/floors/carpet_black.dmi' + floor_tile = /obj/item/stack/tile/carpet/black + canSmoothWith = list(/turf/open/floor/carpet/black) + + /turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20) . = (prob(probability) || force) for(var/I in src) diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index fc5a57e16dd..46bb461660a 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -151,18 +151,14 @@ honk() /turf/open/floor/mineral/bananium/proc/honk() - if(!spam_flag) - spam_flag = 1 + if(spam_flag < world.time) playsound(src, 'sound/items/bikehorn.ogg', 50, 1) - spawn(20) - spam_flag = 0 + spam_flag = world.time + 20 /turf/open/floor/mineral/bananium/proc/squeek() - if(!spam_flag) - spam_flag = 1 + if(spam_flag < world.time) playsound(src, "clownstep", 50, 1) - spawn(10) - spam_flag = 0 + spam_flag = world.time + 10 /turf/open/floor/mineral/bananium/airless initial_gas_mix = "TEMP=2.7" diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm index 19b4b6b4682..1061a58fd58 100644 --- a/code/modules/admin/DB_ban/functions.dm +++ b/code/modules/admin/DB_ban/functions.dm @@ -122,7 +122,7 @@ computerid = "0" if(!ip) ip = "0.0.0.0" - var/sql = "INSERT INTO [format_table_name("ban")] (`bantime`,`server_ip`,`server_port`,`round_id`,`bantype`,`reason`,`job`,`duration`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`) VALUES (Now(), INET_ATON('[world.internet_address]'), '[world.port]', '[GLOB.round_id]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', INET_ATON('[ip]'), '[a_ckey]', '[a_computerid]', INET_ATON('[a_ip]'), '[who]', '[adminwho]')" + var/sql = "INSERT INTO [format_table_name("ban")] (`bantime`,`server_ip`,`server_port`,`round_id`,`bantype`,`reason`,`job`,`duration`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]', '[GLOB.round_id]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', INET_ATON('[ip]'), '[a_ckey]', '[a_computerid]', INET_ATON('[a_ip]'), '[who]', '[adminwho]')" var/datum/DBQuery/query_add_ban = SSdbcore.NewQuery(sql) if(!query_add_ban.warn_execute()) return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a06862734c2..aac82542bcb 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -423,6 +423,8 @@ return var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)") + if(world.RunningService()) + options += "Service Restart (Force restart DD)"; var result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options if(result) SSblackbox.add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -432,7 +434,10 @@ if("Hard Restart (No Delay, No Feeback Reason)") world.Reboot() if("Hardest Restart (No actions, just reboot)") - world.Reboot(fast_track = TRUE) + world.Reboot(fast_track = TRUE) + if("Service Restart (Force restart DD)") + GLOB.reboot_mode = REBOOT_MODE_HARD + world.ServiceReboot() /datum/admins/proc/end_round() set category = "Server" @@ -590,7 +595,7 @@ set category = "Admin" set name = "Unprison" if (M.z == ZLEVEL_CENTCOM) - M.loc = pick(GLOB.latejoin) + SSjob.SendToLateJoin(M) message_admins("[key_name_admin(usr)] has unprisoned [key_name_admin(M)]") log_admin("[key_name(usr)] has unprisoned [key_name(M)]") else diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index e569eacd2bc..428ae959849 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -334,31 +334,18 @@ if(!objective) return SSblackbox.add_details("admin_secrets_fun_used","Traitor All ([objective])") - for(var/mob/living/carbon/human/H in GLOB.player_list) - if(H.stat == 2 || !H.client || !H.mind) continue + for(var/mob/living/H in GLOB.player_list) + if(!(istype(H, /mob/living/carbon/human)||istype(H, /mob/living/silicon/))) continue + if(H.stat == 2 || !H.client || !H.mind || ispAI(H)) continue if(is_special_character(H)) continue - //traitorize(H, objective, 0) - SSticker.mode.traitors += H.mind - H.mind.special_role = "traitor" + H.mind.add_antag_datum(ANTAG_DATUM_TRAITOR_CUSTOM) + var/datum/antagonist/traitor/traitordatum = H.mind.has_antag_datum(ANTAG_DATUM_TRAITOR) //original datum self deletes var/datum/objective/new_objective = new new_objective.owner = H new_objective.explanation_text = objective - H.mind.objectives += new_objective - SSticker.mode.greet_traitor(H.mind) - //SSticker.mode.forge_traitor_objectives(H.mind) - SSticker.mode.finalize_traitor(H.mind) - for(var/mob/living/silicon/A in GLOB.player_list) - if(A.stat == 2 || !A.client || !A.mind) continue - if(ispAI(A)) continue - else if(is_special_character(A)) continue - SSticker.mode.traitors += A.mind - A.mind.special_role = "traitor" - var/datum/objective/new_objective = new - new_objective.owner = A - new_objective.explanation_text = objective - A.mind.objectives += new_objective - SSticker.mode.greet_traitor(A.mind) - SSticker.mode.finalize_traitor(A.mind) + traitordatum.add_objective(new_objective) + traitordatum.equip(FALSE) + traitordatum.greet() message_admins("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]") log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index d99e6bf4acc..a6cac2d8a3c 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -183,7 +183,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(C, "PM to-Admins: [name]") //send it to irc if nobody is on and tell us how many were on - var/admin_number_present = send2irc_adminless_only(initiator_ckey, name) + var/admin_number_present = send2irc_adminless_only("#[id] [initiator_ckey]", name) log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.") @@ -567,9 +567,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /proc/send2irc(msg,msg2) - if(config.useircbot) + if(world.RunningService()) + world.ExportService("[SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE] [msg] | [msg2]") + else if(config.useircbot) shell("python nudge.py [msg] [msg2]") - return /proc/send2otherserver(source,msg,type = "Ahelp") if(config.cross_allowed) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index c4eb65d3527..b964e60a0aa 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -59,11 +59,11 @@ if (!msg) message_admins("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.") return - cmd_admin_pm(whom, msg, AH) + cmd_admin_pm(whom, msg) //takes input from cmd_admin_pm_context, cmd_admin_pm_panel or /client/Topic and sends them a PM. //Fetching a message if needed. src is the sender and C is the target client -/client/proc/cmd_admin_pm(whom, msg, datum/admin_help/AH) +/client/proc/cmd_admin_pm(whom, msg) if(prefs.muted & MUTE_ADMINHELP) to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") return @@ -144,9 +144,9 @@ if(irc) to_chat(src, "PM to-Admins: [rawmsg]") - admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") + var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") ircreplyamount-- - send2irc("Reply: [ckey]",rawmsg) + send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg) else if(recipient.holder) if(holder) //both are admins @@ -221,42 +221,44 @@ var/datum/admin_help/ticket = C ? C.current_ticket : GLOB.ahelp_tickets.CKey2ActiveTicket(target) var/compliant_msg = trim(lowertext(msg)) - var/unhandled = FALSE var/irc_tagged = "[sender](IRC)" - switch(compliant_msg) - if("ticket close") - if(ticket) - ticket.Close(irc_tagged) - return "Ticket #[ticket.id] successfully closed" - if("ticket resolve") - if(ticket) - ticket.Resolve(irc_tagged) - return "Ticket #[ticket.id] successfully resolved" - if("ticket ic") - if(ticket) - ticket.ICIssue(irc_tagged) - return "Ticket #[ticket.id] successfully marked as IC issue" - if("ticket reject") - if(ticket) - ticket.Reject(irc_tagged) - return "Ticket #[ticket.id] successfully rejected" - else - unhandled = TRUE - if(!unhandled) - return "Ticket could not be found" + var/list/splits = splittext(compliant_msg, " ") + if(splits.len && splits[1] == "ticket") + if(splits.len < 2) + return "Usage: ticket " + switch(splits[2]) + if("close") + if(ticket) + ticket.Close(irc_tagged) + return "Ticket #[ticket.id] successfully closed" + if("resolve") + if(ticket) + ticket.Resolve(irc_tagged) + return "Ticket #[ticket.id] successfully resolved" + if("icissue") + if(ticket) + ticket.ICIssue(irc_tagged) + return "Ticket #[ticket.id] successfully marked as IC issue" + if("reject") + if(ticket) + ticket.Reject(irc_tagged) + return "Ticket #[ticket.id] successfully rejected" + else + return "Usage: ticket " + return "Error: Ticket could not be found" var/static/stealthkey var/adminname = config.showircname ? irc_tagged : "Administrator" if(!C) - return "No client" + return "Error: No client" if(!stealthkey) stealthkey = GenIrcStealthKey() msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN)) if(!msg) - return "No message" + return "Error: No message" message_admins("IRC message from [sender] to [key_name_admin(C)] : [msg]") log_admin_private("IRC PM: [sender] -> [key_name(C)] : [msg]") @@ -276,8 +278,6 @@ return "Message Successful" - - /proc/GenIrcStealthKey() var/num = (rand(0,1000)) var/i = 0 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index e9df9a0b654..7dc71a2fc51 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -52,7 +52,20 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(!procname) return - if(targetselected && !hascall(target,procname)) + //hascall() doesn't support proc paths (eg: /proc/gib(), it only supports "gib") + var/testname = procname + if(targetselected) + //Find one of the 3 possible ways they could have written /proc/PROCNAME + if(findtext(procname, "/proc/")) + testname = replacetext(procname, "/proc/", "") + else if(findtext(procname, "/proc")) + testname = replacetext(procname, "/proc", "") + else if(findtext(procname, "proc/")) + testname = replacetext(procname, "proc/", "") + //Clear out any parenthesis if they're a dummy + testname = replacetext(testname, "()", "") + + if(targetselected && !hascall(target,testname)) to_chat(usr, "Error: callproc(): type [target.type] has no proc named [procname].") return else diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm index d7db82f5b34..ca84d5d759e 100644 --- a/code/modules/admin/verbs/individual_logging.dm +++ b/code/modules/admin/verbs/individual_logging.dm @@ -14,11 +14,12 @@ if(type == INDIVIDUAL_SHOW_ALL_LOG) dat += "
Displaying all logs of [key_name(M)]

" for(var/log_type in M.logging) - var/list/reversed = M.logging[log_type] - reversed = reverseRange(reversed.Copy()) dat += "
[log_type]

" - for(var/entry in reversed) - dat += "[entry]: [reversed[entry]]
" + var/list/reversed = M.logging[log_type] + if(islist(reversed)) + reversed = reverseRange(reversed.Copy()) + for(var/entry in reversed) + dat += "[entry]: [reversed[entry]]
" dat += "
" else dat += "
[type] of [key_name(M)]

" @@ -26,6 +27,6 @@ if(reversed) reversed = reverseRange(reversed.Copy()) for(var/entry in reversed) - dat += "[entry]: [reversed[entry]]
" + dat += "[entry]: [reversed[entry]]
" - usr << browse(dat, "window=invidual_logging;size=600x480") \ No newline at end of file + usr << browse(dat, "window=invidual_logging_[M];size=600x480") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ed3765d0cd7..5571f86a7c7 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -226,7 +226,7 @@ return 0 var/alien_caste = input(usr, "Please choose which caste to spawn.","Pick a caste",null) as null|anything in list("Queen","Praetorian","Hunter","Sentinel","Drone","Larva") - var/obj/effect/landmark/spawn_here = GLOB.xeno_spawn.len ? pick(GLOB.xeno_spawn) : pick(GLOB.latejoin) + var/obj/effect/landmark/spawn_here = GLOB.xeno_spawn.len ? pick(GLOB.xeno_spawn) : null var/mob/living/carbon/alien/new_xeno switch(alien_caste) if("Queen") @@ -243,6 +243,8 @@ new_xeno = new /mob/living/carbon/alien/larva(spawn_here) else return 0 + if(!spawn_here) + SSjob.SendToLateJoin(new_xeno, FALSE) new_xeno.ckey = ckey var/msg = "[key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste]." @@ -283,8 +285,6 @@ Traitors and the like can also be revived with the previous role mostly intact. var/turf/T if(GLOB.xeno_spawn.len) T = pick(GLOB.xeno_spawn) - else - T = pick(GLOB.latejoin) var/mob/living/carbon/alien/new_xeno switch(G_found.mind.special_role)//If they have a mind, we can determine which caste they were. @@ -301,6 +301,9 @@ Traitors and the like can also be revived with the previous role mostly intact. else//If we don't know what special role they have, for whatever reason, or they're a larva. create_xeno(G_found.ckey) return + + if(!T) + SSjob.SendToLateJoin(new_xeno, FALSE) //Now to give them their mind back. G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use @@ -314,7 +317,8 @@ Traitors and the like can also be revived with the previous role mostly intact. //check if they were a monkey else if(findtext(G_found.real_name,"monkey")) if(alert("This character appears to have been a monkey. Would you like to respawn them as such?",,"Yes","No")=="Yes") - var/mob/living/carbon/monkey/new_monkey = new(pick(GLOB.latejoin)) + var/mob/living/carbon/monkey/new_monkey = new + SSjob.SendToLateJoin(new_monkey) G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use new_monkey.key = G_found.key to_chat(new_monkey, "You have been fully respawned. Enjoy the game.") @@ -325,7 +329,8 @@ Traitors and the like can also be revived with the previous role mostly intact. //Ok, it's not a xeno or a monkey. So, spawn a human. - var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin))//The mob being spawned. + var/mob/living/carbon/human/new_character = new//The mob being spawned. + SSjob.SendToLateJoin(new_character) var/datum/data/record/record_found //Referenced to later to either randomize or not randomize the character. if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something @@ -368,10 +373,13 @@ Traitors and the like can also be revived with the previous role mostly intact. var/player_key = G_found.key //Now for special roles and equipment. + var/datum/antagonist/traitor/traitordatum = new_character.mind.has_antag_datum(ANTAG_DATUM_TRAITOR) + if(traitordatum) + SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1) + traitordatum.equip() + + switch(new_character.mind.special_role) - if("traitor") - SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1) - SSticker.mode.equip_traitor(new_character) if("Wizard") new_character.loc = pick(GLOB.wizardstart) //SSticker.mode.learn_basic_spells(new_character) @@ -396,12 +404,8 @@ Traitors and the like can also be revived with the previous role mostly intact. switch(new_character.mind.assigned_role) if("Cyborg")//More rigging to make em' work and check if they're traitor. new_character = new_character.Robotize() - if(new_character.mind.special_role=="traitor") - SSticker.mode.add_law_zero(new_character) if("AI") new_character = new_character.AIize() - if(new_character.mind.special_role=="traitor") - SSticker.mode.add_law_zero(new_character) else SSjob.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them. @@ -1205,4 +1209,5 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits return message_admins("[key_name_admin(usr)] triggered a Centcom recall, with the admiral message of: [message]") - log_game("[key_name(usr)] triggered a Centcom recall, with the message of: [message]") \ No newline at end of file + log_game("[key_name(usr)] triggered a Centcom recall, with the message of: [message]") + SSshuttle.centcom_recall(SSshuttle.emergency.timer, message) diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index 3c6c7b2342b..39d81331435 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -12,6 +12,14 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped icon_state = "filter_off_f" flipped = 1 + +// These two filter types have critical_machine flagged to on and thus causes the area they are in to be exempt from the Grid Check event. + +/obj/machinery/atmospherics/components/trinary/filter/critical + critical_machine = TRUE + +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical + critical_machine = TRUE /obj/machinery/atmospherics/components/trinary/filter/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index a34940ce301..0b25c29cc9c 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -1,6 +1,6 @@ #define PUMP_OUT "out" #define PUMP_IN "in" -#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 30) +#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 10) #define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10) #define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 1a4c67f9885..acf9ef4ede3 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -55,16 +55,3 @@ var/loc = pick(L) explosion(loc,explosiondev,explosionmed,explosionlight) reload = 0 - -/*/mob/proc/openfire() - var/A - A = input("Area to jump bombard", "Open Fire", A) in GLOB.teleportlocs - var/area/thearea = GLOB.teleportlocs[A] - priority_announce("Bluespace artillery fire detected. Brace for impact.") - spawn(30) - var/list/L = list() - - for(var/turf/T in get_area_turfs(thearea.type)) - L+=T - var/loc = pick(L) - explosion(loc,2,5,11)*/ diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index af75c635bac..0c6470a870f 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -18,6 +18,8 @@ var/uses = 1 //how many times can we spawn from it. set to -1 for infinite. var/brute_damage = 0 var/oxy_damage = 0 + var/burn_damage = 0 + var/mob_color //Change the mob's color density = 1 anchored = 1 var/banType = "lavaland" @@ -68,6 +70,8 @@ M.adjustOxyLoss(oxy_damage) M.adjustBruteLoss(brute_damage) + M.adjustFireLoss(burn_damage) + M.color = mob_color equip(M) if(ckey) @@ -115,6 +119,9 @@ var/l_pocket = -1 var/back = -1 var/id = -1 + var/neck = -1 + var/backpack_contents = -1 + var/suit_store = -1 /obj/effect/mob_spawn/human/Initialize() if(ispath(outfit)) @@ -128,9 +135,13 @@ H.set_species(mob_species) if(husk) H.Drain() - + else //Because for some reason I can't track down, things are getting turned into husks even if husk = false. It's in some damage proc somewhere. + H.cure_husk() + H.underwear = "Nude" + H.undershirt = "Nude" + H.socks = "Nude" if(outfit) - var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id") + var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store") for(var/slot in slots) var/T = vars[slot] if(!isnum(T)) @@ -351,7 +362,7 @@ /obj/effect/mob_spawn/human/commander name = "Commander" id_job = "Commander" - id_access_list = list(GLOB.access_cent_captain) + id_access_list = list(GLOB.access_cent_captain, GLOB.access_cent_general, GLOB.access_cent_specops, GLOB.access_cent_medical, GLOB.access_cent_storage) outfit = /datum/outfit/nanotrasencommandercorpse /datum/outfit/nanotrasencommandercorpse @@ -371,7 +382,7 @@ /obj/effect/mob_spawn/human/nanotrasensoldier name = "Nanotrasen Private Security Officer" id_job = "Private Security Force" - id_access_list = list(GLOB.access_cent_specops) + id_access_list = list(GLOB.access_cent_captain, GLOB.access_cent_general, GLOB.access_cent_specops, GLOB.access_cent_medical, GLOB.access_cent_storage, GLOB.access_security) outfit = /datum/outfit/nanotrasensoldiercorpse /datum/outfit/nanotrasensoldiercorpse @@ -395,6 +406,16 @@ icon_state = "sleeper" flavour_text = "You are a Nanotrasen Commander!" +/obj/effect/mob_spawn/human/nanotrasensoldier/alive + death = FALSE + roundstart = FALSE + mob_name = "Private Security Officer" + name = "sleeper" + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "sleeper" + faction = "nanotrasenprivate" + flavour_text = "You are a Nanotrasen Private Security Officer!" + /////////////////Spooky Undead////////////////////// diff --git a/code/modules/cargo/exports/organs.dm b/code/modules/cargo/exports/organs.dm index 39c0051a4ee..858914f0fda 100644 --- a/code/modules/cargo/exports/organs.dm +++ b/code/modules/cargo/exports/organs.dm @@ -66,10 +66,10 @@ /datum/export/organ/hivelord cost = 1500 - unit_name = "active hivelord core" - export_types = list(/obj/item/organ/hivelord_core) + unit_name = "active regenerative core" + export_types = list(/obj/item/organ/regenerative_core) -/datum/export/organ/alien/plasmavessel/get_cost(obj/item/organ/hivelord_core/C) +/datum/export/organ/alien/plasmavessel/get_cost(obj/item/organ/regenerative_core/C) if(C.inert) return ..() / 3 if(C.preserved) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 421b8a057e8..fbce7a705dd 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -543,6 +543,13 @@ crate_name = "electrical maintenance crate" crate_type = /obj/structure/closet/crate/engineering/electrical +/datum/supply_pack/engineering/inducers + name = "NT-75 Electromagnetic Power Inducers Crate" + cost = 2000 + contains = list(/obj/item/weapon/inducer/sci {cell_type = /obj/item/weapon/stock_parts/cell/{maxcharge = 5000; charge = 5000};opened = 0},/obj/item/weapon/inducer/sci {cell_type = /obj/item/weapon/stock_parts/cell/{maxcharge = 5000; charge = 5000};opened = 0}) //FALSE doesn't work in modified type paths apparently. + crate_name = "inducer crate" + crate_type = /obj/structure/closet/crate/engineering/electrical + /datum/supply_pack/engineering/engiequipment name = "Engineering Gear Crate" cost = 1300 diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 2530e971dcb..de358e25532 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -461,7 +461,7 @@ GLOBAL_LIST(external_rsc_urls) return if(!account_join_date) account_join_date = "Error" - var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),INET_ATON('[world.internet_address]'),'[world.port]','[sql_ckey]',INET_ATON('[sql_ip]'),'[sql_computerid]')") + var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),COALESCE(INET_ATON('[world.internet_address]'), 0),'[world.port]','[sql_ckey]',INET_ATON('[sql_ip]'),'[sql_computerid]')") query_log_connection.Execute() /client/proc/findJoinDate() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 687ba518587..76171c8d8f2 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -39,8 +39,9 @@ vision_flags = SEE_TURFS lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/lightgreen - var/static/list/meson_mining_failure_excuses = list("seismic activity", "excessive lava", "ambient radiation", "electromagnetic storms", "bluespace disruption", \ - "gravity", "dust", "dense rock", "ash", "badly understood science", "radiant heat") + var/static/list/meson_mining_failure_excuses = list("badly understood science", "damaged meson generators", "electromagnetic storms", "bluespace disruption", "ancient structures", \ + "ambient radiation", "seismic activity", "extreme weather", "strange signals", "excessive lava", "giant monsters", "a loose wire", "lens warping", "radiant heat", "volcanic ash", \ + "budget cuts","alien life","dense rock", "gravity", "dust") var/picked_excuse var/mesons_on = TRUE @@ -65,7 +66,7 @@ if(iscarbon(user)) //only carbons can wear glasses var/mob/living/carbon/C = user - if(!mesons_on) + if(mesons_on) to_chat(C, "Your Meson Scanners have reactivated.") else if(picked_excuse) to_chat(C, "Due to [picked_excuse], your Meson Scanners will not be able to display terrain layouts in this area.") diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 28753c0631a..8402bdfdac3 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -120,6 +120,10 @@ armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0, fire = 50, acid = 60) strip_delay = 80 +/obj/item/clothing/head/HoS/syndicate + name = "syndicate cap" + desc = "A black cap fit for a high ranking syndicate officer." + /obj/item/clothing/head/HoS/beret name = "head of security beret" desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index c0d72e86110..d233f76a79c 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -79,31 +79,6 @@ Contains: max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF - //Marine Armour -/obj/item/clothing/head/helmet/space/hardsuit/ueg - name = "Iron Hawk Marine Helmet" - desc = "An armoured, pressurised, military helmet used as standard issue among Iron Hawk Marines." - icon_state = "ueghelm" - item_state = "ueghelm" - armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 90, rad = 70, fire = 100, acid = 100) - strip_delay = 120 - resistance_flags = FIRE_PROOF | ACID_PROOF - actions_types = list() - -/obj/item/clothing/head/helmet/space/hardsuit/ueg/attack_self(mob/user) - return - -/obj/item/clothing/suit/space/hardsuit/ueg - name = "Iron Hawk Marine Armour" - desc = "Modified MK.II SWAT Armour. Used by Iron Hawk Marines in ship to ship action. This model appears to have lost some of its armour plating during the crash." - icon_state = "uegarmor" - item_state = "uegarmor" - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/kitchen/knife/combat) - armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 90, rad = 100, fire = 100, acid = 100) - strip_delay = 130 - resistance_flags = FIRE_PROOF | ACID_PROOF - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ueg - //NASA Voidsuit /obj/item/clothing/head/helmet/space/nasavoid name = "NASA Void Helmet" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 6eb0df78371..fd7263de54f 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -105,7 +105,6 @@ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80) - flags_inv = HIDEJUMPSUIT strip_delay = 80 put_on_delay = 60 diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index e90c750d129..bcf2e494263 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -60,7 +60,7 @@ name = "goliath cloak" icon_state = "goliath_cloak" desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits." - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/weapon/pickaxe, /obj/item/weapon/twohanded/spear, /obj/item/weapon/twohanded/bonespear, /obj/item/organ/hivelord_core/legion, /obj/item/weapon/kitchen/knife/combat/bone, /obj/item/weapon/kitchen/knife/combat/survival) + allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/weapon/pickaxe, /obj/item/weapon/twohanded/spear, /obj/item/weapon/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/weapon/kitchen/knife/combat/bone, /obj/item/weapon/kitchen/knife/combat/survival) armor = list(melee = 35, bullet = 10, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 60, acid = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index f4bd254a540..a1b0fb4ce2b 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -37,4 +37,11 @@ item_color = "trackpants" can_adjust = 0 armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) - resistance_flags = 0 \ No newline at end of file + resistance_flags = 0 + +/obj/item/clothing/under/syndicate/combat + name = "combat uniform" + desc = "With a suit lined with this many pockets, you are ready to operate." + icon_state = "syndicate_combat" + item_color = "syndicate_combat" + can_adjust = 0 \ No newline at end of file diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index a14d301a31e..91278beb23a 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -1,24 +1,35 @@ /datum/personal_crafting var/busy var/viewing_category = 1 //typical powergamer starting on the Weapons tab - var/list/categories = list(CAT_WEAPON, - CAT_AMMO, + var/viewing_subcategory = 1 + var/list/categories = list( + CAT_WEAPONRY, CAT_ROBOT, CAT_MISC, CAT_PRIMAL, - CAT_BREAD, - CAT_BURGER, - CAT_CAKE, - CAT_EGG, - CAT_MEAT, - CAT_MISCFOOD, - CAT_PASTRY, - CAT_PIE, - CAT_PIZZA, - CAT_SALAD, - CAT_SANDWICH, - CAT_SOUP, - CAT_SPAGHETTI) + CAT_FOOD) + var/list/subcategories = list( + list( //Weapon subcategories + CAT_WEAPON, + CAT_AMMO), + CAT_NONE, //Robot subcategories + CAT_NONE, //Misc subcategories + CAT_NONE, //Tribal subcategories + list( //Food subcategories + CAT_BREAD, + CAT_BURGER, + CAT_CAKE, + CAT_EGG, + CAT_MEAT, + CAT_MISCFOOD, + CAT_PASTRY, + CAT_PIE, + CAT_PIZZA, + CAT_SALAD, + CAT_SANDWICH, + CAT_SOUP, + CAT_SPAGHETTI)) + var/datum/action/innate/crafting/button var/display_craftable_only = FALSE var/display_compact = TRUE @@ -262,11 +273,19 @@ /datum/personal_crafting/ui_data(mob/user) var/list/data = list() + var/list/subs = list() + var/cur_subcategory = CAT_NONE var/cur_category = categories[viewing_category] + if (islist(subcategories[viewing_category])) + subs = subcategories[viewing_category] + cur_subcategory = subs[viewing_subcategory] data["busy"] = busy data["prev_cat"] = categories[prev_cat()] + data["prev_subcat"] = subs[prev_subcat()] data["category"] = cur_category + data["subcategory"] = cur_subcategory data["next_cat"] = categories[next_cat()] + data["next_subcat"] = subs[next_subcat()] data["display_craftable_only"] = display_craftable_only data["display_compact"] = display_compact @@ -275,7 +294,7 @@ var/list/cant_craft = list() for(var/rec in GLOB.crafting_recipes) var/datum/crafting_recipe/R = rec - if(R.category != cur_category) + if((R.category != cur_category) || (R.subcategory != cur_subcategory)) continue if(check_contents(R, surroundings)) can_craft += list(build_recipe_data(R)) @@ -302,29 +321,41 @@ busy = 0 ui_interact(usr) if("forwardCat") //Meow - viewing_category = next_cat() - to_chat(usr, "Category is now [categories[viewing_category]].") + viewing_category = next_cat(FALSE) . = TRUE if("backwardCat") - viewing_category = prev_cat() - to_chat(usr, "Category is now [categories[viewing_category]].") + viewing_category = prev_cat(FALSE) + . = TRUE + if("forwardSubCat") + viewing_subcategory = next_subcat() + . = TRUE + if("backwardSubCat") + viewing_subcategory = prev_subcat() . = TRUE if("toggle_recipes") display_craftable_only = !display_craftable_only - to_chat(usr, "You will now [display_craftable_only ? "only see recipes you can craft":"see all recipes"].") . = TRUE if("toggle_compact") display_compact = !display_compact - to_chat(usr, "Crafting menu is now [display_compact? "compact" : "full size"].") . = TRUE //Next works nicely with modular arithmetic -/datum/personal_crafting/proc/next_cat() +/datum/personal_crafting/proc/next_cat(readonly = TRUE) + if (!readonly) + viewing_subcategory = 1 . = viewing_category % categories.len + 1 +/datum/personal_crafting/proc/next_subcat() + if(islist(subcategories[viewing_category])) + var/list/subs = subcategories[viewing_category] + . = viewing_subcategory % subs.len + 1 + + //Previous can go fuck itself -/datum/personal_crafting/proc/prev_cat() +/datum/personal_crafting/proc/prev_cat(readonly = TRUE) + if (!readonly) + viewing_subcategory = 1 if(viewing_category == categories.len) . = viewing_category-1 else @@ -332,6 +363,18 @@ if(. <= 0) . = categories.len +/datum/personal_crafting/proc/prev_subcat() + if(islist(subcategories[viewing_category])) + var/list/subs = subcategories[viewing_category] + if(viewing_subcategory == subs.len) + . = viewing_subcategory-1 + else + . = viewing_subcategory % subs.len - 1 + if(. <= 0) + . = subs.len + else + . = null + /datum/personal_crafting/proc/build_recipe_data(datum/crafting_recipe/R) var/list/data = list() diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index a489d0fb6a1..d84d806a00e 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -8,6 +8,7 @@ var/parts[] = list() //type paths of items that will be placed in the result var/chem_catalysts[] = list() //like tools but for reagents var/category = CAT_NONE //where it shows up in the crafting UI + var/subcategory = CAT_NONE /datum/crafting_recipe/pin_removal @@ -17,7 +18,8 @@ parts = list(/obj/item/weapon/gun = 1) tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters) time = 50 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/IED name = "IED" @@ -28,7 +30,8 @@ /obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1) parts = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1) time = 15 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/lance name = "explosive lance (grenade)" @@ -38,7 +41,8 @@ parts = list(/obj/item/weapon/twohanded/spear = 1, /obj/item/weapon/grenade = 1) time = 15 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/strobeshield name = "strobe shield" @@ -47,7 +51,8 @@ /obj/item/device/assembly/flash/handheld = 1, /obj/item/weapon/shield/riot = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/molotov name = "Molotov" @@ -56,7 +61,8 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle = 1) parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/stunprod name = "Stunprod" @@ -65,7 +71,8 @@ /obj/item/stack/rods = 1, /obj/item/device/assembly/igniter = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/teleprod name = "Teleprod" @@ -75,7 +82,8 @@ /obj/item/device/assembly/igniter = 1, /obj/item/weapon/ore/bluespace_crystal = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/bola name = "Bola" @@ -84,6 +92,7 @@ /obj/item/stack/sheet/metal = 6) time = 20//15 faster than crafting them by hand! category= CAT_WEAPON + subcategory = CAT_WEAPON /datum/crafting_recipe/tailclub name = "Tail Club" @@ -91,7 +100,8 @@ reqs = list(/obj/item/severedtail = 1, /obj/item/stack/sheet/metal = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/tailwhip name = "Liz O' Nine Tails" @@ -99,7 +109,8 @@ reqs = list(/obj/item/severedtail = 1, /obj/item/stack/cable_coil = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/ed209 name = "ED209" @@ -159,6 +170,18 @@ time = 40 category = CAT_ROBOT +/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but + name = "Pneumatic Cannon" + result = /obj/item/weapon/pneumatic_cannon/ghetto + tools = list(/obj/item/weapon/weldingtool, + /obj/item/weapon/wrench) + reqs = list(/obj/item/stack/sheet/metal = 4, + /obj/item/stack/packageWrap = 8, + /obj/item/pipe = 2) + time = 300 + category = CAT_WEAPONRY + subcategory = CAT_WEAPON + /datum/crafting_recipe/flamethrower name = "Flamethrower" result = /obj/item/weapon/flamethrower @@ -169,7 +192,8 @@ /obj/item/weapon/weldingtool = 1) tools = list(/obj/item/weapon/screwdriver) time = 10 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/meteorshot name = "Meteorshot Shell" @@ -179,7 +203,8 @@ /obj/item/weapon/stock_parts/manipulator = 2) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/pulseslug name = "Pulse Slug Shell" @@ -189,7 +214,8 @@ /obj/item/weapon/stock_parts/micro_laser/ultra = 1) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/dragonsbreath name = "Dragonsbreath Shell" @@ -197,7 +223,8 @@ reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,/datum/reagent/phosphorus = 5) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/frag12 name = "FRAG-12 Shell" @@ -208,7 +235,8 @@ /datum/reagent/toxin/acid/fluacid = 5) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/ionslug name = "Ion Scatter Shell" @@ -218,7 +246,8 @@ /obj/item/weapon/stock_parts/subspace/crystal = 1) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/improvisedslug name = "Improvised Shotgun Shell" @@ -229,7 +258,8 @@ /datum/reagent/fuel = 10) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/improvisedslugoverload name = "Overload Improvised Shell" @@ -239,7 +269,8 @@ /datum/reagent/toxin/plasma = 20) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/laserslug name = "Laser Slug Shell" @@ -249,7 +280,8 @@ /obj/item/weapon/stock_parts/micro_laser/high = 1) tools = list(/obj/item/weapon/screwdriver) time = 5 - category = CAT_AMMO + category = CAT_WEAPONRY + subcategory = CAT_AMMO /datum/crafting_recipe/ishotgun name = "Improvised Shotgun" @@ -260,7 +292,8 @@ /obj/item/stack/packageWrap = 5) tools = list(/obj/item/weapon/screwdriver) time = 100 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/chainsaw name = "Chainsaw" @@ -270,7 +303,8 @@ /obj/item/stack/sheet/plasteel = 1) tools = list(/obj/item/weapon/weldingtool) time = 50 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/spear name = "Spear" @@ -279,7 +313,8 @@ /obj/item/weapon/shard = 1, /obj/item/stack/rods = 1) time = 40 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/spooky_camera name = "Camera Obscura" @@ -344,6 +379,19 @@ result = /obj/item/toy/sword category = CAT_MISC +/datum/crafting_recipe/blackcarpet + name = "Black Carpet" + reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1) + result = /obj/item/stack/tile/carpet/black/fifty + category = CAT_MISC + +/datum/crafting_recipe/showercurtain + name = "Shower Curtains" + reqs = list(/obj/item/stack/sheet/cloth = 2, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1) + result = /obj/structure/curtain + category = CAT_MISC + + /datum/crafting_recipe/chemical_payload name = "Chemical Payload (C4)" result = /obj/item/weapon/bombcore/chemical @@ -354,7 +402,8 @@ ) parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2) time = 30 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/chemical_payload2 name = "Chemical Payload (gibtonite)" @@ -366,7 +415,8 @@ ) parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2) time = 50 - category = CAT_WEAPON + category = CAT_WEAPONRY + subcategory = CAT_WEAPON /datum/crafting_recipe/bonearmor name = "Bone Armor" diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm old mode 100644 new mode 100755 index 0377f0e935f..bbc73dca66b --- a/code/modules/events/abductor.dm +++ b/code/modules/events/abductor.dm @@ -1,10 +1,10 @@ /datum/round_event_control/abductor name = "Abductors" typepath = /datum/round_event/ghost_role/abductor - weight = 5 + weight = 10 max_occurrences = 1 - min_players = 5 + min_players = 20 gamemode_blacklist = list("nuclear","wizard","revolution","abduction") diff --git a/code/modules/events/devil.dm b/code/modules/events/devil.dm index 69648fa95a9..0b49f38343b 100644 --- a/code/modules/events/devil.dm +++ b/code/modules/events/devil.dm @@ -14,9 +14,7 @@ /datum/round_event/ghost_role/devil/spawn_role() //selecting a spawn_loc - var/list/spawn_locs = GLOB.latejoin - var/spawn_loc = pick(spawn_locs) - if(!spawn_loc) + if(!SSjob.latejoin_trackers.len) return MAP_ERROR //selecting a candidate player @@ -30,7 +28,7 @@ var/datum/mind/Mind = create_devil_mind(key) Mind.active = 1 - var/mob/living/carbon/human/devil = create_event_devil(spawn_loc) + var/mob/living/carbon/human/devil = create_event_devil() Mind.transfer_to(devil) add_devil(devil, ascendable = FALSE) @@ -45,6 +43,8 @@ /proc/create_event_devil(spawn_loc) var/mob/living/carbon/human/new_devil = new(spawn_loc) + if(!spawn_loc) + SSjob.SendToLateJoin(new_devil) var/datum/preferences/A = new() //Randomize appearance for the devil. A.copy_to(new_devil) new_devil.dna.update_dna_identity() diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 5e6407b60dd..837a3b650fd 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -82,13 +82,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 if(clong.density) clong.ex_act(2) - else if(ismob(clong)) - if(ishuman(clong)) - var/mob/living/carbon/human/H = clong - H.visible_message("[H.name] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!") - H.adjustBruteLoss(160) - if(clong.density || prob(10)) - clong.ex_act(2) + else if(isliving(clong)) + penetrate(clong) else if(istype(clong, type)) var/obj/effect/immovablerod/other = clong visible_message("[src] collides with [other]!\ @@ -98,3 +93,11 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 smoke.start() qdel(src) qdel(other) + +/obj/effect/immovablerod/proc/penetrate(mob/living/L) + L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!") + if(ishuman(L)) + var/mob/living/carbon/human/H = L + H.adjustBruteLoss(160) + if(L && (L.density || prob(10))) + L.ex_act(2) diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index 5d2d2829a91..ed7a3737eea 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -54,6 +54,7 @@ var/obj/effect/abstract/proximity_checker/advanced/F = edge_turfs[T] F.appearance = I.appearance F.invisibility = 0 + F.mouse_opacity = 0 F.layer = 5 /datum/proximity_monitor/advanced/peaceborg_dampener/cleanup_edge_turf(turf/T) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 9710098c5fa..cacfbd101ba 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -437,7 +437,7 @@ Gunshots/explosions/opening doors/less rare audio (done) var/list/image/delusions = list() /obj/effect/hallucination/delusion/Initialize(mapload, mob/living/carbon/T,force_kind = null , duration = 300,skip_nearby = 1, custom_icon = null, custom_icon_file = null) - ..() + . = ..() target = T var/image/A = null var/kind = force_kind ? force_kind : pick("clown","corgi","carp","skeleton","demon","zombie") diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 314ee2c8e2e..17662feb6e1 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -1,5 +1,6 @@ /datum/crafting_recipe/food var/real_parts + category = CAT_FOOD /datum/crafting_recipe/food/New() real_parts = parts.Copy() diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index d0682ced1eb..38882070119 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -11,7 +11,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/xenomeatbread name = "Xenomeat bread" @@ -21,7 +21,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/spidermeatbread name = "Spidermeat bread" @@ -31,7 +31,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/banananutbread name = "Banana nut bread" @@ -42,7 +42,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/banana - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/tofubread name = "Tofu bread" @@ -52,7 +52,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/tofu - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/creamcheesebread name = "Cream cheese bread" @@ -62,7 +62,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/mimanabread name = "Mimana bread" @@ -73,7 +73,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/butteredtoast name = "Buttered Toast" @@ -82,7 +82,7 @@ /obj/item/weapon/reagent_containers/food/snacks/butter = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/butteredtoast - category = CAT_BREAD + subcategory = CAT_BREAD /datum/crafting_recipe/food/butterbiscuit name = "Butter Biscuit" @@ -91,5 +91,5 @@ /obj/item/weapon/reagent_containers/food/snacks/butter = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/butterbiscuit - category = CAT_BREAD + subcategory = CAT_BREAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index 573574f4e9c..4a150faad77 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -14,7 +14,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/human - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/burger name = "Burger" @@ -24,7 +24,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/plain - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/corgiburger name = "Corgi burger" @@ -34,7 +34,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/corgi - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/appendixburger name = "Appendix burger" @@ -43,7 +43,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/appendix - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/brainburger name = "Brain burger" @@ -52,7 +52,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/brain - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/xenoburger name = "Xeno burger" @@ -61,7 +61,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/bearger name = "Bearger" @@ -70,7 +70,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/bearger - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/fishburger name = "Fish burger" @@ -79,7 +79,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/fish - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/tofuburger name = "Tofu burger" @@ -88,7 +88,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/tofu - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/ghostburger name = "Ghost burger" @@ -97,7 +97,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/ghost - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/clownburger name = "Clown burger" @@ -106,7 +106,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/clown - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/mimeburger name = "Mime burger" @@ -115,7 +115,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/mime - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/redburger name = "Red burger" @@ -125,7 +125,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/red - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/orangeburger name = "Orange burger" @@ -135,7 +135,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/orange - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/yellowburger name = "Yellow burger" @@ -145,7 +145,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/yellow - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/greenburger name = "Green burger" @@ -155,7 +155,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/green - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/blueburger name = "Blue burger" @@ -165,7 +165,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/blue - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/purpleburger name = "Purple burger" @@ -175,7 +175,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/purple - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/spellburger name = "Spell burger" @@ -183,7 +183,7 @@ /obj/item/clothing/head/wizard/fake = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/spellburger2 name = "Spell burger" @@ -192,7 +192,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/bigbiteburger name = "Big bite burger" @@ -201,7 +201,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/superbiteburger name = "Super bite burger" @@ -216,7 +216,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/superbite - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/slimeburger name = "Jelly burger" @@ -225,7 +225,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/jellyburger name = "Jelly burger" @@ -234,7 +234,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/fivealarmburger name = "Five alarm burger" @@ -243,7 +243,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/ratburger name = "Rat burger" @@ -252,7 +252,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/rat - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/baseballburger name = "Home run baseball burger" @@ -261,7 +261,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/baseball - category = CAT_BURGER + subcategory = CAT_BURGER /datum/crafting_recipe/food/baconburger name = "Bacon Burger" @@ -272,4 +272,4 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/baconburger - category = CAT_BURGER + subcategory = CAT_BURGER diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 439db2986b0..af288dddfc3 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -10,7 +10,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/cheesecake name = "Cheese cake" @@ -19,7 +19,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/applecake name = "Apple cake" @@ -28,7 +28,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/apple - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/orangecake name = "Orange cake" @@ -37,7 +37,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/orange - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/limecake name = "Lime cake" @@ -46,7 +46,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lime - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/lemoncake name = "Lemon cake" @@ -55,7 +55,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/chocolatecake name = "Chocolate cake" @@ -64,7 +64,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/birthdaycake name = "Birthday cake" @@ -73,7 +73,7 @@ /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/braincake name = "Brain cake" @@ -82,7 +82,7 @@ /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/brain - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/slimecake name = "Slime cake" @@ -91,7 +91,7 @@ /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/pumpkinspicecake name = "Pumpkin spice cake" @@ -100,7 +100,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice - category = CAT_CAKE + subcategory = CAT_CAKE /datum/crafting_recipe/food/cak name = "Living cat/cake hybrid" @@ -114,4 +114,4 @@ /datum/reagent/teslium = 1 //To shock the whole thing into life ) result = /mob/living/simple_animal/pet/cat/cak - category = CAT_CAKE //Cat! Haha, get it? CAT? GET IT??? + subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT??? diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index c03fbe47107..f1e96f526e8 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -11,7 +11,7 @@ /obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/friedegg - category = CAT_EGG + subcategory = CAT_EGG /datum/crafting_recipe/food/omelette name = "omelette" @@ -20,7 +20,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/omelette - category = CAT_EGG + subcategory = CAT_EGG /datum/crafting_recipe/food/chocolateegg name = "Chocolate egg" @@ -29,7 +29,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg - category = CAT_EGG + subcategory = CAT_EGG /datum/crafting_recipe/food/eggsbenedict name = "Eggs benedict" @@ -39,4 +39,4 @@ /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/benedict - category = CAT_EGG + subcategory = CAT_EGG diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 878dda18042..60d949bb9da 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -9,7 +9,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/kebab/human - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/kebab name = "Kebab" @@ -18,7 +18,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/steak = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/tofukebab name = "Tofu kebab" @@ -27,7 +27,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tofu - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/tailkebab name = "Lizard tail kebab" @@ -36,7 +36,7 @@ /obj/item/severedtail = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tail - category = CAT_MEAT + subcategory = CAT_MEAT // see code/module/crafting/table.dm @@ -50,7 +50,7 @@ /obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/fishandchips name = "Fish and chips" @@ -59,7 +59,7 @@ /obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/fishfingers name = "Fish fingers" @@ -69,7 +69,7 @@ /obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/sashimi name = "Sashimi" @@ -79,7 +79,7 @@ /obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/sashimi - category = CAT_MEAT + subcategory = CAT_MEAT ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// @@ -91,7 +91,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham - category = CAT_MEAT + subcategory = CAT_MEAT ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// @@ -103,7 +103,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/bearsteak name = "Filet migrawr" @@ -113,7 +113,7 @@ ) tools = list(/obj/item/weapon/lighter) result = /obj/item/weapon/reagent_containers/food/snacks/bearsteak - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/enchiladas name = "Enchiladas" @@ -123,7 +123,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/stewedsoymeat name = "Stewed soymeat" @@ -133,7 +133,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/sausage name = "Sausage" @@ -142,7 +142,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/sausage - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/nugget name = "Chicken nugget" @@ -150,7 +150,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/nugget - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/rawkhinkali name = "Raw Khinkali" @@ -159,7 +159,7 @@ /obj/item/weapon/reagent_containers/food/snacks/faggot = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/rawkhinkali - category = CAT_MEAT + subcategory = CAT_MEAT /datum/crafting_recipe/food/pigblanket name = "Pig in a Blanket" @@ -169,4 +169,4 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pigblanket - category = CAT_MEAT + subcategory = CAT_MEAT diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 708f49628ab..5a7c3a1b312 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -10,7 +10,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/chococoin name = "Choco coin" @@ -19,7 +19,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/chococoin - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/fudgedice name = "Fudge dice" @@ -28,7 +28,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/fudgedice - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/chocoorange name = "Choco orange" @@ -37,7 +37,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/chocoorange - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/loadedbakedpotato name = "Loaded baked potato" @@ -47,7 +47,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/cheesyfries name = "Cheesy fries" @@ -56,7 +56,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/wrap name = "Wrap" @@ -65,7 +65,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/eggwrap - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/beans name = "Beans" @@ -74,7 +74,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/beans - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/eggplantparm name ="Eggplant parmigiana" @@ -83,7 +83,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/baguette name = "Baguette" @@ -93,7 +93,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/baguette - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD ////////////////////////////////////////////////TOAST//////////////////////////////////////////////// @@ -104,7 +104,7 @@ /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/jelliedyoast name = "Jellied toast" @@ -113,7 +113,7 @@ /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/twobread name = "Two bread" @@ -122,7 +122,7 @@ /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/twobread - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/burrito name ="Burrito" @@ -131,7 +131,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/burrito - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/cheesyburrito name ="Cheesy burrito" @@ -141,7 +141,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/cheesyburrito - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/carneburrito name ="Carne de asada burrito" @@ -151,7 +151,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/carneburrito - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/fuegoburrito name ="Fuego plasma burrito" @@ -161,7 +161,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/melonfruitbowl name ="Melon fruit bowl" @@ -174,7 +174,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/spacefreezy name ="Space freezy" @@ -184,7 +184,7 @@ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/spacefreezy - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/sundae name ="Sundae" @@ -195,7 +195,7 @@ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/sundae - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/honkdae name ="Honkdae" @@ -207,7 +207,7 @@ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/honkdae - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/nachos name ="Nachos" @@ -216,7 +216,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/nachos - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/cheesynachos name ="Cheesy nachos" @@ -226,7 +226,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/cheesynachos - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/cubannachos name ="Cuban nachos" @@ -236,7 +236,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/cubannachos - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/melonkeg name ="Melon keg" @@ -247,7 +247,7 @@ ) parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 1) result = /obj/item/weapon/reagent_containers/food/snacks/melonkeg - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/honeybar name = "Honey nut bar" @@ -256,7 +256,7 @@ /datum/reagent/consumable/honey = 5 ) result = /obj/item/weapon/reagent_containers/food/snacks/honeybar - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/stuffedlegion @@ -264,12 +264,12 @@ time = 40 reqs = list( /obj/item/weapon/reagent_containers/food/snacks/meat/steak/goliath = 1, - /obj/item/organ/hivelord_core/legion = 1, + /obj/item/organ/regenerative_core/legion = 1, /datum/reagent/consumable/ketchup = 2, /datum/reagent/consumable/capsaicin = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/stuffedlegion - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/lizardwine @@ -280,7 +280,7 @@ /datum/reagent/consumable/ethanol = 100 ) result = /obj/item/weapon/reagent_containers/food/drinks/bottle/lizardwine - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/powercrepe @@ -294,7 +294,7 @@ /obj/item/weapon/melee/sabre = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/powercrepe - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/taco name ="Classic Taco" @@ -305,7 +305,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/taco - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/tacoplain name ="Plain Taco" @@ -315,7 +315,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/taco/plain - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/branrequests name = "Bran Requests Cereal" @@ -324,4 +324,4 @@ /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/branrequests - category = CAT_MISCFOOD + subcategory = CAT_MISCFOOD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index fd943379e0d..b20a957546a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -11,7 +11,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/donut time = 15 @@ -21,7 +21,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/donut - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/jellydonut name = "Jelly donut" @@ -30,7 +30,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/cherryjellydonut name = "Cherry jelly donut" @@ -39,7 +39,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/slimejellydonut name = "Slime jelly donut" @@ -48,7 +48,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly - category = CAT_PASTRY + subcategory = CAT_PASTRY ////////////////////////////////////////////////WAFFLES//////////////////////////////////////////////// @@ -59,7 +59,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/waffles - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/soylenviridians @@ -69,7 +69,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/soylentgreen name = "Soylent green" @@ -78,7 +78,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/rofflewaffles @@ -88,7 +88,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles - category = CAT_PASTRY + subcategory = CAT_PASTRY ////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// @@ -100,7 +100,7 @@ /obj/item/weapon/reagent_containers/food/snacks/faggot = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/dankpocket time = 15 @@ -110,7 +110,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/dankpocket - category = CAT_PASTRY + subcategory = CAT_PASTRY ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// @@ -122,7 +122,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/muffin - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/berrymuffin name = "Berry muffin" @@ -132,7 +132,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/booberrymuffin name = "Booberry muffin" @@ -143,7 +143,7 @@ /obj/item/weapon/ectoplasm = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/chawanmushi name = "Chawanmushi" @@ -154,7 +154,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi - category = CAT_PASTRY + subcategory = CAT_PASTRY ////////////////////////////////////////////OTHER//////////////////////////////////////////// @@ -166,7 +166,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sausage = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/hotdog - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/meatbun name = "Meat bun" @@ -177,7 +177,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/meatbun - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/khachapuri name = "Khachapuri" @@ -187,7 +187,7 @@ /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/khachapuri - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/sugarcookie time = 15 @@ -197,7 +197,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/fortunecookie time = 15 @@ -210,7 +210,7 @@ /obj/item/weapon/paper = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/poppypretzel time = 15 @@ -220,7 +220,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/plumphelmetbiscuit time = 15 @@ -230,7 +230,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/cracker time = 15 @@ -240,7 +240,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/cracker - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/chococornet name = "Choco cornet" @@ -250,7 +250,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/chococornet - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/oatmealcookie name = "Oatmeal cookie" @@ -268,7 +268,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/raisincookie - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/cherrycupcake name = "Cherry cupcake" @@ -277,7 +277,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/cherrycupcake - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/bluecherrycupcake name = "Blue cherry cupcake" @@ -286,7 +286,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake - category = CAT_PASTRY + subcategory = CAT_PASTRY /datum/crafting_recipe/food/honeybun name = "Honey bun" @@ -295,4 +295,4 @@ /datum/reagent/consumable/honey = 5 ) result = /obj/item/weapon/reagent_containers/food/snacks/honeybun - category = CAT_PASTRY + subcategory = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm index df47c64de7f..f1628d41bca 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -11,7 +11,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/cream - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/meatpie name = "Meat pie" @@ -22,7 +22,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/tofupie name = "Tofu pie" @@ -31,7 +31,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/tofupie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/xenopie name = "Xeno pie" @@ -40,7 +40,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/cherrypie name = "Cherry pie" @@ -49,7 +49,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/cherrypie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/berryclafoutis name = "Berry clafoutis" @@ -58,7 +58,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/berryclafoutis - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/bearypie name = "Beary Pie" @@ -68,7 +68,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/amanitapie name = "Amanita pie" @@ -77,7 +77,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/amanita_pie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/plumppie name = "Plump pie" @@ -86,7 +86,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/applepie name = "Apple pie" @@ -95,7 +95,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/applepie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/pumpkinpie name = "Pumpkin pie" @@ -106,7 +106,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/goldenappletart name = "Golden apple tart" @@ -117,7 +117,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/appletart - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/grapetart name = "Grape tart" @@ -128,7 +128,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/blumpkinpie name = "Blumpkin pie" @@ -139,7 +139,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/dulcedebatata name = "Dulce de batata" @@ -149,7 +149,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata - category = CAT_PIE + subcategory = CAT_PIE /datum/crafting_recipe/food/frostypie name = "Frosty pie" @@ -158,4 +158,4 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pie/frostypie - category = CAT_PIE + subcategory = CAT_PIE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 8bb73ad7c86..95580df603e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -11,7 +11,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/margherita - category = CAT_PIZZA + subcategory = CAT_PIZZA /datum/crafting_recipe/food/meatpizza name = "Meat pizza" @@ -22,7 +22,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/meat - category = CAT_PIZZA + subcategory = CAT_PIZZA /datum/crafting_recipe/food/mushroompizza name = "Mushroom pizza" @@ -31,7 +31,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 5 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom - category = CAT_PIZZA + subcategory = CAT_PIZZA /datum/crafting_recipe/food/vegetablepizza name = "Vegetable pizza" @@ -43,7 +43,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable - category = CAT_PIZZA + subcategory = CAT_PIZZA /datum/crafting_recipe/food/donpocketpizza name = "Donkpocket pizza" @@ -54,7 +54,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket - category = CAT_PIZZA + subcategory = CAT_PIZZA /datum/crafting_recipe/food/dankpizza name = "Dank pizza" @@ -65,7 +65,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/dank - category = CAT_PIZZA + subcategory = CAT_PIZZA /datum/crafting_recipe/food/sassysagepizza name = "Sassysage pizza" @@ -76,4 +76,4 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage - category = CAT_PIZZA + subcategory = CAT_PIZZA diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index d60fc340839..66ed6f40ee4 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -11,7 +11,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/aesirsalad name = "Aesir salad" @@ -21,7 +21,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/validsalad name = "Valid salad" @@ -32,7 +32,7 @@ /obj/item/weapon/reagent_containers/food/snacks/faggot = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/monkeysdelight name = "Monkeys delight" @@ -45,7 +45,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/oatmeal name = "Oatmeal" @@ -55,7 +55,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/fruitsalad name = "Fruit salad" @@ -68,7 +68,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/fruit - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/junglesalad name = "Jungle salad" @@ -81,7 +81,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/jungle - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/citrusdelight name = "Citrus delight" @@ -93,7 +93,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/ricepork name = "Rice and pork" @@ -102,7 +102,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepork - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/eggbowl name = "Egg bowl" @@ -113,7 +113,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/corn = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl - category = CAT_SALAD + subcategory = CAT_SALAD /datum/crafting_recipe/food/ricepudding name = "Rice pudding" @@ -123,4 +123,4 @@ /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding - category = CAT_SALAD + subcategory = CAT_SALAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 3880dbdeca6..f2ed7da6aa0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -14,7 +14,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/sandwich - category = CAT_SANDWICH + subcategory = CAT_SANDWICH /datum/crafting_recipe/food/grilledcheesesandwich name = "Grilled cheese sandwich" @@ -23,7 +23,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese - category = CAT_SANDWICH + subcategory = CAT_SANDWICH /datum/crafting_recipe/food/slimesandwich name = "Jelly sandwich" @@ -32,7 +32,7 @@ /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2, ) result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime - category = CAT_SANDWICH + subcategory = CAT_SANDWICH /datum/crafting_recipe/food/cherrysandwich name = "Jelly sandwich" @@ -41,7 +41,7 @@ /obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2, ) result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry - category = CAT_SANDWICH + subcategory = CAT_SANDWICH /datum/crafting_recipe/food/icecreamsandwich name = "Icecream sandwich" @@ -51,7 +51,7 @@ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich - category = CAT_SANDWICH + subcategory = CAT_SANDWICH /datum/crafting_recipe/food/notasandwich name = "Not a sandwich" @@ -60,7 +60,7 @@ /obj/item/clothing/mask/fakemoustache = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/notasandwich - category = CAT_SANDWICH + subcategory = CAT_SANDWICH diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 8ab865f65db..9a2a39c8f29 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -13,7 +13,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/meatball - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/vegetablesoup name = "Vegetable soup" @@ -26,7 +26,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/vegetable - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/nettlesoup name = "Nettle soup" @@ -38,7 +38,7 @@ /obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/nettle - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/wingfangchu name = "Wingfangchu" @@ -48,7 +48,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/wishsoup name = "Wish soup" @@ -57,7 +57,7 @@ /obj/item/weapon/reagent_containers/glass/bowl = 1 ) result= /obj/item/weapon/reagent_containers/food/snacks/soup/wish - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/hotchili name = "Hot chili" @@ -68,7 +68,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/hotchili - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/coldchili name = "Cold chili" @@ -79,7 +79,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/coldchili - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/tomatosoup name = "Tomato soup" @@ -89,7 +89,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/eyeballsoup name = "Eyeball soup" @@ -100,7 +100,7 @@ /obj/item/organ/eyes = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/milosoup @@ -112,7 +112,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/milo - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/bloodsoup name = "Blood soup" @@ -122,7 +122,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/blood - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/slimesoup name = "Slime soup" @@ -132,7 +132,7 @@ /obj/item/weapon/reagent_containers/glass/bowl = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/slime - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/clownstears name = "Clowns tears" @@ -143,7 +143,7 @@ /obj/item/weapon/ore/bananium = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/clownstears - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/mysterysoup name = "Mystery soup" @@ -156,7 +156,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/mystery - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/mushroomsoup name = "Mushroom soup" @@ -167,7 +167,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/mushroom - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/beetsoup name = "Beet soup" @@ -178,7 +178,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1, ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/stew name = "Stew" @@ -193,7 +193,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/stew - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/spacylibertyduff name = "Spacy liberty duff" @@ -203,7 +203,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/spacylibertyduff - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/amanitajelly name = "Amanita jelly" @@ -213,7 +213,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita = 3 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/sweetpotatosoup name = "Sweet potato soup" @@ -224,7 +224,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato - category = CAT_SOUP + subcategory = CAT_SOUP /datum/crafting_recipe/food/redbeetsoup name = "Red beet soup" @@ -235,4 +235,4 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet/red - category = CAT_SOUP + subcategory = CAT_SOUP diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm index 412157033bd..ed6dc4bf41f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -10,7 +10,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato - category = CAT_SPAGHETTI + subcategory = CAT_SPAGHETTI /datum/crafting_recipe/food/copypasta name = "Copypasta" @@ -18,7 +18,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pastatomato = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/copypasta - category = CAT_SPAGHETTI + subcategory = CAT_SPAGHETTI /datum/crafting_recipe/food/spaghettimeatball name = "Spaghetti meatball" @@ -27,7 +27,7 @@ /obj/item/weapon/reagent_containers/food/snacks/faggot = 2 ) result = /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti - category = CAT_SPAGHETTI + subcategory = CAT_SPAGHETTI /datum/crafting_recipe/food/spesslaw name = "Spesslaw" @@ -36,7 +36,7 @@ /obj/item/weapon/reagent_containers/food/snacks/faggot = 4 ) result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw - category = CAT_SPAGHETTI + subcategory = CAT_SPAGHETTI /datum/crafting_recipe/food/beefnoodle name = "Beef noodle" @@ -47,7 +47,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/beefnoodle - category = CAT_SPAGHETTI + subcategory = CAT_SPAGHETTI /datum/crafting_recipe/food/chowmein name = "Chowmein" @@ -58,7 +58,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/chowmein - category = CAT_SPAGHETTI + subcategory = CAT_SPAGHETTI /datum/crafting_recipe/food/butternoodles name = "Butter Noodles" @@ -67,4 +67,4 @@ /obj/item/weapon/reagent_containers/food/snacks/butter = 1 ) result = /obj/item/weapon/reagent_containers/food/snacks/butternoodles - category = CAT_SPAGHETTI \ No newline at end of file + subcategory = CAT_SPAGHETTI \ No newline at end of file diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 527b6ff7365..23655607a87 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -98,9 +98,9 @@ GLOBAL_VAR_CONST(access_away_generic3, 207) GLOBAL_VAR_CONST(access_away_generic4, 208) /obj/var/list/req_access = null -/obj/var/req_access_txt = "0" +/obj/var/req_access_txt = "0" as text /obj/var/list/req_one_access = null -/obj/var/req_one_access_txt = "0" +/obj/var/req_one_access_txt = "0" as text //returns 1 if this mob has sufficient access to use this object /obj/proc/allowed(mob/M) diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index e0588acf2b5..373a937be25 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -71,11 +71,11 @@ if(!bounds) return - //initialize things that are normally initialized after map load - initTemplateBounds(bounds) - if(!SSmapping.loading_ruins) //Will be done manually during mapping ss init repopulate_sorted_areas() + + //initialize things that are normally initialized after map load + initTemplateBounds(bounds) log_game("[name] loaded at at [T.x],[T.y],[T.z]") return TRUE diff --git a/code/modules/mining/equipment/goliath_hide.dm b/code/modules/mining/equipment/goliath_hide.dm new file mode 100644 index 00000000000..e652bc6e940 --- /dev/null +++ b/code/modules/mining/equipment/goliath_hide.dm @@ -0,0 +1,42 @@ + +/obj/item/stack/sheet/animalhide/goliath_hide + name = "goliath hide plates" + desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna." + icon = 'icons/obj/mining.dmi' + icon_state = "goliath_hide" + singular_name = "hide plate" + max_amount = 6 + novariants = FALSE + flags = NOBLUDGEON + w_class = WEIGHT_CLASS_NORMAL + layer = MOB_LAYER + +/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag) + if(proximity_flag) + if(istype(target, /obj/item/clothing/suit/space/hardsuit/mining) || istype(target, /obj/item/clothing/head/helmet/space/hardsuit/mining) || istype(target, /obj/item/clothing/suit/hooded/explorer) || istype(target, /obj/item/clothing/head/hooded/explorer)) + var/obj/item/clothing/C = target + var/list/current_armor = C.armor + if(current_armor.["melee"] < 60) + current_armor.["melee"] = min(current_armor.["melee"] + 10, 60) + to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") + use(1) + else + to_chat(user, "You can't improve [C] any further!") + return + if(istype(target, /obj/mecha/working/ripley)) + var/obj/mecha/working/ripley/D = target + if(D.hides < 3) + D.hides++ + D.armor["melee"] = min(D.armor["melee"] + 10, 70) + D.armor["bullet"] = min(D.armor["bullet"] + 5, 50) + D.armor["laser"] = min(D.armor["laser"] + 5, 50) + to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") + D.update_icon() + if(D.hides == 3) + D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter." + else + D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." + qdel(src) + else + to_chat(user, "You can't improve [D] any further!") + return diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 6d8a99c1a2f..7fca3a315b6 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -21,7 +21,7 @@ sharpness = IS_SHARP var/list/trophies = list() var/charged = TRUE - var/charge_time = 14 + var/charge_time = 15 /obj/item/weapon/twohanded/required/mining_hammer/Destroy() for(var/a in trophies) @@ -92,16 +92,21 @@ for(var/t in trophies) var/obj/item/crusher_trophy/T = t T.on_mark_detonation(target, user) - new /obj/effect/temp_visual/kinetic_blast(get_turf(L)) - var/backstab_dir = get_dir(user, L) - var/def_check = L.getarmor(type = "bomb") - if((user.dir & backstab_dir) && (L.dir & backstab_dir)) - L.apply_damage(80, BRUTE, blocked = def_check) - playsound(user, 'sound/weapons/Kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong - else - L.apply_damage(50, BRUTE, blocked = def_check) - if(!QDELETED(C) && !QDELETED(L)) - C.total_damage += target_health - L.health //we did some damage, but let's not assume how much we did + if(!QDELETED(L)) + if(!QDELETED(C)) + C.total_damage += target_health - L.health //we did some damage, but let's not assume how much we did + new /obj/effect/temp_visual/kinetic_blast(get_turf(L)) + var/backstab_dir = get_dir(user, L) + var/def_check = L.getarmor(type = "bomb") + if((user.dir & backstab_dir) && (L.dir & backstab_dir)) + if(!QDELETED(C)) + C.total_damage += 80 //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item + L.apply_damage(80, BRUTE, blocked = def_check) + playsound(user, 'sound/weapons/Kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong + else + if(!QDELETED(C)) + C.total_damage += 50 + L.apply_damage(50, BRUTE, blocked = def_check) /obj/item/weapon/twohanded/required/mining_hammer/proc/Recharge() if(!charged) @@ -185,9 +190,70 @@ /obj/item/crusher_trophy/proc/on_mark_application(mob/living/target, datum/status_effect/crusher_mark/mark, had_mark) //the target, the mark applied, and if the target had a mark before /obj/item/crusher_trophy/proc/on_mark_detonation(mob/living/target, mob/living/user) //the target and the user +//goliath +/obj/item/crusher_trophy/goliath_tentacle + name = "goliath tentacle" + desc = "A sliced-off goliath tentacle. Suitable as a trophy for a kinetic crusher." + icon_state = "goliath_tentacle" + denied_type = /obj/item/crusher_trophy/goliath_tentacle + bonus_value = 2 + var/missing_health_ratio = 0.1 + var/missing_health_desc = 10 + +/obj/item/crusher_trophy/goliath_tentacle/effect_desc() + return "mark detonation to do [bonus_value] more damage for every [missing_health_desc] health you are missing" + +/obj/item/crusher_trophy/goliath_tentacle/on_mark_detonation(mob/living/target, mob/living/user) + var/missing_health = user.health - user.maxHealth + missing_health *= missing_health_ratio //bonus is active at all times, even if you're above 90 health + missing_health *= bonus_value //multiply the remaining amount by bonus_value + if(missing_health > 0) + target.adjustBruteLoss(missing_health) //and do that much damage + +//watcher +/obj/item/crusher_trophy/watcher_wing + name = "watcher wing" + desc = "A wing ripped from a watcher. Suitable as a trophy for a kinetic crusher." + icon_state = "watcher_wing" + denied_type = /obj/item/crusher_trophy/watcher_wing + bonus_value = 8 + +/obj/item/crusher_trophy/watcher_wing/effect_desc() + return "mark detonation to prevent certain creatures from using certain attacks for [bonus_value*0.1] second[bonus_value*0.1 == 1 ? "":"s"]" + +/obj/item/crusher_trophy/watcher_wing/on_mark_detonation(mob/living/target, mob/living/user) + if(ishostile(target)) + var/mob/living/simple_animal/hostile/H = target + if(H.ranged) //briefly delay ranged attacks + if(H.ranged_cooldown_time >= world.time) + H.ranged_cooldown_time += bonus_value + else + H.ranged_cooldown_time = bonus_value + world.time + +//legion +/obj/item/crusher_trophy/legion_skull + name = "legion skull" + desc = "A dead and lifeless legion skull. Suitable as a trophy for a kinetic crusher." + icon_state = "legion_skull" + denied_type = /obj/item/crusher_trophy/legion_skull + bonus_value = 3 + +/obj/item/crusher_trophy/legion_skull/effect_desc() + return "a kinetic crusher to recharge [bonus_value*0.1] second[bonus_value*0.1 == 1 ? "":"s"] faster" + +/obj/item/crusher_trophy/legion_skull/add_to(obj/item/weapon/twohanded/required/mining_hammer/H, mob/living/user) + . = ..() + if(.) + H.charge_time -= bonus_value + +/obj/item/crusher_trophy/legion_skull/remove_from(obj/item/weapon/twohanded/required/mining_hammer/H, mob/living/user) + . = ..() + if(.) + H.charge_time += bonus_value + //ash drake /obj/item/crusher_trophy/tail_spike - desc = "A spike taken from a ash drake's tail." + desc = "A spike taken from a ash drake's tail. Suitable as a trophy for a kinetic crusher." denied_type = /obj/item/crusher_trophy/tail_spike bonus_value = 5 @@ -210,7 +276,7 @@ //bubblegum /obj/item/crusher_trophy/demon_claws name = "demon claws" - desc = "A set of blood-drenched claws from a massive demon's hand." + desc = "A set of blood-drenched claws from a massive demon's hand. Suitable as a trophy for a kinetic crusher." icon_state = "demon_claws" gender = PLURAL denied_type = /obj/item/crusher_trophy/demon_claws @@ -244,7 +310,7 @@ //colossus /obj/item/crusher_trophy/blaster_tubes name = "blaster tubes" - desc = "The blaster tubes from a colossus's arm." + desc = "The blaster tubes from a colossus's arm. Suitable as a trophy for a kinetic crusher." icon_state = "blaster_tubes" gender = PLURAL denied_type = /obj/item/crusher_trophy/blaster_tubes @@ -273,7 +339,7 @@ //hierophant /obj/item/crusher_trophy/vortex_talisman name = "vortex talisman" - desc = "A glowing trinket that was originally the Hierophant's beacon." + desc = "A glowing trinket that was originally the Hierophant's beacon. Suitable as a trophy for a kinetic crusher." icon_state = "vortex_talisman" denied_type = /obj/item/crusher_trophy/vortex_talisman diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 2770897c34f..49e8adad68e 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( icon_state = "marker" merge_type = /obj/item/stack/marker_beacon max_amount = 100 + novariants = TRUE var/picked_color = "random" /obj/item/stack/marker_beacon/ten //miners start with 10 of these @@ -55,14 +56,14 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( var/obj/structure/marker_beacon/M = new(user.loc, picked_color) transfer_fingerprints_to(M) -/obj/item/stack/marker_beacon/AltClick(mob/user) - if(user.incapacitated()) +/obj/item/stack/marker_beacon/AltClick(mob/living/user) + if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") return if(!in_range(src, user)) return var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors - if(user.incapacitated() || !in_range(src, user)) + if(user.incapacitated() || !istype(user) || !in_range(src, user)) return if(input_color) picked_color = input_color @@ -127,15 +128,15 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( else return ..() -/obj/structure/marker_beacon/AltClick(mob/user) +/obj/structure/marker_beacon/AltClick(mob/living/user) ..() - if(user.incapacitated()) + if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") return if(!in_range(src, user)) return var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors - if(user.incapacitated() || !in_range(src, user)) + if(user.incapacitated() || !istype(user) || !in_range(src, user)) return if(input_color) picked_color = input_color diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm new file mode 100644 index 00000000000..68433791640 --- /dev/null +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -0,0 +1,128 @@ +/*********************Hivelord stabilizer****************/ +/obj/item/weapon/hivelordstabilizer + name = "stabilizing serum" + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle19" + desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely." + w_class = WEIGHT_CLASS_TINY + origin_tech = "biotech=3" + +/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user) + var/obj/item/organ/regenerative_core/C = M + if(!istype(C, /obj/item/organ/regenerative_core)) + to_chat(user, "The stabilizer only works on certain types of monster organs, generally regenerative in nature.") + return ..() + + C.preserved() + to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.") + qdel(src) + +/************************Hivelord core*******************/ +/obj/item/organ/regenerative_core + name = "regenerative core" + desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness." + icon_state = "roro core 2" + flags = NOBLUDGEON + slot = "hivecore" + force = 0 + actions_types = list(/datum/action/item_action/organ_action/use) + var/inert = 0 + var/preserved = 0 + +/obj/item/organ/regenerative_core/Initialize() + . = ..() + addtimer(CALLBACK(src, .proc/inert_check), 2400) + +/obj/item/organ/regenerative_core/proc/inert_check() + if(!preserved) + go_inert() + +/obj/item/organ/regenerative_core/proc/preserved(implanted = 0) + inert = FALSE + preserved = TRUE + update_icon() + desc = "All that remains of a hivelord. It is preserved, allowing you to use it to heal completely without danger of decay." + if(implanted) + SSblackbox.add_details("hivelord_core", "[type]|implanted") + else + SSblackbox.add_details("hivelord_core", "[type]|stabilizer") + +/obj/item/organ/regenerative_core/proc/go_inert() + inert = TRUE + name = "decayed regenerative core" + desc = "All that remains of a hivelord. It has decayed, and is completely useless." + SSblackbox.add_details("hivelord_core", "[type]|inert") + update_icon() + +/obj/item/organ/regenerative_core/ui_action_click() + if(inert) + to_chat(owner, "[src] breaks down as it tries to activate.") + else + owner.revive(full_heal = 1) + qdel(src) + +/obj/item/organ/regenerative_core/on_life() + ..() + if(owner.health < HEALTH_THRESHOLD_CRIT) + ui_action_click() + +/obj/item/organ/regenerative_core/afterattack(atom/target, mob/user, proximity_flag) + if(proximity_flag && ishuman(target)) + var/mob/living/carbon/human/H = target + if(inert) + to_chat(user, "[src] has decayed and can no longer be used to heal.") + return + else + if(H.stat == DEAD) + to_chat(user, "[src] are useless on the dead.") + return + if(H != user) + H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!") + SSblackbox.add_details("hivelord_core","[src.type]|used|other") + else + to_chat(user, "You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.") + SSblackbox.add_details("hivelord_core","[src.type]|used|self") + H.revive(full_heal = 1) + qdel(src) + ..() + +/obj/item/organ/regenerative_core/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) + . = ..() + if(!preserved && !inert) + preserved(TRUE) + owner.visible_message("[src] stabilizes as it's inserted.") + +/obj/item/organ/regenerative_core/Remove(mob/living/carbon/M, special = 0) + if(!inert && !special) + owner.visible_message("[src] rapidly decays as it's removed.") + go_inert() + return ..() + +/obj/item/organ/regenerative_core/prepare_eat() + return null + +/*************************Legion core********************/ +/obj/item/organ/regenerative_core/legion + desc = "A strange rock that crackles with power. It can be used to heal completely, but it will rapidly decay into uselessness." + icon_state = "legion_soul" + +/obj/item/organ/regenerative_core/legion/Initialize() + . = ..() + update_icon() + +/obj/item/organ/regenerative_core/update_icon() + icon_state = inert ? "legion_soul_inert" : "legion_soul" + cut_overlays() + if(!inert && !preserved) + add_overlay("legion_soul_crackle") + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + +/obj/item/organ/regenerative_core/legion/go_inert() + ..() + desc = "[src] has become inert. It has decayed, and is completely useless." + +/obj/item/organ/regenerative_core/legion/preserved(implanted = 0) + ..() + desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay." diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 93244b7ef8b..e28b0c51ab8 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -67,6 +67,12 @@ new /obj/effect/particle_effect/smoke(get_turf(src)) qdel(src) +/obj/item/weapon/survivalcapsule/luxury + name = "luxury bluespace shelter capsule" + desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace." + origin_tech = "engineering=3;bluespace=4" + template_id = "shelter_beta" + //Pod objects //Window @@ -77,6 +83,11 @@ smooth = SMOOTH_MORE canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod) +/obj/structure/window/reinforced/survival_pod + name = "pod window" + icon = 'icons/obj/lavaland/survival_pod.dmi' + icon_state = "pwindow" + //Door /obj/machinery/door/airlock/survival_pod name = "airlock" @@ -122,6 +133,12 @@ dir = EAST expected_dir = EAST +//Windoor +/obj/machinery/door/window/survival_pod + icon = 'icons/obj/lavaland/survival_pod.dmi' + icon_state = "windoor" + base_state = "windoor" + //Table /obj/structure/table/survival_pod icon = 'icons/obj/lavaland/survival_pod.dmi' @@ -280,3 +297,37 @@ anchored = TRUE layer = BELOW_MOB_LAYER density = FALSE + +/obj/item/fakeartefact + name = "expensive forgery" + icon = 'icons/mob/screen_gen.dmi' + icon_state = "x2" + var/possible = list(/obj/item/ship_in_a_bottle, + /obj/item/weapon/gun/energy/pulse, + /obj/item/weapon/sleeping_carp_scroll, + /obj/item/weapon/melee/supermatter_sword, + /obj/item/weapon/shield/changeling, + /obj/item/weapon/lava_staff, + /obj/item/weapon/katana/energy, + /obj/item/weapon/hierophant_club, + /obj/item/weapon/his_grace, + /obj/item/weapon/gun/ballistic/minigun, + /obj/item/weapon/gun/ballistic/automatic/l6_saw, + /obj/item/weapon/gun/magic/staff/chaos, + /obj/item/weapon/gun/magic/staff/spellblade, + /obj/item/weapon/gun/magic/wand/death, + /obj/item/weapon/gun/magic/wand/fireball, + /obj/item/stack/telecrystal/twenty, + /obj/item/nuke_core, + /obj/item/phylactery, + /obj/item/riding_offhand, + /obj/item/weapon/banhammer) + +/obj/item/fakeartefact/Initialize() + . = ..() + var/obj/item/I = pick(possible) + name = initial(I.name) + icon = initial(I.icon) + desc = initial(I.desc) + icon_state = initial(I.icon_state) + item_state = initial(I.item_state) \ No newline at end of file diff --git a/code/modules/mining/equipment/vendor_items.dm b/code/modules/mining/equipment/vendor_items.dm index 4ff83ea21f7..8868d4655b5 100644 --- a/code/modules/mining/equipment/vendor_items.dm +++ b/code/modules/mining/equipment/vendor_items.dm @@ -12,22 +12,3 @@ /obj/item/clothing/mask/facehugger/toy/Die() return - -/*********************Hivelord stabilizer****************/ -/obj/item/weapon/hivelordstabilizer - name = "stabilizing serum" - icon = 'icons/obj/chemical.dmi' - icon_state = "bottle19" - desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely." - w_class = WEIGHT_CLASS_TINY - origin_tech = "biotech=3" - -/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user) - var/obj/item/organ/hivelord_core/C = M - if(!istype(C, /obj/item/organ/hivelord_core)) - to_chat(user, "The stabilizer only works on certain types of monster organs, generally regenerative in nature.") - return ..() - - C.preserved() - to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.") - qdel(src) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 8b18c610771..59dcc324f8b 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -11,7 +11,7 @@ desc = "It's watching you suspiciously." /obj/structure/closet/crate/necropolis/tendril/PopulateContents() - var/loot = rand(1,26) + var/loot = rand(1,28) switch(loot) if(1) new /obj/item/device/shared_storage/red(src) @@ -28,9 +28,7 @@ if(7) new /obj/item/weapon/pickaxe/diamond(src) if(8) - new /obj/item/clothing/head/culthood(src) - new /obj/item/clothing/suit/cultrobes(src) - new /obj/item/weapon/bedsheet/cult(src) + new /obj/item/borg/upgrade/modkit/resonator_blasts(src) if(9) new /obj/item/organ/brain/alien(src) if(10) @@ -40,7 +38,7 @@ if(12) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src) if(13) - new /obj/item/weapon/sord(src) + new /obj/item/borg/upgrade/modkit/cooldown/repeater(src) if(14) new /obj/item/weapon/nullrod/scythe/talking(src) if(15) @@ -68,6 +66,11 @@ new /obj/item/weapon/spellbook/oneuse/summonitem(src) if(26) new /obj/item/book_of_babel(src) + if(27) + new /obj/item/borg/upgrade/modkit/lifesteal(src) + new /obj/item/weapon/bedsheet/cult(src) + if(28) + new /obj/item/borg/upgrade/modkit/bounty(src) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index ee60463d04d..6647ebfca98 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -17,7 +17,7 @@ var/ore_pickup_rate = 15 var/sheet_per_ore = 1 var/point_upgrade = 1 - var/list/ore_values = list("sand" = 1, "iron" = 1, "plasma" = 15, "silver" = 16, "gold" = 18, "titanium" = 30, "uranium" = 30, "diamond" = 50, "bluespace crystal" = 50, "bananium" = 60) + var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60) speed_process = 1 var/message_sent = FALSE var/list/ore_buffer = list() @@ -94,7 +94,7 @@ if(!M || !redemption_mat) return 0 - var/smeltable_sheets = round(redemption_mat.amount / M) + var/smeltable_sheets = Floor(redemption_mat.amount / M) if(!smeltable_sheets) return 0 @@ -194,6 +194,12 @@ inserted_disk = W return TRUE + if(istype(W, /obj/item/stack/sheet)) + var/obj/item/stack/sheet/S = W + var/inserted = materials.insert_stack(S, S.amount) + to_chat(user, "You add [inserted] [S] sheets to \the [src].") + return + return ..() /obj/machinery/mineral/ore_redemption/on_deconstruction() @@ -205,142 +211,147 @@ return interact(user) -/obj/machinery/mineral/ore_redemption/interact(mob/user) - var/dat = "This machine only accepts ore. Gibtonite and Slag are not accepted.

" - dat += "Current unclaimed points: [points]
" +/obj/machinery/mineral/ore_redemption/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "ore_redemption_machine", "Ore Redemption Machine", 440, 550, master_ui, state) + ui.open() +/obj/machinery/mineral/ore_redemption/ui_data(mob/user) + var/list/data = list() + data["unclaimedPoints"] = points if(inserted_id) - dat += "You have [inserted_id.mining_points] mining points collected. Eject ID.
" - dat += "Claim points.

" - else - dat += "No ID inserted. Insert ID.

" + data["hasID"] = TRUE + data["claimedPoints"] = inserted_id.mining_points + data["materials"] = list() for(var/mat_id in materials.materials) var/datum/material/M = materials.materials[mat_id] - if(M.amount) - var/sheet_amount = M.amount / MINERAL_MATERIAL_AMOUNT - dat += "[capitalize(M.name)]: [sheet_amount] " - if(sheet_amount >= 1) - dat += "Release
" - else - dat += "Release
" - - dat += "
Alloys:
" + var/sheet_amount = M.amount ? M.amount / MINERAL_MATERIAL_AMOUNT : "0" + data["materials"] += list(list("name" = M.name, "id" = M.id, "amount" = sheet_amount, "value" = ore_values[M.id] * point_upgrade)) + data["alloys"] = list() for(var/v in files.known_designs) var/datum/design/D = files.known_designs[v] - if(can_smelt_alloy(D)) - dat += "[D.name]: Smelt
" - else - dat += "[D.name]: Smelt
" - - dat += "
Mineral Value List:
[get_ore_values()]
" - + data["alloys"] += list(list("name" = D.name, "id" = D.id, "amount" = can_smelt_alloy(D))) + data["diskDesigns"] = list() if(inserted_disk) - dat += "Eject disk
" - dat += "
Uploadable designs:
" + data["hasDisk"] = TRUE + if(inserted_disk.blueprints.len) + var/index = 1 + for (var/datum/design/thisdesign in inserted_disk.blueprints) + if(thisdesign) + data["diskDesigns"] += list(list("name" = thisdesign.name, "index" = index, "canupload" = thisdesign.build_type&SMELTER)) + index++ + return data - for(var/i in 1 to inserted_disk.max_blueprints) - if(inserted_disk.blueprints[i]) - var/datum/design/D = inserted_disk.blueprints[i] - if(D.build_type & SMELTER) - dat += "Name: [D.name] Upload to smelter" - - dat += "

" - else - dat += "Insert design disk

" - - var/datum/browser/popup = new(user, "ore_redemption_machine", "Ore Redemption Machine", 400, 500) - popup.set_content(dat) - popup.open() - return - -/obj/machinery/mineral/ore_redemption/proc/get_ore_values() - var/dat = "" - for(var/ore in ore_values) - var/value = ore_values[ore] - dat += "" - dat += "
[capitalize(ore)][value * point_upgrade]
" - return dat - -/obj/machinery/mineral/ore_redemption/Topic(href, href_list) +/obj/machinery/mineral/ore_redemption/ui_act(action, params) if(..()) return - if(href_list["eject_id"]) - usr.put_in_hands(inserted_id) - inserted_id = null - if(href_list["claim"]) - if(inserted_id) - if(req_access_reclaim in inserted_id.access) + switch(action) + if("Eject") + if(!inserted_id) + return + usr.put_in_hands(inserted_id) + inserted_id = null + return TRUE + if("Insert") + var/obj/item/weapon/card/id/I = usr.get_active_held_item() + if(istype(I)) + if(!usr.transferItemToLoc(I,src)) + return + inserted_id = I + else + to_chat(usr, "Not a valid ID!") + return TRUE + if("Claim") + if(inserted_id) inserted_id.mining_points += points points = 0 + return TRUE + if("Release") + + if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user + var/out = get_step(src, output_dir) + if(params["id"] == "all") + materials.retrieve_all(out) + else + var/mat_id = params["id"] + if(!materials.materials[mat_id]) + return + var/datum/material/mat = materials.materials[mat_id] + var/stored_amount = mat.amount / MINERAL_MATERIAL_AMOUNT + + if(!stored_amount) + return + + var/desired = 0 + if (params["sheets"]) + desired = text2num(params["sheets"]) + else + desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num + + var/sheets_to_remove = round(min(desired,50,stored_amount)) + materials.retrieve_sheets(sheets_to_remove, mat_id, out) + else to_chat(usr, "Required access not found.") - else if(href_list["insert_id"]) - var/obj/item/weapon/card/id/I = usr.get_active_held_item() - if(istype(I)) - if(!usr.transferItemToLoc(I,src)) - return - inserted_id = I - else - to_chat(usr, "Not a valid ID!") - if(href_list["eject_disk"]) - if(inserted_disk) - inserted_disk.forceMove(loc) - inserted_disk = null - if(href_list["insert_disk"]) - var/obj/item/weapon/disk/design_disk/D = usr.get_active_held_item() - if(istype(D)) - if(!usr.transferItemToLoc(D,src)) - return - inserted_disk = D - if(href_list["upload"]) - var/n = text2num(href_list["upload"]) - if(inserted_disk && inserted_disk.blueprints && inserted_disk.blueprints[n]) - files.AddDesign2Known(inserted_disk.blueprints[n]) - - if(href_list["release"]) - if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user - var/mat_id = href_list["release"] - if(!materials.materials[mat_id]) - return - - var/datum/material/mat = materials.materials[mat_id] - var/stored_amount = mat.amount / MINERAL_MATERIAL_AMOUNT - - if(!stored_amount) - return - - var/desired = input("How many sheets?", "How many sheets to eject?", 1) as null|num - var/sheets_to_remove = round(min(desired,50,stored_amount)) - - var/out = get_step(src, output_dir) - materials.retrieve_sheets(sheets_to_remove, mat_id, out) - - else - to_chat(usr, "Required access not found.") - - if(href_list["alloy"]) - var/alloy_id = href_list["alloy"] - var/datum/design/alloy = files.FindDesignByID(alloy_id) - if((check_access(inserted_id) || allowed(usr)) && alloy) - var/desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num - var/smelt_amount = can_smelt_alloy(alloy) - var/amount = round(min(desired,50,smelt_amount)) - materials.use_amount(alloy.materials, amount) - - var/output = new alloy.build_path(src) - if(istype(output, /obj/item/stack/sheet)) - var/obj/item/stack/sheet/mineral/produced_alloy = output - produced_alloy.amount = amount - unload_mineral(produced_alloy) + return TRUE + if("diskInsert") + var/obj/item/weapon/disk/design_disk/disk = usr.get_active_held_item() + if(istype(disk)) + if(!usr.transferItemToLoc(disk,src)) + return + inserted_disk = disk else - unload_mineral(output) - - else - to_chat(usr, "Required access not found.") - updateUsrDialog() - return + to_chat(usr, "Not a valid Design Disk!") + return TRUE + if("diskEject") + if(inserted_disk) + usr.put_in_hands(inserted_disk) + inserted_disk = null + return TRUE + if("diskUpload") + var/n = text2num(params["design"]) + if(inserted_disk && inserted_disk.blueprints && inserted_disk.blueprints[n]) + files.AddDesign2Known(inserted_disk.blueprints[n]) + return TRUE + if("Smelt") + var/alloy_id = params["id"] + var/datum/design/alloy = files.FindDesignByID(alloy_id) + if((check_access(inserted_id) || allowed(usr)) && alloy) + var/smelt_amount = can_smelt_alloy(alloy) + var/desired = 0 + if (params["sheets"]) + desired = text2num(params["sheets"]) + else + desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num + var/amount = round(min(desired,50,smelt_amount)) + materials.use_amount(alloy.materials, amount) + var/output = new alloy.build_path(src) + if(istype(output, /obj/item/stack/sheet)) + var/obj/item/stack/sheet/produced_alloy = output + produced_alloy.amount = amount + unload_mineral(produced_alloy) + else + unload_mineral(output) + else + to_chat(usr, "Required access not found.") + return TRUE + if("SmeltAll") + var/alloy_id = params["id"] + var/datum/design/alloy = files.FindDesignByID(alloy_id) + if((check_access(inserted_id) || allowed(usr)) && alloy) + var/smelt_amount = can_smelt_alloy(alloy) + while(smelt_amount > 0) + materials.use_amount(alloy.materials) + smelt_amount-- + var/output = new alloy.build_path(src) + unload_mineral(output) + CHECK_TICK + else + to_chat(usr, "Required access not found.") + return TRUE /obj/machinery/mineral/ore_redemption/ex_act(severity, target) do_sparks(5, TRUE, src) @@ -355,4 +366,4 @@ icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]-off" - return \ No newline at end of file + return diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 5e3064eeb58..c2ae6f7e353 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -39,6 +39,7 @@ new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500), + new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/weapon/survivalcapsule/luxury, 3000), new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100), new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150), new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index f5214e48362..595df2a3df9 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -260,7 +260,6 @@ else user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.") log_game("[key_name(user)] has primed a [name] for detonation at [A][COORD(bombturf)]") - spawn(det_time) if(primed) if(quality == 3) explosion(src.loc,2,4,9,adminlog = notify_admins) diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index efb14b9b146..78ef8802003 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -40,3 +40,18 @@ /datum/map_template/shelter/alpha/New() . = ..() whitelisted_turfs = typecacheof(/turf/closed/mineral) + + +/datum/map_template/shelter/beta + name = "Shelter Beta" + shelter_id = "shelter_beta" + description = "An extremly luxurious shelter, containing all \ + the amenities of home, including carpeted floors, hot and cold \ + running water, a gourmet three course meal, cooking facilities, \ + and a deluxe companion to keep you from getting lonely during \ + an ash storm." + mappath = "_maps/templates/shelter_2.dmm" + +/datum/map_template/shelter/beta/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 5dfea0aaa8b..2a4cd1ba2ca 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -322,28 +322,9 @@ if(isliving(equip)) //Borgs get borged in the equip, so we need to make sure we handle the new mob. character = equip - var/D - if(GLOB.latejoin.len) - D = get_turf(pick(GLOB.latejoin)) - if(!D) - for(var/turf/T in get_area_turfs(/area/shuttle/arrival)) - if(!T.density) - var/clear = 1 - for(var/obj/O in T) - if(O.density) - clear = 0 - break - if(clear) - D = T - continue - - character.loc = D + SSjob.SendToLateJoin(character) character.update_parallax_teleport() - var/atom/movable/chair = locate(/obj/structure/chair) in character.loc - if(chair) - chair.buckle_mob(character) - SSticker.minds += character.mind var/mob/living/carbon/human/humanc diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index a075c80e5cb..c30c7dbcfad 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -65,12 +65,22 @@ GLOBAL_VAR(posibrain_notify_cooldown) /obj/item/device/mmi/posibrain/attack_ghost(mob/user) activate(user) +/obj/item/device/mmi/posibrain/proc/is_occupied() + if(brainmob.key) + return TRUE + if(iscyborg(loc)) + var/mob/living/silicon/robot/R = loc + if(R.mmi == src) + return TRUE + return FALSE + //Two ways to activate a positronic brain. A clickable link in the ghost notif, or simply clicking the object itself. /obj/item/device/mmi/posibrain/proc/activate(mob/user) if(QDELETED(brainmob)) return - if(brainmob.key || jobban_isbanned(user,"posibrain")) + if(is_occupied() || jobban_isbanned(user,"posibrain")) return + var/posi_ask = alert("Become a [name]? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No") if(posi_ask == "No" || QDELETED(src)) return @@ -98,7 +108,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) /obj/item/device/mmi/posibrain/proc/transfer_personality(mob/candidate) if(QDELETED(brainmob)) return - if(brainmob.key) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. + if(is_occupied()) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. to_chat(candidate, "This brain has already been taken! Please try your possession again later!") return FALSE if(candidate.mind && !isobserver(candidate)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 13ed9e26d48..6f0b7d375d0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -38,7 +38,7 @@ #define MAX_ALIEN_LEAP_DIST 7 /mob/living/carbon/alien/humanoid/hunter/proc/leap_at(atom/A) - if(pounce_cooldown) + if(pounce_cooldown > world.time) to_chat(src, "You are too fatigued to pounce right now!") return @@ -83,9 +83,7 @@ Weaken(2, 1, 1) toggle_leap(0) - pounce_cooldown = !pounce_cooldown - spawn(pounce_cooldown_time) //3s by default - pounce_cooldown = !pounce_cooldown + pounce_cooldown = world.time + pounce_cooldown_time else if(A.density && !A.CanPass(src)) visible_message("[src] smashes into [A]!", "[src] smashes into [A]!") Weaken(2, 1, 1) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6206f7f2f41..8222c1f46b2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -36,9 +36,6 @@ //initialise organs create_internal_organs() - if(mind) - mind.martial_art = mind.default_martial_art - handcrafting = new() ..() diff --git a/code/modules/mob/living/carbon/human/interactive.dm b/code/modules/mob/living/carbon/human/interactive.dm index 9b4f963d075..c93a79f4fc6 100644 --- a/code/modules/mob/living/carbon/human/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive.dm @@ -1540,7 +1540,7 @@ if(stunning && stunCheck.stunned) shouldFire = 0 if(shouldFire) - if(P.power_supply.charge <= 10) // can shoot seems to bug out for tasers, using this hacky method instead + if(P.cell.charge <= 10) // can shoot seems to bug out for tasers, using this hacky method instead P.update_icon() npcDrop(P,1) else diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index f1ff497a2a9..cc32be6f2f7 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/code/modules/mob/living/carbon/human/status_procs.dm @@ -6,17 +6,20 @@ /mob/living/carbon/human/Weaken(amount, updating = 1, ignore_canstun = 0) amount = dna.species.spec_stun(src,amount) return ..() - + /mob/living/carbon/human/Paralyse(amount, updating = 1, ignore_canstun = 0) amount = dna.species.spec_stun(src,amount) return ..() - + /mob/living/carbon/human/cure_husk() . = ..() if(.) update_hair() /mob/living/carbon/human/become_husk() + if(istype(dna.species, /datum/species/skeleton)) //skeletons shouldn't be husks. + cure_husk() + return . = ..() if(.) update_hair() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 30205e262f5..80f0eff3144 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -53,7 +53,7 @@ var/control_disabled = 0 // Set to 1 to stop AI from interacting via Click() var/malfhacking = 0 // More or less a copy of the above var, so that malf AIs can hack and still get new cyborgs -- NeoFite - var/malf_cooldown = 0 //Cooldown var for malf modules + var/malf_cooldown = 0 //Cooldown var for malf modules, stores a worldtime + cooldown var/obj/machinery/power/apc/malfhack = null var/explosive = 0 //does the AI explode when it dies? diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index d9b157b024a..1b6c67ecc63 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -25,7 +25,7 @@ spawn(10) explosion(src.loc, 3, 6, 12, 15) - for(var/obj/machinery/ai_status_display/O in world) //change status + for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status if(src.key) O.mode = 2 if(istype(loc, /obj/item/device/aicard)) @@ -42,4 +42,4 @@ if(doomsday_device) doomsday_device.timing = FALSE SSshuttle.clearHostileEnvironment(doomsday_device) - qdel(doomsday_device) \ No newline at end of file + qdel(doomsday_device) diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm index 5fd5965f401..109abfe4099 100644 --- a/code/modules/mob/living/silicon/ai/login.dm +++ b/code/modules/mob/living/silicon/ai/login.dm @@ -6,7 +6,7 @@ client.images += blood if(stat != DEAD) - for(var/obj/machinery/ai_status_display/O in GLOB.machines) //change status + for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status O.mode = 1 O.emotion = "Neutral" view_core() diff --git a/code/modules/mob/living/silicon/ai/logout.dm b/code/modules/mob/living/silicon/ai/logout.dm index 7a7670cfcb4..fe5ea98c49e 100644 --- a/code/modules/mob/living/silicon/ai/logout.dm +++ b/code/modules/mob/living/silicon/ai/logout.dm @@ -1,5 +1,5 @@ /mob/living/silicon/ai/Logout() ..() - for(var/obj/machinery/ai_status_display/O in world) //change status + for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status O.mode = 0 view_core() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 6bd320ea5c4..6a44db9a8d2 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -79,7 +79,7 @@ /mob/living/silicon/pai/Destroy() GLOB.pai_list -= src - ..() + return ..() /mob/living/silicon/pai/Initialize() var/obj/item/device/paicard/P = loc diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a35e15dc7b7..2b7cc679f98 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -97,6 +97,9 @@ buckle_lying = FALSE can_ride_typecache = list(/mob/living/carbon/human) +/mob/living/silicon/robot/get_cell() + return cell + /mob/living/silicon/robot/Initialize(mapload) spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, src) @@ -195,6 +198,10 @@ if(module.type != /obj/item/weapon/robot_module) return + if(wires.is_cut(WIRE_RESET_MODULE)) + to_chat(src,"ERROR: Module installer reply timeout. Please check internal connections.") + return + var/list/modulelist = list("Standard" = /obj/item/weapon/robot_module/standard, \ "Engineering" = /obj/item/weapon/robot_module/engineering, \ "Medical" = /obj/item/weapon/robot_module/medical, \ diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 01c700768f1..96247fa1b1d 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -56,7 +56,7 @@ add_fingerprint(user) if(opened && !wiresexposed && !issilicon(user)) if(cell) - cell.updateicon() + cell.update_icon() cell.add_fingerprint(user) user.put_in_active_hand(cell) to_chat(user, "You remove \the [cell].") diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 92e6448cb37..291ab0fbdb5 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -149,8 +149,8 @@ F.update_icon() else if(istype(I, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = I - if(B.bcell) - B.bcell.charge = B.bcell.maxcharge + if(B.cell) + B.cell.charge = B.cell.maxcharge else if(istype(I, /obj/item/weapon/gun/energy)) var/obj/item/weapon/gun/energy/EG = I if(!EG.chambered) @@ -250,7 +250,7 @@ ratvar_modules = list( /obj/item/clockwork/slab/cyborg, /obj/item/clockwork/ratvarian_spear/cyborg, - /obj/item/clockwork/clockwork_proselytizer/cyborg) + /obj/item/clockwork/replica_fabricator/cyborg) moduleselect_icon = "standard" feedback_key = "cyborg_standard" hat_offset = -3 @@ -314,7 +314,7 @@ emag_modules = list(/obj/item/borg/stun) ratvar_modules = list( /obj/item/clockwork/slab/cyborg/engineer, - /obj/item/clockwork/clockwork_proselytizer/cyborg) + /obj/item/clockwork/replica_fabricator/cyborg) cyborg_base_icon = "engineer" moduleselect_icon = "engineer" feedback_key = "cyborg_engineering" @@ -347,9 +347,9 @@ ..() var/obj/item/weapon/gun/energy/e_gun/advtaser/cyborg/T = locate(/obj/item/weapon/gun/energy/e_gun/advtaser/cyborg) in basic_modules if(T) - if(T.power_supply.charge < T.power_supply.maxcharge) + if(T.cell.charge < T.cell.maxcharge) var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select] - T.power_supply.give(S.e_cost * coeff) + T.cell.give(S.e_cost * coeff) T.update_icon() else T.charge_tick = 0 @@ -393,7 +393,7 @@ emag_modules = list(/obj/item/weapon/reagent_containers/spray/cyborg_lube) ratvar_modules = list( /obj/item/clockwork/slab/cyborg/janitor, - /obj/item/clockwork/clockwork_proselytizer/cyborg) + /obj/item/clockwork/replica_fabricator/cyborg) cyborg_base_icon = "janitor" moduleselect_icon = "janitor" feedback_key = "cyborg_janitor" diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 8d21cfb7f62..11c660224ca 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -4,6 +4,7 @@ /mob/living/proc/robot_talk(message) log_say("[key_name(src)] : [message]") + log_message(message, INDIVIDUAL_SAY_LOG) var/desig = "Default Cyborg" //ezmode for taters if(issilicon(src)) var/mob/living/silicon/S = src diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 81bf1145f85..893c34ea656 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -364,15 +364,15 @@ Auto Patrol[]"}, if(!lasercolor) var/obj/item/weapon/gun/energy/e_gun/advtaser/G = new /obj/item/weapon/gun/energy/e_gun/advtaser(Tsec) - G.power_supply.charge = 0 + G.cell.charge = 0 G.update_icon() else if(lasercolor == "b") var/obj/item/weapon/gun/energy/laser/bluetag/G = new /obj/item/weapon/gun/energy/laser/bluetag(Tsec) - G.power_supply.charge = 0 + G.cell.charge = 0 G.update_icon() else if(lasercolor == "r") var/obj/item/weapon/gun/energy/laser/redtag/G = new /obj/item/weapon/gun/energy/laser/redtag(Tsec) - G.power_supply.charge = 0 + G.cell.charge = 0 G.update_icon() if(prob(50)) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index de7fece4ad5..edc4d71812a 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -44,6 +44,7 @@ gold_core_spawnable = 2 /mob/living/simple_animal/pet/dog/Initialize() + . = ..() var/dog_area = get_area(src) for(var/obj/structure/bed/dogbed/D in dog_area) if(!D.owner) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 5c78995be9e..66d8a0520cb 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -121,14 +121,14 @@ hacked = TRUE visualAppearence = CLOCKDRONE can_be_held = FALSE - flavortext = "You are a cogscarab, a clockwork creation of Ratvar. As a cogscarab, you have low health, an inbuilt proselytizer that can convert brass \ - to liquified alloy, a set of relatively fast tools, can communicate over the Hierophant Network with :b, and are immune to extreme \ + flavortext = "You are a cogscarab, a clockwork creation of Ratvar. As a cogscarab, you have low health, an inbuilt fabricator that can convert brass \ + to power, a set of relatively fast tools, can communicate over the Hierophant Network with :b, and are immune to extreme \ temperatures and pressures. \nYour goal is to serve the Justiciar and his servants by repairing and defending all they create." -/mob/living/simple_animal/drone/cogscarab/ratvar //a subtype for spawning when ratvar is alive, has a slab that it can use and a normal proselytizer +/mob/living/simple_animal/drone/cogscarab/ratvar //a subtype for spawning when ratvar is alive, has a slab that it can use and a normal fabricator default_storage = /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar -/mob/living/simple_animal/drone/cogscarab/admin //an admin-only subtype of cogscarab with a no-cost proselytizer and slab in its box +/mob/living/simple_animal/drone/cogscarab/admin //an admin-only subtype of cogscarab with a no-cost fabricator and slab in its box default_storage = /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/admin /mob/living/simple_animal/drone/cogscarab/Initialize() @@ -168,9 +168,7 @@ ..() /mob/living/simple_animal/drone/cogscarab/can_use_guns(obj/item/weapon/gun/G) - if(!GLOB.ratvar_awakens) - changeNext_move(CLICK_CD_RANGE*4) //about as much delay as an unupgraded kinetic accelerator - return TRUE + return GLOB.ratvar_awakens /mob/living/simple_animal/drone/cogscarab/get_armor_effectiveness() if(GLOB.ratvar_awakens) diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm index abcc9cf6a33..523d990ad1b 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -21,7 +21,7 @@ /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget() . = ..() if(. && ishuman(target) && target != summoner) - new /obj/effect/hallucination/delusion(target.loc,target,force_kind="custom",duration=200,skip_nearby=0, custom_icon = src.icon_state, custom_icon_file = src.icon) + new /obj/effect/hallucination/delusion(target.loc,target,"custom",200,0, icon_state,icon) /mob/living/simple_animal/hostile/guardian/fire/Crossed(AM as mob|obj) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/flan.dm b/code/modules/mob/living/simple_animal/hostile/flan.dm deleted file mode 100644 index cb581b6ec5a..00000000000 --- a/code/modules/mob/living/simple_animal/hostile/flan.dm +++ /dev/null @@ -1,89 +0,0 @@ -//Will probably eventually be expanded to fit multiple types of Flan because I am a nerd. - -/mob/living/simple_animal/hostile/flan - name = "Flan" - desc = "Definitely not a dessert." - var/casting = 0 - icon_state = "flan" //Required for the inheritance of casting animations. - icon_living = "flan" - icon_dead = "flan_dead" - turns_per_move = 5 - environment_smash = ENVIRONMENT_SMASH_NONE - speed = -2 - maxHealth = 50 - health = 50 - harm_intent_damage = 5 - damage_coeff = list(BRUTE = 0.75, BURN = 1.5, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) - melee_damage_lower = 5 - melee_damage_upper = 10 - attacktext = "headbutts" - attack_sound = 'sound/weapons/punch1.ogg' - a_intent = INTENT_HARM - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 0 - ranged = 1 - retreat_distance = 2 - minimum_distance = 4 - AIStatus = AI_IDLE - ranged_message = "begins to cast something" - ranged_cooldown_time = 15 - var/spellname = "a generic spell!" - var/spellsound = 'sound/effects/spray3.ogg' - var/spellanimation = ATTACK_EFFECT_SMASH //More in defines/misc.dm - var/spelldamagetype = BRUTE - var/spelldamage = 15 - var/spellcasttime = 15 //if you varedit this also varedit ranged_cooldown_time else the mob will attack again before the spell hits, looking weird but still working - -/mob/living/simple_animal/hostile/flan/Initialize() //Required for the inheritance of casting animations. - ..() - casting = 0 - icon_state = "[initial(icon_state)][casting]" - -/mob/living/simple_animal/hostile/flan/proc/spellaftereffects(mob/living/A) //Inherit and override. Allows for spells that stun and do basically anything you'd want. - return - -/mob/living/simple_animal/hostile/flan/OpenFire(mob/living/A) //Spellcasting! - if(isliving(A)) //A is originally an atom, this is here to prevent that from fucking this up. - visible_message("[src] [ranged_message] at [A]!") - casting = 1 - icon_state = "[initial(icon_state)][casting]" - if(do_after_mob(src, A, spellcasttime, uninterruptible = 1, progress = 0)) //Break LOS to dodge. - if(QDELETED(src)) - return - if((A in view(src))) - A.do_attack_animation(A, spellanimation) - playsound(A, spellsound, 20, 1) - A.apply_damage(damage = spelldamage,damagetype = spelldamagetype, def_zone = null, blocked = 0) - visible_message("[A] has been hit by [spellname]") - spellaftereffects(A,src) - ranged_cooldown = world.time + ranged_cooldown_time - casting = 0 - icon_state = "[initial(icon_state)][casting]" - -/mob/living/simple_animal/hostile/flan/fire - name = "Flame Flan" - desc = "You'd think they'd be spicy, but nobody has ever tried." - icon_state = "fireflan" - icon_living = "fireflan" - icon_dead = "fireflan_dead" - damage_coeff = list(BRUTE = 1.5, BURN = 0.75, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) - spellname = "a Fire spell!" - spellsound = 'sound/effects/fuse.ogg' - spelldamagetype = BURN - spellcasttime = 20 - -/mob/living/simple_animal/hostile/flan/fire/spellaftereffects(mob/living/A) - A.adjust_fire_stacks(2) - A.IgniteMob() - -/mob/living/simple_animal/hostile/flan/water - name = "Water Flan" - desc = "Is pretty likely to dampen your spirits." - icon_state = "flan" - icon_living = "flan" - icon_dead = "flan_dead" - spellname = "a Water spell!" - spelldamage = 10 //Basic flan, learn the dance with em. - -/mob/living/simple_animal/hostile/flan/water/spellaftereffects(mob/living/A) - A.ExtinguishMob() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 6a7bff2ed28..b7de5b9440c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -381,17 +381,22 @@ Difficulty: Hard break max_amount-- var/obj/effect/decal/cleanable/blood/B = H - new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/slaughter(B.loc) + new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter(B.loc) return max_amount -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/slaughter +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter name = "slaughterling" desc = "Though not yet strong enough to create a true physical form, it's nonetheless determined to murder you." + icon_state = "bloodbrood" + icon_living = "bloodbrood" + icon_aggro = "bloodbrood" + attacktext = "pierces" + color = "#C80000" density = 0 faction = list("mining", "boss") weather_immunities = list("lava","ash") -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/slaughter/CanPass(atom/movable/mover, turf/target, height = 0) +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter/CanPass(atom/movable/mover, turf/target, height = 0) if(istype(mover, /mob/living/simple_animal/hostile/megafauna/bubblegum)) return 1 return 0 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 9c65618a0ed..320cafc8003 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -124,6 +124,11 @@ Difficulty: Hard adjustHealth(-L.maxHealth*0.5) L.dust() +/mob/living/simple_animal/hostile/megafauna/hierophant/CanAttack(atom/the_target) + . = ..() + if(istype(the_target, /mob/living/simple_animal/hostile/asteroid/hivelordbrood)) //ignore temporary targets in favor of more permenant targets + return FALSE + /mob/living/simple_animal/hostile/megafauna/hierophant/GiveTarget(new_target) var/targets_the_same = (new_target == target) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index d0c0a35b53a..8b588afdbd8 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -229,10 +229,10 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca /mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(the_target) if(Zapgun) - if(Zapgun.power_supply) + if(Zapgun.cell) var/obj/item/ammo_casing/energy/shot = Zapgun.ammo_type[Zapgun.select] - if(Zapgun.power_supply.charge >= shot.e_cost) - Zapgun.power_supply.use(shot.e_cost) + if(Zapgun.cell.charge >= shot.e_cost) + Zapgun.cell.use(shot.e_cost) Zapgun.update_icon() ..() else if(Zapstick) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm deleted file mode 100644 index c2bd44d8efb..00000000000 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ /dev/null @@ -1,1143 +0,0 @@ -/mob/living/simple_animal/hostile/asteroid - vision_range = 2 - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - faction = list("mining") - weather_immunities = list("lava","ash") - obj_damage = 30 - environment_smash = ENVIRONMENT_SMASH_WALLS - minbodytemp = 0 - maxbodytemp = INFINITY - response_help = "pokes" - response_disarm = "shoves" - response_harm = "strikes" - status_flags = 0 - a_intent = INTENT_HARM - var/throw_message = "bounces off of" - var/icon_aggro = null // for swapping to when we get aggressive - see_in_dark = 8 - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - mob_size = MOB_SIZE_LARGE - -/mob/living/simple_animal/hostile/asteroid/Aggro() - ..() - if(vision_range != aggro_vision_range) - icon_state = icon_aggro - -/mob/living/simple_animal/hostile/asteroid/LoseAggro() - ..() - if(stat == DEAD) - return - icon_state = icon_living - -/mob/living/simple_animal/hostile/asteroid/bullet_act(obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills - if(!stat) - Aggro() - if(P.damage < 30 && P.damage_type != BRUTE) - P.damage = (P.damage / 3) - visible_message("[P] has a reduced effect on [src]!") - ..() - -/mob/living/simple_animal/hostile/asteroid/hitby(atom/movable/AM)//No floor tiling them to death, wiseguy - if(istype(AM, /obj/item)) - var/obj/item/T = AM - if(!stat) - Aggro() - if(T.throwforce <= 20) - visible_message("The [T.name] [src.throw_message] [src.name]!") - return - ..() - -/mob/living/simple_animal/hostile/asteroid/death(gibbed) - SSblackbox.add_details("mobs_killed_mining","[src.type]") - ..(gibbed) - -/mob/living/simple_animal/hostile/asteroid/basilisk - name = "basilisk" - desc = "A territorial beast, covered in a thick shell that absorbs energy. Its stare causes victims to freeze from the inside." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Basilisk" - icon_living = "Basilisk" - icon_aggro = "Basilisk_alert" - icon_dead = "Basilisk_dead" - icon_gib = "syndicate_gib" - move_to_delay = 20 - projectiletype = /obj/item/projectile/temp/basilisk - projectilesound = 'sound/weapons/pierce.ogg' - ranged = 1 - ranged_message = "stares" - ranged_cooldown_time = 30 - throw_message = "does nothing against the hard shell of" - vision_range = 2 - speed = 3 - maxHealth = 200 - health = 200 - harm_intent_damage = 5 - obj_damage = 60 - melee_damage_lower = 12 - melee_damage_upper = 12 - attacktext = "bites into" - a_intent = INTENT_HARM - speak_emote = list("chitters") - attack_sound = 'sound/weapons/bladeslice.ogg' - aggro_vision_range = 9 - idle_vision_range = 2 - turns_per_move = 5 - loot = list(/obj/item/weapon/ore/diamond{layer = ABOVE_MOB_LAYER}, - /obj/item/weapon/ore/diamond{layer = ABOVE_MOB_LAYER}) - -/obj/item/projectile/temp/basilisk - name = "freezing blast" - icon_state = "ice_2" - damage = 0 - damage_type = BURN - nodamage = 1 - flag = "energy" - temperature = 50 - -/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(new_target) - if(..()) //we have a target - if(isliving(target) && !target.Adjacent(targets_from) && ranged_cooldown <= world.time)//No more being shot at point blank or spammed with RNG beams - OpenFire(target) - -/mob/living/simple_animal/hostile/asteroid/basilisk/ex_act(severity, target) - switch(severity) - if(1) - gib() - if(2) - adjustBruteLoss(140) - if(3) - adjustBruteLoss(110) - -/mob/living/simple_animal/hostile/asteroid/goldgrub - name = "goldgrub" - desc = "A worm that grows fat from eating everything in its sight. Seems to enjoy precious metals and other shiny things, hence the name." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Goldgrub" - icon_living = "Goldgrub" - icon_aggro = "Goldgrub_alert" - icon_dead = "Goldgrub_dead" - icon_gib = "syndicate_gib" - vision_range = 2 - aggro_vision_range = 9 - idle_vision_range = 2 - move_to_delay = 5 - friendly = "harmlessly rolls into" - maxHealth = 45 - health = 45 - harm_intent_damage = 5 - melee_damage_lower = 0 - melee_damage_upper = 0 - attacktext = "barrels into" - attack_sound = 'sound/weapons/punch1.ogg' - a_intent = INTENT_HELP - speak_emote = list("screeches") - throw_message = "sinks in slowly, before being pushed out of " - deathmessage = "spits up the contents of its stomach before dying!" - status_flags = CANPUSH - search_objects = 1 - wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/uranium) - - var/chase_time = 100 - var/will_burrow = TRUE - -/mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize() - ..() - var/i = rand(1,3) - while(i) - loot += pick(/obj/item/weapon/ore/silver, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/diamond) - i-- - -/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(new_target) - target = new_target - if(target != null) - if(istype(target, /obj/item/weapon/ore) && loot.len < 10) - visible_message("The [src.name] looks at [target.name] with hungry eyes.") - else if(isliving(target)) - Aggro() - visible_message("The [src.name] tries to flee from [target.name]!") - retreat_distance = 10 - minimum_distance = 10 - if(will_burrow) - addtimer(CALLBACK(src, .proc/Burrow), chase_time) - -/mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget() - if(istype(target, /obj/item/weapon/ore)) - EatOre(target) - return - return ..() - -/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(atom/targeted_ore) - for(var/obj/item/weapon/ore/O in targeted_ore.loc) - if(loot.len < 10) - loot += O.type - qdel(O) - visible_message("The ore was swallowed whole!") - -/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time - if(!stat) - visible_message("The [src.name] buries into the ground, vanishing from sight!") - qdel(src) - -/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P) - visible_message("The [P.name] was repelled by [src.name]'s girth!") - return - -/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - idle_vision_range = 9 - . = ..() - -/mob/living/simple_animal/hostile/asteroid/hivelord - name = "hivelord" - desc = "A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Hivelord" - icon_living = "Hivelord" - icon_aggro = "Hivelord_alert" - icon_dead = "Hivelord_dead" - icon_gib = "syndicate_gib" - mouse_opacity = 2 - move_to_delay = 14 - ranged = 1 - vision_range = 5 - aggro_vision_range = 9 - idle_vision_range = 5 - speed = 3 - maxHealth = 75 - health = 75 - harm_intent_damage = 5 - melee_damage_lower = 0 - melee_damage_upper = 0 - attacktext = "lashes out at" - speak_emote = list("telepathically cries") - attack_sound = 'sound/weapons/pierce.ogg' - throw_message = "falls right through the strange body of the" - ranged_cooldown = 0 - ranged_cooldown_time = 20 - obj_damage = 0 - environment_smash = ENVIRONMENT_SMASH_NONE - retreat_distance = 3 - minimum_distance = 3 - pass_flags = PASSTABLE - loot = list(/obj/item/organ/hivelord_core) - var/brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood - -/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target) - if(world.time >= ranged_cooldown) - var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new brood_type(src.loc) - A.admin_spawned = admin_spawned - A.GiveTarget(target) - A.friends = friends - A.faction = faction.Copy() - ranged_cooldown = world.time + ranged_cooldown_time - -/mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget() - OpenFire() - return TRUE - -/mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed) - mouse_opacity = 1 - ..(gibbed) - -/obj/item/organ/hivelord_core - name = "hivelord remains" - desc = "All that remains of a hivelord, it seems to be what allows it to break pieces of itself off without being hurt... its healing properties will soon become inert if not used quickly." - icon_state = "roro core 2" - flags = NOBLUDGEON - slot = "hivecore" - force = 0 - actions_types = list(/datum/action/item_action/organ_action/use) - var/inert = 0 - var/preserved = 0 - -/obj/item/organ/hivelord_core/Initialize() - ..() - addtimer(CALLBACK(src, .proc/inert_check), 2400) - -/obj/item/organ/hivelord_core/proc/inert_check() - if(!preserved) - go_inert() - -/obj/item/organ/hivelord_core/proc/preserved(implanted = 0) - inert = FALSE - preserved = TRUE - update_icon() - - if(implanted) - SSblackbox.add_details("hivelord_core", "[type]|implanted") - else - SSblackbox.add_details("hivelord_core", "[type]|stabilizer") - - -/obj/item/organ/hivelord_core/proc/go_inert() - inert = TRUE - desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested." - SSblackbox.add_details("hivelord_core", "[src.type]|inert") - update_icon() - -/obj/item/organ/hivelord_core/ui_action_click() - if(inert) - to_chat(owner, "[src] breaks down as it tries to activate.") - else - owner.revive(full_heal = 1) - qdel(src) - -/obj/item/organ/hivelord_core/on_life() - ..() - if(owner.health < HEALTH_THRESHOLD_CRIT) - ui_action_click() - -/obj/item/organ/hivelord_core/afterattack(atom/target, mob/user, proximity_flag) - if(proximity_flag && ishuman(target)) - var/mob/living/carbon/human/H = target - if(inert) - to_chat(user, "[src] has become inert, its healing properties are no more.") - return - else - if(H.stat == DEAD) - to_chat(user, "[src] are useless on the dead.") - return - if(H != user) - H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!") - SSblackbox.add_details("hivelord_core","[src.type]|used|other") - else - to_chat(user, "You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.") - SSblackbox.add_details("hivelord_core","[src.type]|used|self") - H.revive(full_heal = 1) - qdel(src) - ..() - -/obj/item/organ/hivelord_core/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) - . = ..() - if(!preserved && !inert) - preserved(TRUE) - owner.visible_message("[src] stabilizes as it's inserted.") - -/obj/item/organ/hivelord_core/Remove(mob/living/carbon/M, special = 0) - if(!inert && !special) - owner.visible_message("[src] goes inert as it's removed.") - go_inert() - return ..() - -/obj/item/organ/hivelord_core/prepare_eat() - return null - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood - name = "hivelord brood" - desc = "A fragment of the original Hivelord, rallying behind its original. One isn't much of a threat, but..." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Hivelordbrood" - icon_living = "Hivelordbrood" - icon_aggro = "Hivelordbrood" - icon_dead = "Hivelordbrood" - icon_gib = "syndicate_gib" - mouse_opacity = 2 - move_to_delay = 1 - friendly = "buzzes near" - vision_range = 10 - speed = 3 - maxHealth = 1 - health = 1 - movement_type = FLYING - harm_intent_damage = 5 - melee_damage_lower = 2 - melee_damage_upper = 2 - attacktext = "slashes" - speak_emote = list("telepathically cries") - attack_sound = 'sound/weapons/pierce.ogg' - throw_message = "falls right through the strange body of the" - obj_damage = 0 - environment_smash = ENVIRONMENT_SMASH_NONE - pass_flags = PASSTABLE - del_on_death = 1 - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize() - ..() - addtimer(CALLBACK(src, .proc/death), 100) - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood - name = "blood brood" - desc = "A living string of blood and alien materials." - icon_state = "bloodbrood" - icon_living = "bloodbrood" - icon_aggro = "bloodbrood" - attacktext = "pierces" - color = "#C80000" - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/death() - if(loc) // Splash the turf we are on with blood - reagents.reaction(get_turf(src)) - ..() - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/Initialize() - create_reagents(30) - ..() - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/AttackingTarget() - . = ..() - if(. && iscarbon(target)) - transfer_reagents(target, 1) - - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/attack_hand(mob/living/carbon/human/M) - if("\ref[M]" in faction) - reabsorb_host(M) - else - return ..() - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/attack_paw(mob/living/carbon/monkey/M) - if("\ref[M]" in faction) - reabsorb_host(M) - else - return ..() - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/attack_alien(mob/living/carbon/alien/humanoid/M) - if("\ref[M]" in faction) - reabsorb_host(M) - else - return ..() - - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/proc/reabsorb_host(mob/living/carbon/C) - C.visible_message("[src] is reabsorbed by [C]'s body.", \ - "[src] is reabsorbed by your body.") - transfer_reagents(C) - death() - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/proc/transfer_reagents(mob/living/carbon/C, volume = 30) - if(!reagents.total_volume) - return - - volume = min(volume, reagents.total_volume) - - var/fraction = min(volume/reagents.total_volume, 1) - reagents.reaction(C, INJECT, fraction) - reagents.trans_to(C, volume) - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/proc/link_host(mob/living/carbon/C) - faction = list("\ref[src]", "\ref[C]") // Hostile to everyone except the host. - C.transfer_blood_to(src, 30) - var/newcolor = mix_color_from_reagents(reagents.reagent_list) - add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) - -/mob/living/simple_animal/hostile/asteroid/goliath - name = "goliath" - desc = "A massive beast that uses long tentacles to ensare its prey, threatening them is not advised under any conditions." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Goliath" - icon_living = "Goliath" - icon_aggro = "Goliath_alert" - icon_dead = "Goliath_dead" - icon_gib = "syndicate_gib" - mouse_opacity = 2 - move_to_delay = 40 - ranged = 1 - ranged_cooldown_time = 120 - friendly = "wails at" - speak_emote = list("bellows") - vision_range = 4 - speed = 3 - maxHealth = 300 - health = 300 - harm_intent_damage = 0 - obj_damage = 100 - melee_damage_lower = 25 - melee_damage_upper = 25 - attacktext = "pulverizes" - attack_sound = 'sound/weapons/punch1.ogg' - throw_message = "does nothing to the rocky hide of the" - aggro_vision_range = 9 - idle_vision_range = 5 - anchored = 1 //Stays anchored until death as to be unpullable - var/pre_attack = 0 - var/pre_attack_icon = "Goliath_preattack" - loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) - -/mob/living/simple_animal/hostile/asteroid/goliath/Life() - ..() - handle_preattack() - -/mob/living/simple_animal/hostile/asteroid/goliath/proc/handle_preattack() - if(ranged_cooldown <= world.time + ranged_cooldown_time*0.25 && !pre_attack) - pre_attack++ - if(!pre_attack || stat || AIStatus == AI_IDLE) - return - icon_state = pre_attack_icon - -/mob/living/simple_animal/hostile/asteroid/goliath/revive(full_heal = 0, admin_revive = 0) - if(..()) - anchored = 1 - . = 1 - -/mob/living/simple_animal/hostile/asteroid/goliath/death(gibbed) - anchored = 0 - ..(gibbed) - -/mob/living/simple_animal/hostile/asteroid/goliath/OpenFire() - var/tturf = get_turf(target) - if(!isturf(tturf)) - return - if(get_dist(src, target) <= 7)//Screen range check, so you can't get tentacle'd offscreen - visible_message("The [src.name] digs its tentacles under [target.name]!") - new /obj/effect/goliath_tentacle/original(tturf) - ranged_cooldown = world.time + ranged_cooldown_time - icon_state = icon_aggro - pre_attack = 0 - -/mob/living/simple_animal/hostile/asteroid/goliath/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - ranged_cooldown -= 10 - handle_preattack() - . = ..() - -/mob/living/simple_animal/hostile/asteroid/goliath/Aggro() - vision_range = aggro_vision_range - handle_preattack() - if(icon_state != icon_aggro) - icon_state = icon_aggro - -/obj/effect/goliath_tentacle - name = "Goliath tentacle" - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Goliath_tentacle" - var/latched = 0 - anchored = 1 - -/obj/effect/goliath_tentacle/New() - var/turftype = get_turf(src) - if(ismineralturf(turftype)) - var/turf/closed/mineral/M = turftype - M.gets_drilled() - addtimer(CALLBACK(src, .proc/Trip), 10) - -/obj/effect/goliath_tentacle/original - -/obj/effect/goliath_tentacle/original/New() - for(var/obj/effect/goliath_tentacle/original/O in loc)//No more GG NO RE from 2+ goliaths simultaneously tentacling you - if(O != src) - qdel(src) - var/list/directions = GLOB.cardinal.Copy() - var/counter - for(counter = 1, counter <= 3, counter++) - var/spawndir = pick(directions) - directions -= spawndir - var/turf/T = get_step(src,spawndir) - new /obj/effect/goliath_tentacle(T) - ..() - -/obj/effect/goliath_tentacle/proc/Trip() - for(var/mob/living/M in src.loc) - visible_message("The [src.name] grabs hold of [M.name]!") - M.Stun(5) - M.adjustBruteLoss(rand(10,15)) - latched = 1 - if(!latched) - qdel(src) - else - QDEL_IN(src, 50) - -/obj/item/stack/sheet/animalhide/goliath_hide - name = "goliath hide plates" - desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna." - icon = 'icons/obj/mining.dmi' - icon_state = "goliath_hide" - flags = NOBLUDGEON - w_class = WEIGHT_CLASS_NORMAL - layer = MOB_LAYER - -/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag) - if(proximity_flag) - if(istype(target, /obj/item/clothing/suit/space/hardsuit/mining) || istype(target, /obj/item/clothing/head/helmet/space/hardsuit/mining) || istype(target, /obj/item/clothing/suit/hooded/explorer) || istype(target, /obj/item/clothing/head/hooded/explorer)) - var/obj/item/clothing/C = target - var/list/current_armor = C.armor - if(current_armor.["melee"] < 60) - current_armor.["melee"] = min(current_armor.["melee"] + 10, 60) - to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - use(1) - else - to_chat(user, "You can't improve [C] any further!") - return - if(istype(target, /obj/mecha/working/ripley)) - var/obj/mecha/working/ripley/D = target - if(D.hides < 3) - D.hides++ - D.armor["melee"] = min(D.armor["melee"] + 10, 70) - D.armor["bullet"] = min(D.armor["bullet"] + 5, 50) - D.armor["laser"] = min(D.armor["laser"] + 5, 50) - to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - D.update_icon() - if(D.hides == 3) - D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter." - else - D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." - qdel(src) - else - to_chat(user, "You can't improve [D] any further!") - return - - -/mob/living/simple_animal/hostile/asteroid/handle_temperature_damage() - if(bodytemperature < minbodytemp) - adjustBruteLoss(2) - else if(bodytemperature > maxbodytemp) - adjustBruteLoss(20) - -/mob/living/simple_animal/hostile/asteroid/fugu - name = "wumborian fugu" - desc = "The wumborian fugu rapidly increases its body mass in order to ward off its prey. Great care should be taken to avoid it while it's in this state as it is nearly invincible, but it cannot maintain its form forever." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Fugu" - icon_living = "Fugu" - icon_aggro = "Fugu" - icon_dead = "Fugu_dead" - icon_gib = "syndicate_gib" - mouse_opacity = 2 - move_to_delay = 5 - friendly = "floats near" - speak_emote = list("puffs") - vision_range = 5 - speed = 0 - maxHealth = 50 - health = 50 - harm_intent_damage = 5 - obj_damage = 0 - melee_damage_lower = 0 - melee_damage_upper = 0 - attacktext = "chomps" - attack_sound = 'sound/weapons/punch1.ogg' - throw_message = "is avoided by the" - aggro_vision_range = 9 - idle_vision_range = 5 - mob_size = MOB_SIZE_SMALL - environment_smash = ENVIRONMENT_SMASH_NONE - var/wumbo = 0 - var/inflate_cooldown = 0 - loot = list(/obj/item/asteroid/fugu_gland{layer = ABOVE_MOB_LAYER}) - -/mob/living/simple_animal/hostile/asteroid/fugu/Life() - if(!wumbo) - inflate_cooldown = max((inflate_cooldown - 1), 0) - if(target && AIStatus == AI_ON) - Inflate() - ..() - -/mob/living/simple_animal/hostile/asteroid/fugu/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - if(!forced && wumbo) - return FALSE - . = ..() - -/mob/living/simple_animal/hostile/asteroid/fugu/Aggro() - ..() - Inflate() - -/mob/living/simple_animal/hostile/asteroid/fugu/verb/Inflate() - set name = "Inflate" - set category = "Fugu" - set desc = "Temporarily increases your size, and makes you significantly more dangerous and tough." - if(wumbo) - to_chat(src, "You're already inflated.") - return - if(inflate_cooldown) - to_chat(src, "We need time to gather our strength.") - return - if(buffed) - to_chat(src, "Something is interfering with our growth.") - return - wumbo = 1 - icon_state = "Fugu_big" - obj_damage = 60 - melee_damage_lower = 15 - melee_damage_upper = 20 - harm_intent_damage = 0 - throw_message = "is absorbed by the girth of the" - retreat_distance = null - minimum_distance = 1 - move_to_delay = 6 - transform *= 2 - environment_smash = ENVIRONMENT_SMASH_WALLS - mob_size = MOB_SIZE_LARGE - speed = 1 - addtimer(CALLBACK(src, .proc/Deflate), 100) - -/mob/living/simple_animal/hostile/asteroid/fugu/proc/Deflate() - if(wumbo) - walk(src, 0) - wumbo = 0 - icon_state = "Fugu" - obj_damage = 0 - melee_damage_lower = 0 - melee_damage_upper = 0 - harm_intent_damage = 5 - throw_message = "is avoided by the" - retreat_distance = 9 - minimum_distance = 9 - move_to_delay = 2 - transform /= 2 - inflate_cooldown = 4 - environment_smash = ENVIRONMENT_SMASH_NONE - mob_size = MOB_SIZE_SMALL - speed = 0 - -/mob/living/simple_animal/hostile/asteroid/fugu/death(gibbed) - Deflate() - ..(gibbed) - -/obj/item/asteroid/fugu_gland - name = "wumborian fugu gland" - desc = "The key to the wumborian fugu's ability to increase its mass arbitrarily, this disgusting remnant can apply the same effect to other creatures, giving them great strength." - icon = 'icons/obj/surgery.dmi' - icon_state = "fugu_gland" - flags = NOBLUDGEON - w_class = WEIGHT_CLASS_NORMAL - layer = MOB_LAYER - origin_tech = "biotech=6" - var/list/banned_mobs() - -/obj/item/asteroid/fugu_gland/afterattack(atom/target, mob/user, proximity_flag) - if(proximity_flag && istype(target, /mob/living/simple_animal)) - var/mob/living/simple_animal/A = target - if(A.buffed || (A.type in banned_mobs) || A.stat) - to_chat(user, "Something's interfering with the [src]'s effects. It's no use.") - return - A.buffed++ - A.maxHealth *= 1.5 - A.health = min(A.maxHealth,A.health*1.5) - A.melee_damage_lower = max((A.melee_damage_lower * 2), 10) - A.melee_damage_upper = max((A.melee_damage_upper * 2), 10) - A.transform *= 2 - A.environment_smash += 2 - to_chat(user, "You increase the size of [A], giving it a surge of strength!") - qdel(src) - -/////////////////////Lavaland - -//Watcher - -/mob/living/simple_animal/hostile/asteroid/basilisk/watcher - name = "watcher" - desc = "A levitating, eye-like creature held aloft by winglike formations of sinew. A sharp spine of crystal protrudes from its body." - icon = 'icons/mob/lavaland/watcher.dmi' - icon_state = "watcher" - icon_living = "watcher" - icon_aggro = "watcher" - icon_dead = "watcher_dead" - pixel_x = -10 - throw_message = "bounces harmlessly off of" - melee_damage_lower = 15 - melee_damage_upper = 15 - attacktext = "impales" - a_intent = INTENT_HARM - speak_emote = list("telepathically cries") - attack_sound = 'sound/weapons/bladeslice.ogg' - stat_attack = 1 - movement_type = FLYING - robust_searching = 1 - loot = list() - butcher_results = list(/obj/item/weapon/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1) - -//Goliath - -/mob/living/simple_animal/hostile/asteroid/goliath/beast - name = "goliath" - desc = "A hulking, armor-plated beast with long tendrils arching from its back." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "goliath" - icon_living = "goliath" - icon_aggro = "goliath" - icon_dead = "goliath_dead" - throw_message = "does nothing to the tough hide of the" - pre_attack_icon = "goliath2" - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2) - loot = list() - stat_attack = 1 - robust_searching = 1 - - - -//Legion - -/mob/living/simple_animal/hostile/asteroid/hivelord/legion - name = "legion" - desc = "You can still see what was once a human under the shifting mass of corruption." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "legion" - icon_living = "legion" - icon_aggro = "legion" - icon_dead = "legion" - icon_gib = "syndicate_gib" - obj_damage = 60 - melee_damage_lower = 15 - melee_damage_upper = 15 - attacktext = "lashes out at" - speak_emote = list("echoes") - attack_sound = 'sound/weapons/pierce.ogg' - throw_message = "bounces harmlessly off of" - loot = list(/obj/item/organ/hivelord_core/legion) - brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion - del_on_death = 1 - stat_attack = 1 - robust_searching = 1 - var/mob/living/carbon/human/stored_mob - -/mob/living/simple_animal/hostile/asteroid/hivelord/legion/death(gibbed) - visible_message("The skulls on [src] wail in anger as they flee from their dying host!") - var/turf/T = get_turf(src) - if(T) - if(stored_mob) - stored_mob.forceMove(get_turf(src)) - stored_mob = null - else - new /obj/effect/mob_spawn/human/corpse/damaged(T) - ..(gibbed) - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion - name = "legion" - desc = "One of many." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "legion_head" - icon_living = "legion_head" - icon_aggro = "legion_head" - icon_dead = "legion_head" - icon_gib = "syndicate_gib" - friendly = "buzzes near" - vision_range = 10 - maxHealth = 1 - health = 5 - harm_intent_damage = 5 - melee_damage_lower = 12 - melee_damage_upper = 12 - attacktext = "bites" - speak_emote = list("echoes") - attack_sound = 'sound/weapons/pierce.ogg' - throw_message = "is shrugged off by" - pass_flags = PASSTABLE - del_on_death = 1 - stat_attack = 1 - robust_searching = 1 - var/can_infest_dead = FALSE - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life() - if(isturf(loc)) - for(var/mob/living/carbon/human/H in view(src,1)) //Only for corpse right next to/on same tile - if(H.stat == UNCONSCIOUS || (can_infest_dead && H.stat == DEAD)) - infest(H) - ..() - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) - visible_message("[name] burrows into the flesh of [H]!") - var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L = new(H.loc) - visible_message("[L] staggers to their feet!") - H.death() - H.adjustBruteLoss(1000) - L.stored_mob = H - H.forceMove(L) - qdel(src) - -//Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions) - -/mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced - stat_attack = 2 - maxHealth = 120 - health = 120 - brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced - icon_state = "dwarf_legion" - icon_living = "dwarf_legion" - icon_aggro = "dwarf_legion" - icon_dead = "dwarf_legion" - -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced - stat_attack = 2 - can_infest_dead = TRUE - -//Legion that spawns Legions - -/mob/living/simple_animal/hostile/spawner/legion - name = "legion" - desc = "One of many." - icon = 'icons/mob/lavaland/dragon.dmi' - icon_state = "legion" - icon_living = "legion" - icon_dead = "legion" - health = 450 - maxHealth = 450 - max_mobs = 3 - spawn_time = 200 - spawn_text = "peels itself off from" - mob_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion - melee_damage_lower = 20 - melee_damage_upper = 20 - anchored = FALSE - AIStatus = AI_ON - stop_automated_movement = FALSE - wander = TRUE - maxbodytemp = INFINITY - layer = MOB_LAYER - del_on_death = TRUE - sentience_type = SENTIENCE_BOSS - loot = list(/obj/item/organ/hivelord_core/legion = 3, /obj/effect/mob_spawn/human/corpse/damaged = 5) - move_to_delay = 14 - vision_range = 5 - aggro_vision_range = 9 - idle_vision_range = 5 - speed = 3 - faction = list("mining") - weather_immunities = list("lava","ash") - obj_damage = 30 - environment_smash = ENVIRONMENT_SMASH_STRUCTURES - see_in_dark = 8 - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - -//Organ - -/obj/item/organ/hivelord_core/legion - name = "legion's soul" - desc = "A strange rock that still crackles with power... its \ - healing properties will soon become inert if not used quickly." - icon_state = "legion_soul" - -/obj/item/organ/hivelord_core/legion/New() - ..() - update_icon() - -/obj/item/organ/hivelord_core/update_icon() - icon_state = inert ? "legion_soul_inert" : "legion_soul" - cut_overlays() - if(!inert && !preserved) - add_overlay("legion_soul_crackle") - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() - -/obj/item/organ/hivelord_core/legion/go_inert() - . = ..() - desc = "[src] has become inert, it crackles no more and is useless for \ - healing injuries." - -/obj/item/organ/hivelord_core/legion/preserved(implanted = 0) - ..() - desc = "[src] has been stabilized. It no longer crackles with power, but it's healing properties are preserved indefinitely." - -/obj/item/weapon/legion_skull - name = "legion's head" - desc = "The once living, now empty eyes of the former human's skull cut deep into your soul." - icon = 'icons/obj/mining.dmi' - icon_state = "skull" - - -//Gutlunches - -/mob/living/simple_animal/hostile/asteroid/gutlunch - name = "gutlunch" - desc = "A scavenger that eats raw meat, often found alongside ash walkers. Produces a thick, nutritious milk." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "gutlunch" - icon_living = "gutlunch" - icon_dead = "gutlunch" - speak_emote = list("warbles", "quavers") - emote_hear = list("trills.") - emote_see = list("sniffs.", "burps.") - weather_immunities = list("lava","ash") - faction = list("mining", "ashwalker") - density = 0 - speak_chance = 1 - turns_per_move = 8 - obj_damage = 0 - environment_smash = ENVIRONMENT_SMASH_NONE - move_to_delay = 15 - response_help = "pets" - response_disarm = "gently pushes aside" - response_harm = "squishes" - friendly = "pinches" - a_intent = INTENT_HELP - ventcrawler = VENTCRAWLER_ALWAYS - gold_core_spawnable = 2 - stat_attack = 1 - gender = NEUTER - stop_automated_movement = FALSE - stop_automated_movement_when_pulled = TRUE - stat_exclusive = TRUE - robust_searching = TRUE - search_objects = TRUE - del_on_death = TRUE - loot = list(/obj/effect/decal/cleanable/blood/gibs) - deathmessage = "is pulped into bugmash." - - animal_species = /mob/living/simple_animal/hostile/asteroid/gutlunch - childtype = list(/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck = 45, /mob/living/simple_animal/hostile/asteroid/gutlunch/guthen = 55) - - wanted_objects = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/blood/gibs/) - var/obj/item/udder/gutlunch/udder = null - -/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize() - udder = new() - ..() - -/mob/living/simple_animal/hostile/asteroid/gutlunch/Destroy() - qdel(udder) - udder = null - return ..() - -/mob/living/simple_animal/hostile/asteroid/gutlunch/regenerate_icons() - cut_overlays() - if(udder.reagents.total_volume == udder.reagents.maximum_volume) - add_overlay("gl_full") - ..() - -/mob/living/simple_animal/hostile/asteroid/gutlunch/attackby(obj/item/O, mob/user, params) - if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) - udder.milkAnimal(O, user) - regenerate_icons() - else - ..() - -/mob/living/simple_animal/hostile/asteroid/gutlunch/AttackingTarget() - if(is_type_in_typecache(target,wanted_objects)) //we eats - udder.generateMilk() - regenerate_icons() - visible_message("[src] slurps up [target].") - qdel(target) - return ..() - - -/obj/item/udder/gutlunch - name = "nutrient sac" - -/obj/item/udder/gutlunch/New() - reagents = new(50) - reagents.my_atom = src - -/obj/item/udder/gutlunch/generateMilk() - if(prob(60)) - reagents.add_reagent("cream", rand(2, 5)) - if(prob(45)) - reagents.add_reagent("salglu_solution", rand(2,5)) - - -//Male gutlunch. They're smaller and more colorful! -/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck - name = "gubbuck" - gender = MALE - -/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck/Initialize() - ..() - add_atom_colour(pick("#E39FBB", "#D97D64", "#CF8C4A"), FIXED_COLOUR_PRIORITY) - resize = 0.85 - update_transform() - - -//Lady gutlunch. They make the babby. -/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen - name = "guthen" - gender = FEMALE - -/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/Life() - ..() - if(udder.reagents.total_volume == udder.reagents.maximum_volume) //Only breed when we're full. - make_babies() - -/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/make_babies() - . = ..() - if(.) - udder.reagents.clear_reagents() - regenerate_icons() - -//Nests -/obj/effect/light_emitter/tendril - set_luminosity = 4 - set_cap = 2.5 - light_color = LIGHT_COLOR_LAVA - -/mob/living/simple_animal/hostile/spawner/lavaland - name = "necropolis tendril" - desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it." - icon = 'icons/mob/nest.dmi' - icon_state = "tendril" - icon_living = "tendril" - icon_dead = "tendril" - faction = list("mining") - weather_immunities = list("lava","ash") - health = 250 - maxHealth = 250 - max_mobs = 3 - spawn_time = 300 //30 seconds default - mob_type = /mob/living/simple_animal/hostile/asteroid/basilisk/watcher - spawn_text = "emerges from" - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 0 - maxbodytemp = INFINITY - loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) - del_on_death = 1 - var/gps = null - var/obj/effect/light_emitter/tendril/emitted_light - -/mob/living/simple_animal/hostile/spawner/lavaland/goliath - mob_type = /mob/living/simple_animal/hostile/asteroid/goliath/beast - -/mob/living/simple_animal/hostile/spawner/lavaland/legion - mob_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion - -/mob/living/simple_animal/hostile/spawner/lavaland/Initialize() - . = ..() - emitted_light = new(loc) - for(var/F in RANGE_TURFS(1, src)) - if(ismineralturf(F)) - var/turf/closed/mineral/M = F - M.ChangeTurf(M.turf_type,FALSE,TRUE) - gps = new /obj/item/device/gps/internal(src) - -/mob/living/simple_animal/hostile/spawner/lavaland/Destroy() - QDEL_NULL(emitted_light) - QDEL_NULL(gps) - . = ..() - -#define MEDAL_PREFIX "Tendril" -/mob/living/simple_animal/hostile/spawner/lavaland/death() - var/last_tendril = TRUE - for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in GLOB.mob_list) - if(other != src) - last_tendril = FALSE - break - if(last_tendril && !admin_spawned) - if(global.medal_hub && global.medal_pass && global.medals_enabled) - for(var/mob/living/L in view(7,src)) - if(L.stat) - continue - if(L.client) - var/client/C = L.client - var/suffixm = ALL_KILL_MEDAL - var/prefix = MEDAL_PREFIX - UnlockMedal("[prefix] [suffixm]",C) - SetScore(TENDRIL_CLEAR_SCORE,C,1) - ..() -#undef MEDAL_PREFIX - -/obj/effect/collapse - name = "collapsing necropolis tendril" - desc = "Get clear!" - layer = BELOW_OBJ_LAYER - icon = 'icons/mob/nest.dmi' - icon_state = "tendril" - anchored = TRUE - density = TRUE - var/obj/effect/light_emitter/tendril/emitted_light - -/obj/effect/collapse/Initialize() - . = ..() - emitted_light = new(loc) - visible_message("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!") - visible_message("Something falls free of the tendril!") - playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1) - addtimer(CALLBACK(src, .proc/collapse), 50) - -/obj/effect/collapse/Destroy() - QDEL_NULL(emitted_light) - return ..() - -/obj/effect/collapse/proc/collapse() - for(var/mob/M in range(7,src)) - shake_camera(M, 15, 1) - playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, 1) - visible_message("The tendril falls inward, the ground around it widening into a yawning chasm!") - for(var/turf/T in range(2,src)) - if(!T.density) - T.TerraformTurf(/turf/open/chasm/straight_down/lava_land_surface) - qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm new file mode 100644 index 00000000000..a379b0e8ac7 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -0,0 +1,84 @@ +//A beast that fire freezing blasts. +/mob/living/simple_animal/hostile/asteroid/basilisk + name = "basilisk" + desc = "A territorial beast, covered in a thick shell that absorbs energy. Its stare causes victims to freeze from the inside." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Basilisk" + icon_living = "Basilisk" + icon_aggro = "Basilisk_alert" + icon_dead = "Basilisk_dead" + icon_gib = "syndicate_gib" + move_to_delay = 20 + projectiletype = /obj/item/projectile/temp/basilisk + projectilesound = 'sound/weapons/pierce.ogg' + ranged = 1 + ranged_message = "stares" + ranged_cooldown_time = 30 + throw_message = "does nothing against the hard shell of" + vision_range = 2 + speed = 3 + maxHealth = 200 + health = 200 + harm_intent_damage = 5 + obj_damage = 60 + melee_damage_lower = 12 + melee_damage_upper = 12 + attacktext = "bites into" + a_intent = INTENT_HARM + speak_emote = list("chitters") + attack_sound = 'sound/weapons/bladeslice.ogg' + aggro_vision_range = 9 + idle_vision_range = 2 + turns_per_move = 5 + loot = list(/obj/item/weapon/ore/diamond{layer = ABOVE_MOB_LAYER}, + /obj/item/weapon/ore/diamond{layer = ABOVE_MOB_LAYER}) + +/obj/item/projectile/temp/basilisk + name = "freezing blast" + icon_state = "ice_2" + damage = 0 + damage_type = BURN + nodamage = 1 + flag = "energy" + temperature = 50 + +/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(new_target) + if(..()) //we have a target + if(isliving(target) && !target.Adjacent(targets_from) && ranged_cooldown <= world.time)//No more being shot at point blank or spammed with RNG beams + OpenFire(target) + +/mob/living/simple_animal/hostile/asteroid/basilisk/ex_act(severity, target) + switch(severity) + if(1) + gib() + if(2) + adjustBruteLoss(140) + if(3) + adjustBruteLoss(110) + +//Watcher +/mob/living/simple_animal/hostile/asteroid/basilisk/watcher + name = "watcher" + desc = "A levitating, eye-like creature held aloft by winglike formations of sinew. A sharp spine of crystal protrudes from its body." + icon = 'icons/mob/lavaland/watcher.dmi' + icon_state = "watcher" + icon_living = "watcher" + icon_aggro = "watcher" + icon_dead = "watcher_dead" + pixel_x = -10 + throw_message = "bounces harmlessly off of" + melee_damage_lower = 15 + melee_damage_upper = 15 + attacktext = "impales" + a_intent = INTENT_HARM + speak_emote = list("telepathically cries") + attack_sound = 'sound/weapons/bladeslice.ogg' + stat_attack = UNCONSCIOUS + movement_type = FLYING + robust_searching = 1 + crusher_loot = /obj/item/crusher_trophy/watcher_wing + loot = list() + butcher_results = list(/obj/item/weapon/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1) + +/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril + fromtendril = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm new file mode 100644 index 00000000000..54673c887e3 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -0,0 +1,79 @@ +//An ore-devouring but easily scared creature +/mob/living/simple_animal/hostile/asteroid/goldgrub + name = "goldgrub" + desc = "A worm that grows fat from eating everything in its sight. Seems to enjoy precious metals and other shiny things, hence the name." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Goldgrub" + icon_living = "Goldgrub" + icon_aggro = "Goldgrub_alert" + icon_dead = "Goldgrub_dead" + icon_gib = "syndicate_gib" + vision_range = 2 + aggro_vision_range = 9 + idle_vision_range = 2 + move_to_delay = 5 + friendly = "harmlessly rolls into" + maxHealth = 45 + health = 45 + harm_intent_damage = 5 + melee_damage_lower = 0 + melee_damage_upper = 0 + attacktext = "barrels into" + attack_sound = 'sound/weapons/punch1.ogg' + a_intent = INTENT_HELP + speak_emote = list("screeches") + throw_message = "sinks in slowly, before being pushed out of " + deathmessage = "spits up the contents of its stomach before dying!" + status_flags = CANPUSH + search_objects = 1 + wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver, + /obj/item/weapon/ore/uranium) + + var/chase_time = 100 + var/will_burrow = TRUE + +/mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize() + ..() + var/i = rand(1,3) + while(i) + loot += pick(/obj/item/weapon/ore/silver, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/diamond) + i-- + +/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(new_target) + target = new_target + if(target != null) + if(istype(target, /obj/item/weapon/ore) && loot.len < 10) + visible_message("The [src.name] looks at [target.name] with hungry eyes.") + else if(isliving(target)) + Aggro() + visible_message("The [src.name] tries to flee from [target.name]!") + retreat_distance = 10 + minimum_distance = 10 + if(will_burrow) + addtimer(CALLBACK(src, .proc/Burrow), chase_time) + +/mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget() + if(istype(target, /obj/item/weapon/ore)) + EatOre(target) + return + return ..() + +/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(atom/targeted_ore) + for(var/obj/item/weapon/ore/O in targeted_ore.loc) + if(loot.len < 10) + loot += O.type + qdel(O) + visible_message("The ore was swallowed whole!") + +/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time + if(!stat) + visible_message("The [src.name] buries into the ground, vanishing from sight!") + qdel(src) + +/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P) + visible_message("The [P.name] was repelled by [src.name]'s girth!") + return + +/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + idle_vision_range = 9 + . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm new file mode 100644 index 00000000000..2c0758fe81b --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -0,0 +1,134 @@ +//A slow but strong beast that tries to stun using its tentacles +/mob/living/simple_animal/hostile/asteroid/goliath + name = "goliath" + desc = "A massive beast that uses long tentacles to ensare its prey, threatening them is not advised under any conditions." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Goliath" + icon_living = "Goliath" + icon_aggro = "Goliath_alert" + icon_dead = "Goliath_dead" + icon_gib = "syndicate_gib" + mouse_opacity = 2 + move_to_delay = 40 + ranged = 1 + ranged_cooldown_time = 120 + friendly = "wails at" + speak_emote = list("bellows") + vision_range = 4 + speed = 3 + maxHealth = 300 + health = 300 + harm_intent_damage = 0 + obj_damage = 100 + melee_damage_lower = 25 + melee_damage_upper = 25 + attacktext = "pulverizes" + attack_sound = 'sound/weapons/punch1.ogg' + throw_message = "does nothing to the rocky hide of the" + aggro_vision_range = 9 + idle_vision_range = 5 + anchored = TRUE //Stays anchored until death as to be unpullable + var/pre_attack = 0 + var/pre_attack_icon = "Goliath_preattack" + loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) + +/mob/living/simple_animal/hostile/asteroid/goliath/Life() + ..() + handle_preattack() + +/mob/living/simple_animal/hostile/asteroid/goliath/proc/handle_preattack() + if(ranged_cooldown <= world.time + ranged_cooldown_time*0.25 && !pre_attack) + pre_attack++ + if(!pre_attack || stat || AIStatus == AI_IDLE) + return + icon_state = pre_attack_icon + +/mob/living/simple_animal/hostile/asteroid/goliath/revive(full_heal = 0, admin_revive = 0) + if(..()) + anchored = TRUE + . = 1 + +/mob/living/simple_animal/hostile/asteroid/goliath/death(gibbed) + anchored = 0 + ..(gibbed) + +/mob/living/simple_animal/hostile/asteroid/goliath/OpenFire() + var/tturf = get_turf(target) + if(!isturf(tturf)) + return + if(get_dist(src, target) <= 7)//Screen range check, so you can't get tentacle'd offscreen + visible_message("The [src.name] digs its tentacles under [target.name]!") + new /obj/effect/goliath_tentacle/original(tturf) + ranged_cooldown = world.time + ranged_cooldown_time + icon_state = icon_aggro + pre_attack = 0 + +/mob/living/simple_animal/hostile/asteroid/goliath/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + ranged_cooldown -= 10 + handle_preattack() + . = ..() + +/mob/living/simple_animal/hostile/asteroid/goliath/Aggro() + vision_range = aggro_vision_range + handle_preattack() + if(icon_state != icon_aggro) + icon_state = icon_aggro + +//Lavaland Goliath +/mob/living/simple_animal/hostile/asteroid/goliath/beast + name = "goliath" + desc = "A hulking, armor-plated beast with long tendrils arching from its back." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "goliath" + icon_living = "goliath" + icon_aggro = "goliath" + icon_dead = "goliath_dead" + throw_message = "does nothing to the tough hide of the" + pre_attack_icon = "goliath2" + crusher_loot = /obj/item/crusher_trophy/goliath_tentacle + butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2) + loot = list() + stat_attack = UNCONSCIOUS + robust_searching = 1 + +/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril + fromtendril = TRUE + +//tentacles +/obj/effect/goliath_tentacle + name = "Goliath tentacle" + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Goliath_tentacle" + var/latched = FALSE + anchored = TRUE + +/obj/effect/goliath_tentacle/Initialize() + . = ..() + if(ismineralturf(loc)) + var/turf/closed/mineral/M = loc + M.gets_drilled() + addtimer(CALLBACK(src, .proc/Trip), 10) + +/obj/effect/goliath_tentacle/original/Initialize() + . = ..() + for(var/obj/effect/goliath_tentacle/original/O in loc)//No more GG NO RE from 2+ goliaths simultaneously tentacling you + if(O != src) + qdel(src) + var/list/directions = GLOB.cardinal.Copy() + for(var/i in 1 to 3) + var/spawndir = pick(directions) + directions -= spawndir + var/turf/T = get_step(src,spawndir) + if(T) + new /obj/effect/goliath_tentacle(T) + +/obj/effect/goliath_tentacle/proc/Trip() + for(var/mob/living/M in src.loc) + visible_message("The [src.name] grabs hold of [M.name]!") + M.Stun(5) + M.adjustBruteLoss(rand(10,15)) + latched = TRUE + if(!latched) + qdel(src) + else + QDEL_IN(src, 50) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm new file mode 100644 index 00000000000..b5bea10cd3c --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -0,0 +1,113 @@ +//Gutlunches, passive mods that devour blood and gibs +/mob/living/simple_animal/hostile/asteroid/gutlunch + name = "gutlunch" + desc = "A scavenger that eats raw meat, often found alongside ash walkers. Produces a thick, nutritious milk." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "gutlunch" + icon_living = "gutlunch" + icon_dead = "gutlunch" + speak_emote = list("warbles", "quavers") + emote_hear = list("trills.") + emote_see = list("sniffs.", "burps.") + weather_immunities = list("lava","ash") + faction = list("mining", "ashwalker") + density = 0 + speak_chance = 1 + turns_per_move = 8 + obj_damage = 0 + environment_smash = ENVIRONMENT_SMASH_NONE + move_to_delay = 15 + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "squishes" + friendly = "pinches" + a_intent = INTENT_HELP + ventcrawler = VENTCRAWLER_ALWAYS + gold_core_spawnable = 2 + stat_attack = UNCONSCIOUS + gender = NEUTER + stop_automated_movement = FALSE + stop_automated_movement_when_pulled = TRUE + stat_exclusive = TRUE + robust_searching = TRUE + search_objects = TRUE + del_on_death = TRUE + loot = list(/obj/effect/decal/cleanable/blood/gibs) + deathmessage = "is pulped into bugmash." + + animal_species = /mob/living/simple_animal/hostile/asteroid/gutlunch + childtype = list(/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck = 45, /mob/living/simple_animal/hostile/asteroid/gutlunch/guthen = 55) + + wanted_objects = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/blood/gibs/) + var/obj/item/udder/gutlunch/udder = null + +/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize() + udder = new() + . = ..() + +/mob/living/simple_animal/hostile/asteroid/gutlunch/Destroy() + QDEL_NULL(udder) + return ..() + +/mob/living/simple_animal/hostile/asteroid/gutlunch/regenerate_icons() + cut_overlays() + if(udder.reagents.total_volume == udder.reagents.maximum_volume) + add_overlay("gl_full") + ..() + +/mob/living/simple_animal/hostile/asteroid/gutlunch/attackby(obj/item/O, mob/user, params) + if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) + udder.milkAnimal(O, user) + regenerate_icons() + else + ..() + +/mob/living/simple_animal/hostile/asteroid/gutlunch/AttackingTarget() + if(is_type_in_typecache(target,wanted_objects)) //we eats + udder.generateMilk() + regenerate_icons() + visible_message("[src] slurps up [target].") + qdel(target) + return ..() + +//Male gutlunch. They're smaller and more colorful! +/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck + name = "gubbuck" + gender = MALE + +/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck/Initialize() + ..() + add_atom_colour(pick("#E39FBB", "#D97D64", "#CF8C4A"), FIXED_COLOUR_PRIORITY) + resize = 0.85 + update_transform() + +//Lady gutlunch. They make the babby. +/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen + name = "guthen" + gender = FEMALE + +/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/Life() + ..() + if(udder.reagents.total_volume == udder.reagents.maximum_volume) //Only breed when we're full. + make_babies() + +/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/make_babies() + . = ..() + if(.) + udder.reagents.clear_reagents() + regenerate_icons() + +//Gutlunch udder +/obj/item/udder/gutlunch + name = "nutrient sac" + +/obj/item/udder/gutlunch/New() + reagents = new(50) + reagents.my_atom = src + +/obj/item/udder/gutlunch/generateMilk() + if(prob(60)) + reagents.add_reagent("cream", rand(2, 5)) + if(prob(45)) + reagents.add_reagent("salglu_solution", rand(2,5)) + diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm new file mode 100644 index 00000000000..3b1cc00b2d2 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -0,0 +1,344 @@ +/mob/living/simple_animal/hostile/asteroid/hivelord + name = "hivelord" + desc = "A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Hivelord" + icon_living = "Hivelord" + icon_aggro = "Hivelord_alert" + icon_dead = "Hivelord_dead" + icon_gib = "syndicate_gib" + mouse_opacity = 2 + move_to_delay = 14 + ranged = 1 + vision_range = 5 + aggro_vision_range = 9 + idle_vision_range = 5 + speed = 3 + maxHealth = 75 + health = 75 + harm_intent_damage = 5 + melee_damage_lower = 0 + melee_damage_upper = 0 + attacktext = "lashes out at" + speak_emote = list("telepathically cries") + attack_sound = 'sound/weapons/pierce.ogg' + throw_message = "falls right through the strange body of the" + ranged_cooldown = 0 + ranged_cooldown_time = 20 + obj_damage = 0 + environment_smash = ENVIRONMENT_SMASH_NONE + retreat_distance = 3 + minimum_distance = 3 + pass_flags = PASSTABLE + loot = list(/obj/item/organ/regenerative_core) + var/brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood + +/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target) + if(world.time >= ranged_cooldown) + var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new brood_type(src.loc) + A.admin_spawned = admin_spawned + A.GiveTarget(target) + A.friends = friends + A.faction = faction.Copy() + ranged_cooldown = world.time + ranged_cooldown_time + +/mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget() + OpenFire() + return TRUE + +/mob/living/simple_animal/hostile/asteroid/hivelord/spawn_crusher_loot() + loot += crusher_loot //we don't butcher + +/mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed) + mouse_opacity = 1 + ..(gibbed) + +//A fragile but rapidly produced creature +/mob/living/simple_animal/hostile/asteroid/hivelordbrood + name = "hivelord brood" + desc = "A fragment of the original Hivelord, rallying behind its original. One isn't much of a threat, but..." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Hivelordbrood" + icon_living = "Hivelordbrood" + icon_aggro = "Hivelordbrood" + icon_dead = "Hivelordbrood" + icon_gib = "syndicate_gib" + mouse_opacity = 2 + move_to_delay = 1 + friendly = "buzzes near" + vision_range = 10 + speed = 3 + maxHealth = 1 + health = 1 + movement_type = FLYING + harm_intent_damage = 5 + melee_damage_lower = 2 + melee_damage_upper = 2 + attacktext = "slashes" + speak_emote = list("telepathically cries") + attack_sound = 'sound/weapons/pierce.ogg' + throw_message = "falls right through the strange body of the" + obj_damage = 0 + environment_smash = ENVIRONMENT_SMASH_NONE + pass_flags = PASSTABLE + del_on_death = 1 + +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize() + ..() + addtimer(CALLBACK(src, .proc/death), 100) + +//Legion +/mob/living/simple_animal/hostile/asteroid/hivelord/legion + name = "legion" + desc = "You can still see what was once a human under the shifting mass of corruption." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "legion" + icon_living = "legion" + icon_aggro = "legion" + icon_dead = "legion" + icon_gib = "syndicate_gib" + obj_damage = 60 + melee_damage_lower = 15 + melee_damage_upper = 15 + attacktext = "lashes out at" + speak_emote = list("echoes") + attack_sound = 'sound/weapons/pierce.ogg' + throw_message = "bounces harmlessly off of" + crusher_loot = /obj/item/crusher_trophy/legion_skull + loot = list(/obj/item/organ/regenerative_core/legion) + brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion + del_on_death = 1 + stat_attack = UNCONSCIOUS + robust_searching = 1 + var/mob/living/carbon/human/stored_mob + +/mob/living/simple_animal/hostile/asteroid/hivelord/legion/death(gibbed) + visible_message("The skulls on [src] wail in anger as they flee from their dying host!") + var/turf/T = get_turf(src) + if(T) + if(stored_mob) + stored_mob.forceMove(get_turf(src)) + stored_mob = null + else if(fromtendril) + new /obj/effect/mob_spawn/human/corpse/charredskeleton(T) + else + new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested(T) + ..(gibbed) + +/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril + fromtendril = TRUE + +//Legion skull +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion + name = "legion" + desc = "One of many." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "legion_head" + icon_living = "legion_head" + icon_aggro = "legion_head" + icon_dead = "legion_head" + icon_gib = "syndicate_gib" + friendly = "buzzes near" + vision_range = 10 + maxHealth = 1 + health = 5 + harm_intent_damage = 5 + melee_damage_lower = 12 + melee_damage_upper = 12 + attacktext = "bites" + speak_emote = list("echoes") + attack_sound = 'sound/weapons/pierce.ogg' + throw_message = "is shrugged off by" + pass_flags = PASSTABLE + del_on_death = TRUE + stat_attack = UNCONSCIOUS + robust_searching = 1 + var/can_infest_dead = FALSE + +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life() + if(isturf(loc)) + for(var/mob/living/carbon/human/H in view(src,1)) //Only for corpse right next to/on same tile + if(H.stat == UNCONSCIOUS || (can_infest_dead && H.stat == DEAD)) + infest(H) + ..() + +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) + visible_message("[name] burrows into the flesh of [H]!") + var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L = new(H.loc) + visible_message("[L] staggers to their feet!") + H.death() + H.adjustBruteLoss(1000) + L.stored_mob = H + H.forceMove(L) + qdel(src) + +//Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions) +/mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced + stat_attack = 2 + maxHealth = 120 + health = 120 + brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced + icon_state = "dwarf_legion" + icon_living = "dwarf_legion" + icon_aggro = "dwarf_legion" + icon_dead = "dwarf_legion" + +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/advanced + stat_attack = 2 + can_infest_dead = TRUE + +//Legion that spawns Legions +/mob/living/simple_animal/hostile/spawner/legion + name = "legion" + desc = "One of many." + icon = 'icons/mob/lavaland/dragon.dmi' + icon_state = "legion" + icon_living = "legion" + icon_dead = "legion" + health = 450 + maxHealth = 450 + max_mobs = 3 + spawn_time = 200 + spawn_text = "peels itself off from" + mob_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion + melee_damage_lower = 20 + melee_damage_upper = 20 + anchored = FALSE + AIStatus = AI_ON + stop_automated_movement = FALSE + wander = TRUE + maxbodytemp = INFINITY + layer = MOB_LAYER + del_on_death = TRUE + sentience_type = SENTIENCE_BOSS + loot = list(/obj/item/organ/regenerative_core/legion = 3, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5) + move_to_delay = 14 + vision_range = 5 + aggro_vision_range = 9 + idle_vision_range = 5 + speed = 3 + faction = list("mining") + weather_immunities = list("lava","ash") + obj_damage = 30 + environment_smash = ENVIRONMENT_SMASH_STRUCTURES + see_in_dark = 8 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + +//Tendril-spawned Legion remains, the charred skeletons of those whose bodies sank into laval or fell into chasms. +/obj/effect/mob_spawn/human/corpse/charredskeleton + name = "charred skeletal remains" + burn_damage = 1000 + mob_name = "ashen skeleton" + mob_gender = NEUTER + husk = FALSE + mob_species = /datum/species/skeleton + mob_color = "#454545" + +//Legion infested mobs + +/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() + var/type = pickweight(list("Miner" = 66, "Ashwalker" = 10, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde","Operative", "Cultist")) = 4)) + switch(type) + if("Miner") + mob_species = pickweight(list(/datum/species/human = 70, /datum/species/lizard = 26, /datum/species/fly = 2, /datum/species/plasmaman = 2)) + if(mob_species == /datum/species/plasmaman) + uniform = /obj/item/clothing/under/plasmaman + head = /obj/item/clothing/head/helmet/space/plasmaman + belt = /obj/item/weapon/tank/internals/plasmaman/belt + else + uniform = /obj/item/clothing/under/rank/miner/lavaland + if (prob(4)) + belt = pickweight(list(/obj/item/weapon/storage/belt/mining = 2, /obj/item/weapon/storage/belt/mining/alt = 2)) + else if(prob(10)) + belt = pickweight(list(/obj/item/weapon/pickaxe = 8, /obj/item/weapon/pickaxe/mini = 4, /obj/item/weapon/pickaxe/silver = 2, /obj/item/weapon/pickaxe/diamond = 1)) + else + belt = /obj/item/weapon/tank/internals/emergency_oxygen/engi + if(mob_species != /datum/species/lizard) + shoes = /obj/item/clothing/shoes/workboots/mining + gloves = /obj/item/clothing/gloves/color/black + mask = /obj/item/clothing/mask/gas/explorer + if(prob(20)) + suit = pickweight(list(/obj/item/clothing/suit/hooded/explorer = 18, /obj/item/clothing/suit/hooded/cloak/goliath = 2)) + if(prob(30)) + r_pocket = pickweight(list(/obj/item/stack/marker_beacon = 20, /obj/item/stack/spacecash/c1000 = 7,/obj/item/weapon/reagent_containers/hypospray/medipen/survival = 2, /obj/item/borg/upgrade/modkit/damage = 1 )) + if(prob(10)) + l_pocket = pickweight(list(/obj/item/stack/spacecash/c1000 = 7,/obj/item/weapon/reagent_containers/hypospray/medipen/survival = 2, /obj/item/borg/upgrade/modkit/cooldown = 1 )) + if("Ashwalker") + mob_species = /datum/species/lizard/ashwalker + uniform = /obj/item/clothing/under/gladiator/ash_walker + if(prob(95)) + head = /obj/item/clothing/head/helmet/gladiator + else + head = /obj/item/clothing/head/helmet/skull + suit = /obj/item/clothing/suit/armor/bone + gloves = /obj/item/clothing/gloves/bracer + if(prob(5)) + back = pickweight(list(/obj/item/weapon/twohanded/bonespear = 3,/obj/item/weapon/twohanded/fireaxe/boneaxe = 2)) + if(prob(10)) + belt = /obj/item/weapon/storage/belt/mining/primitive + if(prob(30)) + r_pocket = /obj/item/weapon/kitchen/knife/combat/bone + if(prob(30)) + l_pocket = /obj/item/weapon/kitchen/knife/combat/bone + if("Clown") + name = pick(GLOB.clown_names) + outfit = /datum/outfit/job/clown + belt = null + backpack_contents = list() + if(prob(70)) + backpack_contents += pick(list(/obj/item/weapon/stamp/clown = 1, /obj/item/weapon/reagent_containers/spray/waterflower = 1,/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1, /obj/item/device/megaphone/clown = 1,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter = 1,/obj/item/weapon/pneumatic_cannon/pie = 1)) + if(prob(30)) + backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pickweight(list( 1 = 3, 2 = 2, 3 = 1))) + if(prob(10)) + l_pocket = pickweight(list(/obj/item/weapon/bikehorn/golden = 3, /obj/item/weapon/bikehorn/airhorn= 1 )) + if(prob(10)) + r_pocket = /obj/item/weapon/implanter/sad_trombone + if("Golem") + mob_species = pick(list(/datum/species/golem/adamantine, /datum/species/golem/plasma, /datum/species/golem/diamond, /datum/species/golem/gold, /datum/species/golem/silver, /datum/species/golem/plasteel, /datum/species/golem/titanium, /datum/species/golem/plastitanium)) + if(prob(30)) + glasses = pickweight(list(/obj/item/clothing/glasses/meson = 2, /obj/item/clothing/glasses/hud/health = 2,/obj/item/clothing/glasses/hud/diagnostic =2, /obj/item/clothing/glasses/science = 2, /obj/item/clothing/glasses/welding = 2, /obj/item/clothing/glasses/night = 1)) + if(prob(10)) + belt = pick(list(/obj/item/weapon/storage/belt/mining/vendor,/obj/item/weapon/storage/belt/utility/full)) + if(prob(50)) + neck = /obj/item/weapon/bedsheet/rd/royal_cape + if(prob(10)) + l_pocket = pick(list(/obj/item/weapon/crowbar/power, /obj/item/weapon/wrench/power, /obj/item/weapon/weldingtool/experimental)) + if("YeOlde") + mob_gender = FEMALE + uniform = /obj/item/clothing/under/maid + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/helmet/knight + suit = /obj/item/clothing/suit/armor/riot/knight + back = /obj/item/weapon/shield/riot/buckler + belt = /obj/item/weapon/nullrod/claymore + r_pocket = /obj/item/weapon/tank/internals/emergency_oxygen + mask = /obj/item/clothing/mask/breath + if("Operative") + id_job = "Operative" + id_access_list = list(GLOB.access_syndicate) + outfit = /datum/outfit/syndicatecommandocorpse + if("Shadow") + mob_species = /datum/species/shadow + r_pocket = /obj/item/weapon/reagent_containers/pill/shadowtoxin + neck = /obj/item/clothing/tie/medal/nobel_science + uniform = /obj/item/clothing/under/color/black + shoes = /obj/item/clothing/shoes/sneakers/black + suit = /obj/item/clothing/suit/toggle/labcoat + glasses = /obj/item/clothing/glasses/sunglasses/blindfold + back = /obj/item/weapon/tank/internals/oxygen + mask = /obj/item/clothing/mask/breath + if("Cultist") + uniform = /obj/item/clothing/under/roman + suit = /obj/item/clothing/suit/cultrobes + head = /obj/item/clothing/head/culthood + suit_store = /obj/item/weapon/tome + r_pocket = /obj/item/weapon/restraints/legcuffs/bola/cult + l_pocket = /obj/item/weapon/melee/cultblade/dagger + glasses = /obj/item/clothing/glasses/night/cultblind + backpack_contents = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/device/cult_shift = 1, /obj/item/device/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15) + . = ..() + + + + diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm new file mode 100644 index 00000000000..5788a6fdc6d --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -0,0 +1,71 @@ +//the base mining mob +/mob/living/simple_animal/hostile/asteroid + vision_range = 2 + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + faction = list("mining") + weather_immunities = list("lava","ash") + obj_damage = 30 + environment_smash = ENVIRONMENT_SMASH_WALLS + minbodytemp = 0 + maxbodytemp = INFINITY + response_help = "pokes" + response_disarm = "shoves" + response_harm = "strikes" + status_flags = 0 + a_intent = INTENT_HARM + var/crusher_loot + var/throw_message = "bounces off of" + var/icon_aggro = null // for swapping to when we get aggressive + var/fromtendril = FALSE + see_in_dark = 8 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + mob_size = MOB_SIZE_LARGE + +/mob/living/simple_animal/hostile/asteroid/Initialize(mapload) + . = ..() + apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + +/mob/living/simple_animal/hostile/asteroid/Aggro() + ..() + if(vision_range != aggro_vision_range) + icon_state = icon_aggro + +/mob/living/simple_animal/hostile/asteroid/LoseAggro() + ..() + if(stat == DEAD) + return + icon_state = icon_living + +/mob/living/simple_animal/hostile/asteroid/bullet_act(obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills + if(!stat) + Aggro() + if(P.damage < 30 && P.damage_type != BRUTE) + P.damage = (P.damage / 3) + visible_message("[P] has a reduced effect on [src]!") + ..() + +/mob/living/simple_animal/hostile/asteroid/hitby(atom/movable/AM)//No floor tiling them to death, wiseguy + if(istype(AM, /obj/item)) + var/obj/item/T = AM + if(!stat) + Aggro() + if(T.throwforce <= 20) + visible_message("The [T.name] [throw_message] [src.name]!") + return + ..() + +/mob/living/simple_animal/hostile/asteroid/death(gibbed) + SSblackbox.add_details("mobs_killed_mining","[src.type]") + var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) + if(C && crusher_loot && prob((C.total_damage/maxHealth)) * 5) //on average, you'll need to kill 20 creatures before getting the item + spawn_crusher_loot() + ..(gibbed) + +/mob/living/simple_animal/hostile/asteroid/proc/spawn_crusher_loot() + butcher_results[crusher_loot] = 1 + +/mob/living/simple_animal/hostile/asteroid/handle_temperature_damage() + if(bodytemperature < minbodytemp) + adjustBruteLoss(2) + else if(bodytemperature > maxbodytemp) + adjustBruteLoss(20) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm new file mode 100644 index 00000000000..02257193ffa --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm @@ -0,0 +1,101 @@ +//Necropolis Tendrils, which spawn lavaland monsters and break into a chasm when killed +/obj/effect/light_emitter/tendril + set_luminosity = 4 + set_cap = 2.5 + light_color = LIGHT_COLOR_LAVA + +/mob/living/simple_animal/hostile/spawner/lavaland + name = "necropolis tendril" + desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it." + icon = 'icons/mob/nest.dmi' + icon_state = "tendril" + icon_living = "tendril" + icon_dead = "tendril" + faction = list("mining") + weather_immunities = list("lava","ash") + health = 250 + maxHealth = 250 + max_mobs = 3 + spawn_time = 300 //30 seconds default + mob_type = /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril + spawn_text = "emerges from" + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 0 + maxbodytemp = INFINITY + loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) + del_on_death = 1 + var/gps = null + var/obj/effect/light_emitter/tendril/emitted_light + +/mob/living/simple_animal/hostile/spawner/lavaland/goliath + mob_type = /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril + +/mob/living/simple_animal/hostile/spawner/lavaland/legion + mob_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril + +/mob/living/simple_animal/hostile/spawner/lavaland/Initialize() + . = ..() + emitted_light = new(loc) + for(var/F in RANGE_TURFS(1, src)) + if(ismineralturf(F)) + var/turf/closed/mineral/M = F + M.ChangeTurf(M.turf_type,FALSE,TRUE) + gps = new /obj/item/device/gps/internal(src) + +/mob/living/simple_animal/hostile/spawner/lavaland/Destroy() + QDEL_NULL(emitted_light) + QDEL_NULL(gps) + . = ..() + +#define MEDAL_PREFIX "Tendril" +/mob/living/simple_animal/hostile/spawner/lavaland/death() + var/last_tendril = TRUE + for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in GLOB.mob_list) + if(other != src) + last_tendril = FALSE + break + if(last_tendril && !admin_spawned) + if(global.medal_hub && global.medal_pass && global.medals_enabled) + for(var/mob/living/L in view(7,src)) + if(L.stat) + continue + if(L.client) + var/client/C = L.client + var/suffixm = ALL_KILL_MEDAL + var/prefix = MEDAL_PREFIX + UnlockMedal("[prefix] [suffixm]",C) + SetScore(TENDRIL_CLEAR_SCORE,C,1) + ..() +#undef MEDAL_PREFIX + +/obj/effect/collapse + name = "collapsing necropolis tendril" + desc = "Get clear!" + layer = BELOW_OBJ_LAYER + icon = 'icons/mob/nest.dmi' + icon_state = "tendril" + anchored = TRUE + density = TRUE + var/obj/effect/light_emitter/tendril/emitted_light + +/obj/effect/collapse/Initialize() + . = ..() + emitted_light = new(loc) + visible_message("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!") + visible_message("Something falls free of the tendril!") + playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1) + addtimer(CALLBACK(src, .proc/collapse), 50) + +/obj/effect/collapse/Destroy() + QDEL_NULL(emitted_light) + return ..() + +/obj/effect/collapse/proc/collapse() + for(var/mob/M in range(7,src)) + shake_camera(M, 15, 1) + playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, 1) + visible_message("The tendril falls inward, the ground around it widening into a yawning chasm!") + for(var/turf/T in range(2,src)) + if(!T.density) + T.TerraformTurf(/turf/open/chasm/straight_down/lava_land_surface) + qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm index 563c5a3d036..7dd53541dd3 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm @@ -23,3 +23,51 @@ environment_smash = ENVIRONMENT_SMASH_NONE del_on_death = 0 +/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace + name = "Nanotrasen Private Security Officer" + desc = "An officer part of Nanotrasen's private security force." + icon = 'icons/mob/simple_human.dmi' + icon_state = "nanotrasen" + icon_living = "nanotrasen" + icon_dead = null + icon_gib = "syndicate_gib" + turns_per_move = 5 + response_help = "pokes" + response_disarm = "shoves" + response_harm = "hits" + speed = 0 + stat_attack = 1 + robust_searching = 1 + vision_range = 3 + maxHealth = 100 + health = 100 + harm_intent_damage = 5 + melee_damage_lower = 10 + melee_damage_upper = 15 + attacktext = "punches" + attack_sound = 'sound/weapons/punch1.ogg' + faction = list("nanotrasenprivate") + a_intent = INTENT_HARM + loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier) + atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + unsuitable_atmos_damage = 15 + status_flags = CANPUSH + search_objects = 1 + +/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/Aggro() + ..() + summon_backup(15) + say("411 in progress, requesting backup!") + +/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/ranged + icon_state = "nanotrasenrangedsmg" + icon_living = "nanotrasenrangedsmg" + vision_range = 9 + rapid = 1 + ranged = 1 + retreat_distance = 3 + minimum_distance = 5 + casingtype = /obj/item/ammo_casing/c46x30mm + projectilesound = 'sound/weapons/Gunshot_smg.ogg' + loot = list(/obj/item/weapon/gun/ballistic/automatic/wt550, + /obj/effect/mob_spawn/human/corpse/nanotrasensoldier) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm new file mode 100644 index 00000000000..d4aa40ed133 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -0,0 +1,127 @@ +//A fragile mob that becomes temporarily invincible and large to attack +/mob/living/simple_animal/hostile/asteroid/fugu + name = "wumborian fugu" + desc = "The wumborian fugu rapidly increases its body mass in order to ward off its prey. Great care should be taken to avoid it while it's in this state as it is nearly invincible, but it cannot maintain its form forever." + icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_state = "Fugu" + icon_living = "Fugu" + icon_aggro = "Fugu" + icon_dead = "Fugu_dead" + icon_gib = "syndicate_gib" + mouse_opacity = 2 + move_to_delay = 5 + friendly = "floats near" + speak_emote = list("puffs") + vision_range = 5 + speed = 0 + maxHealth = 50 + health = 50 + harm_intent_damage = 5 + obj_damage = 0 + melee_damage_lower = 0 + melee_damage_upper = 0 + attacktext = "chomps" + attack_sound = 'sound/weapons/punch1.ogg' + throw_message = "is avoided by the" + aggro_vision_range = 9 + idle_vision_range = 5 + mob_size = MOB_SIZE_SMALL + environment_smash = ENVIRONMENT_SMASH_NONE + var/wumbo = 0 + var/inflate_cooldown = 0 + loot = list(/obj/item/asteroid/fugu_gland{layer = ABOVE_MOB_LAYER}) + +/mob/living/simple_animal/hostile/asteroid/fugu/Life() + if(!wumbo) + inflate_cooldown = max((inflate_cooldown - 1), 0) + if(target && AIStatus == AI_ON) + Inflate() + ..() + +/mob/living/simple_animal/hostile/asteroid/fugu/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + if(!forced && wumbo) + return FALSE + . = ..() + +/mob/living/simple_animal/hostile/asteroid/fugu/Aggro() + ..() + Inflate() + +/mob/living/simple_animal/hostile/asteroid/fugu/verb/Inflate() + set name = "Inflate" + set category = "Fugu" + set desc = "Temporarily increases your size, and makes you significantly more dangerous and tough." + if(wumbo) + to_chat(src, "You're already inflated.") + return + if(inflate_cooldown) + to_chat(src, "We need time to gather our strength.") + return + if(buffed) + to_chat(src, "Something is interfering with our growth.") + return + wumbo = 1 + icon_state = "Fugu_big" + obj_damage = 60 + melee_damage_lower = 15 + melee_damage_upper = 20 + harm_intent_damage = 0 + throw_message = "is absorbed by the girth of the" + retreat_distance = null + minimum_distance = 1 + move_to_delay = 6 + transform *= 2 + environment_smash = ENVIRONMENT_SMASH_WALLS + mob_size = MOB_SIZE_LARGE + speed = 1 + addtimer(CALLBACK(src, .proc/Deflate), 100) + +/mob/living/simple_animal/hostile/asteroid/fugu/proc/Deflate() + if(wumbo) + walk(src, 0) + wumbo = 0 + icon_state = "Fugu" + obj_damage = 0 + melee_damage_lower = 0 + melee_damage_upper = 0 + harm_intent_damage = 5 + throw_message = "is avoided by the" + retreat_distance = 9 + minimum_distance = 9 + move_to_delay = 2 + transform /= 2 + inflate_cooldown = 4 + environment_smash = ENVIRONMENT_SMASH_NONE + mob_size = MOB_SIZE_SMALL + speed = 0 + +/mob/living/simple_animal/hostile/asteroid/fugu/death(gibbed) + Deflate() + ..(gibbed) + +/obj/item/asteroid/fugu_gland + name = "wumborian fugu gland" + desc = "The key to the wumborian fugu's ability to increase its mass arbitrarily, this disgusting remnant can apply the same effect to other creatures, giving them great strength." + icon = 'icons/obj/surgery.dmi' + icon_state = "fugu_gland" + flags = NOBLUDGEON + w_class = WEIGHT_CLASS_NORMAL + layer = MOB_LAYER + origin_tech = "biotech=6" + var/list/banned_mobs() + +/obj/item/asteroid/fugu_gland/afterattack(atom/target, mob/user, proximity_flag) + if(proximity_flag && istype(target, /mob/living/simple_animal)) + var/mob/living/simple_animal/A = target + if(A.buffed || (A.type in banned_mobs) || A.stat) + to_chat(user, "Something's interfering with the [src]'s effects. It's no use.") + return + A.buffed++ + A.maxHealth *= 1.5 + A.health = min(A.maxHealth,A.health*1.5) + A.melee_damage_lower = max((A.melee_damage_lower * 2), 10) + A.melee_damage_upper = max((A.melee_damage_upper * 2), 10) + A.transform *= 2 + A.environment_smash += 2 + to_chat(user, "You increase the size of [A], giving it a surge of strength!") + qdel(src) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index eaee4a6b622..e60f4f1b791 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -309,11 +309,11 @@ if(Target) --target_patience - if (target_patience <= 0 || SStun || Discipline || attacked || docile) // Tired of chasing or something draws out attention + if (target_patience <= 0 || SStun > world.time || Discipline || attacked || docile) // Tired of chasing or something draws out attention target_patience = 0 Target = null - if(AIproc && SStun) + if(AIproc && SStun > world.time) return var/hungry = 0 // determines if the slime is hungry diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index a5facfba089..e016be2033f 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -394,11 +394,7 @@ if(buckled) Feedstop(silent=1) //we unbuckle the slime from the mob it latched onto. - spawn(0) - SStun = 1 - sleep(rand(20,60)) - SStun = 0 - + SStun = world.time + rand(20,60) spawn(0) canmove = 0 if(user) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 733b39591e8..5a9596792ce 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -178,7 +178,7 @@ if(mob.throwing) mob.throwing.finalize(FALSE) - for(var/obj/O in mob) + for(var/obj/O in mob.contents|mob.held_items) O.on_mob_move(direct, src) return . diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm index c03570c3353..963aaf33099 100644 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ b/code/modules/modular_computers/computers/item/computer_power.dm @@ -26,6 +26,10 @@ return battery_module.battery.give(amount) return 0 +/obj/item/device/modular_computer/get_cell() + var/obj/item/weapon/computer_hardware/battery/battery_module = all_components[MC_CELL] + if(battery_module && battery_module.battery) + return battery_module.battery // Used in following function to reduce copypaste /obj/item/device/modular_computer/proc/power_failure() diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 74590339b42..5eab5f5c43b 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -41,6 +41,9 @@ /datum/computer_file/program/card_mod/New() ..() + addtimer(CALLBACK(src, .proc/SetConfigCooldown), 0) + +/datum/computer_file/program/card_mod/proc/SetConfigCooldown() change_position_cooldown = config.id_console_jobslot_delay /datum/computer_file/program/card_mod/event_idremoved(background, slot) diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 7a3e119a56d..c75dd1032d5 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -111,7 +111,7 @@ They *could* go in their appropriate files, but this is supposed to be modular S.cell.charge += charge charge = 0 corrupt() - updateicon() + update_icon() //RDCONSOLE// diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index d5811e32c93..2f3c64ca8f8 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -57,6 +57,9 @@ Contents: var/a_boost = 3//Number of adrenaline boosters. +/obj/item/clothing/suit/space/space_ninja/get_cell() + return cell + /obj/item/clothing/suit/space/space_ninja/New() ..() diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index e54a5e0e85f..7903d4c3e7c 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -32,7 +32,7 @@ U.put_in_hands(old_cell) old_cell.add_fingerprint(U) old_cell.corrupt() - old_cell.updateicon() + old_cell.update_icon() cell = CELL to_chat(U, "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%") else diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index c084befd924..7eaa0a7e268 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -276,7 +276,7 @@ if(!user.dna) return -1 user.dna.add_mutation(HULK) - var/obj/item/organ/hivelord_core/organ = new /obj/item/organ/hivelord_core + var/obj/item/organ/regenerative_core/organ = new /obj/item/organ/regenerative_core organ.Insert(user) return ..() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 976e48707b1..f985099219d 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -304,7 +304,6 @@ else info += t // Oh, he wants to edit to the end of the file, let him. updateinfolinks() - i.on_write(src,usr) usr << browse("[name][info_links]
[stamps]", "window=[name]") // Update the window update_icon() diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index c6d65031477..3b691720e2a 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -197,12 +197,3 @@ else icon_state = initial(icon_state) //looks like a normal pen when off. item_state = initial(item_state) - -//Crayons path disambiguity sigh. -/obj/item/proc/on_write(obj/item/weapon/paper/P, mob/user) - return - -/obj/item/weapon/pen/poison/on_write(obj/item/weapon/paper/P, mob/user) - P.contact_poison = "delayed_toxin" - P.contact_poison_volume = 10 - add_logs(user,P,"used poison pen on") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e58240b0452..bdf720b50f6 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -27,8 +27,6 @@ #define APC_UPOVERLAY_OPERATING 8192 -#define APC_UPDATE_ICON_COOLDOWN 200 // 20 seconds - // the Area Power Controller (APC), formerly Power Distribution Unit (PDU) // one per area, needs wire conection to power network through a terminal @@ -93,13 +91,14 @@ var/force_update = 0 var/update_state = -1 var/update_overlay = -1 + var/icon_update_needed = FALSE +/obj/machinery/power/apc/get_cell() + return cell /obj/machinery/power/apc/connect_to_network() //Override because the APC does not directly connect to the network; it goes through a terminal. //The terminal is what the power computer looks for anyway. - if(!terminal) - make_terminal() if(terminal) terminal.connect_to_network() @@ -212,11 +211,11 @@ // update the APC icon to show the three base states // also add overlays for indicator lights /obj/machinery/power/apc/update_icon() - var/update = check_updates() //returns 0 if no need to update icons. // 1 if we need to update the icon_state // 2 if we need to update the overlays if(!update) + icon_update_needed = FALSE return if(update & 1) // Updating the icon state @@ -240,6 +239,8 @@ icon_state = "apcemag" else if(update_state & UPSTATE_WIREEXP) icon_state = "apcewires" + else if(update_state & UPSTATE_MAINT) + icon_state = "apc0" if(!(update_state & UPSTATE_ALLGOOD)) cut_overlays() @@ -272,8 +273,9 @@ else set_light(0) -/obj/machinery/power/apc/proc/check_updates() + icon_update_needed = FALSE +/obj/machinery/power/apc/proc/check_updates() var/last_update_state = update_state var/last_update_overlay = update_overlay update_state = 0 @@ -344,7 +346,7 @@ // Used in process so it doesn't update the icon too much /obj/machinery/power/apc/proc/queue_icon_update() - addtimer(CALLBACK(src, .proc/update_icon), APC_UPDATE_ICON_COOLDOWN, TIMER_UNIQUE) + icon_update_needed = TRUE //attack with an item - open/close cover, insert cell, or (un)lock interface @@ -446,6 +448,8 @@ update_icon() else if(emagged) to_chat(user, "The interface is broken!") + else if((stat & MAINT) && !opened) + ..() //its an empty closed frame... theres no wires to expose! else panel_open = !panel_open to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"]") @@ -621,17 +625,15 @@ return if(usr == user && opened && (!issilicon(user))) if(cell) + user.visible_message("[user] removes \the [cell] from [src]!","You remove \the [cell].") user.put_in_hands(cell) - cell.add_fingerprint(user) - cell.updateicon() - + cell.update_icon() src.cell = null - user.visible_message("[user.name] removes the power cell from [src.name]!",\ - "You remove the power cell.") - //to_chat(user, "You remove the power cell.") charging = 0 src.update_icon() return + if((stat & MAINT) && !opened) //no board; no interface + return ..() /obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ @@ -937,7 +939,8 @@ return 0 /obj/machinery/power/apc/process() - + if(icon_update_needed) + update_icon() if(stat & (BROKEN|MAINT)) return if(!area.requires_power) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index a1e650f73dd..69cc104d78d 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -509,6 +509,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") singular_name = "cable piece" + full_w_class = WEIGHT_CLASS_SMALL /obj/item/stack/cable_coil/cyborg is_cyborg = 1 @@ -527,7 +528,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") return(OXYLOSS) -/obj/item/stack/cable_coil/New(loc, new_amount = null, var/param_color = null) +/obj/item/stack/cable_coil/Initialize(mapload, new_amount = null, param_color = null) . = ..() if(new_amount) // MAXCOIL by default amount = new_amount @@ -779,9 +780,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai /obj/item/stack/cable_coil/cut item_state = "coil_red2" -/obj/item/stack/cable_coil/cut/New(loc) - ..() - src.amount = rand(1,2) +/obj/item/stack/cable_coil/cut/Initialize(mapload) + . =..() + amount = rand(1,2) pixel_x = rand(-2,2) pixel_y = rand(-2,2) update_icon() @@ -819,10 +820,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai item_color = "white" icon_state = "coil_white" -/obj/item/stack/cable_coil/random/New() +/obj/item/stack/cable_coil/random/Initialize(mapload) + . = ..() item_color = pick("red","orange","yellow","green","cyan","blue","pink","white") icon_state = "coil_[item_color]" - ..() + /obj/item/stack/cable_coil/random/five amount = 5 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 350eb534e65..0b74b1ec31d 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -19,13 +19,16 @@ var/ratingdesc = TRUE var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it. +/obj/item/weapon/stock_parts/cell/get_cell() + return src + /obj/item/weapon/stock_parts/cell/New() ..() START_PROCESSING(SSobj, src) charge = maxcharge if(ratingdesc) desc += " This one has a power rating of [maxcharge], and you should not swallow it." - updateicon() + update_icon() /obj/item/weapon/stock_parts/cell/Destroy() STOP_PROCESSING(SSobj, src) @@ -46,7 +49,7 @@ else return PROCESS_KILL -/obj/item/weapon/stock_parts/cell/proc/updateicon() +/obj/item/weapon/stock_parts/cell/update_icon() cut_overlays() if(grown_battery) add_overlay("grown_wires") @@ -318,3 +321,16 @@ /obj/item/weapon/stock_parts/cell/emproof/corrupt() return + +/obj/item/weapon/stock_parts/cell/beam_rifle + name = "beam rifle capacitor" + desc = "A high powered capacitor that can provide huge amounts of energy in an instant" + maxcharge = 50000 + chargerate = 5000 //Extremely energy intensive + rating = 4 + +/obj/item/weapon/stock_parts/cell/beam_rifle/corrupt() + return + +/obj/item/weapon/stock_parts/cell/beam_rifle/emp_act(severity) + charge = Clamp((charge-(10000/severity)),0,maxcharge) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index dea263231ac..3e35e3a42d2 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -23,7 +23,8 @@ #define SEVERE_POWER_PENALTY_THRESHOLD 7000 //Same as above, but causes more dangerous effects #define CRITICAL_POWER_PENALTY_THRESHOLD 9000 //Even more dangerous effects, threshold for tesla delamination #define HEAT_PENALTY_THRESHOLD 40 //Higher == Crystal safe operational temperature is higher. -#define DAMAGE_HARDCAP 0.01 +#define DAMAGE_HARDCAP 0.0025 +#define DAMAGE_INCREASE_MULTIPLIER 0.25 #define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction, not to be confused with the above values @@ -214,9 +215,9 @@ damage_archived = damage if(takes_damage) //causing damage - damage = max(damage + (max(removed.temperature - ((T0C + HEAT_PENALTY_THRESHOLD)*dynamic_heat_resistance), 0) * mole_heat_penalty / 150 ), 0) - damage = max(damage + (max(power - POWER_PENALTY_THRESHOLD, 0)/500), 0) - damage = max(damage + (max(combined_gas - MOLE_PENALTY_THRESHOLD, 0)/80), 0) + damage = max(damage + (max(removed.temperature - ((T0C + HEAT_PENALTY_THRESHOLD)*dynamic_heat_resistance), 0) * mole_heat_penalty / 150 ) * DAMAGE_INCREASE_MULTIPLIER, 0) + damage = max(damage + (max(power - POWER_PENALTY_THRESHOLD, 0)/500) * DAMAGE_INCREASE_MULTIPLIER, 0) + damage = max(damage + (max(combined_gas - MOLE_PENALTY_THRESHOLD, 0)/80) * DAMAGE_INCREASE_MULTIPLIER, 0) //healing damage if(combined_gas < MOLE_PENALTY_THRESHOLD) diff --git a/code/modules/procedural_mapping/mapGenerators/lavaland.dm b/code/modules/procedural_mapping/mapGenerators/lavaland.dm new file mode 100644 index 00000000000..9c160ee8488 --- /dev/null +++ b/code/modules/procedural_mapping/mapGenerators/lavaland.dm @@ -0,0 +1,30 @@ + +/datum/mapGeneratorModule/bottomLayer/lavaland_default + spawnableTurfs = list(/turf/open/floor/plating/asteroid/basalt/lava_land_surface = 100) + +/datum/mapGeneratorModule/bottomLayer/lavaland_mineral + spawnableTurfs = list(/turf/closed/mineral/random/volcanic = 100) + +/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense + spawnableTurfs = list(/turf/closed/mineral/random/high_chance/volcanic = 100) + +/datum/mapGeneratorModule/splatterLayer/lavalandMonsters + spawnableTurfs = list() + spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast = 10, + /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 10, + /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 10) + +/datum/mapGeneratorModule/splatterLayer/lavalandTendrils + spawnableTurfs = list() + spawnableAtoms = list(/mob/living/simple_animal/hostile/spawner/lavaland = 5, + /mob/living/simple_animal/hostile/spawner/lavaland/legion = 5, + /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 5) + +/datum/mapGenerator/lavaland/ground_only + modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_default) + +/datum/mapGenerator/lavaland/dense_ores + modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense) + +/datum/mapGenerator/lavaland/normal_ores + modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral) diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm new file mode 100644 index 00000000000..d568b83e806 --- /dev/null +++ b/code/modules/procedural_mapping/mapGenerators/repair.dm @@ -0,0 +1,31 @@ +/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel + spawnableTurfs = list(/turf/open/floor/plasteel = 100) + var/ignore_wall = FALSE + allowAtomsOnSpace = TRUE + +/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/place(turf/T) + if(isclosedturf(T) && !ignore_wall) + return FALSE + return TRUE + +/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten + ignore_wall = TRUE + +/datum/mapGeneratorModule/border/normalWalls + spawnableAtoms = list() + spawnableTurfs = list(/turf/closed/wall = 100) + allowAtomsOnSpace = TRUE + +/datum/mapGenerator/repair + modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel, + /datum/mapGeneratorModule/bottomLayer/repressurize) + +/datum/mapGenerator/repair/delete_walls + modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten, + /datum/mapGeneratorModule/bottomLayer/repressurize) + +/datum/mapGenerator/repair/enclose_room + modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten, + /datum/mapGeneratorModule/border/normalWalls, + /datum/mapGeneratorModule/bottomLayer/repressurize) + diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 376e372cb6c..d91859f1983 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -76,11 +76,6 @@ caliber = "4.6x30mm" projectile_type = /obj/item/projectile/bullet/incendiary/firebullet -/obj/item/ammo_casing/c46carbine - desc = "A 4.6x30mm bullet casing." - caliber = "4.6x30mm" - projectile_type = /obj/item/projectile/bullet/carbinebullet - /obj/item/ammo_casing/c45 desc = "A .45 bullet casing." caliber = ".45" diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm index 8ebcd1eab36..3bfb90224dd 100644 --- a/code/modules/projectiles/boxes_magazines/external_mag.dm +++ b/code/modules/projectiles/boxes_magazines/external_mag.dm @@ -186,14 +186,6 @@ max_ammo = 30 multiple_sprites = 2 -/obj/item/ammo_box/magazine/carbine - name = "carbine magazine (4.6x30mm)" - icon_state = "oldrifle" - origin_tech = "combat=5" - ammo_type = /obj/item/ammo_casing/c46carbine - caliber = "4.6x30mm" - max_ammo = 32 - /obj/item/ammo_box/magazine/m12g name = "shotgun magazine (12g taser slugs)" desc = "A drum magazine." diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 89baa173c1a..6454e17e0a4 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -62,9 +62,9 @@ var/zoomable = FALSE //whether the gun generates a Zoom action on creation var/zoomed = FALSE //Zoom toggle var/zoom_amt = 3 //Distance in TURFs to move the user's screen forward (the "zoom" effect) + var/zoom_out_amt = 0 var/datum/action/toggle_scope_zoom/azoom - /obj/item/weapon/gun/Initialize() . = ..() if(pin) @@ -214,6 +214,7 @@ var/sprd = 0 var/randomized_gun_spread = 0 + var/rand_spr = rand() if(spread) randomized_gun_spread = rand(0,spread) var/randomized_bonus_spread = rand(0, bonus_spread) @@ -230,7 +231,7 @@ if(randomspread) sprd = round((rand() - 0.5) * (randomized_gun_spread + randomized_bonus_spread)) else //Smart spread - sprd = round((i / burst_size - 0.5) * (randomized_gun_spread + randomized_bonus_spread)) + sprd = round((((rand_spr/burst_size) * i) - (0.5 + (rand_spr * 0.25))) * (randomized_gun_spread + randomized_bonus_spread)) if(!chambered.fire_casing(target, user, params, ,suppressed, zone_override, sprd)) shoot_with_empty_chamber(user) @@ -249,7 +250,7 @@ firing_burst = 0 else if(chambered) - sprd = round((pick(1,-1)) * (randomized_gun_spread + randomized_bonus_spread)) + sprd = round((rand() - 0.5) * (randomized_gun_spread + randomized_bonus_spread)) if(!chambered.fire_casing(target, user, params, , suppressed, zone_override, sprd)) shoot_with_empty_chamber(user) return @@ -297,7 +298,9 @@ if(bayonet) M.attackby(bayonet, user) return - return ..() + else + return ..() + return /obj/item/weapon/gun/attack_obj(obj/O, mob/user) if(user.a_intent == INTENT_HARM) @@ -501,12 +504,14 @@ if(WEST) _x = -zoom_amt + user.client.view = zoom_out_amt user.client.pixel_x = world.icon_size*_x user.client.pixel_y = world.icon_size*_y else + user.client.view = world.view user.client.pixel_x = 0 user.client.pixel_y = 0 - + return zoomed //Proc, so that gun accessories/scopes/etc. can easily add zooming. /obj/item/weapon/gun/proc/build_zooming() diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 0503a011b36..abc4aeaa191 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -234,17 +234,6 @@ burst_size = 3 fire_delay = 1 -/obj/item/weapon/gun/ballistic/automatic/carbine - name = "\improper Marine Carbine" - desc = "Standard issue weapon used by Iron Hawk Marines in space to space combat. Due to modifications for space combat, the weapon has a very limited firing range." - icon_state = "oldrifle" - item_state = "arg" - mag_type = /obj/item/ammo_box/magazine/carbine - fire_sound = 'sound/weapons/Gunshot_smg.ogg' - can_suppress = 0 - burst_size = 0 - fire_delay = 2 - // Bulldog shotgun // /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog @@ -253,6 +242,7 @@ icon_state = "bulldog" item_state = "bulldog" w_class = WEIGHT_CLASS_NORMAL + weapon_weight = WEAPON_MEDIUM origin_tech = "combat=6;materials=4;syndicate=6" mag_type = /obj/item/ammo_box/magazine/m12g fire_sound = 'sound/weapons/Gunshot.ogg' @@ -270,8 +260,8 @@ update_icon() /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/update_icon() + cut_overlays() if(magazine) - cut_overlays() add_overlay("[magazine.icon_state]") icon_state = "bulldog[chambered ? "" : "-e"]" diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 79557a81964..11e8027d376 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -263,6 +263,7 @@ icon_state = "dshotgun" item_state = "shotgun" w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM force = 10 flags = CONDUCT slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm new file mode 100644 index 00000000000..ca3468446d4 --- /dev/null +++ b/code/modules/projectiles/guns/beam_rifle.dm @@ -0,0 +1,531 @@ + +/obj/item/weapon/gun/energy/beam_rifle + name = "particle acceleration rifle" + desc = "An energy-based anti material marksman rifle that uses highly charged particle beams moving at extreme velocities to decimate whatever is unfortunate enough to be targetted by one. \ + Hold down left click while scoped to aim, when weapon is fully aimed (Tracer goes from red to green as it charges), release to fire. Moving while aiming or \ + changing where you're pointing at while aiming will delay the aiming process depending on how much you changed." + icon = 'icons/obj/guns/energy.dmi' + icon_state = "esniper" + item_state = "esniper" + fire_sound = 'sound/weapons/beam_sniper.ogg' + slot_flags = SLOT_BACK + force = 15 + materials = list() + origin_tech = "" + recoil = 5 + ammo_x_offset = 3 + ammo_y_offset = 3 + modifystate = FALSE + zoomable = TRUE + zoom_amt = 17 + zoom_out_amt = 20 + weapon_weight = WEAPON_HEAVY + w_class = WEIGHT_CLASS_BULKY + ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan) + var/hipfire_inaccuracy = 2 + var/hipfire_recoil = 10 + var/scoped_inaccuracy = 0 + var/scoped_recoil = 3 + var/scoped = FALSE + var/noscope = FALSE //Can you fire this without a scope? + cell_type = /obj/item/weapon/stock_parts/cell/beam_rifle + canMouseDown = TRUE + pin = null + var/aiming = FALSE + var/aiming_time = 7 + var/aiming_time_fire_threshold = 2 + var/aiming_time_left = 7 + var/aiming_time_increase_user_movement = 3 + var/scoped_slow = 1 + var/aiming_time_increase_angle_multiplier = 0.6 + + var/lastangle = 0 + var/mob/current_user = null + var/list/obj/effect/temp_visual/current_tracers = list() + + var/structure_piercing = 2 //This doesn't always work! + var/structure_bleed_coeff = 0.7 + var/wall_pierce_amount = 0 + var/wall_devastate = 0 + var/aoe_structure_range = 1 + var/aoe_structure_damage = 50 + var/aoe_fire_range = 2 + var/aoe_fire_chance = 40 + var/aoe_mob_range = 1 + var/aoe_mob_damage = 30 + var/impact_structure_damage = 60 + var/projectile_damage = 30 + var/projectile_stun = 0 + var/projectile_setting_pierce = TRUE + var/delay = 65 + var/lastfire = 0 + + var/static/image/charged_overlay = image(icon = 'icons/obj/guns/energy.dmi', icon_state = "esniper_charged") + var/static/image/drained_overlay = image(icon = 'icons/obj/guns/energy.dmi', icon_state = "esniper_empty") + +/obj/item/weapon/gun/energy/beam_rifle/debug + delay = 0 + cell_type = /obj/item/weapon/stock_parts/cell/infinite + aiming_time = 0 + recoil = 0 + scoped_recoil = 0 + hipfire_recoil = 0 + hipfire_inaccuracy = 0 + scoped_inaccuracy = 0 + noscope = 1 + +/obj/item/weapon/gun/energy/beam_rifle/update_icon() + cut_overlays() + var/obj/item/ammo_casing/energy/primary_ammo = ammo_type[1] + if(cell.charge > primary_ammo.e_cost) + add_overlay(charged_overlay) + else + add_overlay(drained_overlay) + +/obj/item/weapon/gun/energy/beam_rifle/attack_self(mob/user) + projectile_setting_pierce = !projectile_setting_pierce + to_chat(user, "You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.") + +/obj/item/weapon/gun/energy/beam_rifle/proc/update_slowdown() + if(scoped) + slowdown = scoped_slow + else + slowdown = initial(slowdown) + +/obj/item/weapon/gun/energy/beam_rifle/Initialize() + . = ..() + START_PROCESSING(SSfastprocess, src) + +/obj/item/weapon/gun/energy/beam_rifle/Destroy() + STOP_PROCESSING(SSfastprocess, src) + ..() + +/obj/item/weapon/gun/energy/beam_rifle/zoom(user, forced_zoom) + . = ..() + scope(user, .) + +/obj/item/weapon/gun/energy/beam_rifle/proc/scope(mob/user, forced) + var/scoping + switch(forced) + if(TRUE) + scoping = TRUE + if(FALSE) + scoping = FALSE + else + scoping = !scoped + if(scoping) + spread = scoped_inaccuracy + recoil = scoped_recoil + scoped = TRUE + user << "You bring your [src] up and use its scope..." + else + spread = hipfire_inaccuracy + recoil = hipfire_recoil + scoped = FALSE + user << "You lower your [src]." + update_slowdown() + +/obj/item/weapon/gun/energy/beam_rifle/can_trigger_gun(var/mob/living/user) + if(!scoped && !noscope) + user << "This beam rifle can only be used while scoped!" + return FALSE + . = ..(user) + +/obj/item/weapon/gun/energy/beam_rifle/emp_act(severity) + chambered = null + recharge_newshot() + +/obj/item/weapon/gun/energy/beam_rifle/proc/aiming_beam() + var/atom/A = current_user.client.mouseObject + if(!istype(A) || !A.loc) + return + var/turf/T = get_turf(current_user.client.mouseObject) + if(!istype(T)) + return + var/obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/P = new + P.gun = src + P.wall_pierce_amount = wall_pierce_amount + P.structure_pierce_amount = structure_piercing + P.do_pierce = projectile_setting_pierce + P.preparePixelProjectile(current_user.client.mouseObject, T, current_user, current_user.client.mouseParams, 0) + if(aiming_time) + var/percent = ((100/aiming_time)*aiming_time_left) + P.color = rgb(255 * percent,255 * ((100 - percent) / 100),0) + else + P.color = rgb(0, 255, 0) + clear_tracers() + P.fire() + +/obj/item/weapon/gun/energy/beam_rifle/proc/clear_tracers() + for(var/I in current_tracers) + current_tracers -= I + var/obj/effect/temp_visual/projectile_beam/PB = I + qdel(PB) + +/obj/item/weapon/gun/energy/beam_rifle/proc/terminate_aiming() + stop_aiming() + clear_tracers() + +/obj/item/weapon/gun/energy/beam_rifle/process() + if(!aiming) + return + if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated()) //Doesn't work if you're not holding it! + terminate_aiming() + return + if(aiming_time_left > 0) + aiming_time_left-- + aiming_beam() + if(current_user.client.mouseParams) + var/list/mouse_control = params2list(current_user.client.mouseParams) + if(isturf(current_user.client.mouseLocation)) + current_user.face_atom(current_user.client.mouseLocation) + if(mouse_control["screen-loc"]) + var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",") + var/list/screen_loc_X = splittext(screen_loc_params[1],":") + var/list/screen_loc_Y = splittext(screen_loc_params[2],":") + var/x = (text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32) + var/y = (text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32) + var/screenview = (current_user.client.view * 2 + 1) * world.icon_size //Refer to http://www.byond.com/docs/ref/info.html#/client/var/view for mad maths + var/ox = round(screenview/2) - current_user.client.pixel_x //"origin" x + var/oy = round(screenview/2) - current_user.client.pixel_y //"origin" y + var/angle = NORM_ROT(Atan2(y - oy, x - ox)) + var/difference = abs(lastangle - angle) + delay_penalty(difference * aiming_time_increase_angle_multiplier) + lastangle = angle + +/obj/item/weapon/gun/energy/beam_rifle/on_mob_move() + delay_penalty(aiming_time_increase_user_movement) + +/obj/item/weapon/gun/energy/beam_rifle/proc/start_aiming() + aiming_time_left = aiming_time + aiming = TRUE + +/obj/item/weapon/gun/energy/beam_rifle/proc/stop_aiming() + aiming_time_left = aiming_time + aiming = FALSE + +/obj/item/weapon/gun/energy/beam_rifle/onMouseDrag(src_object, over_object, src_location, over_location, params, mob) + current_user = mob + +/obj/item/weapon/gun/energy/beam_rifle/onMouseDown(object, location, params, mob) + start_aiming() + current_user = mob + +/obj/item/weapon/gun/energy/beam_rifle/onMouseUp(object, location, params, mob/M) + if(aiming_time_left <= aiming_time_fire_threshold) + sync_ammo() + afterattack(M.client.mouseObject, M, FALSE, M.client.mouseParams, passthrough = TRUE) + stop_aiming() + clear_tracers() + +/obj/item/weapon/gun/energy/beam_rifle/afterattack(atom/target, mob/living/user, flag, params, passthrough = FALSE) + if(!passthrough && (aiming_time > aiming_time_fire_threshold)) + return + if(lastfire > world.time + delay) + return + lastfire = world.time + . = ..() + +/obj/item/weapon/gun/energy/beam_rifle/proc/sync_ammo() + for(var/obj/item/ammo_casing/energy/beam_rifle/AC in contents) + AC.sync_stats() + +/obj/item/weapon/gun/energy/beam_rifle/proc/delay_penalty(amount) + aiming_time_left = Clamp(aiming_time_left + amount, 0, aiming_time) + +/obj/item/ammo_casing/energy/beam_rifle + name = "particle acceleration lens" + desc = "Don't look into barrel!" + var/wall_pierce_amount = 0 + var/wall_devastate = 0 + var/aoe_structure_range = 1 + var/aoe_structure_damage = 30 + var/aoe_fire_range = 2 + var/aoe_fire_chance = 66 + var/aoe_mob_range = 1 + var/aoe_mob_damage = 20 + var/impact_structure_damage = 50 + var/projectile_damage = 40 + var/projectile_stun = 0 + var/structure_piercing = 2 + var/structure_bleed_coeff = 0.7 + var/do_pierce = TRUE + var/obj/item/weapon/gun/energy/beam_rifle/host + +/obj/item/ammo_casing/energy/beam_rifle/proc/sync_stats() + var/obj/item/weapon/gun/energy/beam_rifle/BR = loc + if(!istype(BR)) + stack_trace("Beam rifle syncing error") + host = BR + do_pierce = BR.projectile_setting_pierce + wall_pierce_amount = BR.wall_pierce_amount + wall_devastate = BR.wall_devastate + aoe_structure_range = BR.aoe_structure_range + aoe_structure_damage = BR.aoe_structure_damage + aoe_fire_range = BR.aoe_fire_range + aoe_fire_chance = BR.aoe_fire_chance + aoe_mob_range = BR.aoe_mob_range + aoe_mob_damage = BR.aoe_mob_damage + impact_structure_damage = BR.impact_structure_damage + projectile_damage = BR.projectile_damage + projectile_stun = BR.projectile_stun + delay = BR.delay + structure_piercing = BR.structure_piercing + structure_bleed_coeff = BR.structure_bleed_coeff + +/obj/item/ammo_casing/energy/beam_rifle/ready_proj(atom/target, mob/living/user, quiet, zone_override) + . = ..(target, user, quiet, zone_override) + var/obj/item/projectile/beam/beam_rifle/hitscan/HS_BB = BB + if(!istype(HS_BB)) + return + HS_BB.impact_direct_damage = projectile_damage + HS_BB.stun = projectile_stun + HS_BB.impact_structure_damage = impact_structure_damage + HS_BB.aoe_mob_damage = aoe_mob_damage + HS_BB.aoe_mob_range = Clamp(aoe_mob_range, 0, 15) //Badmin safety lock + HS_BB.aoe_fire_chance = aoe_fire_chance + HS_BB.aoe_fire_range = aoe_fire_range + HS_BB.aoe_structure_damage = aoe_structure_damage + HS_BB.aoe_structure_range = Clamp(aoe_structure_range, 0, 15) //Badmin safety lock + HS_BB.wall_devastate = wall_devastate + HS_BB.wall_pierce_amount = wall_pierce_amount + HS_BB.structure_pierce_amount = structure_piercing + HS_BB.structure_bleed_coeff = structure_bleed_coeff + HS_BB.do_pierce = do_pierce + HS_BB.gun = host + +/obj/item/ammo_casing/energy/beam_rifle/hitscan + projectile_type = /obj/item/projectile/beam/beam_rifle/hitscan + select_name = "beam" + e_cost = 5000 + fire_sound = 'sound/weapons/beam_sniper.ogg' + +/obj/item/projectile/beam/beam_rifle + name = "particle beam" + icon = "" + hitsound = 'sound/effects/explosion3.ogg' + damage = 0 //Handled manually. + damage_type = BURN + flag = "energy" + range = 150 + jitter = 10 + var/obj/item/weapon/gun/energy/beam_rifle/gun + var/structure_pierce_amount = 0 //All set to 0 so the gun can manually set them during firing. + var/structure_bleed_coeff = 0 + var/structure_pierce = 0 + var/do_pierce = TRUE + var/wall_pierce_amount = 0 + var/wall_pierce = 0 + var/wall_devastate = 0 + var/aoe_structure_range = 0 + var/aoe_structure_damage = 0 + var/aoe_fire_range = 0 + var/aoe_fire_chance = 0 + var/aoe_mob_range = 0 + var/aoe_mob_damage = 0 + var/impact_structure_damage = 0 + var/impact_direct_damage = 0 + var/turf/cached + +/obj/item/projectile/beam/beam_rifle/proc/AOE(turf/epicenter) + set waitfor = FALSE + if(!epicenter) + return + new /obj/effect/temp_visual/explosion/fast(epicenter) + for(var/mob/living/L in range(aoe_mob_range, epicenter)) //handle aoe mob damage + L.adjustFireLoss(aoe_mob_damage) + to_chat(L, "\The [src] sears you!") + for(var/turf/T in range(aoe_fire_range, epicenter)) //handle aoe fire + if(prob(aoe_fire_chance)) + new /obj/effect/hotspot(T) + for(var/obj/O in range(aoe_structure_range, epicenter)) + if(!istype(O, /obj/item)) + if(O.level == 1) //Please don't break underfloor items! + continue + O.take_damage(aoe_structure_damage * get_damage_coeff(O), BURN, "laser", FALSE) + +/obj/item/projectile/beam/beam_rifle/proc/check_pierce(atom/target) + if(!do_pierce) + return FALSE + if(isclosedturf(target)) + if(wall_pierce++ < wall_pierce_amount) + loc = target + if(prob(wall_devastate)) + target.ex_act(2) + return TRUE + if(ismovableatom(target)) + var/atom/movable/AM = target + if(AM.density && !AM.CanPass(src, get_turf(target)) && !ismob(AM)) + if(structure_pierce++ < structure_pierce_amount) + if(isobj(AM)) + var/obj/O = AM + O.take_damage((impact_structure_damage + aoe_structure_damage) * structure_bleed_coeff * get_damage_coeff(AM), BURN, "energy", FALSE) + loc = get_turf(AM) + return TRUE + return FALSE + +/obj/item/projectile/beam/beam_rifle/proc/get_damage_coeff(atom/target) + if(istype(target, /obj/machinery/door)) + return 0.4 + if(istype(target, /obj/structure/window)) + return 0.5 + return 1 + +/obj/item/projectile/beam/beam_rifle/proc/handle_impact(atom/target) + if(isobj(target)) + var/obj/O = target + O.take_damage(impact_structure_damage * get_damage_coeff(target), BURN, "laser", FALSE) + if(isliving(target)) + var/mob/living/L = target + L.adjustFireLoss(impact_direct_damage) + L.emote("scream") + +/obj/item/projectile/beam/beam_rifle/proc/handle_hit(atom/target) + set waitfor = FALSE + if(!cached && !QDELETED(target)) + cached = get_turf(target) + if(nodamage) + return FALSE + playsound(cached, 'sound/effects/explosion3.ogg', 100, 1) + AOE(cached) + if(!QDELETED(target)) + handle_impact(target) + +/obj/item/projectile/beam/beam_rifle/Bump(atom/target, yes) + if(check_pierce(target)) + permutated += target + return FALSE + if(!QDELETED(target)) + cached = get_turf(target) + . = ..() + +/obj/item/projectile/beam/beam_rifle/on_hit(atom/target, blocked = 0) + if(!QDELETED(target)) + cached = get_turf(target) + handle_hit(target) + . = ..() + +/obj/item/projectile/beam/beam_rifle/hitscan + icon_state = "" + var/tracer_type = /obj/effect/temp_visual/projectile_beam/tracer + +/obj/item/projectile/beam/beam_rifle/hitscan/fire(setAngle, atom/direct_target) //oranges didn't let me make this a var the first time around so copypasta time + set waitfor = 0 + if(!log_override && firer && original) + add_logs(firer, original, "fired at", src, " [get_area(src)]") + if(setAngle) + Angle = setAngle + var/next_run = world.time + var/old_pixel_x = pixel_x + var/old_pixel_y = pixel_y + var/safety = 0 //The code works fine, but... just in case... + while(loc) + if(++safety > (range * 3)) //If it's looping for way, way too long... + return //Kill! + if((!( current ) || loc == current)) + current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z) + if(!Angle) + Angle=round(Get_Angle(src,current)) + if(spread) + Angle += (rand() - 0.5) * spread + var/matrix/M = new + M.Turn(Angle) + transform = M + var/Pixel_x=sin(Angle)+16*sin(Angle)*2 + var/Pixel_y=cos(Angle)+16*cos(Angle)*2 + var/pixel_x_offset = old_pixel_x + Pixel_x + var/pixel_y_offset = old_pixel_y + Pixel_y + var/new_x = x + var/new_y = y + while(pixel_x_offset > 16) + pixel_x_offset -= 32 + old_pixel_x -= 32 + new_x++// x++ + while(pixel_x_offset < -16) + pixel_x_offset += 32 + old_pixel_x += 32 + new_x-- + while(pixel_y_offset > 16) + pixel_y_offset -= 32 + old_pixel_y -= 32 + new_y++ + while(pixel_y_offset < -16) + pixel_y_offset += 32 + old_pixel_y += 32 + new_y-- + pixel_x = old_pixel_x + pixel_y = old_pixel_y + step_towards(src, locate(new_x, new_y, z)) + next_run += max(world.tick_lag, speed) + var/delay = next_run - world.time + if(delay <= world.tick_lag*2) + pixel_x = pixel_x_offset + pixel_y = pixel_y_offset + else + animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW) + old_pixel_x = pixel_x_offset + old_pixel_y = pixel_y_offset + if(original && (original.layer>=2.75) || ismob(original)) + if(loc == get_turf(original)) + if(!(original in permutated)) + Bump(original, 1) + Range() + +/obj/item/projectile/beam/beam_rifle/hitscan/Range() + spawn_tracer_effect() + if(!QDELETED(src) && loc) + cached = get_turf(src) + +/obj/item/projectile/beam/beam_rifle/hitscan/proc/spawn_tracer_effect() + QDEL_IN((new tracer_type(loc, time = 5, angle_override = Angle, p_x = pixel_x, p_y = pixel_y, color_override = color)), 5) + +/obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam + tracer_type = /obj/effect/temp_visual/projectile_beam/tracer/aiming + name = "aiming beam" + hitsound = null + hitsound_wall = null + nodamage = TRUE + damage = 0 + +/obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/prehit(atom/target) + qdel(src) + return FALSE + +/obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/on_hit() + qdel(src) + return FALSE + +/obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/spawn_tracer_effect() + var/obj/effect/temp_visual/projectile_beam/T = new tracer_type(loc, time = 5, angle_override = Angle, p_x = pixel_x, p_y = pixel_y, color_override = color) + if(istype(gun) && istype(T)) + gun.current_tracers[T] = TRUE + +/obj/effect/temp_visual/projectile_beam + icon = 'icons/obj/projectiles.dmi' + layer = ABOVE_MOB_LAYER + anchored = 1 + duration = 5 + randomdir = FALSE + light_power = 1 + light_range = 2 + light_color = "#00ffff" + +/obj/effect/temp_visual/projectile_beam/New(time = 5, angle_override, p_x, p_y, color_override) + duration = time + var/mutable_appearance/look = new(src) + look.pixel_x = p_x + look.pixel_y = p_y + if(color_override) + look.color = color_override + var/matrix/M = new + M.Turn(angle_override) + look.transform = M + appearance = look + ..() + +/obj/effect/temp_visual/projectile_beam/tracer + icon_state = "tracer_beam" + +/obj/effect/temp_visual/projectile_beam/tracer/aiming + icon_state = "gbeam" + duration = 1 diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 15eab5d2f8a..e20cb770899 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -4,7 +4,7 @@ desc = "A basic energy-based gun." icon = 'icons/obj/guns/energy.dmi' - var/obj/item/weapon/stock_parts/cell/power_supply //What type of power cell this uses + var/obj/item/weapon/stock_parts/cell/cell //What type of power cell this uses var/cell_type = /obj/item/weapon/stock_parts/cell var/modifystate = 0 var/list/ammo_type = list(/obj/item/ammo_casing/energy) @@ -20,19 +20,21 @@ var/use_cyborg_cell = 0 //whether the gun's cell drains the cyborg user's cell to recharge /obj/item/weapon/gun/energy/emp_act(severity) - power_supply.use(round(power_supply.charge / severity)) + cell.use(round(cell.charge / severity)) chambered = null //we empty the chamber recharge_newshot() //and try to charge a new shot update_icon() +/obj/item/weapon/gun/energy/get_cell() + return cell /obj/item/weapon/gun/energy/Initialize() . = ..() if(cell_type) - power_supply = new cell_type(src) + cell = new cell_type(src) else - power_supply = new(src) - power_supply.give(power_supply.maxcharge) + cell = new(src) + cell.give(cell.maxcharge) update_ammo_types() recharge_newshot(1) if(selfcharge) @@ -50,9 +52,7 @@ fire_delay = shot.delay /obj/item/weapon/gun/energy/Destroy() - if(power_supply) - qdel(power_supply) - power_supply = null + QDEL_NULL(cell) STOP_PROCESSING(SSobj, src) return ..() @@ -62,9 +62,9 @@ if(charge_tick < charge_delay) return charge_tick = 0 - if(!power_supply) + if(!cell) return - power_supply.give(100) + cell.give(100) if(!chambered) //if empty chamber we try to charge a new shot recharge_newshot(1) update_icon() @@ -76,10 +76,10 @@ /obj/item/weapon/gun/energy/can_shoot() var/obj/item/ammo_casing/energy/shot = ammo_type[select] - return power_supply.charge >= shot.e_cost + return cell.charge >= shot.e_cost /obj/item/weapon/gun/energy/recharge_newshot(no_cyborg_drain) - if (!ammo_type || !power_supply) + if (!ammo_type || !cell) return if(use_cyborg_cell && !no_cyborg_drain) if(iscyborg(loc)) @@ -87,10 +87,10 @@ if(R.cell) var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot if(R.cell.use(shot.e_cost)) //Take power from the borg... - power_supply.give(shot.e_cost) //... to recharge the shot + cell.give(shot.e_cost) //... to recharge the shot if(!chambered) var/obj/item/ammo_casing/energy/AC = ammo_type[select] - if(power_supply.charge >= AC.e_cost) //if there's enough power in the power_supply cell... + if(cell.charge >= AC.e_cost) //if there's enough power in the cell cell... chambered = AC //...prepare a new shot based on the current ammo type selected if(!chambered.BB) chambered.newshot() @@ -98,7 +98,7 @@ /obj/item/weapon/gun/energy/process_chamber() if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired... var/obj/item/ammo_casing/energy/shot = chambered - power_supply.use(shot.e_cost)//... drain the power_supply cell + cell.use(shot.e_cost)//... drain the cell cell chambered = null //either way, released the prepared shot recharge_newshot() //try to charge a new shot @@ -120,7 +120,7 @@ ..() if(!automatic_charge_overlays) return - var/ratio = Ceiling((power_supply.charge / power_supply.maxcharge) * charge_sections) + var/ratio = Ceiling((cell.charge / cell.maxcharge) * charge_sections) var/obj/item/ammo_casing/energy/shot = ammo_type[select] var/iconState = "[icon_state]_charge" var/itemState = null @@ -131,13 +131,14 @@ iconState += "_[shot.select_name]" if(itemState) itemState += "[shot.select_name]" - if(power_supply.charge < shot.e_cost) + if(cell.charge < shot.e_cost) add_overlay("[icon_state]_empty") else if(!shaded_charge) var/mutable_appearance/charge_overlay = mutable_appearance(icon, iconState) for(var/i = ratio, i >= 1, i--) charge_overlay.pixel_x = ammo_x_offset * (i - 1) + charge_overlay.pixel_y = ammo_y_offset * (i - 1) add_overlay(charge_overlay) else add_overlay("[icon_state]_charge[ratio]") @@ -156,7 +157,7 @@ user.visible_message("[user] melts [user.p_their()] face off with [src]!") playsound(loc, fire_sound, 50, 1, -1) var/obj/item/ammo_casing/energy/shot = ammo_type[select] - power_supply.use(shot.e_cost) + cell.use(shot.e_cost) update_icon() return(FIRELOSS) else @@ -191,17 +192,17 @@ user.visible_message("[user] tries to light their [A.name] with [src], but it doesn't do anything. Dumbass.") playsound(user, E.fire_sound, 50, 1) playsound(user, BB.hitsound, 50, 1) - power_supply.use(E.e_cost) + cell.use(E.e_cost) . = "" else if(BB.damage_type != BURN) user.visible_message("[user] tries to light their [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.") playsound(user, E.fire_sound, 50, 1) playsound(user, BB.hitsound, 50, 1) - power_supply.use(E.e_cost) + cell.use(E.e_cost) qdel(A) . = "" else playsound(user, E.fire_sound, 50, 1) playsound(user, BB.hitsound, 50, 1) - power_supply.use(E.e_cost) + cell.use(E.e_cost) . = "[user] casually lights their [A.name] with [src]. Damn." diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 770a8952048..b0753c027a9 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -24,6 +24,7 @@ var/list/modkits = list() var/empty_state = "kineticgun_empty" + var/recharge_timerid /obj/item/weapon/gun/energy/kinetic_accelerator/examine(mob/user) ..() @@ -61,10 +62,10 @@ . += A /obj/item/weapon/gun/energy/kinetic_accelerator/proc/modify_projectile(obj/item/projectile/kinetic/K) + K.kinetic_gun = src //do something special on-hit, easy! for(var/A in get_modkits()) var/obj/item/borg/upgrade/modkit/M = A M.modify_projectile(K) - K.kinetic_modules += M //do something special on-hit, easy! /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg holds_charge = TRUE @@ -97,18 +98,19 @@ empty() /obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty() - power_supply.use(500) + cell.use(500) update_icon() -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload() +/obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time) if(overheat) return + if(!recharge_time) + recharge_time = overheat_time overheat = TRUE var/carried = 0 if(!unique_frequency) - for(var/obj/item/weapon/gun/energy/kinetic_accelerator/K in \ - loc.GetAllContents()) + for(var/obj/item/weapon/gun/energy/kinetic_accelerator/K in loc.GetAllContents()) carried++ @@ -116,13 +118,14 @@ else carried = 1 - addtimer(CALLBACK(src, .proc/reload), overheat_time * carried) + deltimer(recharge_timerid) + recharge_timerid = addtimer(CALLBACK(src, .proc/reload), recharge_time * carried, TIMER_STOPPABLE) /obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity) return /obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload() - power_supply.give(500) + cell.give(500) recharge_newshot(1) if(!suppressed) playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) @@ -160,11 +163,12 @@ range = 3 log_override = TRUE + var/pressure_decrease_active = FALSE var/pressure_decrease = 0.25 - var/list/kinetic_modules = list() + var/obj/item/weapon/gun/energy/kinetic_accelerator/kinetic_gun /obj/item/projectile/kinetic/Destroy() - QDEL_NULL(kinetic_modules) + kinetic_gun = null return ..() /obj/item/projectile/kinetic/prehit(atom/target) @@ -176,6 +180,7 @@ if(pressure > 50) name = "weakened [name]" damage = damage * pressure_decrease + pressure_decrease_active = TRUE . = ..() /obj/item/projectile/kinetic/on_range() @@ -190,15 +195,17 @@ var/turf/target_turf = get_turf(target) if(!target_turf) target_turf = get_turf(src) + if(kinetic_gun) //hopefully whoever shot this was not very, very unfortunate. + var/list/mods = kinetic_gun.get_modkits() + for(var/obj/item/borg/upgrade/modkit/M in mods) + M.projectile_strike_predamage(src, target_turf, target, kinetic_gun) + for(var/obj/item/borg/upgrade/modkit/M in mods) + M.projectile_strike(src, target_turf, target, kinetic_gun) if(ismineralturf(target_turf)) var/turf/closed/mineral/M = target_turf M.gets_drilled(firer) var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf) K.color = color - for(var/obj/item/borg/upgrade/modkit/M in kinetic_modules) - if(QDELETED(M)) //whoever shot this was very, very unfortunate. - continue - M.projectile_strike(src, target_turf, target) //Modkits @@ -208,6 +215,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "modkit" origin_tech = "programming=2;materials=2;magnets=4" + w_class = WEIGHT_CLASS_SMALL require_module = 1 module_type = /obj/item/weapon/robot_module/miner var/denied_type = null @@ -262,7 +270,10 @@ /obj/item/borg/upgrade/modkit/proc/modify_projectile(obj/item/projectile/kinetic/K) -/obj/item/borg/upgrade/modkit/proc/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target) +//use this one for effects you want to trigger before mods that do damage +/obj/item/borg/upgrade/modkit/proc/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +//and this one for things that don't need to trigger before other damage-dealing mods +/obj/item/borg/upgrade/modkit/proc/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) //Range /obj/item/borg/upgrade/modkit/range @@ -311,7 +322,7 @@ . = ..() if(.) for(var/obj/item/borg/upgrade/modkit/aoe/AOE in KA.modkits) //make sure only one of the aoe modules has values if somebody has multiple - if(AOE.stats_stolen) + if(AOE.stats_stolen || AOE == src) continue modifier += AOE.modifier //take its modifiers AOE.modifier = 0 @@ -350,7 +361,7 @@ /obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K) K.name = "kinetic explosion" -/obj/item/borg/upgrade/modkit/aoe/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target) +/obj/item/borg/upgrade/modkit/aoe/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) if(stats_stolen) return new /obj/effect/temp_visual/explosion/fast(target_turf) @@ -383,6 +394,94 @@ desc = "Causes the kinetic accelerator to damage mobs in an AoE." modifier = 0.2 +//Tendril-unique modules +/obj/item/borg/upgrade/modkit/cooldown/repeater + name = "rapid repeater" + desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown." + denied_type = /obj/item/borg/upgrade/modkit/cooldown/repeater + modifier = -14 //Makes the cooldown 3 seconds(with no cooldown mods) if you miss. Don't miss. + cost = 50 + +/obj/item/borg/upgrade/modkit/cooldown/repeater/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) + var/valid_repeat = FALSE + if(isliving(target)) + var/mob/living/L = target + if(L.stat != DEAD) + valid_repeat = TRUE + if(ismineralturf(target_turf)) + valid_repeat = TRUE + if(valid_repeat) + KA.overheat = FALSE + KA.attempt_reload(KA.overheat_time * 0.25) //If you hit, the cooldown drops to 0.75 seconds. + +/obj/item/borg/upgrade/modkit/lifesteal + name = "lifesteal crystal" + desc = "Causes kinetic accelerator shots to slightly heal the firer on striking a living target." + icon_state = "modkit_crystal" + denied_type = /obj/item/borg/upgrade/modkit/lifesteal + modifier = 2.5 //Not a very effective method of healing. + cost = 20 + var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) + +/obj/item/borg/upgrade/modkit/lifesteal/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) + if(isliving(target) && isliving(K.firer)) + var/mob/living/L = target + if(L.stat == DEAD) + return + L = K.firer + L.heal_ordered_damage(modifier, damage_heal_order) + +/obj/item/borg/upgrade/modkit/resonator_blasts + name = "resonator blast" + desc = "Causes kinetic accelerator shots to leave and detonate resonator blasts." + denied_type = /obj/item/borg/upgrade/modkit/resonator_blasts + cost = 30 + modifier = 0.25 //A bonus 15 damage if you burst the field on a target, 60 if you lure them into it. + +/obj/item/borg/upgrade/modkit/resonator_blasts/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) + if(target_turf && !ismineralturf(target_turf)) //Don't make fields on mineral turfs. + var/obj/effect/temp_visual/resonance/R = locate(/obj/effect/temp_visual/resonance) in target_turf + if(R) + R.damage_multiplier = modifier + R.burst() + return + new /obj/effect/temp_visual/resonance(target_turf, K.firer, null, 30) + +/obj/item/borg/upgrade/modkit/bounty + name = "death syphon" + desc = "Killing or assisting in killing a creature permenantly increases your damage against that type of creature." + denied_type = /obj/item/borg/upgrade/modkit/bounty + modifier = 1.25 + cost = 30 + var/maximum_bounty = 25 + var/list/bounties_reaped = list() + +/obj/item/borg/upgrade/modkit/bounty/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) + if(isliving(target)) + var/mob/living/L = target + var/list/existing_marks = L.has_status_effect_list(STATUS_EFFECT_SYPHONMARK) + for(var/i in existing_marks) + var/datum/status_effect/syphon_mark/SM = i + if(SM.reward_target == src) //we want to allow multiple people with bounty modkits to use them, but we need to replace our own marks so we don't multi-reward + SM.reward_target = null + qdel(SM) + var/datum/status_effect/syphon_mark/SM = L.apply_status_effect(STATUS_EFFECT_SYPHONMARK) + SM.reward_target = src + if(bounties_reaped[L.type]) + var/kill_modifier = 1 + if(K.pressure_decrease_active) + kill_modifier *= K.pressure_decrease + var/armor = L.run_armor_check(K.def_zone, K.flag, "", "", K.armour_penetration) + L.apply_damage(bounties_reaped[L.type]*kill_modifier, K.damage_type, K.def_zone, armor) + +/obj/item/borg/upgrade/modkit/bounty/proc/get_kill(mob/living/L) + var/bonus_mod = 1 + if(ismegafauna(L)) //megafauna reward + bonus_mod = 4 + if(!bounties_reaped[L.type]) + bounties_reaped[L.type] = min(modifier * bonus_mod, maximum_bounty) + else + bounties_reaped[L.type] = min(bounties_reaped[L.type] + (modifier * bonus_mod), maximum_bounty) //Indoors /obj/item/borg/upgrade/modkit/indoors diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 90c3b4a72ab..196d44ad083 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -39,7 +39,7 @@ /obj/item/weapon/gun/energy/decloner/update_icon() ..() var/obj/item/ammo_casing/energy/shot = ammo_type[select] - if(power_supply.charge > shot.e_cost) + if(cell.charge > shot.e_cost) add_overlay("decloner_spin") /obj/item/weapon/gun/energy/floragun @@ -137,19 +137,19 @@ /obj/item/weapon/gun/energy/plasmacutter/examine(mob/user) ..() - if(power_supply) - to_chat(user, "[src] is [round(power_supply.percent())]% charged.") + if(cell) + to_chat(user, "[src] is [round(cell.percent())]% charged.") /obj/item/weapon/gun/energy/plasmacutter/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/sheet/S = A S.use(1) - power_supply.give(1000) + cell.give(1000) recharge_newshot(1) to_chat(user, "You insert [A] in [src], recharging it.") else if(istype(A, /obj/item/weapon/ore/plasma)) qdel(A) - power_supply.give(500) + cell.give(500) recharge_newshot(1) to_chat(user, "You insert [A] in [src], recharging it.") else diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm new file mode 100644 index 00000000000..24b6d1765d0 --- /dev/null +++ b/code/modules/projectiles/guns/misc/blastcannon.dm @@ -0,0 +1,127 @@ +/obj/item/weapon/gun/blastcannon + name = "pipe gun" + desc = "A pipe welded onto a gun stock, with a mechanical trigger. The pipe has an opening near the top, and there seems to be a spring loaded wheel in the hole." + icon_state = "empty_blastcannon" + var/icon_state_loaded = "loaded_blastcannon" + item_state = "blastcannon_empty" + w_class = WEIGHT_CLASS_NORMAL + force = 10 + fire_sound = 'sound/weapons/blastcannon.ogg' + needs_permit = FALSE + clumsy_check = FALSE + randomspread = FALSE + + var/obj/item/device/transfer_valve/bomb + var/datum/gas_mixture/air1 + var/datum/gas_mixture/air2 + +/obj/item/weapon/gun/blastcannon/New() + if(!pin) + pin = new + . = ..() + +/obj/item/weapon/gun/blastcannon/Destroy() + if(bomb) + qdel(bomb) + bomb = null + air1 = null + air2 = null + . = ..() + +/obj/item/weapon/gun/blastcannon/attack_self(mob/user) + if(bomb) + bomb.forceMove(user.loc) + user.put_in_hands(bomb) + user.visible_message("[user] detaches the [bomb] from the [src]") + bomb = null + update_icon() + . = ..(user) + +/obj/item/weapon/gun/blastcannon/update_icon() + if(bomb) + icon_state = icon_state_loaded + name = "blast cannon" + desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave." + else + icon_state = initial(icon_state) + name = initial(name) + desc = initial(desc) + . = ..() + +/obj/item/weapon/gun/blastcannon/attackby(obj/O, mob/user) + if(istype(O, /obj/item/device/transfer_valve)) + var/obj/item/device/transfer_valve/T = O + if(!T.tank_one || !T.tank_two) + to_chat(user, "What good would an incomplete bomb do?") + return FALSE + if(!user.drop_item(O)) + to_chat(user, "The [O] seems to be stuck to your hand!") + return FALSE + user.visible_message("[user] attaches the [O] to the [src]!") + bomb = O + O.loc = src + update_icon() + return TRUE + . = ..() + +/obj/item/weapon/gun/blastcannon/proc/calculate_bomb() + if(!istype(bomb)||!istype(bomb.tank_one)||!istype(bomb.tank_two)) + return 0 + air1 = bomb.tank_one.air_contents + air2 = bomb.tank_two.air_contents + var/datum/gas_mixture/temp + temp.volume = air1.volume + air2.volume + temp.merge(air1) + temp.merge(air2) + for(var/i in 1 to 6) + temp.react() + var/pressure = temp.return_pressure() + qdel(temp) + if(pressure < TANK_FRAGMENT_PRESSURE) + return 0 + return (pressure/TANK_FRAGMENT_SCALE) + +/obj/item/weapon/gun/blastcannon/afterattack(atom/target, mob/user, flag, params) + if((!bomb) || (target == user) || (target.loc == user) || (!target) || (target.loc == user.loc) || (target.loc in range(user, 2)) || (target in range(user, 2))) + return ..() + var/power = calculate_bomb() + qdel(bomb) + update_icon() + var/heavy = power * 0.2 + var/medium = power * 0.5 + var/light = power + user.visible_message("[user] opens \the [bomb] on \his [src.name] and fires a blast wave at \the [target]!","You open \the [bomb] on your [src.name] and fire a blast wave at \the [target]!") + playsound(user, "explosion", 100, 1) + var/turf/starting = get_turf(user) + var/area/A = get_area(user) + var/log_str = "Blast wave fired at [ADMIN_COORDJMP(starting)] ([A.name]) by [user.name]([user.ckey]) with power [heavy]/[medium]/[light]." + message_admins(log_str) + log_game(log_str) + +/obj/item/projectile/blastwave + name = "blast wave" + icon_state = "blastwave" + damage = 0 + nodamage = FALSE + forcedodge = TRUE + var/heavyr = 0 + var/mediumr = 0 + var/lightr = 0 + range = 150 + +/obj/item/projectile/blastwave/Range() + ..() + if(heavyr) + loc.ex_act(1) + else if(mediumr) + loc.ex_act(2) + else if(lightr) + loc.ex_act(3) + else + qdel(src) + heavyr-- + mediumr-- + lightr-- + +/obj/item/projectile/blastwave/ex_act() + return diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8c810155db0..d051ec02216 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -78,7 +78,7 @@ return "chest" /obj/item/projectile/proc/prehit(atom/target) - return + return TRUE /obj/item/projectile/proc/on_hit(atom/target, blocked = 0) var/turf/target_loca = get_turf(target) @@ -142,7 +142,7 @@ if(firer && !ricochets) if(A == firer || (A == firer.loc && istype(A, /obj/mecha))) //cannot shoot yourself or your mech loc = A.loc - return 0 + return FALSE var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. @@ -155,13 +155,14 @@ var/turf/target_turf = get_turf(A) - prehit(A) + if(!prehit(A)) + return FALSE var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null if(permutation == -1 || forcedodge)// the bullet passes through a dense object! loc = target_turf if(A) permutated.Add(A) - return 0 + return FALSE else if(A && A.density && !ismob(A) && !(A.flags & ON_BORDER)) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs on that tile. var/list/mobs_list = list() @@ -169,9 +170,11 @@ mobs_list += L if(mobs_list.len) var/mob/living/picked_mob = pick(mobs_list) - prehit(picked_mob) + if(!prehit(picked_mob)) + return FALSE picked_mob.bullet_act(src, def_zone) qdel(src) + return TRUE /obj/item/projectile/proc/check_ricochet() if(prob(ricochet_chance)) @@ -277,46 +280,53 @@ Range() sleep(config.run_speed * 0.9) - /obj/item/projectile/proc/preparePixelProjectile(atom/target, var/turf/targloc, mob/living/user, params, spread) var/turf/curloc = get_turf(user) - src.loc = get_turf(user) - src.starting = get_turf(user) - src.current = curloc - src.yo = targloc.y - curloc.y - src.xo = targloc.x - curloc.x + forceMove(get_turf(user)) + starting = get_turf(user) + current = curloc + yo = targloc.y - curloc.y + xo = targloc.x - curloc.x - if(params) - var/list/mouse_control = params2list(params) - if(mouse_control["icon-x"]) - src.p_x = text2num(mouse_control["icon-x"]) - if(mouse_control["icon-y"]) - src.p_y = text2num(mouse_control["icon-y"]) - if(mouse_control["screen-loc"]) - //Split screen-loc up into X+Pixel_X and Y+Pixel_Y - var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",") + var/list/calculated = calculate_projectile_angle_and_pixel_offsets(user, params) + Angle = calculated[1] + p_x = calculated[2] + p_y = calculated[3] - //Split X+Pixel_X up into list(X, Pixel_X) - var/list/screen_loc_X = splittext(screen_loc_params[1],":") - - //Split Y+Pixel_Y up into list(Y, Pixel_Y) - var/list/screen_loc_Y = splittext(screen_loc_params[2],":") - // to_chat(world, "X: [screen_loc_X[1]] PixelX: [screen_loc_X[2]] / Y: [screen_loc_Y[1]] PixelY: [screen_loc_Y[2]]") - var/x = text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32 - var/y = text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32 - - //Calculate the "resolution" of screen based on client's view and world's icon size. This will work if the user can view more tiles than average. - var/screenview = (user.client.view * 2 + 1) * world.icon_size //Refer to http://www.byond.com/docs/ref/info.html#/client/var/view for mad maths - - var/ox = round(screenview/2) //"origin" x - var/oy = round(screenview/2) //"origin" y - // to_chat(world, "Pixel position: [x] [y]") - var/angle = Atan2(y - oy, x - ox) - // to_chat(world, "Angle: [angle]") - src.Angle = angle if(spread) src.Angle += spread +/proc/calculate_projectile_angle_and_pixel_offsets(mob/user, params) + var/list/mouse_control = params2list(params) + var/p_x = 0 + var/p_y = 0 + var/angle = 0 + if(mouse_control["icon-x"]) + p_x = text2num(mouse_control["icon-x"]) + if(mouse_control["icon-y"]) + p_y = text2num(mouse_control["icon-y"]) + if(mouse_control["screen-loc"]) + //Split screen-loc up into X+Pixel_X and Y+Pixel_Y + var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",") + + //Split X+Pixel_X up into list(X, Pixel_X) + var/list/screen_loc_X = splittext(screen_loc_params[1],":") + + //Split Y+Pixel_Y up into list(Y, Pixel_Y) + var/list/screen_loc_Y = splittext(screen_loc_params[2],":") + // to_chat(world, "X: [screen_loc_X[1]] PixelX: [screen_loc_X[2]] / Y: [screen_loc_Y[1]] PixelY: [screen_loc_Y[2]]") + var/x = text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32 + var/y = text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32 + + //Calculate the "resolution" of screen based on client's view and world's icon size. This will work if the user can view more tiles than average. + var/screenview = (user.client.view * 2 + 1) * world.icon_size //Refer to http://www.byond.com/docs/ref/info.html#/client/var/view for mad maths + + var/ox = round(screenview/2) - user.client.pixel_x //"origin" x + var/oy = round(screenview/2) - user.client.pixel_y //"origin" y + // to_chat(world, "Pixel position: [x] [y]") + angle = Atan2(y - oy, x - ox) + // to_chat(world, "Angle: [angle]") + return list(angle, p_x, p_y) /obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it. ..() diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index e420be18d0b..600fe4f2be7 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -20,10 +20,6 @@ /obj/item/projectile/bullet/weakbullet3 damage = 20 -/obj/item/projectile/bullet/carbinebullet - damage = 20 - range = 5 - /obj/item/projectile/bullet/toxinbullet damage = 15 damage_type = TOX diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 99056eb1dca..9974caea27a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -9,8 +9,9 @@ idle_power_usage = 40 interact_offline = 1 resistance_flags = FIRE_PROOF | ACID_PROOF - var/energy = 100 - var/max_energy = 100 + var/cell_type = /obj/item/weapon/stock_parts/cell/high + var/obj/item/weapon/stock_parts/cell/cell + var/powerefficiency = 0.01 var/amount = 30 var/recharged = 0 var/recharge_delay = 5 @@ -54,6 +55,7 @@ /obj/machinery/chem_dispenser/Initialize() . = ..() + cell = new cell_type recharge() dispensable_reagents = sortList(dispensable_reagents) @@ -67,10 +69,8 @@ /obj/machinery/chem_dispenser/proc/recharge() if(stat & (BROKEN|NOPOWER)) return - var/addenergy = 1 - var/oldenergy = energy - energy = min(energy + addenergy, max_energy) - if(energy != oldenergy) + var/usedpower = cell.give( 1 / powerefficiency) //Should always be a gain of one on the UI. + if(usedpower) use_power(2500) /obj/machinery/chem_dispenser/emag_act(mob/user) @@ -106,8 +106,8 @@ /obj/machinery/chem_dispenser/ui_data() var/data = list() data["amount"] = amount - data["energy"] = energy - data["maxEnergy"] = max_energy + data["energy"] = cell.charge ? cell.charge * powerefficiency : "0" //To prevent NaN in the UI. + data["maxEnergy"] = cell.maxcharge * powerefficiency data["isBeakerLoaded"] = beaker ? 1 : 0 var beakerContents[0] @@ -149,10 +149,10 @@ if(beaker && dispensable_reagents.Find(reagent)) var/datum/reagents/R = beaker.reagents var/free = R.maximum_volume - R.total_volume - var/actual = min(amount, energy * 10, free) + var/actual = min(amount, (cell.charge * powerefficiency)*10, free) R.add_reagent(reagent, actual) - energy = max(energy - actual / 10, 0) + cell.use((actual / 10) / powerefficiency) . = TRUE if("remove") var/amount = text2num(params["amount"]) @@ -184,20 +184,40 @@ beaker.loc = src to_chat(user, "You add \the [B] to the machine.") - beaker_overlay = beaker_overlay || mutable_appearance(icon, "disp_beaker") + beaker_overlay = beaker_overlay || mutable_appearance(icon, "disp_beaker") beaker_overlay.pixel_x = rand(-10, 5)//randomize beaker overlay position. add_overlay(beaker_overlay) else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/weapon/card/emag)) to_chat(user, "You can't load \the [I] into the machine!") + return ..() else return ..() +/obj/machinery/chem_dispenser/get_cell() + return cell + +/obj/machinery/chem_dispenser/emp_act(severity) + var/list/datum/reagents/R = list() + var/total = min(rand(7,15), Floor(cell.charge*powerefficiency)) + var/datum/reagents/Q = new(total*10) + if(beaker && beaker.reagents) + R += beaker.reagents + for(var/i in 1 to total) + Q.add_reagent(pick(dispensable_reagents), 10) + R += Q + chem_splash(get_turf(src), 3, R) + if(beaker && beaker.reagents) + beaker.reagents.remove_all() + cell.use(total/powerefficiency) + cell.emp_act() + visible_message(" The [src] malfunctions, spraying chemicals everywhere!") + ..() + /obj/machinery/chem_dispenser/constructable name = "portable chem dispenser" icon = 'icons/obj/chemical.dmi' icon_state = "minidispenser" - energy = 10 - max_energy = 10 + powerefficiency = 0.001 amount = 5 recharge_delay = 30 dispensable_reagents = list() @@ -263,16 +283,13 @@ /obj/machinery/chem_dispenser/constructable/RefreshParts() var/time = 0 - var/temp_energy = 0 var/i + for(var/obj/item/weapon/stock_parts/cell/P in component_parts) + cell = P for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) - temp_energy += M.rating - temp_energy-- - max_energy = temp_energy * 5 //max energy = (bin1.rating + bin2.rating - 1) * 5, 5 on lowest 25 on highest + time += M.rating for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) time += C.rating - for(var/obj/item/weapon/stock_parts/cell/P in component_parts) - time += round(P.maxcharge, 10000) / 10000 recharge_delay /= time/2 //delay between recharges, double the usual time on lowest 50% less than usual on highest for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) for(i=1, i<=M.rating, i++) @@ -370,6 +387,19 @@ /obj/machinery/chem_dispenser/mutagensaltpeter - name = "mutagen and saltpeter dispenser" - desc = "Creates and dispenses mutagen and even saltpeter." - dispensable_reagents = list("mutagen", "saltpetre") + name = "botanical chemical dispenser" + desc = "Creates and dispenses chemicals useful for botany." + dispensable_reagents = list( + "mutagen", + "saltpetre", + "eznutriment", + "left4zednutriment", + "robustharvestnutriment", + "water", + "plantbgone", + "weedkiller", + "pestkiller", + "cryoxadone", + "ammonia", + "ash", + "diethylamine") diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 0bc843a6054..3ba5519a9c0 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -121,8 +121,8 @@ /datum/chemical_reaction/nitrous_oxide name = "Nitrous Oxide" id = "nitrous_oxide" - results = list("nitrous_oxide" = 2, "water" = 4) - required_reagents = list("ammonia" = 3, "nitrogen" = 1, "oxygen" = 2) + results = list("nitrous_oxide" = 5) + required_reagents = list("ammonia" = 2, "nitrogen" = 1, "oxygen" = 2) required_temp = 525 ////////////////////////////////// Mutation Toxins /////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index f7399fc4b74..43d7de2e20b 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -142,3 +142,10 @@ icon_state = "pill18" list_reagents = list("insulin" = 50) roundstart = 1 + +/obj/item/weapon/reagent_containers/pill/shadowtoxin + name = "black pill" + desc = "I wouldn't eat this if I were you." + icon_state = "pill9" + color = "#454545" + list_reagents = list("shadowmutationtoxin" = 1) \ No newline at end of file diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 7fbc8309a8f..dbe9e372e46 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -216,7 +216,7 @@ /datum/design/rglass name = "Reinforced Glass" id = "rglass" - build_type = AUTOLATHE + build_type = AUTOLATHE | SMELTER materials = list(MAT_METAL = 1000, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/rglass category = list("initial","Construction") @@ -783,7 +783,7 @@ materials = list(MAT_METAL = 2000, MAT_GLASS = 1000) build_path = /obj/item/device/modular_computer/tablet category = list("initial","Misc") - + /datum/design/slime_scanner name = "Slime Scanner" id = "slime_scanner" @@ -791,4 +791,3 @@ materials = list(MAT_METAL = 300, MAT_GLASS = 200) build_path = /obj/item/device/slime_scanner category = list("initial", "Misc") - \ No newline at end of file diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index f03bb8f3e9d..aa52acc2fb9 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -68,6 +68,16 @@ build_path = /obj/item/device/lightreplacer category = list("Power Designs") +/datum/design/inducer + name = "Inducer" + desc = "The NT-75 Electromagnetic Power Inducer can wirelessly induce electric charge in an object, allowing you to recharge power cells without having to remove them." + id = "inducer" + req_tech = list("powerstorage" = 4, "engineering" = 4, "magnets" = 4) + build_type = PROTOLATHE + materials = list(MAT_METAL = 3000, MAT_GLASS = 1000) + build_path = /obj/item/weapon/inducer/sci + category = list("Power Designs") + /datum/design/board/pacman name = "Machine Design (PACMAN-type Generator Board)" desc = "The circuit board that for a PACMAN-type portable generator." diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 15704651f6d..3d94ccef58a 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -52,14 +52,14 @@ build_path = /obj/item/weapon/shield/riot/tele category = list("Weapons") -/datum/design/lasercannon - name = "Accelerator Laser Cannon" - desc = "A heavy duty laser cannon. It does more damage the farther away the target is." - id = "lasercannon" - req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 3) +/datum/design/beamrifle + name = "Beam Marksman Rifle" + desc = "A powerful long ranged anti-material rifle that fires charged particle beams to obliterate targets." + id = "beamrifle" + req_tech = list("combat" = 7, "magnets" = 5, "powerstorage" = 5, "materials" = 7, "programming" = 5) build_type = PROTOLATHE - materials = list(MAT_METAL = 10000, MAT_GLASS = 3000, MAT_DIAMOND = 3000) - build_path = /obj/item/weapon/gun/energy/lasercannon + materials = list(MAT_METAL = 10000, MAT_GLASS = 5000, MAT_DIAMOND = 5000, MAT_URANIUM = 8000, MAT_SILVER = 4500, MAT_GOLD = 5000) + build_path = /obj/item/weapon/gun/energy/beam_rifle category = list("Weapons") /datum/design/decloner @@ -258,4 +258,4 @@ build_type = PROTOLATHE materials = list(MAT_METAL = 5000, MAT_GLASS = 1500, MAT_URANIUM = 1500, MAT_SILVER = 1500) build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large - category = list("Weapons") \ No newline at end of file + category = list("Weapons") diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 8ead387a8e9..805d46b9c72 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -133,7 +133,7 @@ death = FALSE icon = 'icons/obj/Cryogenic2.dmi' icon_state = "sleeper_s" - flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Continue your research as best you can, and try to keep a low profile. Do not abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!" + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Continue your research as best you can, and try to keep a low profile. DON'T abandon the base without good cause. The base is rigged with explosives should the worst happen, do not let the base fall into enemy hands!" id_access_list = list(GLOB.access_syndicate) outfit = /datum/outfit/lavaland_syndicate @@ -148,13 +148,14 @@ back = /obj/item/weapon/storage/backpack r_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol id = /obj/item/weapon/card/id + implants = list(/obj/item/weapon/implant/weapons_auth) /datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/H) H.faction |= "syndicate" /obj/effect/mob_spawn/human/lavaland_syndicate/comms name = "Syndicate Comms Agent" - flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base without good cause. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" + flavour_text = "You are a syndicate agent, employed in a top secret research facility developing biological weapons. Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. DON'T abandon the base without good cause. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" outfit = /datum/outfit/lavaland_syndicate/comms /datum/outfit/lavaland_syndicate/comms diff --git a/code/modules/server_tools/nudge.py b/code/modules/server_tools/nudge.py new file mode 100644 index 00000000000..4652d178cba --- /dev/null +++ b/code/modules/server_tools/nudge.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +import sys +import pickle +import socket + + +def pack(): + data = sys.argv[1] + + nudge(str.encode(data)) + + +def nudge(data): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + with open('config/server_to_tool_bridge_port.txt', 'r') as myfile: + portstr=myfile.read().replace('\n', '').strip() + s.connect(("localhost", int(portstr))) + s.send(data) + s.close() + +if __name__ == "__main__" and len(sys.argv) > 1: + pack() diff --git a/code/modules/server_tools/server_tools.dm b/code/modules/server_tools/server_tools.dm new file mode 100644 index 00000000000..106f4c7aa9e --- /dev/null +++ b/code/modules/server_tools/server_tools.dm @@ -0,0 +1,84 @@ +GLOBAL_VAR_INIT(reboot_mode, REBOOT_MODE_NORMAL) //if the world should request the service to kill it at reboot +GLOBAL_PROTECT(reboot_mode) + +/world/proc/RunningService() + return params[SERVICE_WORLD_PARAM] + +/world/proc/ExportService(command) + return shell("python code/modules/server_tools/nudge.py \"[command]\"") == 0 + +/world/proc/IRCBroadcast(msg) + ExportService("[SERVICE_REQUEST_IRC_BROADCAST] [msg]") + +//called at the exact moment the world is supposed to reboot +/world/proc/ServiceReboot() + switch(GLOB.reboot_mode) + if(REBOOT_MODE_HARD) + to_chat(src, "Hard reboot triggered, you will automatically reconnect...") + log_world("Sending shutdown request!"); + sleep(1) //flush the buffers + ExportService(SERVICE_REQUEST_KILL_PROCESS) + if(REBOOT_MODE_SHUTDOWN) + to_chat(src, "The server is shutting down...") + log_world("Deleting world") + qdel(src) + +/world/proc/ServiceCommand(list/params) + var/sCK = RunningService() + var/their_sCK = params[SERVICE_CMD_PARAM_KEY] + + if(!their_sCK || their_sCK != sCK) + return "Invalid comms key!"; + + var/command = params[SERVICE_CMD_PARAM_COMMAND] + if(!command) + return "No command!" + + var/static/last_irc_status = 0 + switch(command) + if(SERVICE_CMD_HARD_REBOOT) + if(GLOB.reboot_mode != REBOOT_MODE_HARD) + GLOB.reboot_mode = REBOOT_MODE_HARD + log_world("Hard reboot requested by service") + message_admins("The world will hard reboot at the end of the game. Requested by service.") + SSblackbox.set_val("service_hard_restart", TRUE) + if(SERVICE_CMD_GRACEFUL_SHUTDOWN) + if(GLOB.reboot_mode != REBOOT_MODE_SHUTDOWN) + GLOB.reboot_mode = REBOOT_MODE_SHUTDOWN + log_world("Shutdown requested by service") + message_admins("The world will shutdown at the end of the game. Requested by service.") + SSblackbox.set_val("service_shutdown", TRUE) + if(SERVICE_CMD_WORLD_ANNOUNCE) + var/msg = params["message"] + if(!istext(msg) || !msg) + return "No message set!" + to_chat(src, "[html_encode(msg)]") + return "SUCCESS" + if(SERVICE_CMD_IRC_STATUS) + var/rtod = REALTIMEOFDAY + if(rtod - last_irc_status < IRC_STATUS_THROTTLE) + return + last_irc_status = rtod + var/list/adm = get_admin_counts() + var/list/allmins = adm["total"] + var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). " + status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]." + return status + if(SERVICE_CMD_IRC_CHECK) + var/rtod = REALTIMEOFDAY + if(rtod - last_irc_status < IRC_STATUS_THROTTLE) + return + last_irc_status = rtod + return "[GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [config.server ? config.server : "byond://[address]:[port]"]" + if(SERVICE_CMD_ADMIN_MSG) + return IrcPm(params[SERVICE_CMD_PARAM_TARGET], params[SERVICE_CMD_PARAM_MESSAGE], params[SERVICE_CMD_PARAM_SENDER]) + + if(SERVICE_CMD_NAME_CHECK) + log_admin("IRC Name Check: [params[SERVICE_CMD_PARAM_SENDER]] on [params[SERVICE_CMD_PARAM_TARGET]]") + message_admins("IRC name checking on [params[SERVICE_CMD_PARAM_TARGET]] from [params[SERVICE_CMD_PARAM_SENDER]]") + return keywords_lookup(params[SERVICE_CMD_PARAM_TARGET], 1) + if(SERVICE_CMD_ADMIN_WHO) + return ircadminwho() + else + return "Unknown command: [command]" + diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 9aa0041a657..25dfa135975 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -43,16 +43,16 @@ console = locate(/obj/machinery/requests_console) in A areas += A - if(GLOB.latejoin.len) + if(SSjob.latejoin_trackers.len) WARNING("Map contains predefined latejoin spawn points and an arrivals shuttle. Using the arrivals shuttle.") if(!new_latejoin.len) WARNING("Arrivals shuttle contains no chairs for spawn points. Reverting to latejoin landmarks.") - if(!GLOB.latejoin.len) + if(!SSjob.latejoin_trackers.len) WARNING("No latejoin landmarks exist. Players will spawn unbuckled on the shuttle.") return - GLOB.latejoin = new_latejoin + SSjob.latejoin_trackers = new_latejoin /obj/docking_port/mobile/arrivals/dockRoundstart() SSshuttle.generate_transit_dock(src) @@ -109,7 +109,7 @@ Launch(FALSE) /obj/docking_port/mobile/arrivals/proc/CheckTurfsPressure() - for(var/I in GLOB.latejoin) + for(var/I in SSjob.latejoin_trackers) var/turf/open/T = get_turf(I) var/pressure = T.air.return_pressure() if(pressure < HAZARD_LOW_PRESSURE || pressure > HAZARD_HIGH_PRESSURE) //simple safety check diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index f022e0338fe..e5957e7cdef 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th return 0 var/turf/T = get_turf(user) - if(T.z == ZLEVEL_CENTCOM && (!centcom_cancast || SSticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel + if(T.z == ZLEVEL_CENTCOM && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel to_chat(user, "You can't cast this spell here.") return 0 diff --git a/code/modules/spells/spell_types/rod_form.dm b/code/modules/spells/spell_types/rod_form.dm index 5046da7c34d..dc77615307f 100644 --- a/code/modules/spells/spell_types/rod_form.dm +++ b/code/modules/spells/spell_types/rod_form.dm @@ -17,6 +17,7 @@ var/obj/effect/immovablerod/wizard/W = new(start, get_ranged_target_turf(M, M.dir, (15 + spell_level * 3))) W.wizard = M W.max_distance += spell_level * 3 //You travel farther when you upgrade the spell + W.damage_bonus += spell_level * 20 //You do more damage when you upgrade the spell W.start_turf = start M.forceMove(W) M.notransform = 1 @@ -26,6 +27,7 @@ /obj/effect/immovablerod/wizard var/max_distance = 13 + var/damage_bonus = 0 var/mob/living/wizard var/turf/start_turf notify = FALSE @@ -41,3 +43,7 @@ wizard.notransform = 0 wizard.forceMove(get_turf(src)) return ..() + +/obj/effect/immovablerod/wizard/penetrate(mob/living/L) + L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!") + L.adjustBruteLoss(70 + damage_bonus) diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 5f808035fd3..52919c996d1 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -326,7 +326,7 @@ var/datum/effect_system/smoke_spread/s = new s.set_up(4,get_turf(centerpiece)) s.start() - var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece),cannon_direction=centerpiece.get_cannon_direction()) + var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece),centerpiece.get_cannon_direction()) qdel(centerpiece.front) qdel(centerpiece.back) qdel(centerpiece) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 585f452de49..089d8be105f 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -294,10 +294,11 @@ /obj/item/bodypart/head/attach_limb(mob/living/carbon/C, special) //Transfer some head appearance vars over if(brain) - brainmob.container = null //Reset brainmob head var. - brainmob.loc = brain //Throw mob into brain. - brain.brainmob = brainmob //Set the brain to use the brainmob - brainmob = null //Set head brainmob var to null + if(brainmob) + brainmob.container = null //Reset brainmob head var. + brainmob.loc = brain //Throw mob into brain. + brain.brainmob = brainmob //Set the brain to use the brainmob + brainmob = null //Set head brainmob var to null brain.Insert(C) //Now insert the brain proper brain = null //No more brain in the head diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index b4154c8e9c8..a166be04a47 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -292,7 +292,7 @@ cooldown = COOLDOWN_MEME for(var/V in listeners) var/mob/living/L = V - new /obj/effect/hallucination/delusion(get_turf(L),L,duration=150 * power_multiplier,skip_nearby=0) + new /obj/effect/hallucination/delusion(get_turf(L),L,null,150 * power_multiplier,0) //WAKE UP else if((findtext(message, wakeup_words))) diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index 4be7b84a6c6..af1d6e47431 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -82,7 +82,7 @@ target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm) return 1 else if(istype(tool, /obj/item/weapon/melee/synthetic_arm_blade)) - var/obj/item/weapon/melee/arm_blade/new_arm = new(target, silent = TRUE, synthetic = TRUE) + var/obj/item/weapon/melee/arm_blade/new_arm = new(target,TRUE,TRUE) target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm) return 1 diff --git a/code/modules/surgery/tail_modification.dm b/code/modules/surgery/tail_modification.dm index 082d6acd48c..b8e8da5d318 100644 --- a/code/modules/surgery/tail_modification.dm +++ b/code/modules/surgery/tail_modification.dm @@ -17,12 +17,22 @@ /datum/surgery_step/sever_tail name = "sever tail" - implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/circular_saw = 100, /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, /obj/item/weapon/melee/arm_blade = 80, /obj/item/weapon/twohanded/required/chainsaw = 80, /obj/item/weapon/mounted_chainsaw = 80, /obj/item/weapon/twohanded/fireaxe = 50, /obj/item/weapon/hatchet = 40, /obj/item/weapon/kitchen/knife/butcher = 25) + implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/circular_saw = 100, + /obj/item/weapon/melee/sabre = 100, /obj/item/weapon/melee/energy/sword/cyborg/saw = 100, + /obj/item/weapon/melee/arm_blade = 80, /obj/item/weapon/twohanded/required/chainsaw = 80, + /obj/item/weapon/mounted_chainsaw = 80, /obj/item/weapon/twohanded/fireaxe = 50, + /obj/item/weapon/hatchet = 40, /obj/item = 30) // 30% success with any sharp item. time = 64 /datum/surgery_step/sever_tail/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] begins to sever [target]'s tail!", "You begin to sever [target]'s tail...") +/datum/surgery_step/sever_tail/tool_check(mob/user, obj/item/tool) + if(implement_type == /obj/item && !tool.is_sharp()) + return FALSE + + return TRUE + /datum/surgery_step/sever_tail/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/mob/living/carbon/human/L = target user.visible_message("[user] severs [L]'s tail!", "You sever [L]'s tail.") diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 6a04f7ddab2..f6fa99bf045 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/dangerous/shotgun name = "Bulldog Shotgun" desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatiable with all 12g rounds. Designed for close \ - quarter anti-personel engagements." + quarter anti-personnel engagements." item = /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog cost = 8 surplus = 40 @@ -297,7 +297,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/dangerous/powerfist name = "Power Fist" desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply.\ - Upon hitting a target, the piston-ram will extend foward to make contact for some serious damage. \ + Upon hitting a target, the piston-ram will extend forward to make contact for some serious damage. \ Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \ deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks." item = /obj/item/weapon/melee/powerfist @@ -649,13 +649,6 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. cost = 4 exclude_modes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) -/datum/uplink_item/stealthy_weapons/poison_pen - name = "Poison Pen" - desc = "Cutting edge of deadly writing implements technology, this gadget will infuse any piece of paper with delayed contact poison." - item = /obj/item/weapon/pen/poison - cost = 2 - exclude_modes = list(/datum/game_mode/nuclear) - /datum/uplink_item/stealthy_weapons/soap name = "Syndicate Soap" desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. \ @@ -905,7 +898,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/military_belt name = "Chest Rig" - desc = "A robust seven-slot set of webbing that is capable of holding all manner of tatical equipment." + desc = "A robust seven-slot set of webbing that is capable of holding all manner of tactical equipment." item = /obj/item/weapon/storage/belt/military cost = 1 exclude_modes = list(/datum/game_mode/nuclear) @@ -1021,7 +1014,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/powersink name = "Power Sink" desc = "When screwed to wiring attached to a power grid and activated, this large device places excessive \ - load on the grid, causing a stationwide blackout. The sink is large and cannot be stored in most \ + load on the grid, causing a station-wide blackout. The sink is large and cannot be stored in most \ traditional bags and boxes." item = /obj/item/device/powersink cost = 6 @@ -1059,7 +1052,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/rad_laser name = "Radioactive Microlaser" desc = "A radioactive microlaser disguised as a standard Nanotrasen health analyzer. When used, it emits a \ - powerful burst of radiation, which, after a short delay, can incapitate all but the most protected \ + powerful burst of radiation, which, after a short delay, can incapacitate all but the most protected \ of humanoids. It has two settings: intensity, which controls the power of the radiation, \ and wavelength, which controls how long the radiation delay is." item = /obj/item/device/healthanalyzer/rad_laser @@ -1128,14 +1121,14 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/codespeak_manual name = "Codespeak Manual" - desc = "Syndicate agents can be trained to use a series of codewords to comvey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. One use." + desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. One use." item = /obj/item/weapon/codespeak_manual cost = 2 exclude_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/device_tools/codespeak_manual_deluxe name = "Deluxe Codespeak Manual" - desc = "Syndicate agents can be trained to use a series of codewords to comvey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses." + desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses." cost = 8 include_modes = list(/datum/game_mode/nuclear) @@ -1254,7 +1247,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/role_restricted/mimery name = "Guide to Advanced Mimery Series" - desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisble walls, and shoot bullets out of their fingers. Obviously only works for Mimes." + desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. Obviously only works for Mimes." cost = 12 item = /obj/item/weapon/storage/box/syndie_kit/mimery restricted_roles = list("Mime") @@ -1366,7 +1359,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/badass/surplus name = "Syndicate Surplus Crate" - desc = "A dusty crate from the back of the Syndicate warehouse. Rumored to contain a valuable assortion of items, \ + desc = "A dusty crate from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \ but you never know. Contents are sorted to always be worth 50 TC." item = /obj/structure/closet/crate cost = 20 diff --git a/code/world.dm b/code/world.dm index b35f12753d4..7b81dfd7831 100644 --- a/code/world.dm +++ b/code/world.dm @@ -28,7 +28,8 @@ SetupLogs() - GLOB.revdata.DownloadPRDetails() + if(!RunningService()) //tgs2 support + GLOB.revdata.DownloadPRDetails() load_motd() load_admins() @@ -41,6 +42,9 @@ Master.Initialize(10, FALSE) + if(config.irc_announce_new_game) + IRCBroadcast("New round starting on [SSmapping.config.map_name]!") + /world/proc/SetupExternalRSC() #if (PRELOAD_RSC == 0) external_rsc_urls = world.file2list("config/external_rsc_urls.txt","\n") @@ -86,14 +90,14 @@ if(GLOB.round_id) log_game("Round ID: [GLOB.round_id]") -#define IRC_STATUS_THROTTLE 50 /world/Topic(T, addr, master, key) if(config && config.log_world_topic) GLOB.world_game_log << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]" var/list/input = params2list(T) + if(input[SERVICE_CMD_PARAM_KEY]) + return ServiceCommand(input) var/key_valid = (global.comms_allowed && input["key"] == global.comms_key) - var/static/last_irc_status = 0 if("ping" in input) var/x = 1 @@ -108,8 +112,9 @@ n++ return n - else if("ircstatus" in input) - if(world.time - last_irc_status < IRC_STATUS_THROTTLE) + else if("ircstatus" in input) //tgs2 support + var/static/last_irc_status = 0 + if(world.time - last_irc_status < 50) return var/list/adm = get_admin_counts() var/list/allmins = adm["total"] @@ -177,20 +182,20 @@ if(input["crossmessage"] == "News_Report") minor_announce(input["message"], "Breaking Update From [input["message_sender"]]") - else if("adminmsg" in input) + else if("adminmsg" in input) //tgs2 support if(!key_valid) return "Bad Key" else return IrcPm(input["adminmsg"],input["msg"],input["sender"]) - else if("namecheck" in input) + else if("namecheck" in input) //tgs2 support if(!key_valid) return "Bad Key" else log_admin("IRC Name Check: [input["sender"]] on [input["namecheck"]]") message_admins("IRC name checking on [input["namecheck"]] from [input["sender"]]") return keywords_lookup(input["namecheck"],1) - else if("adminwho" in input) + else if("adminwho" in input) //tgs2 support if(!key_valid) return "Bad Key" else @@ -216,6 +221,7 @@ C.AnnouncePR(final_composed) /world/Reboot(reason = 0, fast_track = FALSE) + ServiceReboot() //handles alternative actions if necessary if (reason || fast_track) //special reboot, do none of the normal stuff if (usr) log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") diff --git a/config/admins.txt b/config/admins.txt index b4485c08411..296377199e7 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -8,6 +8,7 @@ # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # ############################################################################################### Optimumtact = Host +Expletives = Game Master kingofkosmos = Game Master MrStonedOne = Game Master microscopics = Game Master diff --git a/config/game_options.txt b/config/game_options.txt index fca46c529d1..87c4ed5c14b 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -87,7 +87,6 @@ PROBABILITY CHANGELING 2 PROBABILITY WIZARD 4 PROBABILITY MALFUNCTION 1 PROBABILITY BLOB 2 -PROBABILITY RAGINMAGES 2 PROBABILITY MONKEY 0 PROBABILITY METEOR 0 PROBABILITY EXTENDED 0 @@ -114,7 +113,6 @@ CONTINUOUS WIZARD CONTINUOUS MALFUNCTION CONTINUOUS BLOB CONTINUOUS ABDUCTION -#CONTINUOUS RAGINMAGES #CONTINUOUS MONKEY ##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately! @@ -139,7 +137,6 @@ MIDROUND_ANTAG WIZARD MIDROUND_ANTAG MALFUNCTION MIDROUND_ANTAG BLOB MIDROUND_ANTAG ABDUCTION -#MIDROUND_ANTAG RAGINMAGES #MIDROUND_ANTAG MONKEY ## Uncomment these for overrides of the minimum / maximum number of players in a round type. diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt index 5afb96f6cdc..aec26764a59 100644 --- a/config/lavaruinblacklist.txt +++ b/config/lavaruinblacklist.txt @@ -14,7 +14,6 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm -#_maps/RandomRuins/LavaRuins/lavaland_surface_surface_ueg_crash1.dmm ##SIN #_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index f56db22fd95..bfdb55c83e6 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -41,4 +41,3 @@ #_maps/RandomRuins/SpaceRuins/vaporwave.dmm #_maps/RandomRuins/SpaceRuins/bus.dmm #_maps/RandomRuins/SpaceRuins/miracle.dmm -#_maps/RandomRuins/SpaceRuins/dragoontomb.dmm diff --git a/html/changelog.html b/html/changelog.html index 42573b3a40b..1ce1f4107f7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,196 @@ -->
+

06 June 2017

+

Joan updated:

+
    +
  • Added a new unique Kinetic Accelerator module to necropolis chests.
    • +
  • Renames Clockwork Proselytizers to Replica Fabricators.
    • +
  • Replica Fabricators can directly consume floor tiles, rods, metal, and plasteel for power instead of needing to convert to brass first.
    • +
  • Cogscarabs can no longer use guns.
    • +
+

PKPenguin321 updated:

+
    +
  • The fake pits that the arcade machines can vend now vend properly, for real this time.
    • +
+

Robustin updated:

+
    +
  • The cult master has finally acquired their 3rd spell, Eldritch Pulse. This ability allows the cult master to quickly teleport any cultist or cult structure in visual range to another tile in visual range. This spell has an obvious spell effect that will indicate where the target has gone but without explicitly revealing who the master is. This spell should assist with moving obstinate cultists off an important rune, getting wandering cultists back onto an important rune, save a cultist from an untimely arrest/summary execution, assist in getting your allies into secure areas, etc.
    • +
  • The void torch now only works on items that have been placed on surfaces, this prevents the inventory bugs associated with this item.
    • +
+

thefastfoodguy updated:

+
    +
  • you can burn your brains out with a flashlight if you're tired of life
    • +
+ +

05 June 2017

+

Expletive updated:

+
    +
  • The Ore Redemption Machine has been ported to TGUI. New features include the addition of "Release All" and "Smelt All" buttons.
    • +
  • The Ore Redemption Machine now be loaded with sheets of material.
    • +
  • The Ore Redemption Machine can now 'smelt' Reinforced Glass.
    • +
+

Joan updated:

+
    +
  • Only human and silicon servants can help recite multi-invoker scriptures. This means cogscarabs, clockwork marauders, and anima fragments DO NOT COUNT for scriptures that require multiple invokers.
    • +
  • Clockcult scripture tiers can no longer be lost by dipping below their requirements once they are unlocked.
    • +
  • Removes Revenant scriptures entirely.
    • +
+

MMMiracles updated:

+
    +
  • Deepstorage ruin has been redone to be more self-sufficient and up to better mapping standards.
    • +
+ +

04 June 2017

+

Expletive updated:

+
    +
  • Many stacks now update their sprite based on their amount.
    • +
  • Stacks will now weigh less if they're less than full.
    • +
  • Added new icon states for glass, reinforced glass, metal, plasteel, plastic, plasma, plastitanium, titanium, gold, silver, adamantine, brass, bruise packs, ointment, gauze, cloth, leather, wet leather, hairless hide, human hide, ash drake hide, goliath hide, bones, sandstone blocks, and snow blocks.
    • +
  • Some lavaland stacks' max amounts have been reduced.
    • +
  • Bulldog Shotguns should update their sprite properly when you remove the magazine.
    • +
  • Riot suits no longer hide jumpsuits.
    • +
+

Joan updated:

+
    +
  • Rod Form now costs 2 points, from 3.
    • +
  • Rod Form now does 70 damage, from 160, but gains 20 damage, per upgrade, when upgraded. This means you'll need to spend 6 points on it to instantly crit people from full health.
    • +
+

Swindly updated:

+
    +
  • Chemical grenades are no longer permanently disabled after being unlocked by wirecutters after being primed.
    • +
+ +

03 June 2017

+

Expletive updated:

+
    +
  • Chem Dispensers now store their power in their batteries.
    • +
  • Instead of being based on battery and capacitor ratings, recharge delay for portable chem dispensers is now based on their capacitor and matter bin ratings.
    • +
  • The Seed Vault's chemical dispenser now has all the chemicals a pod person could want.
    • +
  • The crafting menu now has subcategories!
    • +
  • Food recipe categories have been combined as subcategories of the Foods category.
    • +
  • Weaponry and Ammunition have been combined as subcategories of the Weaponry category.
    • +
+

Improvedname updated:

+
    +
  • Janitors now start with a flyswatter
    • +
+

Mothership Epsilon updated:

+
    +
  • All your base are belong to us.
    • +
+

Penguaro updated:

+
    +
  • [Box] Removes extra/unattached vent from Xeno Lab
    • +
+

Planned Spaceparenthood updated:

+
    +
  • We would like to apologize for mislabeled cloning pod buttons.
    • +
+

WJohnston updated:

+
    +
  • Deltastation's south nuke op shuttle location should no longer be possible to teleport into by moving off the map and back on, and moved the rest closer to the station.
    • +
+

p440 updated:

+
    +
  • Fixed duping cable coils with magic APC terminals
    • +
  • Fixed invalid icon state for empty APCs
    • +
+ +

02 June 2017

+

Cyberboss updated:

+
    +
  • New server backend!
    • +
  • Test merged PRs now show the commit of the PR at which they were merged
    • +
+

Expletive updated:

+
    +
  • Adds the NT75 Electromagnetic Power Inducer, a tool which can be used to quickly recharge many devices! They can be found in Electrical Closets, the CE's locker, ordered by cargo, or created in RnD.
    • +
+

Goodstuff updated:

+
    +
  • Fixes the crafting recipe for black carpet
    • +
  • Removed a random white dot on the black carpet sprite
    • +
+

Joan updated:

+
    +
  • Goliaths, Watchers, and Legions have a small chance of dropping a kinetic crusher trophy item when killed with a kinetic crusher. Like the boss trophy items, these give various effects.
    • +
  • Kinetic crushers recharge very slightly slower.
    • +
  • Three unique Kinetic Accelerator modules will now appear in necropolis chests.
    • +
+

MMMiracles (Cerestation) updated:

+
    +
  • CereStation's Security department has been overhauled entirely thanks to the tireless efforts of Nanotrasen's construction division.
    • +
+

Nanotrasen Mining Alert updated:

+
    +
  • Nanotrasen's mining operations have created far more corpses than an entire galaxy of cooks could hope to deal with. To solve this, we decided to just dump them all from orbit onto the barren lava planet. Unfortunately, the creatures called "Legion" have infested a great number of them, and you can now commonly find the bodies of former Nanotrasen employees left behind. Additionally, there are reports of natives, other settlers, and even stranger things found among the corpses.
    • +
+

QualityVan updated:

+
    +
  • The tactical rigging in op closets is more tacticool
    • +
+

Shadowlight213 updated:

+
    +
  • The reset wire on borgs must now be cut to reset a borg's module instead of pulsed.
    • +
  • Portable pump max pressure has been lowered.
    • +
+

Steelpoint updated:

+
    +
  • Iron Hawk Marine no longer has Centcom all access. My mistake.
    • +
  • Fixes Iron Hawk marine carbine not having a visible sprite.
    • +
+

Swindly updated:

+
    +
  • Nitrous oxide no longer produces water as a by-product, requires 2 parts ammonia instead of 3, and produces 5 parts when made instead of 2.
    • +
+

kevinz000 updated:

+
    +
  • Gang turrets now follow the mouse of the person using them! Yay!
    • +
+

octareenroon91 updated:

+
    +
  • Attempts to add items to a storage container beyond its slots limit will now obtain a failure message again.
    • +
+ +

30 May 2017

+

Expletive updated:

+
    +
  • Luxury versions of the bluespace shelter capsule are now available! Purchase them at the mining equipment vendor.
    • +
  • Cardboard cutouts have a new option: Xenomorph Maid
    • +
  • Black Carpet can now be crafted using a stack of carpet and a black crayon.
    • +
  • Black fancy tables can now be crafted using Black Carpet.
    • +
  • Shower curtains can now be recoloured with crayons, unscrewed from the floor, disassembled with wire cutters, and reassembled using cloth, plastic, and a metal rod.
    • +
+

kevinz000 updated:

+
    +
  • Research and Development have recieved designs for new prototype Beam Marksman Rifles. These rifles require a short aiming cycle to fire, however, have extreme velocity over other weapons.
    • +
  • Aiming time is 2 seconds, hold down mouse to aim, aiming time increases if you change your aim based on angle changed, or if you move while aiming. The weapon can not be fired while unscoped.
    • +
  • However, someone tripped and pulled out the power cord while your servers were being updated with the latest revision of accelerator laser cannons. All data have been lost...
    • +
+ +

29 May 2017

+

Joan updated:

+
    +
  • Renames hivelord and legion cores to 'regenerative core'. Their descs have also been updated to be more clear.
    • +
+

Nanotrasen Plasmaman Outreach Division updated:

+
    +
  • plasmaman tank volume has been increased from 3 to 6.
    • +
+

XDTM updated:

+
    +
  • Abductors have learned how to properly delete the memories of their test subjects.
    • +
+

bandit updated:

+
    +
  • The officer's sabre standard in Nanotrasen captain rollouts can be used to remove the tails of lizard traitors, or lizards in general.
    • +
+

oranges updated:

+
    +
  • AI's can now hang up all holocalls at a station with alt+click
    • +
+

28 May 2017

ClosingBracket updated:

    @@ -89,6 +279,12 @@

    Steelpoint updated:

    • A New Iron Hawk troop transport ruin has been added to lavaland. Can the sole surviving Marine somehow survive the horrors of lavaland? Lore fluff included.
      • +
    • Central Command has listened to complaints and, as such, has now stationed "real" Private Security Officers at centcom docks.
      • +
    • A new Nanotrasen Security Officer NPC variant is available to admins, this 'peaceful' version will only attack people who attack it first. Great for keeping order.
      • +
    +

    Swindly updated:

    +
      +
    • fixed not being able to attach heads without brainmobs in them

    cacogen updated:

      @@ -1304,119 +1500,6 @@
      • Emergency shuttles will now forget early launch authorizations if they cannot launch due to a hostile environment.
      - -

      02 April 2017

      -

      BeeSting12 updated:

      -
        -
      • Metastation's northeast radiation collector is now connected to the grid. Nanotrasen would like to apologize for any inconvenience caused to engineers, but copper is expensive.
        • -
      • Boxstation's HoP office now has a PDA tech.
        • -
      -

      Cyberboss updated:

      -
        -
      • Firedoors no longer operate automatically without power
        • -
      • Blood and other decals will no longer remain on turfs they shouldn't
        • -
      • The splashscreen is working again
        • -
      • False alarms are now guaranteed to actually announce something
        • -
      -

      Incoming5643 updated:

      -
        -
      • Lighting visuals have been changed slightly to reduce it's cost to the client. If you had trouble running the new lighting, it might run a little better now.
        • -
      -

      MMMiracles (CereStation) updated:

      -
        -
      • Added a patrol path for bots, includes 2 round-start securitrons placed on opposite sites of station.
        • -
      • Due to map size, mulebots are still somewhat unreliable on longer distances. Disposals are still advised, but mule bots are now technically an option for delivery.
        • -
      • Added multiple status displays, extinguishers, and appropriate newscasters to hallways.
        • -
      • A drone dispenser is now located underneath Engineering in maintenance.
        • -
      • Each security checkpoint now has a disposal chute that directs to a waiting cell in the Brig for rapid processing of criminals. Why run half-way across the station with some petty thief when you can just shove him in the criminal chute and have the warden deal with him?
        • -
      • Security's mail chute no longer leads into the armory. This was probably not the best idea in hindsight.
        • -
      • Virology has a bathroom now.
        • -
      • Genetics monkey pen is a bit more green now.
        • -
      • Lawyer now has access the brig cells so he can complain more effectively.
        • -
      • Xenobio kill chamber is now in range of a camera.
        • -
      • Removed rogue bits of Vault area.
        • -
      • Medbay escape pod no longer juts out far enough to block the disposal's path.
        • -
      • Captain's spare ID is now real and not just a gold ID card.
        • -
      -

      Penguaro updated:

      -
        -
      • [Meta] The Chapel Security Hatches were very intimidating. They have been changed to more inviting glass doors.
        • -
      • [Meta] The maintenance tunnels in the Xeno Lab now have radiation shielding. The Slime Euthanization Chamber will not have radiation shielding at this time as dead slimes will not mind radiation.
        • -
      -

      coiax updated:

      -
        -
      • Adds seperate languages to the game. Now Ratvarian, Drone, Machine, Swarmer, Human (now called Galactic Common), Slime and Monkey are separate languages. Each languages has its own comma prefix, for example, Galcom has the ,0 prefix, while Ratvarian has the ,r prefix. If you don't understand a language when it is spoken to you, you will hear a scrambled version that will vary depending on the language that you're not understanding.
        • -
      • This does not change who can understand what.
        • -
      • Removed the talk wheel feature.
        • -
      • Clicking the speech bubble icon now opens the Language Menu, allowing you to review which languages you speak, their keys, and letting you set which language you speak by default. Admins have additional abilities to add and remove languages from mobs using this menu.
        • -
      -

      ktccd updated:

      -
        -
      • Ninja suits have received a new software update, making them able to **actually steal tech levels** from R&D consoles and servers, thus avoid being forced to honourably kill themselves for failing their objective.
        • -
      - -

      01 April 2017

      -

      Cyberboss updated:

      -
        -
      • The contents of the shelterpod smart fridge work again
        • -
      -

      XDTM updated:

      -
        -
      • Facehuggers no longer rip masks from people protected by helmets.
        • -
      - -

      31 March 2017

      -

      Cobby updated:

      -
        -
      • Shot glasses are now more ambiguous [EASIER TO MAINTAIN]
        • -
      -

      Cyberboss updated:

      -
        -
      • Temperature changes will now properly cause atmospherics simulation to activate
        • -
      • The command report for random xeno eggs will now be delivered along with the rest of the roundstart reports
        • -
      • Drones can no longer be irradiated
        • -
      - -

      30 March 2017

      -

      coiax updated:

      -
        -
      • Autoimplanters have been renamed to autosurgeons. Currently only the CMO and nuclear operatives have access to autosurgeons. What is the CMO hiding?
        • -
      • All upgraded organs for purchase by nuclear operatives now actually come in an autosurgeon, for speed of surgery.
        • -
      - -

      29 March 2017

      -

      BeeSting12 updated:

      -
        -
      • Adds emergency launch console to the backup emergency shuttle.
        • -
      -

      Joan updated:

      -
        -
      • Putting sec armour and a helmet on a corgi no longer makes the corgi immune to item attacks.
        • -
      • All items with armour will now grant corgis actual armour.
        • -
      -

      Kevinz000 updated:

      -
        -
      • High-powered floodlights may be constructed with 5 sheets of metal, a wrench, a screwdriver, 5 cable coils, and a light tube. They require a powernet connection via direct wire node.
        • -
      -

      coiax updated:

      -
        -
      • All tophats, rather than just the ones in maintenance, hurt a tiny bit if you throw them at people.
        • -
      • Supermatter anomalies are more shortlived than regular anomalies, as intended.
        • -
      - -

      28 March 2017

      -

      Supermichael777 updated:

      -
        -
      • Backup operatives now get the nukes code.
        • -
      -

      XDTM updated:

      -
        -
      • Wooden tiles can now be quick-replaced with a screwdriver instead of a crowbar, preserving the floor tile.
        • -
      -

      octareenroon91 updated:

      -
        -
      • Bonfires that have a metal rod added should buckle instead of runtiming.
        • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 78223eee0a1..091a293167e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -11530,6 +11530,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Steelpoint: - rscadd: A New Iron Hawk troop transport ruin has been added to lavaland. Can the sole surviving Marine somehow survive the horrors of lavaland? Lore fluff included. + - rscadd: Central Command has listened to complaints and, as such, has now stationed + "real" Private Security Officers at centcom docks. + - rscadd: A new Nanotrasen Security Officer NPC variant is available to admins, + this 'peaceful' version will only attack people who attack it first. Great for + keeping order. + Swindly: + - bugfix: fixed not being able to attach heads without brainmobs in them cacogen: - rscadd: You can now rename dog beds by buckling a new owner to them - rscadd: Dogs that spawn in an area with a vacant bed will take possession of and @@ -11540,3 +11547,170 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. kevinz000: - rscadd: Nanotrasen's new titanium wall blueprints are smooth enough that it can reflect projectiles! +2017-05-29: + Joan: + - spellcheck: Renames hivelord and legion cores to 'regenerative core'. Their descs + have also been updated to be more clear. + Nanotrasen Plasmaman Outreach Division: + - tweak: plasmaman tank volume has been increased from 3 to 6. + XDTM: + - balance: Abductors have learned how to properly delete the memories of their test + subjects. + bandit: + - tweak: The officer's sabre standard in Nanotrasen captain rollouts can be used + to remove the tails of lizard traitors, or lizards in general. + oranges: + - rscadd: AI's can now hang up all holocalls at a station with alt+click +2017-05-30: + Expletive: + - rscadd: Luxury versions of the bluespace shelter capsule are now available! Purchase + them at the mining equipment vendor. + - rscadd: 'Cardboard cutouts have a new option: Xenomorph Maid' + - rscadd: Black Carpet can now be crafted using a stack of carpet and a black crayon. + - rscadd: Black fancy tables can now be crafted using Black Carpet. + - rscadd: Shower curtains can now be recoloured with crayons, unscrewed from the + floor, disassembled with wire cutters, and reassembled using cloth, plastic, + and a metal rod. + kevinz000: + - rscadd: Research and Development have recieved designs for new prototype Beam + Marksman Rifles. These rifles require a short aiming cycle to fire, however, + have extreme velocity over other weapons. + - experiment: Aiming time is 2 seconds, hold down mouse to aim, aiming time increases + if you change your aim based on angle changed, or if you move while aiming. + The weapon can not be fired while unscoped. + - rscdel: However, someone tripped and pulled out the power cord while your servers + were being updated with the latest revision of accelerator laser cannons. All + data have been lost... +2017-06-02: + Cyberboss: + - experiment: New server backend! + - tweak: Test merged PRs now show the commit of the PR at which they were merged + Expletive: + - rscadd: Adds the NT75 Electromagnetic Power Inducer, a tool which can be used + to quickly recharge many devices! They can be found in Electrical Closets, the + CE's locker, ordered by cargo, or created in RnD. + Goodstuff: + - bugfix: Fixes the crafting recipe for black carpet + - bugfix: Removed a random white dot on the black carpet sprite + Joan: + - rscadd: Goliaths, Watchers, and Legions have a small chance of dropping a kinetic + crusher trophy item when killed with a kinetic crusher. Like the boss trophy + items, these give various effects. + - tweak: Kinetic crushers recharge very slightly slower. + - rscadd: Three unique Kinetic Accelerator modules will now appear in necropolis + chests. + MMMiracles (Cerestation): + - rscadd: CereStation's Security department has been overhauled entirely thanks + to the tireless efforts of Nanotrasen's construction division. + Nanotrasen Mining Alert: + - rscadd: Nanotrasen's mining operations have created far more corpses than an entire + galaxy of cooks could hope to deal with. To solve this, we decided to just dump + them all from orbit onto the barren lava planet. Unfortunately, the creatures + called "Legion" have infested a great number of them, and you can now commonly + find the bodies of former Nanotrasen employees left behind. Additionally, there + are reports of natives, other settlers, and even stranger things found among + the corpses. + QualityVan: + - tweak: The tactical rigging in op closets is more tacticool + Shadowlight213: + - balance: The reset wire on borgs must now be cut to reset a borg's module instead + of pulsed. + - tweak: Portable pump max pressure has been lowered. + Steelpoint: + - tweak: Iron Hawk Marine no longer has Centcom all access. My mistake. + - bugfix: Fixes Iron Hawk marine carbine not having a visible sprite. + Swindly: + - balance: Nitrous oxide no longer produces water as a by-product, requires 2 parts + ammonia instead of 3, and produces 5 parts when made instead of 2. + kevinz000: + - experiment: Gang turrets now follow the mouse of the person using them! Yay! + octareenroon91: + - bugfix: Attempts to add items to a storage container beyond its slots limit will + now obtain a failure message again. +2017-06-03: + Expletive: + - tweak: Chem Dispensers now store their power in their batteries. + - tweak: Instead of being based on battery and capacitor ratings, recharge delay + for portable chem dispensers is now based on their capacitor and matter bin + ratings. + - tweak: The Seed Vault's chemical dispenser now has all the chemicals a pod person + could want. + - rscadd: The crafting menu now has subcategories! + - rscadd: Food recipe categories have been combined as subcategories of the Foods + category. + - rscadd: Weaponry and Ammunition have been combined as subcategories of the Weaponry + category. + Improvedname: + - rscadd: Janitors now start with a flyswatter + Mothership Epsilon: + - tweak: All your base are belong to us. + Penguaro: + - bugfix: '[Box] Removes extra/unattached vent from Xeno Lab' + Planned Spaceparenthood: + - bugfix: We would like to apologize for mislabeled cloning pod buttons. + WJohnston: + - bugfix: Deltastation's south nuke op shuttle location should no longer be possible + to teleport into by moving off the map and back on, and moved the rest closer + to the station. + p440: + - bugfix: Fixed duping cable coils with magic APC terminals + - bugfix: Fixed invalid icon state for empty APCs +2017-06-04: + Expletive: + - rscadd: Many stacks now update their sprite based on their amount. + - rscadd: Stacks will now weigh less if they're less than full. + - imageadd: Added new icon states for glass, reinforced glass, metal, plasteel, + plastic, plasma, plastitanium, titanium, gold, silver, adamantine, brass, bruise + packs, ointment, gauze, cloth, leather, wet leather, hairless hide, human hide, + ash drake hide, goliath hide, bones, sandstone blocks, and snow blocks. + - tweak: Some lavaland stacks' max amounts have been reduced. + - bugfix: Bulldog Shotguns should update their sprite properly when you remove the + magazine. + - bugfix: Riot suits no longer hide jumpsuits. + Joan: + - balance: Rod Form now costs 2 points, from 3. + - balance: Rod Form now does 70 damage, from 160, but gains 20 damage, per upgrade, + when upgraded. This means you'll need to spend 6 points on it to instantly crit + people from full health. + Swindly: + - balance: Chemical grenades are no longer permanently disabled after being unlocked + by wirecutters after being primed. +2017-06-05: + Expletive: + - rscadd: The Ore Redemption Machine has been ported to TGUI. New features include + the addition of "Release All" and "Smelt All" buttons. + - rscadd: The Ore Redemption Machine now be loaded with sheets of material. + - rscadd: The Ore Redemption Machine can now 'smelt' Reinforced Glass. + Joan: + - balance: Only human and silicon servants can help recite multi-invoker scriptures. + This means cogscarabs, clockwork marauders, and anima fragments DO NOT COUNT + for scriptures that require multiple invokers. + - balance: Clockcult scripture tiers can no longer be lost by dipping below their + requirements once they are unlocked. + - rscdel: Removes Revenant scriptures entirely. + MMMiracles: + - tweak: Deepstorage ruin has been redone to be more self-sufficient and up to better + mapping standards. +2017-06-06: + Joan: + - rscadd: Added a new unique Kinetic Accelerator module to necropolis chests. + - spellcheck: Renames Clockwork Proselytizers to Replica Fabricators. + - balance: Replica Fabricators can directly consume floor tiles, rods, metal, and + plasteel for power instead of needing to convert to brass first. + - balance: Cogscarabs can no longer use guns. + PKPenguin321: + - bugfix: The fake pits that the arcade machines can vend now vend properly, for + real this time. + Robustin: + - rscadd: The cult master has finally acquired their 3rd spell, Eldritch Pulse. + This ability allows the cult master to quickly teleport any cultist or cult + structure in visual range to another tile in visual range. This spell has an + obvious spell effect that will indicate where the target has gone but without + explicitly revealing who the master is. This spell should assist with moving + obstinate cultists off an important rune, getting wandering cultists back onto + an important rune, save a cultist from an untimely arrest/summary execution, + assist in getting your allies into secure areas, etc. + - bugfix: The void torch now only works on items that have been placed on surfaces, + this prevents the inventory bugs associated with this item. + thefastfoodguy: + - tweak: you can burn your brains out with a flashlight if you're tired of life diff --git a/icons/effects/119x268.dmi b/icons/effects/119x268.dmi new file mode 100644 index 00000000000..6685901db46 Binary files /dev/null and b/icons/effects/119x268.dmi differ diff --git a/icons/effects/166x195.dmi b/icons/effects/166x195.dmi new file mode 100644 index 00000000000..ef49baf9f54 Binary files /dev/null and b/icons/effects/166x195.dmi differ diff --git a/icons/effects/187x381.dmi b/icons/effects/187x381.dmi deleted file mode 100644 index dd43297db53..00000000000 Binary files a/icons/effects/187x381.dmi and /dev/null differ diff --git a/icons/effects/211x247.dmi b/icons/effects/211x247.dmi deleted file mode 100644 index 35b25ffe146..00000000000 Binary files a/icons/effects/211x247.dmi and /dev/null differ diff --git a/icons/effects/237x321.dmi b/icons/effects/237x321.dmi new file mode 100644 index 00000000000..089c08d9a20 Binary files /dev/null and b/icons/effects/237x321.dmi differ diff --git a/icons/effects/254x361.dmi b/icons/effects/254x361.dmi deleted file mode 100644 index 4fd6543c32d..00000000000 Binary files a/icons/effects/254x361.dmi and /dev/null differ diff --git a/icons/effects/274x385.dmi b/icons/effects/274x385.dmi new file mode 100644 index 00000000000..9a8ba55f915 Binary files /dev/null and b/icons/effects/274x385.dmi differ diff --git a/icons/effects/340x428.dmi b/icons/effects/340x428.dmi deleted file mode 100644 index eb735c0ba92..00000000000 Binary files a/icons/effects/340x428.dmi and /dev/null differ diff --git a/icons/effects/cult_effects.dmi b/icons/effects/cult_effects.dmi index 58a2d3c9c97..925950b9a39 100644 Binary files a/icons/effects/cult_effects.dmi and b/icons/effects/cult_effects.dmi differ diff --git a/icons/effects/station_explosion.dmi b/icons/effects/station_explosion.dmi index 385818b0117..d8ced1f544b 100644 Binary files a/icons/effects/station_explosion.dmi and b/icons/effects/station_explosion.dmi differ diff --git a/icons/effects/throw_target.dmi b/icons/effects/throw_target.dmi new file mode 100644 index 00000000000..660eafbf2b1 Binary files /dev/null and b/icons/effects/throw_target.dmi differ diff --git a/icons/minimaps/CereStation_2.png b/icons/minimaps/CereStation_2.png index 93ba714d5b0..3e1b0f2ff08 100644 Binary files a/icons/minimaps/CereStation_2.png and b/icons/minimaps/CereStation_2.png differ diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi index c8fc98d4f50..214bfd744ea 100644 Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 8fbd06a23be..f73a54ab1d1 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 8a825b0bf93..a5d4511c86c 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 7cac375ef5f..97ef6cc028c 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 42b390ff3b4..2fb1c07f773 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 64a58e66987..aa0bd962d1f 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index a3dd1e21bd2..6e620cd92d8 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/cardboard_cutout.dmi b/icons/obj/cardboard_cutout.dmi index a329c00555e..da5f58d7f7c 100644 Binary files a/icons/obj/cardboard_cutout.dmi and b/icons/obj/cardboard_cutout.dmi differ diff --git a/icons/obj/clockwork_objects.dmi b/icons/obj/clockwork_objects.dmi index a7c80ba5361..02e07435931 100644 Binary files a/icons/obj/clockwork_objects.dmi and b/icons/obj/clockwork_objects.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 441f334ca77..2043111e605 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 327d2749f76..deb0908fed5 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 6034e54b05e..82129ba7a6e 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index d8c4010aeff..99bf60eb5c4 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 6a5b075b1d9..a6849c2d955 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index bffa20e6aab..88cfcd39d60 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi index 41c1ba56cd3..ca254e47e75 100644 Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ diff --git a/icons/obj/lavaland/survival_pod.dmi b/icons/obj/lavaland/survival_pod.dmi index 51358dfe4c6..84ea0e1e832 100644 Binary files a/icons/obj/lavaland/survival_pod.dmi and b/icons/obj/lavaland/survival_pod.dmi differ diff --git a/icons/obj/machines/dominator.dmi b/icons/obj/machines/dominator.dmi index 9f743174e74..42337dc1c80 100644 Binary files a/icons/obj/machines/dominator.dmi and b/icons/obj/machines/dominator.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index a5fe40431ed..3de64f610a1 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 2bbe115510c..ca0e225d7ee 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index c60188cec5c..1931c3019f7 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ diff --git a/icons/obj/smooth_structures/fancy_table_black.dmi b/icons/obj/smooth_structures/fancy_table_black.dmi new file mode 100644 index 00000000000..d4570e8a7c1 Binary files /dev/null and b/icons/obj/smooth_structures/fancy_table_black.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 5a8afeee510..8b439d2bad3 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 042a8c12cd3..cdbaa9e2489 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/icons/turf/floors/carpet_black.dmi b/icons/turf/floors/carpet_black.dmi new file mode 100644 index 00000000000..d1174203aa9 Binary files /dev/null and b/icons/turf/floors/carpet_black.dmi differ diff --git a/sound/effects/explosion3.ogg b/sound/effects/explosion3.ogg new file mode 100644 index 00000000000..81422415d44 Binary files /dev/null and b/sound/effects/explosion3.ogg differ diff --git a/sound/weapons/beam_sniper.ogg b/sound/weapons/beam_sniper.ogg new file mode 100644 index 00000000000..0bd7b89c8d1 Binary files /dev/null and b/sound/weapons/beam_sniper.ogg differ diff --git a/sound/weapons/blastcannon.ogg b/sound/weapons/blastcannon.ogg new file mode 100644 index 00000000000..9b88f3ecf96 Binary files /dev/null and b/sound/weapons/blastcannon.ogg differ diff --git a/strings/tips.txt b/strings/tips.txt index 4db52bbed2b..591ba0c04b8 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -161,13 +161,13 @@ As a Servant, the Judicial Visor is an effective defensive combat tool in small As a Servant, making, and protecting, Tinkerer's Caches is extremely important, as caches are required to unlock scripture and share components. As a Servant, Ocular Wardens, while fragile, do very high, rapid damage to a target non-servant that can see them and will even attack mechs that contain heretics. Place them behind objects that don't block vision to get the most use out of them. As a Servant, Clockwork Structures that require power will draw power from the APC if they cannot find a different source of power, and most power-using Structures will rapidly drain the APC. -As a Servant, you can repair Servant cyborgs, Clockwork Constructs, and Clockwork Structures with a Clockwork Proselytizer at a rate of 25W power to 1 health. +As a Servant, you can repair Servant cyborgs, Clockwork Constructs, and Clockwork Structures with a Replica Fabricator at a rate of 25W power to 1 health. As a Servant, securing a reliable source of component generation is high-priority, as simply handing out slabs will slowly become inefficient. Try placing Tinkerer's Caches near clockwork walls or creating and powering Tinkerer's Daemons. As a Servant, only a single held Clockwork Slab will generate components, no matter how many you're holding. In addition, slabs will generate components slower with large amounts of servants; you can see the exact time with Recollection. As a Servant, you can use Geis to easily convert single targets, as it binds them in place, preventing escape unless they react quickly enough. Having another Servant apply Geis to someone already bound will prevent their escape and mute them, even if they reacted quickly. As a Servant, placing components in a slab or cache places those components in a globally-accessable storage that slabs will draw from to invoke scripture. As a Servant, you can stack different types of Sigils on the same turf; try stacking a Sigil of Transgression and a Sigil of Submission for a subtle conversion trap. -As a Servant, you can deconstruct a Clockwork Wall with a Clockwork Proselytizer to regain 1000W power. You can also construct Clockwork Walls on Clockwork Floors for a cost of 1000W power. +As a Servant, you can deconstruct a Clockwork Wall with a Replica Fabricator to regain 1000W power. You can also construct Clockwork Walls on Clockwork Floors for a cost of 1000W power. As a Servant, Volt Void will drain power from nearby Sigils of Transmission to up to double the damage of each volt ray. It'll even use your own power if you happen to be a cyborg! As a Servant, Fellowship Armory invokes much faster for each nearby servant and attempts to provide each affected servant with powerful armor against melee, bullet, and bomb attacks. The gauntlets provided are also immune to elecricity. As a Servant, Spatial Gateway can teleport to any living Servant or Clockwork Obelisk, and gains additional uses and duration for each Servant assisting in the invocation. @@ -177,7 +177,7 @@ As a Servant, you can impale human targets with a Ratvarian Spear by pulling the As a Servant, Sentinel's Compromise can instantly return you or another Servant to a fighting state by converting half of all their brute, burn, and oxygen damage to toxin, effectively halving the damage they have. Clockwork Floors will also rapidly heal toxin damage in Servants, allowing the Compromise more effectiveness. As a Servant, Belligerent and Taunting Tirade are extremely powerful for disabling and disrupting large groups of enemies, though they render you somewhat vulnerable, as Belligerent requires that you stand still, and Taunting Tirade makes you extremely obvious. As a Servant, Soul Vessels can be placed in cyborg shells, mecha, Cogscarab shells, and Anima Fragment shells. -As a Servant, you can unwrench Clockwork Structures, but doing so will damage them, severely weakening them until repaired with a Proselytizer or Mending Mantra. Damage from other sources will also similarly weaken structures. +As a Servant, you can unwrench Clockwork Structures, but doing so will damage them, severely weakening them until repaired with a Replica Fabricator or Mending Mantra. Damage from other sources will also similarly weaken structures. You can deconvert Cultists of Nar-Sie and Servants of Ratvar by feeding them large amounts of holy water. As a Wizard, you can turn people to stone, then animate the resulting statue with a staff of animation to create an extremely powerful minion, for all of 5 minutes at least. As a Wizard, the fireball spell performs very poorly at close range, as it can easily catch you in the blast. It is best used as a form of artillery down long hallways. diff --git a/tgstation.dme b/tgstation.dme index 4897b1a2bab..6e514f8a05e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -59,6 +59,7 @@ #include "code\__DEFINES\robots.dm" #include "code\__DEFINES\role_preferences.dm" #include "code\__DEFINES\say.dm" +#include "code\__DEFINES\server_tools.dm" #include "code\__DEFINES\shuttles.dm" #include "code\__DEFINES\sight.dm" #include "code\__DEFINES\sound.dm" @@ -237,6 +238,8 @@ #include "code\datums\antagonists\antag_datum.dm" #include "code\datums\antagonists\datum_clockcult.dm" #include "code\datums\antagonists\datum_cult.dm" +#include "code\datums\antagonists\datum_internal_affairs.dm" +#include "code\datums\antagonists\datum_traitor.dm" #include "code\datums\antagonists\ninja.dm" #include "code\datums\diseases\_disease.dm" #include "code\datums\diseases\_MobProcs.dm" @@ -408,17 +411,17 @@ #include "code\game\gamemodes\clock_cult\clock_effects\spatial_gateway.dm" #include "code\game\gamemodes\clock_cult\clock_helpers\clock_powerdrain.dm" #include "code\game\gamemodes\clock_cult\clock_helpers\component_helpers.dm" +#include "code\game\gamemodes\clock_cult\clock_helpers\fabrication_helpers.dm" #include "code\game\gamemodes\clock_cult\clock_helpers\hierophant_network.dm" -#include "code\game\gamemodes\clock_cult\clock_helpers\proselytizer_helpers.dm" #include "code\game\gamemodes\clock_cult\clock_helpers\ratvarian_language.dm" #include "code\game\gamemodes\clock_cult\clock_helpers\scripture_checks.dm" #include "code\game\gamemodes\clock_cult\clock_helpers\slab_abilities.dm" #include "code\game\gamemodes\clock_cult\clock_items\clock_components.dm" #include "code\game\gamemodes\clock_cult\clock_items\clockwork_armor.dm" -#include "code\game\gamemodes\clock_cult\clock_items\clockwork_proselytizer.dm" #include "code\game\gamemodes\clock_cult\clock_items\clockwork_slab.dm" #include "code\game\gamemodes\clock_cult\clock_items\judicial_visor.dm" #include "code\game\gamemodes\clock_cult\clock_items\ratvarian_spear.dm" +#include "code\game\gamemodes\clock_cult\clock_items\replica_fabricator.dm" #include "code\game\gamemodes\clock_cult\clock_items\soul_vessel.dm" #include "code\game\gamemodes\clock_cult\clock_items\wraith_spectacles.dm" #include "code\game\gamemodes\clock_cult\clock_mobs\anima_fragment.dm" @@ -427,7 +430,6 @@ #include "code\game\gamemodes\clock_cult\clock_scriptures\scripture_cyborg.dm" #include "code\game\gamemodes\clock_cult\clock_scriptures\scripture_drivers.dm" #include "code\game\gamemodes\clock_cult\clock_scriptures\scripture_judgement.dm" -#include "code\game\gamemodes\clock_cult\clock_scriptures\scripture_revenant.dm" #include "code\game\gamemodes\clock_cult\clock_scriptures\scripture_scripts.dm" #include "code\game\gamemodes\clock_cult\clock_structures\ark_of_the_clockwork_justicar.dm" #include "code\game\gamemodes\clock_cult\clock_structures\clock_shells.dm" @@ -507,7 +509,6 @@ #include "code\game\gamemodes\traitor\double_agents.dm" #include "code\game\gamemodes\traitor\traitor.dm" #include "code\game\gamemodes\wizard\artefact.dm" -#include "code\game\gamemodes\wizard\raginmages.dm" #include "code\game\gamemodes\wizard\soulstone.dm" #include "code\game\gamemodes\wizard\spellbook.dm" #include "code\game\gamemodes\wizard\wizard.dm" @@ -798,6 +799,7 @@ #include "code\game\objects\items\weapons\his_grace.dm" #include "code\game\objects\items\weapons\holosign_creator.dm" #include "code\game\objects\items\weapons\holy_weapons.dm" +#include "code\game\objects\items\weapons\inducer.dm" #include "code\game\objects\items\weapons\kitchen.dm" #include "code\game\objects\items\weapons\manuals.dm" #include "code\game\objects\items\weapons\miscellaneous.dm" @@ -898,6 +900,7 @@ #include "code\game\objects\structures\ladders.dm" #include "code\game\objects\structures\lattice.dm" #include "code\game\objects\structures\life_candle.dm" +#include "code\game\objects\structures\manned_turret.dm" #include "code\game\objects\structures\memorial.dm" #include "code\game\objects\structures\mineral_doors.dm" #include "code\game\objects\structures\mirror.dm" @@ -1448,11 +1451,13 @@ #include "code\modules\mining\satchel_ore_boxdm.dm" #include "code\modules\mining\shelters.dm" #include "code\modules\mining\equipment\explorer_gear.dm" +#include "code\modules\mining\equipment\goliath_hide.dm" #include "code\modules\mining\equipment\kinetic_crusher.dm" #include "code\modules\mining\equipment\lazarus_injector.dm" #include "code\modules\mining\equipment\marker_beacons.dm" #include "code\modules\mining\equipment\mineral_scanner.dm" #include "code\modules\mining\equipment\mining_tools.dm" +#include "code\modules\mining\equipment\regenerative_core.dm" #include "code\modules\mining\equipment\resonator.dm" #include "code\modules\mining\equipment\survival_pod.dm" #include "code\modules\mining\equipment\vendor_items.dm" @@ -1695,7 +1700,6 @@ #include "code\modules\mob\living\simple_animal\hostile\creature.dm" #include "code\modules\mob\living\simple_animal\hostile\eyeballs.dm" #include "code\modules\mob\living\simple_animal\hostile\faithless.dm" -#include "code\modules\mob\living\simple_animal\hostile\flan.dm" #include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm" #include "code\modules\mob\living\simple_animal\hostile\headcrab.dm" #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm" @@ -1705,7 +1709,6 @@ #include "code\modules\mob\living\simple_animal\hostile\killertomato.dm" #include "code\modules\mob\living\simple_animal\hostile\mecha_pilot.dm" #include "code\modules\mob\living\simple_animal\hostile\mimic.dm" -#include "code\modules\mob\living\simple_animal\hostile\mining_mobs.dm" #include "code\modules\mob\living\simple_animal\hostile\mushroom.dm" #include "code\modules\mob\living\simple_animal\hostile\nanotrasen.dm" #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" @@ -1717,6 +1720,7 @@ #include "code\modules\mob\living\simple_animal\hostile\tree.dm" #include "code\modules\mob\living\simple_animal\hostile\venus_human_trap.dm" #include "code\modules\mob\living\simple_animal\hostile\wizard.dm" +#include "code\modules\mob\living\simple_animal\hostile\wumborian_fugu.dm" #include "code\modules\mob\living\simple_animal\hostile\bosses\boss.dm" #include "code\modules\mob\living\simple_animal\hostile\bosses\paperwizard.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm" @@ -1726,6 +1730,13 @@ #include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\swarmer.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\basilisk.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\goldgrub.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\goliath.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\gutlunch.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\hivelord.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\mining_mobs.dm" +#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\necropolis_tendril.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\frog.dm" @@ -1867,7 +1878,9 @@ #include "code\modules\procedural_mapping\mapGenerators\cellular.dm" #include "code\modules\procedural_mapping\mapGenerators\cult.dm" #include "code\modules\procedural_mapping\mapGenerators\lava_river.dm" +#include "code\modules\procedural_mapping\mapGenerators\lavaland.dm" #include "code\modules\procedural_mapping\mapGenerators\nature.dm" +#include "code\modules\procedural_mapping\mapGenerators\repair.dm" #include "code\modules\procedural_mapping\mapGenerators\shuttle.dm" #include "code\modules\procedural_mapping\mapGenerators\syndicate.dm" #include "code\modules\projectiles\ammunition.dm" @@ -1884,6 +1897,7 @@ #include "code\modules\projectiles\boxes_magazines\external_mag.dm" #include "code\modules\projectiles\boxes_magazines\internal_mag.dm" #include "code\modules\projectiles\guns\ballistic.dm" +#include "code\modules\projectiles\guns\beam_rifle.dm" #include "code\modules\projectiles\guns\energy.dm" #include "code\modules\projectiles\guns\grenade_launcher.dm" #include "code\modules\projectiles\guns\magic.dm" @@ -1906,6 +1920,7 @@ #include "code\modules\projectiles\guns\energy\stun.dm" #include "code\modules\projectiles\guns\magic\staff.dm" #include "code\modules\projectiles\guns\magic\wand.dm" +#include "code\modules\projectiles\guns\misc\blastcannon.dm" #include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\bullets.dm" #include "code\modules\projectiles\projectile\energy.dm" @@ -1991,6 +2006,7 @@ #include "code\modules\ruins\objects_and_mobs\sin_ruins.dm" #include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\security_levels.dm" +#include "code\modules\server_tools\server_tools.dm" #include "code\modules\shuttle\arrivals.dm" #include "code\modules\shuttle\assault_pod.dm" #include "code\modules\shuttle\computer.dm" diff --git a/tgui/assets/tgui.css b/tgui/assets/tgui.css index 531fb00530b..ffe61666b99 100644 --- a/tgui/assets/tgui.css +++ b/tgui/assets/tgui.css @@ -1 +1 @@ -@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.clockwork{background:linear-gradient(180deg,#b18b25 0,#5f380e);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffb18b25",endColorstr="#ff5f380e",GradientType=0)}body.clockwork .normal{color:#b18b25}body.clockwork .good{color:#cfba47}body.clockwork .average{color:#896b19}body.clockwork .bad{color:#5f380e}body.clockwork .highlight{color:#b18b25}body.clockwork main{display:block;margin-top:32px;padding:2px 6px 0}body.clockwork hr{height:2px;background-color:#b18b25;border:none}body.clockwork .hidden{display:none}body.clockwork .bar .barText,body.clockwork span.button{color:#b18b25;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.clockwork .bold{font-weight:700}body.clockwork .italic{font-style:italic}body.clockwork [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.clockwork div[data-tooltip],body.clockwork span[data-tooltip]{position:relative}body.clockwork div[data-tooltip]:after,body.clockwork span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #170800;background-color:#2d1400}body.clockwork div[data-tooltip]:hover:after,body.clockwork span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.clockwork div[data-tooltip].tooltip-top:after,body.clockwork span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-top:hover:after,body.clockwork span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:after,body.clockwork span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:hover:after,body.clockwork span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-left:after,body.clockwork span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-left:hover:after,body.clockwork span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:after,body.clockwork span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:hover:after,body.clockwork span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #170800;background:#2d1400}body.clockwork .bar .barText{position:absolute;top:0;right:3px}body.clockwork .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#b18b25}body.clockwork .bar .barFill.good{background-color:#cfba47}body.clockwork .bar .barFill.average{background-color:#896b19}body.clockwork .bar .barFill.bad{background-color:#5f380e}body.clockwork span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #170800}body.clockwork span.button .fa{padding-right:2px}body.clockwork span.button.normal{transition:background-color .5s;background-color:#5f380e}body.clockwork span.button.normal.active:focus,body.clockwork span.button.normal.active:hover{transition:background-color .25s;background-color:#704211;outline:0}body.clockwork span.button.disabled{transition:background-color .5s;background-color:#2d1400}body.clockwork span.button.disabled.active:focus,body.clockwork span.button.disabled.active:hover{transition:background-color .25s;background-color:#441e00;outline:0}body.clockwork span.button.selected{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.selected.active:focus,body.clockwork span.button.selected.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.toggle{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.toggle.active:focus,body.clockwork span.button.toggle.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.caution{transition:background-color .5s;background-color:#be6209}body.clockwork span.button.caution.active:focus,body.clockwork span.button.caution.active:hover{transition:background-color .25s;background-color:#cd6a0a;outline:0}body.clockwork span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.clockwork span.button.danger.active:focus,body.clockwork span.button.danger.active:hover{transition:background-color .25s;background-color:#abaf00;outline:0}body.clockwork span.button.gridable{width:125px;margin:2px 0}body.clockwork span.button+span:not(.button),body.clockwork span:not(.button)+span.button{margin-left:5px}body.clockwork div.display{width:100%;padding:4px;margin:6px 0;background-color:#2d1400;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400);background-color:rgba(45,20,0,.9);box-shadow:inset 0 0 5px rgba(0,0,0,.3)}body.clockwork div.display header,body.clockwork div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#cfba47;border-bottom:2px solid #b18b25}body.clockwork div.display header .buttonRight,body.clockwork div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.clockwork div.display article,body.clockwork div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.clockwork input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#b18b25;background-color:#cfba47;border:1px solid #272727}body.clockwork input::-webkit-input-placeholder{color:#999}body.clockwork input:-ms-input-placeholder{color:#999}body.clockwork input::placeholder{color:#999}body.clockwork input::-ms-clear{display:none}body.clockwork svg.linegraph{overflow:hidden}body.clockwork div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#2d1400;font-weight:700;font-style:italic;background-color:#000;background-image:repeating-linear-gradient(-45deg,#000,#000 10px,#170800 0,#170800 20px)}body.clockwork div.notice .label{color:#2d1400}body.clockwork div.notice .content:only-of-type{padding:0}body.clockwork div.notice hr{background-color:#896b19}body.clockwork div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #5f380e;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.clockwork section .content,body.clockwork section .label,body.clockwork section .line,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.clockwork section{display:table-row;width:100%}body.clockwork section:not(:first-child){padding-top:4px}body.clockwork section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.clockwork section .label{width:1%;padding-right:32px;white-space:nowrap;color:#b18b25}body.clockwork section .content:not(:last-child){padding-right:16px}body.clockwork section .line{width:100%}body.clockwork div.subdisplay{width:100%;margin:0}body.clockwork header.titlebar .close,body.clockwork header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#cfba47}body.clockwork header.titlebar .close:hover,body.clockwork header.titlebar .minimize:hover{color:#d1bd50}body.clockwork header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#5f380e;border-bottom:1px solid #170800;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.clockwork header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.clockwork header.titlebar .title{position:absolute;top:6px;left:46px;color:#cfba47;font-size:16px;white-space:nowrap}body.clockwork header.titlebar .minimize{position:absolute;top:6px;right:46px}body.clockwork header.titlebar .close{position:absolute;top:4px;right:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgNDI1IDIwMCIgb3BhY2l0eT0iLjMzIj4NCiAgPHBhdGggZD0ibSAxNzguMDAzOTksMC4wMzg2OSAtNzEuMjAzOTMsMCBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTYuNzYxMzQsNi4wMjU1NSBsIDAsMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM0LDYuMDI1NTQgbCA1My4xMDcyLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xMDEuNTQ0MDE4IDcyLjIxNjI4LDEwNC42OTkzOTggYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDUuNzYwMTUsMi44NzAxNiBsIDczLjU1NDg3LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xODcuODcxNDcgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM1LC02LjAyNTU1IGwgLTU0LjcxNjQ0LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTMzLDYuMDI1NTUgbCAwLDEwMi42MTkzNSBMIDE4My43NjQxMywyLjkwODg2IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNS43NjAxNCwtMi44NzAxNyB6IiAvPg0KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPg0KICA8cGF0aCBkPSJtIDQyMC4xNTUzNSwxNzcuODkxMTkgYSAxMy40MTIwMzgsMTIuNTAxODQyIDAgMCAxIC04LjYzMjk1LDIyLjA2OTUxIGwgLTY2LjExODMyLDAgYSA1LjM2NDgxNTIsNS4wMDA3MzcgMCAwIDEgLTUuMzY0ODIsLTUuMDAwNzQgbCAwLC03OS44NzkzMSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.toggle{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.toggle.active:focus,body.nanotrasen span.button.toggle.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input::-webkit-input-placeholder{color:#999}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgMjAwIDI4OS43NDIiIG9wYWNpdHk9Ii4zMyI+DQogIDxwYXRoIGQ9Im0gOTMuNTM3Njc3LDAgYyAtMTguMTEzMTI1LDAgLTM0LjIyMDEzMywzLjExMTY0IC00OC4zMjM0ODQsOS4zMzQzNyAtMTMuOTY1MDkyLDYuMjIxNjcgLTI0LjYxMjQ0MiwxNS4wNzExNCAtMzEuOTQwNjUxLDI2LjU0NzEgLTcuMTg5OTM5OCwxMS4zMzc4OSAtMTAuMzAxMjI2NiwyNC43NDkxMSAtMTAuMzAxMjI2Niw0MC4yMzQ3OCAwLDEwLjY0NjYyIDIuNzI1MDAyNiwyMC40NjQ2NSA4LjE3NTExMTYsMjkuNDUyNTggNS42MTUyNzcsOC45ODY4NiAxNC4wMzgyNzcsMTcuMzUyMDQgMjUuMjY4ODIxLDI1LjA5NDM2IDExLjIzMDU0NCw3LjYwNTMxIDI2LjUwNzQyMSwxNS40MTgzNSA0NS44MzA1MTQsMjMuNDM3ODIgMTkuOTgzNzQ4LDguMjk1NTcgMzQuODQ4ODQ4LDE1LjU1NDcxIDQ0LjU5Mjk5OCwyMS43NzYzOCA5Ljc0NDE0LDYuMjIyNzMgMTYuNzYxNywxMi44NTg1IDIxLjA1NTcyLDE5LjkwOTUxIDQuMjk0MDQsNy4wNTIwOCA2LjQ0MTkzLDE1Ljc2NDA4IDYuNDQxOTMsMjYuMTM0NTkgMCwxNi4xNzcwMiAtNS4yMDE5NiwyOC40ODIyMiAtMTUuNjA2NzMsMzYuOTE2ODIgLTEwLjIzOTYsOC40MzQ3IC0yNS4wMjIwMywxMi42NTIzIC00NC4zNDUxNjksMTIuNjUyMyAtMTQuMDM4MTcxLDAgLTI1LjUxNTI0NywtMS42NTk0IC0zNC40MzM2MTgsLTQuOTc3NyAtOC45MTgzNywtMy40NTY2IC0xNi4xODU1NzIsLTguNzExMyAtMjEuODAwODM5LC0xNS43NjMzIC01LjYxNTI3NywtNy4wNTIxIC0xMC4wNzQ3OTUsLTE2LjY2MDg4IC0xMy4zNzc4OTksLTI4LjgyODEyIGwgLTI0Ljc3MzE2MjYyOTM5NDUsMCAwLDU2LjgyNjMyIEMgMzMuODU2NzY5LDI4Ni4wNzYwMSA2My43NDkwNCwyODkuNzQyMDEgODkuNjc4MzgzLDI4OS43NDIwMSBjIDE2LjAyMDAyNywwIDMwLjcxOTc4NywtMS4zODI3IDQ0LjA5NzMzNywtNC4xNDc5IDEzLjU0MjcyLC0yLjkwNDMgMjUuMTA0MSwtNy40Njc2IDM0LjY4MzA5LC0xMy42ODkzIDkuNzQ0MTMsLTYuMzU5NyAxNy4zNDA0MiwtMTQuNTE5NSAyMi43OTA1MiwtMjQuNDc0OCA1LjQ1MDEsLTEwLjA5MzMyIDguMTc1MTEsLTIyLjM5OTU5IDguMTc1MTEsLTM2LjkxNjgyIDAsLTEyLjk5NzY0IC0zLjMwMjEsLTI0LjMzNTM5IC05LjkwODI5LC0zNC4wMTQ2IC02LjQ0MTA1LC05LjgxNzI1IC0xNS41MjU0NSwtMTguNTI3MDcgLTI3LjI1MTQ2LC0yNi4xMzEzMyAtMTEuNTYwODUsLTcuNjA0MjcgLTI3LjkxMDgzLC0xNS44MzE0MiAtNDkuMDUwNjYsLTI0LjY4MDIyIC0xNy41MDY0NCwtNy4xOTAxMiAtMzAuNzE5NjY4LC0xMy42ODk0OCAtMzkuNjM4MDM4LC0xOS40OTcwMSAtOC45MTgzNzEsLTUuODA3NTIgLTE4LjYwNzQ3NCwtMTIuNDM0MDkgLTI0LjA5NjUyNCwtMTguODc0MTcgLTUuNDI2MDQzLC02LjM2NjE2IC05LjY1ODgyNiwtMTUuMDcwMDMgLTkuNjU4ODI2LC0yNC44ODcyOSAwLC05LjI2NDAxIDIuMDc1NDE0LC0xNy4yMTM0NSA2LjIyMzQ1NCwtMjMuODUwMzMgMTEuMDk4Mjk4LC0xNC4zOTc0OCA0MS4yODY2MzgsLTEuNzk1MDcgNDUuMDc1NjA5LDI0LjM0NzYyIDQuODM5MzkyLDYuNzc0OTEgOC44NDkzNSwxNi4yNDcyOSAxMi4wMjk1MTUsMjguNDE1NiBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNC40NzgyNSwtNS45MjQ0OCAtOS45NTQ4OCwtMTAuNjMyMjIgLTE1LjkwODM3LC0xNC4zNzQxMSAxLjY0MDU1LDAuNDc5MDUgMy4xOTAzOSwxLjAyMzc2IDQuNjM4NjUsMS42NDAyNCA2LjQ5ODYxLDIuNjI2MDcgMTIuMTY3OTMsNy4zMjc0NyAxNy4wMDczLDE0LjEwMzQ1IDQuODM5MzksNi43NzQ5MSA4Ljg0OTM1LDE2LjI0NTY3IDEyLjAyOTUyLDI4LjQxMzk3IDAsMCA4LjQ4MTI4LC0wLjEyODk0IDguNDg5NzgsLTAuMDAyIDAuNDE3NzYsNi40MTQ5NCAtMS43NTMzOSw5LjQ1Mjg2IC00LjEyMzQyLDEyLjU2MTA0IC0yLjQxNzQsMy4xNjk3OCAtNS4xNDQ4Niw2Ljc4OTczIC00LjAwMjc4LDEzLjAwMjkgMS41MDc4Niw4LjIwMzE4IDEwLjE4MzU0LDEwLjU5NjQyIDE0LjYyMTk0LDkuMzExNTQgLTMuMzE4NDIsLTAuNDk5MTEgLTUuMzE4NTUsLTEuNzQ5NDggLTUuMzE4NTUsLTEuNzQ5NDggMCwwIDEuODc2NDYsMC45OTg2OCA1LjY1MTE3LC0xLjM1OTgxIC0zLjI3Njk1LDAuOTU1NzEgLTEwLjcwNTI5LC0wLjc5NzM4IC0xMS44MDEyNSwtNi43NjMxMyAtMC45NTc1MiwtNS4yMDg2MSAwLjk0NjU0LC03LjI5NTE0IDMuNDAxMTMsLTEwLjUxNDgyIDIuNDU0NjIsLTMuMjE5NjggNS4yODQyNiwtNi45NTgzMSA0LjY4NDMsLTE0LjQ4ODI0IGwgMC4wMDMsMC4wMDIgOC45MjY3NiwwIDAsLTU1Ljk5OTY3IGMgLTE1LjA3MTI1LC0zLjg3MTY4IC0yNy42NTMxNCwtNi4zNjA0MiAtMzcuNzQ2NzEsLTcuNDY1ODYgLTkuOTU1MzEsLTEuMTA3NTUgLTIwLjE4ODIzLC0xLjY1OTgxIC0zMC42OTY2MTMsLTEuNjU5ODEgeiBtIDcwLjMyMTYwMywxNy4zMDg5MyAwLjIzODA1LDQwLjMwNDkgYyAxLjMxODA4LDEuMjI2NjYgMi40Mzk2NSwyLjI3ODE1IDMuMzQwODEsMy4xMDYwMiA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNCwxNi4yNDU2NiAxMi4wMjk1MSwyOC40MTM5NyBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNi42NzczMSwtNC41OTM4MSAtMTkuODM2NDMsLTEwLjQ3MzA5IC0zNi4xNDA3MSwtMTUuODI1MjIgeiBtIC0yOC4xMjA0OSw1LjYwNTUxIDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzcsLTYuNDY2OTcgLTEzLjg0Njc4LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDUsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gMTUuMjIxOTUsMjQuMDA4NDggOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzOCwtNi40NjY5NyAtMTMuODQ2NzksLTkuNzE3MjYgLTguNTY0NzksLTE3LjcxNjU1IHogbSAyMi43OTcwNCwwIGMgMi43NzE1LDcuOTk5MjkgMS43ODc0MSwxMS4yNDk1OCAtNC40OTM1NCwxNy43MTY1NSBsIDQuNDkzNTQsLTE3LjcxNjU1IHogbSAtOTkuMTEzODQsMi4yMDc2NCA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM4MiwtNi40NjY5NyAtMTMuODQ2NzgyLC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk1NDIsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff750000",endColorstr="#ff340404",GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.toggle{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.toggle.active:focus,body.syndicate span.button.toggle.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input::-webkit-input-placeholder{color:#999}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"} \ No newline at end of file +@charset "utf-8";body,html{box-sizing:border-box;height:100%;margin:0}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff;background-color:#2a2a2a;background-image:linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}*,:after,:before{box-sizing:inherit}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}body.clockwork{background:linear-gradient(180deg,#b18b25 0,#5f380e);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffb18b25",endColorstr="#ff5f380e",GradientType=0)}body.clockwork .normal{color:#b18b25}body.clockwork .good{color:#cfba47}body.clockwork .average{color:#896b19}body.clockwork .bad{color:#5f380e}body.clockwork .highlight{color:#b18b25}body.clockwork main{display:block;margin-top:32px;padding:2px 6px 0}body.clockwork hr{height:2px;background-color:#b18b25;border:none}body.clockwork .hidden{display:none}body.clockwork .bar .barText,body.clockwork span.button{color:#b18b25;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.clockwork .bold{font-weight:700}body.clockwork .italic{font-style:italic}body.clockwork [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.clockwork div[data-tooltip],body.clockwork span[data-tooltip]{position:relative}body.clockwork div[data-tooltip]:after,body.clockwork span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #170800;background-color:#2d1400}body.clockwork div[data-tooltip]:hover:after,body.clockwork span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.clockwork div[data-tooltip].tooltip-top:after,body.clockwork span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-top:hover:after,body.clockwork span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:after,body.clockwork span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.clockwork div[data-tooltip].tooltip-bottom:hover:after,body.clockwork span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.clockwork div[data-tooltip].tooltip-left:after,body.clockwork span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-left:hover:after,body.clockwork span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:after,body.clockwork span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.clockwork div[data-tooltip].tooltip-right:hover:after,body.clockwork span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.clockwork .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #170800;background:#2d1400}body.clockwork .bar .barText{position:absolute;top:0;right:3px}body.clockwork .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#b18b25}body.clockwork .bar .barFill.good{background-color:#cfba47}body.clockwork .bar .barFill.average{background-color:#896b19}body.clockwork .bar .barFill.bad{background-color:#5f380e}body.clockwork span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #170800}body.clockwork span.button .fa{padding-right:2px}body.clockwork span.button.normal{transition:background-color .5s;background-color:#5f380e}body.clockwork span.button.normal.active:focus,body.clockwork span.button.normal.active:hover{transition:background-color .25s;background-color:#704211;outline:0}body.clockwork span.button.disabled{transition:background-color .5s;background-color:#2d1400}body.clockwork span.button.disabled.active:focus,body.clockwork span.button.disabled.active:hover{transition:background-color .25s;background-color:#441e00;outline:0}body.clockwork span.button.selected{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.selected.active:focus,body.clockwork span.button.selected.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.toggle{transition:background-color .5s;background-color:#cfba47}body.clockwork span.button.toggle.active:focus,body.clockwork span.button.toggle.active:hover{transition:background-color .25s;background-color:#d1bd50;outline:0}body.clockwork span.button.caution{transition:background-color .5s;background-color:#be6209}body.clockwork span.button.caution.active:focus,body.clockwork span.button.caution.active:hover{transition:background-color .25s;background-color:#cd6a0a;outline:0}body.clockwork span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.clockwork span.button.danger.active:focus,body.clockwork span.button.danger.active:hover{transition:background-color .25s;background-color:#abaf00;outline:0}body.clockwork span.button.gridable{width:125px;margin:2px 0}body.clockwork span.button.gridable.center{text-align:center;width:75px}body.clockwork span.button+span:not(.button),body.clockwork span:not(.button)+span.button{margin-left:5px}body.clockwork div.display{width:100%;padding:4px;margin:6px 0;background-color:#2d1400;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#e62d1400,endColorStr=#e62d1400);background-color:rgba(45,20,0,.9);box-shadow:inset 0 0 5px rgba(0,0,0,.3)}body.clockwork div.display.tabular{padding:0;margin:0}body.clockwork div.display header,body.clockwork div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#cfba47;border-bottom:2px solid #b18b25}body.clockwork div.display header .buttonRight,body.clockwork div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.clockwork div.display article,body.clockwork div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.clockwork input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#b18b25;background-color:#cfba47;border:1px solid #272727}body.clockwork input.number{width:35px}body.clockwork input::-webkit-input-placeholder{color:#999}body.clockwork input:-ms-input-placeholder{color:#999}body.clockwork input::placeholder{color:#999}body.clockwork input::-ms-clear{display:none}body.clockwork svg.linegraph{overflow:hidden}body.clockwork div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#2d1400;font-weight:700;font-style:italic;background-color:#000;background-image:repeating-linear-gradient(-45deg,#000,#000 10px,#170800 0,#170800 20px)}body.clockwork div.notice .label{color:#2d1400}body.clockwork div.notice .content:only-of-type{padding:0}body.clockwork div.notice hr{background-color:#896b19}body.clockwork div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #5f380e;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.clockwork section .cell,body.clockwork section .content,body.clockwork section .label,body.clockwork section .line,body.nanotrasen section .cell,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.clockwork section{display:table-row;width:100%}body.clockwork section:not(:first-child){padding-top:4px}body.clockwork section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.clockwork section .label{width:1%;padding-right:32px;white-space:nowrap;color:#b18b25}body.clockwork section .content:not(:last-child){padding-right:16px}body.clockwork section .line{width:100%}body.clockwork section .cell:not(:first-child){text-align:center;padding-top:0}body.clockwork section .cell span.button{width:75px}body.clockwork section:not(:last-child){padding-right:4px}body.clockwork div.subdisplay{width:100%;margin:0}body.clockwork header.titlebar .close,body.clockwork header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#cfba47}body.clockwork header.titlebar .close:hover,body.clockwork header.titlebar .minimize:hover{color:#d1bd50}body.clockwork header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#5f380e;border-bottom:1px solid #170800;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.clockwork header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.clockwork header.titlebar .title{position:absolute;top:6px;left:46px;color:#cfba47;font-size:16px;white-space:nowrap}body.clockwork header.titlebar .minimize{position:absolute;top:6px;right:46px}body.clockwork header.titlebar .close{position:absolute;top:4px;right:12px}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgNDI1IDIwMCIgb3BhY2l0eT0iLjMzIj4NCiAgPHBhdGggZD0ibSAxNzguMDAzOTksMC4wMzg2OSAtNzEuMjAzOTMsMCBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTYuNzYxMzQsNi4wMjU1NSBsIDAsMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM0LDYuMDI1NTQgbCA1My4xMDcyLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xMDEuNTQ0MDE4IDcyLjIxNjI4LDEwNC42OTkzOTggYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDUuNzYwMTUsMi44NzAxNiBsIDczLjU1NDg3LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIDYuNzYxMzUsLTYuMDI1NTQgbCAwLC0xODcuODcxNDcgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM1LC02LjAyNTU1IGwgLTU0LjcxNjQ0LDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTMzLDYuMDI1NTUgbCAwLDEwMi42MTkzNSBMIDE4My43NjQxMywyLjkwODg2IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNS43NjAxNCwtMi44NzAxNyB6IiAvPg0KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPg0KICA8cGF0aCBkPSJtIDQyMC4xNTUzNSwxNzcuODkxMTkgYSAxMy40MTIwMzgsMTIuNTAxODQyIDAgMCAxIC04LjYzMjk1LDIyLjA2OTUxIGwgLTY2LjExODMyLDAgYSA1LjM2NDgxNTIsNS4wMDA3MzcgMCAwIDEgLTUuMzY0ODIsLTUuMDAwNzQgbCAwLC03OS44NzkzMSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff2a2a2a",endColorstr="#ff202020",GradientType=0)}body.nanotrasen .normal{color:#40628a}body.nanotrasen .good{color:#537d29}body.nanotrasen .average{color:#be6209}body.nanotrasen .bad{color:#b00e0e}body.nanotrasen .highlight{color:#8ba5c4}body.nanotrasen main{display:block;margin-top:32px;padding:2px 6px 0}body.nanotrasen hr{height:2px;background-color:#40628a;border:none}body.nanotrasen .hidden{display:none}body.nanotrasen .bar .barText,body.nanotrasen span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.nanotrasen .bold{font-weight:700}body.nanotrasen .italic{font-style:italic}body.nanotrasen [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.nanotrasen div[data-tooltip],body.nanotrasen span[data-tooltip]{position:relative}body.nanotrasen div[data-tooltip]:after,body.nanotrasen span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.nanotrasen div[data-tooltip]:hover:after,body.nanotrasen span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.nanotrasen div[data-tooltip].tooltip-top:after,body.nanotrasen span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-top:hover:after,body.nanotrasen span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:after,body.nanotrasen span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.nanotrasen div[data-tooltip].tooltip-bottom:hover:after,body.nanotrasen span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.nanotrasen div[data-tooltip].tooltip-left:after,body.nanotrasen span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-left:hover:after,body.nanotrasen span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:after,body.nanotrasen span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.nanotrasen div[data-tooltip].tooltip-right:hover:after,body.nanotrasen span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.nanotrasen .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}body.nanotrasen .bar .barText{position:absolute;top:0;right:3px}body.nanotrasen .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}body.nanotrasen .bar .barFill.good{background-color:#537d29}body.nanotrasen .bar .barFill.average{background-color:#be6209}body.nanotrasen .bar .barFill.bad{background-color:#b00e0e}body.nanotrasen span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.nanotrasen span.button .fa{padding-right:2px}body.nanotrasen span.button.normal{transition:background-color .5s;background-color:#40628a}body.nanotrasen span.button.normal.active:focus,body.nanotrasen span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}body.nanotrasen span.button.disabled{transition:background-color .5s;background-color:#999}body.nanotrasen span.button.disabled.active:focus,body.nanotrasen span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}body.nanotrasen span.button.selected{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.selected.active:focus,body.nanotrasen span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.toggle{transition:background-color .5s;background-color:#2f943c}body.nanotrasen span.button.toggle.active:focus,body.nanotrasen span.button.toggle.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}body.nanotrasen span.button.caution{transition:background-color .5s;background-color:#9a9d00}body.nanotrasen span.button.caution.active:focus,body.nanotrasen span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.nanotrasen span.button.danger{transition:background-color .5s;background-color:#9d0808}body.nanotrasen span.button.danger.active:focus,body.nanotrasen span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.nanotrasen span.button.gridable{width:125px;margin:2px 0}body.nanotrasen span.button.gridable.center{text-align:center;width:75px}body.nanotrasen span.button+span:not(.button),body.nanotrasen span:not(.button)+span.button{margin-left:5px}body.nanotrasen div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}body.nanotrasen div.display.tabular{padding:0;margin:0}body.nanotrasen div.display header,body.nanotrasen div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}body.nanotrasen div.display header .buttonRight,body.nanotrasen div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.nanotrasen div.display article,body.nanotrasen div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.nanotrasen input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#000;background-color:#fff;border:1px solid #272727}body.nanotrasen input.number{width:35px}body.nanotrasen input::-webkit-input-placeholder{color:#999}body.nanotrasen input:-ms-input-placeholder{color:#999}body.nanotrasen input::placeholder{color:#999}body.nanotrasen input::-ms-clear{display:none}body.nanotrasen svg.linegraph{overflow:hidden}body.nanotrasen div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px)}body.nanotrasen div.notice .label{color:#000}body.nanotrasen div.notice .content:only-of-type{padding:0}body.nanotrasen div.notice hr{background-color:#272727}body.nanotrasen div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.nanotrasen section .cell,body.nanotrasen section .content,body.nanotrasen section .label,body.nanotrasen section .line,body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.nanotrasen section{display:table-row;width:100%}body.nanotrasen section:not(:first-child){padding-top:4px}body.nanotrasen section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.nanotrasen section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}body.nanotrasen section .content:not(:last-child){padding-right:16px}body.nanotrasen section .line{width:100%}body.nanotrasen section .cell:not(:first-child){text-align:center;padding-top:0}body.nanotrasen section .cell span.button{width:75px}body.nanotrasen section:not(:last-child){padding-right:4px}body.nanotrasen div.subdisplay{width:100%;margin:0}body.nanotrasen header.titlebar .close,body.nanotrasen header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#8ba5c4}body.nanotrasen header.titlebar .close:hover,body.nanotrasen header.titlebar .minimize:hover{color:#9cb2cd}body.nanotrasen header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.nanotrasen header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.nanotrasen header.titlebar .title{position:absolute;top:6px;left:46px;color:#8ba5c4;font-size:16px;white-space:nowrap}body.nanotrasen header.titlebar .minimize{position:absolute;top:6px;right:46px}body.nanotrasen header.titlebar .close{position:absolute;top:4px;right:12px}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmVyc2lvbj0iMS4wIiB2aWV3Qm94PSIwIDAgMjAwIDI4OS43NDIiIG9wYWNpdHk9Ii4zMyI+DQogIDxwYXRoIGQ9Im0gOTMuNTM3Njc3LDAgYyAtMTguMTEzMTI1LDAgLTM0LjIyMDEzMywzLjExMTY0IC00OC4zMjM0ODQsOS4zMzQzNyAtMTMuOTY1MDkyLDYuMjIxNjcgLTI0LjYxMjQ0MiwxNS4wNzExNCAtMzEuOTQwNjUxLDI2LjU0NzEgLTcuMTg5OTM5OCwxMS4zMzc4OSAtMTAuMzAxMjI2NiwyNC43NDkxMSAtMTAuMzAxMjI2Niw0MC4yMzQ3OCAwLDEwLjY0NjYyIDIuNzI1MDAyNiwyMC40NjQ2NSA4LjE3NTExMTYsMjkuNDUyNTggNS42MTUyNzcsOC45ODY4NiAxNC4wMzgyNzcsMTcuMzUyMDQgMjUuMjY4ODIxLDI1LjA5NDM2IDExLjIzMDU0NCw3LjYwNTMxIDI2LjUwNzQyMSwxNS40MTgzNSA0NS44MzA1MTQsMjMuNDM3ODIgMTkuOTgzNzQ4LDguMjk1NTcgMzQuODQ4ODQ4LDE1LjU1NDcxIDQ0LjU5Mjk5OCwyMS43NzYzOCA5Ljc0NDE0LDYuMjIyNzMgMTYuNzYxNywxMi44NTg1IDIxLjA1NTcyLDE5LjkwOTUxIDQuMjk0MDQsNy4wNTIwOCA2LjQ0MTkzLDE1Ljc2NDA4IDYuNDQxOTMsMjYuMTM0NTkgMCwxNi4xNzcwMiAtNS4yMDE5NiwyOC40ODIyMiAtMTUuNjA2NzMsMzYuOTE2ODIgLTEwLjIzOTYsOC40MzQ3IC0yNS4wMjIwMywxMi42NTIzIC00NC4zNDUxNjksMTIuNjUyMyAtMTQuMDM4MTcxLDAgLTI1LjUxNTI0NywtMS42NTk0IC0zNC40MzM2MTgsLTQuOTc3NyAtOC45MTgzNywtMy40NTY2IC0xNi4xODU1NzIsLTguNzExMyAtMjEuODAwODM5LC0xNS43NjMzIC01LjYxNTI3NywtNy4wNTIxIC0xMC4wNzQ3OTUsLTE2LjY2MDg4IC0xMy4zNzc4OTksLTI4LjgyODEyIGwgLTI0Ljc3MzE2MjYyOTM5NDUsMCAwLDU2LjgyNjMyIEMgMzMuODU2NzY5LDI4Ni4wNzYwMSA2My43NDkwNCwyODkuNzQyMDEgODkuNjc4MzgzLDI4OS43NDIwMSBjIDE2LjAyMDAyNywwIDMwLjcxOTc4NywtMS4zODI3IDQ0LjA5NzMzNywtNC4xNDc5IDEzLjU0MjcyLC0yLjkwNDMgMjUuMTA0MSwtNy40Njc2IDM0LjY4MzA5LC0xMy42ODkzIDkuNzQ0MTMsLTYuMzU5NyAxNy4zNDA0MiwtMTQuNTE5NSAyMi43OTA1MiwtMjQuNDc0OCA1LjQ1MDEsLTEwLjA5MzMyIDguMTc1MTEsLTIyLjM5OTU5IDguMTc1MTEsLTM2LjkxNjgyIDAsLTEyLjk5NzY0IC0zLjMwMjEsLTI0LjMzNTM5IC05LjkwODI5LC0zNC4wMTQ2IC02LjQ0MTA1LC05LjgxNzI1IC0xNS41MjU0NSwtMTguNTI3MDcgLTI3LjI1MTQ2LC0yNi4xMzEzMyAtMTEuNTYwODUsLTcuNjA0MjcgLTI3LjkxMDgzLC0xNS44MzE0MiAtNDkuMDUwNjYsLTI0LjY4MDIyIC0xNy41MDY0NCwtNy4xOTAxMiAtMzAuNzE5NjY4LC0xMy42ODk0OCAtMzkuNjM4MDM4LC0xOS40OTcwMSAtOC45MTgzNzEsLTUuODA3NTIgLTE4LjYwNzQ3NCwtMTIuNDM0MDkgLTI0LjA5NjUyNCwtMTguODc0MTcgLTUuNDI2MDQzLC02LjM2NjE2IC05LjY1ODgyNiwtMTUuMDcwMDMgLTkuNjU4ODI2LC0yNC44ODcyOSAwLC05LjI2NDAxIDIuMDc1NDE0LC0xNy4yMTM0NSA2LjIyMzQ1NCwtMjMuODUwMzMgMTEuMDk4Mjk4LC0xNC4zOTc0OCA0MS4yODY2MzgsLTEuNzk1MDcgNDUuMDc1NjA5LDI0LjM0NzYyIDQuODM5MzkyLDYuNzc0OTEgOC44NDkzNSwxNi4yNDcyOSAxMi4wMjk1MTUsMjguNDE1NiBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNC40NzgyNSwtNS45MjQ0OCAtOS45NTQ4OCwtMTAuNjMyMjIgLTE1LjkwODM3LC0xNC4zNzQxMSAxLjY0MDU1LDAuNDc5MDUgMy4xOTAzOSwxLjAyMzc2IDQuNjM4NjUsMS42NDAyNCA2LjQ5ODYxLDIuNjI2MDcgMTIuMTY3OTMsNy4zMjc0NyAxNy4wMDczLDE0LjEwMzQ1IDQuODM5MzksNi43NzQ5MSA4Ljg0OTM1LDE2LjI0NTY3IDEyLjAyOTUyLDI4LjQxMzk3IDAsMCA4LjQ4MTI4LC0wLjEyODk0IDguNDg5NzgsLTAuMDAyIDAuNDE3NzYsNi40MTQ5NCAtMS43NTMzOSw5LjQ1Mjg2IC00LjEyMzQyLDEyLjU2MTA0IC0yLjQxNzQsMy4xNjk3OCAtNS4xNDQ4Niw2Ljc4OTczIC00LjAwMjc4LDEzLjAwMjkgMS41MDc4Niw4LjIwMzE4IDEwLjE4MzU0LDEwLjU5NjQyIDE0LjYyMTk0LDkuMzExNTQgLTMuMzE4NDIsLTAuNDk5MTEgLTUuMzE4NTUsLTEuNzQ5NDggLTUuMzE4NTUsLTEuNzQ5NDggMCwwIDEuODc2NDYsMC45OTg2OCA1LjY1MTE3LC0xLjM1OTgxIC0zLjI3Njk1LDAuOTU1NzEgLTEwLjcwNTI5LC0wLjc5NzM4IC0xMS44MDEyNSwtNi43NjMxMyAtMC45NTc1MiwtNS4yMDg2MSAwLjk0NjU0LC03LjI5NTE0IDMuNDAxMTMsLTEwLjUxNDgyIDIuNDU0NjIsLTMuMjE5NjggNS4yODQyNiwtNi45NTgzMSA0LjY4NDMsLTE0LjQ4ODI0IGwgMC4wMDMsMC4wMDIgOC45MjY3NiwwIDAsLTU1Ljk5OTY3IGMgLTE1LjA3MTI1LC0zLjg3MTY4IC0yNy42NTMxNCwtNi4zNjA0MiAtMzcuNzQ2NzEsLTcuNDY1ODYgLTkuOTU1MzEsLTEuMTA3NTUgLTIwLjE4ODIzLC0xLjY1OTgxIC0zMC42OTY2MTMsLTEuNjU5ODEgeiBtIDcwLjMyMTYwMywxNy4zMDg5MyAwLjIzODA1LDQwLjMwNDkgYyAxLjMxODA4LDEuMjI2NjYgMi40Mzk2NSwyLjI3ODE1IDMuMzQwODEsMy4xMDYwMiA0LjgzOTM5LDYuNzc0OTEgOC44NDkzNCwxNi4yNDU2NiAxMi4wMjk1MSwyOC40MTM5NyBsIDIwLjUzMjM0LDAgMCwtNTUuOTk5NjcgYyAtNi42NzczMSwtNC41OTM4MSAtMTkuODM2NDMsLTEwLjQ3MzA5IC0zNi4xNDA3MSwtMTUuODI1MjIgeiBtIC0yOC4xMjA0OSw1LjYwNTUxIDguNTY0NzksMTcuNzE2NTUgYyAtMTEuOTcwMzcsLTYuNDY2OTcgLTEzLjg0Njc4LC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk3MDUsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IG0gMTUuMjIxOTUsMjQuMDA4NDggOC41NjQ3OSwxNy43MTY1NSBjIC0xMS45NzAzOCwtNi40NjY5NyAtMTMuODQ2NzksLTkuNzE3MjYgLTguNTY0NzksLTE3LjcxNjU1IHogbSAyMi43OTcwNCwwIGMgMi43NzE1LDcuOTk5MjkgMS43ODc0MSwxMS4yNDk1OCAtNC40OTM1NCwxNy43MTY1NSBsIDQuNDkzNTQsLTE3LjcxNjU1IHogbSAtOTkuMTEzODQsMi4yMDc2NCA4LjU2NDc5LDE3LjcxNjU1IGMgLTExLjk3MDM4MiwtNi40NjY5NyAtMTMuODQ2NzgyLC05LjcxNzI2IC04LjU2NDc5LC0xNy43MTY1NSB6IG0gMjIuNzk1NDIsMCBjIDIuNzcxNSw3Ljk5OTI5IDEuNzg3NDEsMTEuMjQ5NTggLTQuNDkzNTQsMTcuNzE2NTUgbCA0LjQ5MzU0LC0xNy43MTY1NSB6IiAvPg0KPC9zdmc+DQo8IS0tIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciBhIENyZWF0aXZlIENvbW1vbnMgQXR0cmlidXRpb24tU2hhcmVBbGlrZSA0LjAgSW50ZXJuYXRpb25hbCBMaWNlbnNlLiAtLT4NCjwhLS0gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktc2EvNC4wLyAtLT4NCg==") no-repeat fixed 50%/70% 70%,linear-gradient(180deg,#750000 0,#340404);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#ff750000",endColorstr="#ff340404",GradientType=0)}body.syndicate .normal{color:#40628a}body.syndicate .good{color:#73e573}body.syndicate .average{color:#be6209}body.syndicate .bad{color:#b00e0e}body.syndicate .highlight{color:#000}body.syndicate main{display:block;margin-top:32px;padding:2px 6px 0}body.syndicate hr{height:2px;background-color:#272727;border:none}body.syndicate .hidden{display:none}body.syndicate .bar .barText,body.syndicate span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}body.syndicate .bold{font-weight:700}body.syndicate .italic{font-style:italic}body.syndicate [unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}body.syndicate div[data-tooltip],body.syndicate span[data-tooltip]{position:relative}body.syndicate div[data-tooltip]:after,body.syndicate span[data-tooltip]:after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";white-space:normal;text-align:left;content:attr(data-tooltip);transition:all .5s;border:1px solid #272727;background-color:#363636}body.syndicate div[data-tooltip]:hover:after,body.syndicate span[data-tooltip]:hover:after{visibility:visible;opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}body.syndicate div[data-tooltip].tooltip-top:after,body.syndicate span[data-tooltip].tooltip-top:after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-top:hover:after,body.syndicate span[data-tooltip].tooltip-top:hover:after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:after,body.syndicate span[data-tooltip].tooltip-bottom:after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}body.syndicate div[data-tooltip].tooltip-bottom:hover:after,body.syndicate span[data-tooltip].tooltip-bottom:hover:after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}body.syndicate div[data-tooltip].tooltip-left:after,body.syndicate span[data-tooltip].tooltip-left:after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-left:hover:after,body.syndicate span[data-tooltip].tooltip-left:hover:after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:after,body.syndicate span[data-tooltip].tooltip-right:after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}body.syndicate div[data-tooltip].tooltip-right:hover:after,body.syndicate span[data-tooltip].tooltip-right:hover:after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}body.syndicate .bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #000;background:#272727}body.syndicate .bar .barText{position:absolute;top:0;right:3px}body.syndicate .bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#000}body.syndicate .bar .barFill.good{background-color:#73e573}body.syndicate .bar .barFill.average{background-color:#be6209}body.syndicate .bar .barFill.bad{background-color:#b00e0e}body.syndicate span.button{display:inline-block;vertical-align:middle;min-height:20px;line-height:17px;padding:0 5px;white-space:nowrap;border:1px solid #272727}body.syndicate span.button .fa{padding-right:2px}body.syndicate span.button.normal{transition:background-color .5s;background-color:#397439}body.syndicate span.button.normal.active:focus,body.syndicate span.button.normal.active:hover{transition:background-color .25s;background-color:#4a964a;outline:0}body.syndicate span.button.disabled{transition:background-color .5s;background-color:#363636}body.syndicate span.button.disabled.active:focus,body.syndicate span.button.disabled.active:hover{transition:background-color .25s;background-color:#545454;outline:0}body.syndicate span.button.selected{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.selected.active:focus,body.syndicate span.button.selected.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.toggle{transition:background-color .5s;background-color:#9d0808}body.syndicate span.button.toggle.active:focus,body.syndicate span.button.toggle.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}body.syndicate span.button.caution{transition:background-color .5s;background-color:#be6209}body.syndicate span.button.caution.active:focus,body.syndicate span.button.caution.active:hover{transition:background-color .25s;background-color:#eb790b;outline:0}body.syndicate span.button.danger{transition:background-color .5s;background-color:#9a9d00}body.syndicate span.button.danger.active:focus,body.syndicate span.button.danger.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}body.syndicate span.button.gridable{width:125px;margin:2px 0}body.syndicate span.button.gridable.center{text-align:center;width:75px}body.syndicate span.button+span:not(.button),body.syndicate span:not(.button)+span.button{margin-left:5px}body.syndicate div.display{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#80000000,endColorStr=#80000000);background-color:rgba(0,0,0,.5);box-shadow:inset 0 0 5px rgba(0,0,0,.75)}body.syndicate div.display.tabular{padding:0;margin:0}body.syndicate div.display header,body.syndicate div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #272727}body.syndicate div.display header .buttonRight,body.syndicate div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}body.syndicate div.display article,body.syndicate div.subdisplay article{display:table;width:100%;border-collapse:collapse}body.syndicate input{display:inline-block;vertical-align:middle;height:20px;line-height:17px;padding:0 5px;white-space:nowrap;color:#fff;background-color:#9d0808;border:1px solid #272727}body.syndicate input.number{width:35px}body.syndicate input::-webkit-input-placeholder{color:#999}body.syndicate input:-ms-input-placeholder{color:#999}body.syndicate input::placeholder{color:#999}body.syndicate input::-ms-clear{display:none}body.syndicate svg.linegraph{overflow:hidden}body.syndicate div.notice{margin:8px 0;padding:4px;box-shadow:none;color:#000;font-weight:700;font-style:italic;background-color:#750000;background-image:repeating-linear-gradient(-45deg,#750000,#750000 10px,#910101 0,#910101 20px)}body.syndicate div.notice .label{color:#000}body.syndicate div.notice .content:only-of-type{padding:0}body.syndicate div.notice hr{background-color:#272727}body.syndicate div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-ms-transform:rotate(1turn);transform:rotate(1turn)}body.syndicate section .cell,body.syndicate section .content,body.syndicate section .label,body.syndicate section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle;padding:3px 2px}body.syndicate section{display:table-row;width:100%}body.syndicate section:not(:first-child){padding-top:4px}body.syndicate section.candystripe:nth-child(2n){background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#33000000,endColorStr=#33000000);background-color:rgba(0,0,0,.2)}body.syndicate section .label{width:1%;padding-right:32px;white-space:nowrap;color:#fff}body.syndicate section .content:not(:last-child){padding-right:16px}body.syndicate section .line{width:100%}body.syndicate section .cell:not(:first-child){text-align:center;padding-top:0}body.syndicate section .cell span.button{width:75px}body.syndicate section:not(:last-child){padding-right:4px}body.syndicate div.subdisplay{width:100%;margin:0}body.syndicate header.titlebar .close,body.syndicate header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#e74242}body.syndicate header.titlebar .close:hover,body.syndicate header.titlebar .minimize:hover{color:#eb5e5e}body.syndicate header.titlebar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;background-color:#363636;border-bottom:1px solid #161616;box-shadow:0 3px 3px rgba(0,0,0,.1)}body.syndicate header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}body.syndicate header.titlebar .title{position:absolute;top:6px;left:46px;color:#e74242;font-size:16px;white-space:nowrap}body.syndicate header.titlebar .minimize{position:absolute;top:6px;right:46px}body.syndicate header.titlebar .close{position:absolute;top:4px;right:12px}.no-icons header.titlebar .statusicon{font-size:20px}.no-icons header.titlebar .statusicon:after{content:"O"}.no-icons header.titlebar .minimize{top:-2px;font-size:20px}.no-icons header.titlebar .minimize:after{content:"—"}.no-icons header.titlebar .close{font-size:20px}.no-icons header.titlebar .close:after{content:"X"} \ No newline at end of file diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js index 92e66d41678..48d0948b969 100644 --- a/tgui/assets/tgui.js +++ b/tgui/assets/tgui.js @@ -1,16 +1,16 @@ -require=function t(e,n,a){function r(o,s){if(!n[o]){if(!e[o]){var u="function"==typeof require&&require;if(!s&&u)return u(o,!0);if(i)return i(o,!0);var p=Error("Cannot find module '"+o+"'");throw p.code="MODULE_NOT_FOUND",p}var c=n[o]={exports:{}};e[o][0].call(c.exports,function(t){var n=e[o][1][t];return r(n?n:t)},c,c.exports,t,e,n,a)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o2?p[2]:void 0,l=Math.min((void 0===c?o:r(c,o))-u,o-s),f=1;for(s>u&&u+l>s&&(f=-1,u+=l-1,s+=l-1);l-- >0;)u in n?n[s]=n[u]:delete n[s],s+=f,u+=f;return n}},{76:76,79:79,80:80}],6:[function(t,e,n){"use strict";var a=t(80),r=t(76),i=t(79);e.exports=[].fill||function(t){for(var e=a(this),n=i(e.length),o=arguments,s=o.length,u=r(s>1?o[1]:void 0,n),p=s>2?o[2]:void 0,c=void 0===p?n:r(p,n);c>u;)e[u++]=t;return e}},{76:76,79:79,80:80}],7:[function(t,e,n){var a=t(78),r=t(79),i=t(76);e.exports=function(t){return function(e,n,o){var s,u=a(e),p=r(u.length),c=i(o,p);if(t&&n!=n){for(;p>c;)if(s=u[c++],s!=s)return!0}else for(;p>c;c++)if((t||c in u)&&u[c]===n)return t||c;return!t&&-1}}},{76:76,78:78,79:79}],8:[function(t,e,n){var a=t(17),r=t(34),i=t(80),o=t(79),s=t(9);e.exports=function(t){var e=1==t,n=2==t,u=3==t,p=4==t,c=6==t,l=5==t||c;return function(f,d,h){for(var m,v,g=i(f),b=r(g),y=a(d,h,3),x=o(b.length),_=0,w=e?s(f,x):n?s(f,0):void 0;x>_;_++)if((l||_ in b)&&(m=b[_],v=y(m,_,g),t))if(e)w[_]=v;else if(v)switch(t){case 3:return!0;case 5:return m;case 6:return _;case 2:w.push(m)}else if(p)return!1;return c?-1:u||p?p:w}}},{17:17,34:34,79:79,80:80,9:9}],9:[function(t,e,n){var a=t(38),r=t(36),i=t(83)("species");e.exports=function(t,e){var n;return r(t)&&(n=t.constructor,"function"!=typeof n||n!==Array&&!r(n.prototype)||(n=void 0),a(n)&&(n=n[i],null===n&&(n=void 0))),new(void 0===n?Array:n)(e)}},{36:36,38:38,83:83}],10:[function(t,e,n){var a=t(11),r=t(83)("toStringTag"),i="Arguments"==a(function(){return arguments}());e.exports=function(t){var e,n,o;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=(e=Object(t))[r])?n:i?a(e):"Object"==(o=a(e))&&"function"==typeof e.callee?"Arguments":o}},{11:11,83:83}],11:[function(t,e,n){var a={}.toString;e.exports=function(t){return a.call(t).slice(8,-1)}},{}],12:[function(t,e,n){"use strict";var a=t(46),r=t(31),i=t(60),o=t(17),s=t(69),u=t(18),p=t(27),c=t(42),l=t(44),f=t(82)("id"),d=t(30),h=t(38),m=t(65),v=t(19),g=Object.isExtensible||h,b=v?"_s":"size",y=0,x=function(t,e){if(!h(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!d(t,f)){if(!g(t))return"F";if(!e)return"E";r(t,f,++y)}return"O"+t[f]},_=function(t,e){var n,a=x(e);if("F"!==a)return t._i[a];for(n=t._f;n;n=n.n)if(n.k==e)return n};e.exports={getConstructor:function(t,e,n,r){var c=t(function(t,i){s(t,c,e),t._i=a.create(null),t._f=void 0,t._l=void 0,t[b]=0,void 0!=i&&p(i,n,t[r],t)});return i(c.prototype,{clear:function(){for(var t=this,e=t._i,n=t._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete e[n.i];t._f=t._l=void 0,t[b]=0},"delete":function(t){var e=this,n=_(e,t);if(n){var a=n.n,r=n.p;delete e._i[n.i],n.r=!0,r&&(r.n=a),a&&(a.p=r),e._f==n&&(e._f=a),e._l==n&&(e._l=r),e[b]--}return!!n},forEach:function(t){for(var e,n=o(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(n(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t){return!!_(this,t)}}),v&&a.setDesc(c.prototype,"size",{get:function(){return u(this[b])}}),c},def:function(t,e,n){var a,r,i=_(t,e);return i?i.v=n:(t._l=i={i:r=x(e,!0),k:e,v:n,p:a=t._l,n:void 0,r:!1},t._f||(t._f=i),a&&(a.n=i),t[b]++,"F"!==r&&(t._i[r]=i)),t},getEntry:_,setStrong:function(t,e,n){c(t,e,function(t,e){this._t=t,this._k=e,this._l=void 0},function(){for(var t=this,e=t._k,n=t._l;n&&n.r;)n=n.p;return t._t&&(t._l=n=n?n.n:t._t._f)?"keys"==e?l(0,n.k):"values"==e?l(0,n.v):l(0,[n.k,n.v]):(t._t=void 0,l(1))},n?"entries":"values",!n,!0),m(e)}}},{17:17,18:18,19:19,27:27,30:30,31:31,38:38,42:42,44:44,46:46,60:60,65:65,69:69,82:82}],13:[function(t,e,n){var a=t(27),r=t(10);e.exports=function(t){return function(){if(r(this)!=t)throw TypeError(t+"#toJSON isn't generic");var e=[];return a(this,!1,e.push,e),e}}},{10:10,27:27}],14:[function(t,e,n){"use strict";var a=t(31),r=t(60),i=t(4),o=t(38),s=t(69),u=t(27),p=t(8),c=t(30),l=t(82)("weak"),f=Object.isExtensible||o,d=p(5),h=p(6),m=0,v=function(t){return t._l||(t._l=new g)},g=function(){this.a=[]},b=function(t,e){return d(t.a,function(t){return t[0]===e})};g.prototype={get:function(t){var e=b(this,t);return e?e[1]:void 0},has:function(t){return!!b(this,t)},set:function(t,e){var n=b(this,t);n?n[1]=e:this.a.push([t,e])},"delete":function(t){var e=h(this.a,function(e){return e[0]===t});return~e&&this.a.splice(e,1),!!~e}},e.exports={getConstructor:function(t,e,n,a){var i=t(function(t,r){s(t,i,e),t._i=m++,t._l=void 0,void 0!=r&&u(r,n,t[a],t)});return r(i.prototype,{"delete":function(t){return o(t)?f(t)?c(t,l)&&c(t[l],this._i)&&delete t[l][this._i]:v(this)["delete"](t):!1},has:function(t){return o(t)?f(t)?c(t,l)&&c(t[l],this._i):v(this).has(t):!1}}),i},def:function(t,e,n){return f(i(e))?(c(e,l)||a(e,l,{}),e[l][t._i]=n):v(t).set(e,n),t},frozenStore:v,WEAK:l}},{27:27,30:30,31:31,38:38,4:4,60:60,69:69,8:8,82:82}],15:[function(t,e,n){"use strict";var a=t(29),r=t(22),i=t(61),o=t(60),s=t(27),u=t(69),p=t(38),c=t(24),l=t(43),f=t(66);e.exports=function(t,e,n,d,h,m){var v=a[t],g=v,b=h?"set":"add",y=g&&g.prototype,x={},_=function(t){var e=y[t];i(y,t,"delete"==t?function(t){return m&&!p(t)?!1:e.call(this,0===t?0:t)}:"has"==t?function(t){return m&&!p(t)?!1:e.call(this,0===t?0:t)}:"get"==t?function(t){return m&&!p(t)?void 0:e.call(this,0===t?0:t)}:"add"==t?function(t){return e.call(this,0===t?0:t),this}:function(t,n){return e.call(this,0===t?0:t,n),this})};if("function"==typeof g&&(m||y.forEach&&!c(function(){(new g).entries().next()}))){var w,k=new g,E=k[b](m?{}:-0,1)!=k,S=c(function(){k.has(1)}),C=l(function(t){new g(t)});C||(g=e(function(e,n){u(e,g,t);var a=new v;return void 0!=n&&s(n,h,a[b],a),a}),g.prototype=y,y.constructor=g),m||k.forEach(function(t,e){w=1/e===-(1/0)}),(S||w)&&(_("delete"),_("has"),h&&_("get")),(w||E)&&_(b),m&&y.clear&&delete y.clear}else g=d.getConstructor(e,t,h,b),o(g.prototype,n);return f(g,t),x[t]=g,r(r.G+r.W+r.F*(g!=v),x),m||d.setStrong(g,t,h),g}},{22:22,24:24,27:27,29:29,38:38,43:43,60:60,61:61,66:66,69:69}],16:[function(t,e,n){var a=e.exports={version:"1.2.6"};"number"==typeof __e&&(__e=a)},{}],17:[function(t,e,n){var a=t(2);e.exports=function(t,e,n){if(a(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,a){return t.call(e,n,a)};case 3:return function(n,a,r){return t.call(e,n,a,r)}}return function(){return t.apply(e,arguments)}}},{2:2}],18:[function(t,e,n){e.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},{}],19:[function(t,e,n){e.exports=!t(24)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{24:24}],20:[function(t,e,n){var a=t(38),r=t(29).document,i=a(r)&&a(r.createElement);e.exports=function(t){return i?r.createElement(t):{}}},{29:29,38:38}],21:[function(t,e,n){var a=t(46);e.exports=function(t){var e=a.getKeys(t),n=a.getSymbols;if(n)for(var r,i=n(t),o=a.isEnum,s=0;i.length>s;)o.call(t,r=i[s++])&&e.push(r);return e}},{46:46}],22:[function(t,e,n){var a=t(29),r=t(16),i=t(31),o=t(61),s=t(17),u="prototype",p=function(t,e,n){var c,l,f,d,h=t&p.F,m=t&p.G,v=t&p.S,g=t&p.P,b=t&p.B,y=m?a:v?a[e]||(a[e]={}):(a[e]||{})[u],x=m?r:r[e]||(r[e]={}),_=x[u]||(x[u]={});m&&(n=e);for(c in n)l=!h&&y&&c in y,f=(l?y:n)[c],d=b&&l?s(f,a):g&&"function"==typeof f?s(Function.call,f):f,y&&!l&&o(y,c,f),x[c]!=f&&i(x,c,d),g&&_[c]!=f&&(_[c]=f)};a.core=r,p.F=1,p.G=2,p.S=4,p.P=8,p.B=16,p.W=32,e.exports=p},{16:16,17:17,29:29,31:31,61:61}],23:[function(t,e,n){var a=t(83)("match");e.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[a]=!1,!"/./"[t](e)}catch(r){}}return!0}},{83:83}],24:[function(t,e,n){e.exports=function(t){try{return!!t()}catch(e){return!0}}},{}],25:[function(t,e,n){"use strict";var a=t(31),r=t(61),i=t(24),o=t(18),s=t(83);e.exports=function(t,e,n){var u=s(t),p=""[t];i(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(r(String.prototype,t,n(o,u,p)),a(RegExp.prototype,u,2==e?function(t,e){return p.call(t,this,e)}:function(t){return p.call(t,this)}))}},{18:18,24:24,31:31,61:61,83:83}],26:[function(t,e,n){"use strict";var a=t(4);e.exports=function(){var t=a(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},{4:4}],27:[function(t,e,n){var a=t(17),r=t(40),i=t(35),o=t(4),s=t(79),u=t(84);e.exports=function(t,e,n,p){var c,l,f,d=u(t),h=a(n,p,e?2:1),m=0;if("function"!=typeof d)throw TypeError(t+" is not iterable!");if(i(d))for(c=s(t.length);c>m;m++)e?h(o(l=t[m])[0],l[1]):h(t[m]);else for(f=d.call(t);!(l=f.next()).done;)r(f,h,l.value,e)}},{17:17,35:35,4:4,40:40,79:79,84:84}],28:[function(t,e,n){var a=t(78),r=t(46).getNames,i={}.toString,o="object"==typeof window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(t){try{return r(t)}catch(e){return o.slice()}};e.exports.get=function(t){return o&&"[object Window]"==i.call(t)?s(t):r(a(t))}},{46:46,78:78}],29:[function(t,e,n){var a=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=a)},{}],30:[function(t,e,n){var a={}.hasOwnProperty;e.exports=function(t,e){return a.call(t,e)}},{}],31:[function(t,e,n){var a=t(46),r=t(59);e.exports=t(19)?function(t,e,n){return a.setDesc(t,e,r(1,n))}:function(t,e,n){return t[e]=n,t}},{19:19,46:46,59:59}],32:[function(t,e,n){e.exports=t(29).document&&document.documentElement},{29:29}],33:[function(t,e,n){e.exports=function(t,e,n){var a=void 0===n;switch(e.length){case 0:return a?t():t.call(n);case 1:return a?t(e[0]):t.call(n,e[0]);case 2:return a?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return a?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return a?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},{}],34:[function(t,e,n){var a=t(11);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==a(t)?t.split(""):Object(t)}},{11:11}],35:[function(t,e,n){var a=t(45),r=t(83)("iterator"),i=Array.prototype;e.exports=function(t){return void 0!==t&&(a.Array===t||i[r]===t)}},{45:45,83:83}],36:[function(t,e,n){var a=t(11);e.exports=Array.isArray||function(t){return"Array"==a(t)}},{11:11}],37:[function(t,e,n){var a=t(38),r=Math.floor;e.exports=function(t){return!a(t)&&isFinite(t)&&r(t)===t}},{38:38}],38:[function(t,e,n){e.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},{}],39:[function(t,e,n){var a=t(38),r=t(11),i=t(83)("match");e.exports=function(t){var e;return a(t)&&(void 0!==(e=t[i])?!!e:"RegExp"==r(t))}},{11:11,38:38,83:83}],40:[function(t,e,n){var a=t(4);e.exports=function(t,e,n,r){try{return r?e(a(n)[0],n[1]):e(n)}catch(i){var o=t["return"];throw void 0!==o&&a(o.call(t)),i}}},{4:4}],41:[function(t,e,n){"use strict";var a=t(46),r=t(59),i=t(66),o={};t(31)(o,t(83)("iterator"),function(){return this}),e.exports=function(t,e,n){t.prototype=a.create(o,{next:r(1,n)}),i(t,e+" Iterator")}},{31:31,46:46,59:59,66:66,83:83}],42:[function(t,e,n){"use strict";var a=t(48),r=t(22),i=t(61),o=t(31),s=t(30),u=t(45),p=t(41),c=t(66),l=t(46).getProto,f=t(83)("iterator"),d=!([].keys&&"next"in[].keys()),h="@@iterator",m="keys",v="values",g=function(){return this};e.exports=function(t,e,n,b,y,x,_){p(n,e,b);var w,k,E=function(t){if(!d&&t in A)return A[t];switch(t){case m:return function(){return new n(this,t)};case v:return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",C=y==v,P=!1,A=t.prototype,O=A[f]||A[h]||y&&A[y],T=O||E(y);if(O){var j=l(T.call(new t));c(j,S,!0),!a&&s(A,h)&&o(j,f,g),C&&O.name!==v&&(P=!0,T=function(){return O.call(this)})}if(a&&!_||!d&&!P&&A[f]||o(A,f,T),u[e]=T,u[S]=g,y)if(w={values:C?T:E(v),keys:x?T:E(m),entries:C?E("entries"):T},_)for(k in w)k in A||i(A,k,w[k]);else r(r.P+r.F*(d||P),e,w);return w}},{22:22,30:30,31:31,41:41,45:45,46:46,48:48,61:61,66:66,83:83}],43:[function(t,e,n){var a=t(83)("iterator"),r=!1;try{var i=[7][a]();i["return"]=function(){r=!0},Array.from(i,function(){throw 2})}catch(o){}e.exports=function(t,e){if(!e&&!r)return!1;var n=!1;try{var i=[7],o=i[a]();o.next=function(){return{done:n=!0}},i[a]=function(){return o},t(i)}catch(s){}return n}},{83:83}],44:[function(t,e,n){e.exports=function(t,e){return{value:e,done:!!t}}},{}],45:[function(t,e,n){e.exports={}},{}],46:[function(t,e,n){var a=Object;e.exports={create:a.create,getProto:a.getPrototypeOf,isEnum:{}.propertyIsEnumerable,getDesc:a.getOwnPropertyDescriptor,setDesc:a.defineProperty,setDescs:a.defineProperties,getKeys:a.keys,getNames:a.getOwnPropertyNames,getSymbols:a.getOwnPropertySymbols,each:[].forEach}},{}],47:[function(t,e,n){var a=t(46),r=t(78);e.exports=function(t,e){for(var n,i=r(t),o=a.getKeys(i),s=o.length,u=0;s>u;)if(i[n=o[u++]]===e)return n}},{46:46,78:78}],48:[function(t,e,n){e.exports=!1},{}],49:[function(t,e,n){e.exports=Math.expm1||function(t){return 0==(t=+t)?t:t>-1e-6&&1e-6>t?t+t*t/2:Math.exp(t)-1}},{}],50:[function(t,e,n){e.exports=Math.log1p||function(t){return(t=+t)>-1e-8&&1e-8>t?t-t*t/2:Math.log(1+t)}},{}],51:[function(t,e,n){e.exports=Math.sign||function(t){return 0==(t=+t)||t!=t?t:0>t?-1:1}},{}],52:[function(t,e,n){var a,r,i,o=t(29),s=t(75).set,u=o.MutationObserver||o.WebKitMutationObserver,p=o.process,c=o.Promise,l="process"==t(11)(p),f=function(){var t,e,n;for(l&&(t=p.domain)&&(p.domain=null,t.exit());a;)e=a.domain,n=a.fn,e&&e.enter(),n(),e&&e.exit(),a=a.next;r=void 0,t&&t.enter()};if(l)i=function(){p.nextTick(f)};else if(u){var d=1,h=document.createTextNode("");new u(f).observe(h,{characterData:!0}),i=function(){h.data=d=-d}}else i=c&&c.resolve?function(){c.resolve().then(f)}:function(){s.call(o,f)};e.exports=function(t){var e={fn:t,next:void 0,domain:l&&p.domain};r&&(r.next=e),a||(a=e,i()),r=e}},{11:11,29:29,75:75}],53:[function(t,e,n){var a=t(46),r=t(80),i=t(34);e.exports=t(24)(function(){var t=Object.assign,e={},n={},a=Symbol(),r="abcdefghijklmnopqrst";return e[a]=7,r.split("").forEach(function(t){n[t]=t}),7!=t({},e)[a]||Object.keys(t({},n)).join("")!=r})?function(t,e){for(var n=r(t),o=arguments,s=o.length,u=1,p=a.getKeys,c=a.getSymbols,l=a.isEnum;s>u;)for(var f,d=i(o[u++]),h=c?p(d).concat(c(d)):p(d),m=h.length,v=0;m>v;)l.call(d,f=h[v++])&&(n[f]=d[f]);return n}:Object.assign},{24:24,34:34,46:46,80:80}],54:[function(t,e,n){var a=t(22),r=t(16),i=t(24);e.exports=function(t,e){var n=(r.Object||{})[t]||Object[t],o={};o[t]=e(n),a(a.S+a.F*i(function(){n(1)}),"Object",o)}},{16:16,22:22,24:24}],55:[function(t,e,n){var a=t(46),r=t(78),i=a.isEnum;e.exports=function(t){return function(e){for(var n,o=r(e),s=a.getKeys(o),u=s.length,p=0,c=[];u>p;)i.call(o,n=s[p++])&&c.push(t?[n,o[n]]:o[n]);return c}}},{46:46,78:78}],56:[function(t,e,n){var a=t(46),r=t(4),i=t(29).Reflect;e.exports=i&&i.ownKeys||function(t){var e=a.getNames(r(t)),n=a.getSymbols;return n?e.concat(n(t)):e}},{29:29,4:4,46:46}],57:[function(t,e,n){"use strict";var a=t(58),r=t(33),i=t(2);e.exports=function(){for(var t=i(this),e=arguments.length,n=Array(e),o=0,s=a._,u=!1;e>o;)(n[o]=arguments[o++])===s&&(u=!0);return function(){var a,i=this,o=arguments,p=o.length,c=0,l=0;if(!u&&!p)return r(t,n,i);if(a=n.slice(),u)for(;e>c;c++)a[c]===s&&(a[c]=o[l++]);for(;p>l;)a.push(o[l++]);return r(t,a,i)}}},{2:2,33:33,58:58}],58:[function(t,e,n){e.exports=t(29)},{29:29}],59:[function(t,e,n){e.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},{}],60:[function(t,e,n){var a=t(61);e.exports=function(t,e){for(var n in e)a(t,n,e[n]);return t}},{61:61}],61:[function(t,e,n){var a=t(29),r=t(31),i=t(82)("src"),o="toString",s=Function[o],u=(""+s).split(o);t(16).inspectSource=function(t){return s.call(t)},(e.exports=function(t,e,n,o){"function"==typeof n&&(n.hasOwnProperty(i)||r(n,i,t[e]?""+t[e]:u.join(e+"")),n.hasOwnProperty("name")||r(n,"name",e)),t===a?t[e]=n:(o||delete t[e],r(t,e,n))})(Function.prototype,o,function(){return"function"==typeof this&&this[i]||s.call(this)})},{16:16,29:29,31:31,82:82}],62:[function(t,e,n){e.exports=function(t,e){var n=e===Object(e)?function(t){return e[t]}:e;return function(e){return(e+"").replace(t,n)}}},{}],63:[function(t,e,n){e.exports=Object.is||function(t,e){return t===e?0!==t||1/t===1/e:t!=t&&e!=e}},{}],64:[function(t,e,n){var a=t(46).getDesc,r=t(38),i=t(4),o=function(t,e){if(i(t),!r(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,r){try{r=t(17)(Function.call,a(Object.prototype,"__proto__").set,2),r(e,[]),n=!(e instanceof Array)}catch(i){n=!0}return function(t,e){return o(t,e),n?t.__proto__=e:r(t,e),t}}({},!1):void 0),check:o}},{17:17,38:38,4:4,46:46}],65:[function(t,e,n){"use strict";var a=t(29),r=t(46),i=t(19),o=t(83)("species");e.exports=function(t){var e=a[t];i&&e&&!e[o]&&r.setDesc(e,o,{configurable:!0,get:function(){return this}})}},{19:19,29:29,46:46,83:83}],66:[function(t,e,n){var a=t(46).setDesc,r=t(30),i=t(83)("toStringTag");e.exports=function(t,e,n){t&&!r(t=n?t:t.prototype,i)&&a(t,i,{configurable:!0,value:e})}},{30:30,46:46,83:83}],67:[function(t,e,n){var a=t(29),r="__core-js_shared__",i=a[r]||(a[r]={});e.exports=function(t){return i[t]||(i[t]={})}},{29:29}],68:[function(t,e,n){var a=t(4),r=t(2),i=t(83)("species");e.exports=function(t,e){var n,o=a(t).constructor;return void 0===o||void 0==(n=a(o)[i])?e:r(n)}},{2:2,4:4,83:83}],69:[function(t,e,n){e.exports=function(t,e,n){if(!(t instanceof e))throw TypeError(n+": use the 'new' operator!");return t}},{}],70:[function(t,e,n){var a=t(77),r=t(18);e.exports=function(t){return function(e,n){var i,o,s=r(e)+"",u=a(n),p=s.length;return 0>u||u>=p?t?"":void 0:(i=s.charCodeAt(u),55296>i||i>56319||u+1===p||(o=s.charCodeAt(u+1))<56320||o>57343?t?s.charAt(u):i:t?s.slice(u,u+2):(i-55296<<10)+(o-56320)+65536)}}},{18:18,77:77}],71:[function(t,e,n){var a=t(39),r=t(18);e.exports=function(t,e,n){if(a(e))throw TypeError("String#"+n+" doesn't accept regex!");return r(t)+""}},{18:18,39:39}],72:[function(t,e,n){var a=t(79),r=t(73),i=t(18);e.exports=function(t,e,n,o){var s=i(t)+"",u=s.length,p=void 0===n?" ":n+"",c=a(e);if(u>=c)return s;""==p&&(p=" ");var l=c-u,f=r.call(p,Math.ceil(l/p.length));return f.length>l&&(f=f.slice(0,l)),o?f+s:s+f}},{18:18,73:73,79:79}],73:[function(t,e,n){"use strict";var a=t(77),r=t(18);e.exports=function(t){var e=r(this)+"",n="",i=a(t);if(0>i||i==1/0)throw RangeError("Count can't be negative");for(;i>0;(i>>>=1)&&(e+=e))1&i&&(n+=e);return n}},{18:18,77:77}],74:[function(t,e,n){var a=t(22),r=t(18),i=t(24),o=" \n\x0B\f\r   ᠎             　\u2028\u2029\ufeff",s="["+o+"]",u="​…",p=RegExp("^"+s+s+"*"),c=RegExp(s+s+"*$"),l=function(t,e){var n={};n[t]=e(f),a(a.P+a.F*i(function(){return!!o[t]()||u[t]()!=u}),"String",n)},f=l.trim=function(t,e){return t=r(t)+"",1&e&&(t=t.replace(p,"")),2&e&&(t=t.replace(c,"")),t};e.exports=l},{18:18,22:22,24:24}],75:[function(t,e,n){var a,r,i,o=t(17),s=t(33),u=t(32),p=t(20),c=t(29),l=c.process,f=c.setImmediate,d=c.clearImmediate,h=c.MessageChannel,m=0,v={},g="onreadystatechange",b=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},y=function(t){b.call(t.data)};f&&d||(f=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++m]=function(){s("function"==typeof t?t:Function(t),e)},a(m),m},d=function(t){delete v[t]},"process"==t(11)(l)?a=function(t){l.nextTick(o(b,t,1))}:h?(r=new h,i=r.port2,r.port1.onmessage=y,a=o(i.postMessage,i,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(a=function(t){c.postMessage(t+"","*")},c.addEventListener("message",y,!1)):a=g in p("script")?function(t){u.appendChild(p("script"))[g]=function(){u.removeChild(this),b.call(t)}}:function(t){setTimeout(o(b,t,1),0)}),e.exports={set:f,clear:d}},{11:11,17:17,20:20,29:29,32:32,33:33}],76:[function(t,e,n){var a=t(77),r=Math.max,i=Math.min;e.exports=function(t,e){return t=a(t),0>t?r(t+e,0):i(t,e)}},{77:77}],77:[function(t,e,n){var a=Math.ceil,r=Math.floor;e.exports=function(t){return isNaN(t=+t)?0:(t>0?r:a)(t)}},{}],78:[function(t,e,n){var a=t(34),r=t(18);e.exports=function(t){return a(r(t))}},{18:18,34:34}],79:[function(t,e,n){var a=t(77),r=Math.min;e.exports=function(t){return t>0?r(a(t),9007199254740991):0}},{77:77}],80:[function(t,e,n){var a=t(18);e.exports=function(t){return Object(a(t))}},{18:18}],81:[function(t,e,n){var a=t(38);e.exports=function(t,e){if(!a(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!a(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!a(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!a(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")}},{38:38}],82:[function(t,e,n){var a=0,r=Math.random();e.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++a+r).toString(36))}},{}],83:[function(t,e,n){var a=t(67)("wks"),r=t(82),i=t(29).Symbol;e.exports=function(t){return a[t]||(a[t]=i&&i[t]||(i||r)("Symbol."+t))}},{29:29,67:67,82:82}],84:[function(t,e,n){var a=t(10),r=t(83)("iterator"),i=t(45);e.exports=t(16).getIteratorMethod=function(t){return void 0!=t?t[r]||t["@@iterator"]||i[a(t)]:void 0}},{10:10,16:16,45:45,83:83}],85:[function(t,e,n){"use strict";var a,r=t(46),i=t(22),o=t(19),s=t(59),u=t(32),p=t(20),c=t(30),l=t(11),f=t(33),d=t(24),h=t(4),m=t(2),v=t(38),g=t(80),b=t(78),y=t(77),x=t(76),_=t(79),w=t(34),k=t(82)("__proto__"),E=t(8),S=t(7)(!1),C=Object.prototype,P=Array.prototype,A=P.slice,O=P.join,T=r.setDesc,j=r.getDesc,R=r.setDescs,M={};o||(a=!d(function(){return 7!=T(p("div"),"a",{get:function(){return 7}}).a}),r.setDesc=function(t,e,n){if(a)try{return T(t,e,n)}catch(r){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(h(t)[e]=n.value),t},r.getDesc=function(t,e){if(a)try{return j(t,e)}catch(n){}return c(t,e)?s(!C.propertyIsEnumerable.call(t,e),t[e]):void 0},r.setDescs=R=function(t,e){h(t);for(var n,a=r.getKeys(e),i=a.length,o=0;i>o;)r.setDesc(t,n=a[o++],e[n]);return t}),i(i.S+i.F*!o,"Object",{getOwnPropertyDescriptor:r.getDesc,defineProperty:r.setDesc,defineProperties:R});var L="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(","),N=L.concat("length","prototype"),D=L.length,F=function(){var t,e=p("iframe"),n=D,a=">";for(e.style.display="none",u.appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("