diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index f6d7212eb3b..451e6b84aa0 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -633,6 +633,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/tank/oxygen, /turf/simulated/floor/plasteel, /area/ruin/powered/animal_hospital) "bI" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 3069d734ae8..a63b9b33bf5 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -16,6 +16,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/access_button{ @@ -290,6 +292,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -322,6 +326,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -343,6 +349,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel/white, @@ -363,6 +371,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -375,6 +385,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/red{ @@ -418,6 +430,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/access_button{ @@ -651,9 +665,13 @@ pixel_y = 24 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -1143,6 +1161,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/effect/baseturf_helper/lava_land/surface, @@ -1430,6 +1450,8 @@ pixel_x = -24 }, /obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1618,6 +1640,8 @@ pixel_x = -26 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1747,6 +1771,8 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; icon_state = "0-2" }, /obj/machinery/power/apc/syndicate{ @@ -1875,6 +1901,8 @@ pixel_y = 1 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1925,6 +1953,8 @@ pixel_x = -26 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -1947,6 +1977,8 @@ /area/ruin/unpowered/syndicate_lava_base/cargo) "ey" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1970,6 +2002,8 @@ /area/ruin/unpowered/syndicate_lava_base/cargo) "ez" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1993,6 +2027,8 @@ "eA" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2020,6 +2056,8 @@ /area/ruin/unpowered/syndicate_lava_base/cargo) "eB" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2033,6 +2071,8 @@ /area/ruin/unpowered/syndicate_lava_base/cargo) "eC" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, @@ -2213,6 +2253,8 @@ /area/ruin/unpowered/syndicate_lava_base/testlab) "eR" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2252,6 +2294,8 @@ /area/ruin/unpowered/syndicate_lava_base/chemistry) "eW" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2402,6 +2446,8 @@ pixel_y = 24 }, /obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt, @@ -2434,6 +2480,7 @@ pixel_y = -24 }, /obj/structure/cable/yellow{ + d2 = 4; icon_state = "0-4" }, /obj/effect/decal/cleanable/dirt, @@ -2456,6 +2503,8 @@ pixel_x = 25 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/effect/turf_decal/tile/neutral{ @@ -2477,6 +2526,8 @@ req_access_txt = "150" }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2532,6 +2583,8 @@ /area/ruin/unpowered/syndicate_lava_base/cargo) "fr" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2650,6 +2703,8 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/spray/cleaner, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white/side{ @@ -2703,6 +2758,8 @@ req_access_txt = "150" }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral{ @@ -2726,6 +2783,8 @@ "fI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2742,6 +2801,8 @@ "fW" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2872,6 +2933,8 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -2887,6 +2950,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -2903,6 +2968,8 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -2910,13 +2977,19 @@ "gE" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /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/effect/decal/cleanable/dirt, @@ -2927,6 +3000,8 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2940,6 +3015,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "gG" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2952,6 +3029,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "gH" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -2959,12 +3038,16 @@ dir = 2 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/main) "gI" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2979,6 +3062,8 @@ "gJ" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2995,6 +3080,8 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3010,6 +3097,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "gL" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3134,6 +3223,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/tile/red{ @@ -3296,6 +3387,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -3384,6 +3477,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/tile/red{ @@ -3482,6 +3577,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -3600,6 +3697,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/tile/red{ @@ -3733,6 +3832,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -3894,6 +3995,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "iP" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -3910,6 +4013,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -3927,6 +4032,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -3940,6 +4047,8 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -3956,6 +4065,8 @@ dir = 2 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral{ @@ -3971,9 +4082,13 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, @@ -3992,6 +4107,8 @@ pixel_y = -24 }, /obj/structure/cable/yellow{ + d1 = 0; + d2 = 8; icon_state = "0-8" }, /obj/effect/turf_decal/tile/neutral, @@ -4135,6 +4252,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -4150,6 +4269,8 @@ /area/ruin/unpowered/syndicate_lava_base/dormitories) "ji" = ( /obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; icon_state = "0-2" }, /obj/machinery/power/apc/syndicate{ @@ -4219,6 +4340,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -4251,6 +4374,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "js" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -4344,9 +4469,13 @@ /area/ruin/unpowered/syndicate_lava_base/main) "jE" = ( /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4359,6 +4488,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "jF" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4377,6 +4508,8 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4396,6 +4529,8 @@ dir = 9 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4418,6 +4553,8 @@ pixel_x = 24 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4505,6 +4642,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -4520,6 +4659,8 @@ /area/ruin/unpowered/syndicate_lava_base/main) "jS" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4565,6 +4706,8 @@ dir = 6 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4610,6 +4753,8 @@ dir = 6 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, @@ -4621,9 +4766,13 @@ dir = 2 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -4637,9 +4786,13 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, @@ -4653,6 +4806,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -4665,6 +4820,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -4679,12 +4836,16 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/main) "ki" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4708,6 +4869,8 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4724,6 +4887,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "km" = ( /obj/structure/cable/yellow{ + d1 = 0; + d2 = 2; icon_state = "0-2" }, /obj/machinery/computer/monitor/secret, @@ -4795,6 +4960,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -4844,6 +5011,8 @@ dir = 9 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, @@ -4857,9 +5026,13 @@ dir = 5 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -4870,9 +5043,13 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "kz" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -4882,6 +5059,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "kB" = ( /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, @@ -4995,6 +5174,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -5135,6 +5316,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/reagent_dispensers/beerkeg, @@ -5271,6 +5454,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -5395,6 +5580,8 @@ "lW" = ( /obj/structure/table/wood, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, @@ -5402,6 +5589,8 @@ /area/ruin/unpowered/syndicate_lava_base/bar) "lX" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/wood, @@ -5414,6 +5603,8 @@ dir = 5 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/wood, @@ -5426,6 +5617,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/wood, @@ -5442,6 +5635,8 @@ req_access_txt = "150" }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark, @@ -5454,6 +5649,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark, @@ -5476,6 +5673,8 @@ dir = 9 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, @@ -5603,6 +5802,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -5745,6 +5946,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -5945,6 +6148,8 @@ dir = 6 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, @@ -5967,6 +6172,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -5976,6 +6183,7 @@ pixel_y = 24 }, /obj/structure/cable/yellow{ + d2 = 4; icon_state = "0-4" }, /obj/effect/turf_decal/tile/red{ @@ -5994,6 +6202,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/red{ @@ -6006,6 +6216,8 @@ /area/ruin/unpowered/syndicate_lava_base/arrivals) "nv" = ( /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/red{ @@ -6025,9 +6237,13 @@ dir = 2 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel/white/side{ @@ -6043,6 +6259,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/door/airlock/medical/glass{ @@ -6058,6 +6276,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel/white/side{ @@ -6072,12 +6292,16 @@ dir = 9 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/medbay) "nA" = ( /obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/simulated/floor/plasteel/white/corner, @@ -6154,6 +6378,8 @@ dir = 5 }, /obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral{ @@ -6180,6 +6406,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/neutral{ @@ -6202,6 +6430,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -6218,6 +6448,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -6230,6 +6462,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/red{ @@ -6249,6 +6483,8 @@ pixel_y = 24 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/red{ @@ -6267,6 +6503,8 @@ dir = 1 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/tile/red{ @@ -6291,6 +6529,8 @@ dir = 4 }, /obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -6310,6 +6550,8 @@ dir = 9 }, /obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/turf_decal/tile/red{ diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index a8f1ff2c6cb..db88f46a676 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -5,7 +5,6 @@ #define PLANE_SPACE -95 #define PLANE_SPACE_PARALLAX -90 -#define FLOOR_PLANE -2 #define FLOOR_PLANE -2 #define GAME_PLANE -1 diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 76110bcbe98..1c390bdf5ff 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -402,3 +402,6 @@ #define SENSOR_LIVING 1 #define SENSOR_VITALS 2 #define SENSOR_COORDS 3 + +// Cult summon possibilities +#define SUMMON_POSSIBILITIES 3 \ No newline at end of file diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 08c538c0462..266821db766 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -18,7 +18,6 @@ However if you want that mind to have any special properties like being a traitor etc you will have to do that yourself. */ -#define SUMMON_POSSIBILITIES 3 /datum/mind var/key diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d9b93a24a2d..fe0e2e357ad 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1362,6 +1362,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 40 containername = "religious supplies crate" +/datum/supply_packs/misc/minerkit + name = "Shaft Miner Starter Kit" + cost = 30 + access = access_qm + contains = list(/obj/item/storage/backpack/duffel/mining_conscript) + containertype = /obj/structure/closet/crate/secure + containername = "shaft miner starter kit" + ///////////// Paper Work diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 2b860756b45..90ab53dfde2 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -1,4 +1,3 @@ -#define SUMMON_POSSIBILITIES 3 var/global/list/all_cults = list() /datum/game_mode diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index c49c56fe312..f3273c7786a 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -8,7 +8,7 @@ canSmoothWith = list(/turf/simulated/floor/chasm) density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf var/static/list/falling_atoms = list() //Atoms currently falling into the chasm - var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/temp_visual, /obj/effect/collapse)) + var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/temp_visual, /obj/effect/collapse, /obj/effect/collapse, /atom/movable/lighting_object)) var/drop_x = 1 var/drop_y = 1 var/drop_z = 1 diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 2c2fdfbab84..28ca16b9a79 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -23,6 +23,5 @@ var/mob/M = pick(candidates) B.key = M.key to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.") - var/image/alert_overlay = image('icons/mob/blob.dmi', "blank_blob") - notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B, alert_overlay = alert_overlay) + notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B) processing = TRUE // Let it naturally end, if it runs successfully \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 620093a776b..72b36bd38a5 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -482,6 +482,9 @@ max_n_of_items = 10 pixel_y = -4 +/obj/machinery/smartfridge/survival_pod/update_icon() + return + /obj/item/circuitboard/smartfridge/survival name = "circuit board (Smartfridge Survival)" build_path = /obj/machinery/smartfridge/survival_pod diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index e34c794ab81..c1f474ccd64 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -48,7 +48,7 @@ if(istype(thing, /obj/item/storage/bag/ore)) OB = thing break - if(OB && istype(F, /turf/simulated/floor/plating/asteroid/airless)) + if(OB && istype(F, /turf/simulated/floor/plating/asteroid)) F.attackby(OB, AM) return ..() diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 9a8d69a66bd..35694b3719e 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ