diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm index 67cfd04ecee..8623b6df448 100644 --- a/_maps/map_files/vonneumann/vnmk3.dmm +++ b/_maps/map_files/vonneumann/vnmk3.dmm @@ -94,7 +94,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/vending/liberationstation, /turf/open/floor/carpet/ship, /area/security) "as" = ( @@ -142,6 +141,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "az" = ( @@ -236,6 +236,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plasteel, /area/science/lobby) "aI" = ( @@ -261,6 +262,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -278,6 +280,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/purple_carpet, /area/crew_quarters/heads/hor) "aL" = ( @@ -512,6 +515,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/robotics) "bs" = ( @@ -620,6 +624,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/blue, /area/crew_quarters/cryopods) "bE" = ( @@ -686,6 +691,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay) "bN" = ( @@ -898,6 +904,13 @@ }, /turf/open/floor/carpet/ship/red_carpet, /area/security/brig) +"cA" = ( +/obj/structure/hull_plate/end{ + dir = 6 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "cB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -930,6 +943,13 @@ "cG" = ( /turf/open/floor/monotile/light, /area/medical/medbay) +"cK" = ( +/obj/structure/hull_plate/end{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "cL" = ( /obj/machinery/atmospherics/pipe/simple/brown/hidden{ dir = 4 @@ -1030,6 +1050,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/bridge/cic) "cZ" = ( @@ -1047,6 +1068,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -1154,6 +1176,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/wood, /area/crew_quarters/dorms) "do" = ( @@ -1387,6 +1410,7 @@ dir = 8 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "dP" = ( @@ -1416,6 +1440,7 @@ /obj/structure/table/glass, /obj/item/storage/lockbox/loyalty, /obj/item/storage/box/pinpointer_pairs, +/obj/machinery/recharger, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -1465,6 +1490,7 @@ dir = 4 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "dZ" = ( @@ -1485,6 +1511,11 @@ }, /turf/open/floor/carpet/ship/blue, /area/bridge/cic) +"ea" = ( +/obj/structure/hull_plate, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "eb" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible/layer2{ dir = 5 @@ -1553,6 +1584,7 @@ }, /obj/machinery/camera/autoname, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "ej" = ( @@ -1770,6 +1802,11 @@ /obj/item/assembly/prox_sensor, /turf/open/floor/durasteel/techfloor_grid, /area/science/robotics) +"eL" = ( +/obj/structure/hull_plate/end, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "eM" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -1800,6 +1837,16 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) +"eP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/ship, +/area/ai_monitored/turret_protected/aisat/hallway) "eQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1965,6 +2012,10 @@ }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering) +"fm" = ( +/obj/machinery/firealarm/directional/south, +/turf/open/floor/circuit, +/area/hallway/primary/central) "fn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1987,6 +2038,7 @@ }, /obj/machinery/computer/ship/viewscreen, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "fq" = ( @@ -2017,6 +2069,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/purple_carpet, /area/science/lab) "ft" = ( @@ -2034,6 +2087,11 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) +"fu" = ( +/obj/structure/grille/wall, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "fv" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2062,6 +2120,13 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/restrooms) +"fy" = ( +/obj/structure/hull_plate/end{ + dir = 9 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "fA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2224,6 +2289,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plasteel, /area/nsv/hanger) "fZ" = ( @@ -2374,6 +2440,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plasteel, /area/science/lobby) "gt" = ( @@ -2445,6 +2512,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plasteel, /area/science/lobby) "gF" = ( @@ -2563,6 +2631,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/engine/gravity_generator) "gU" = ( @@ -2573,6 +2642,10 @@ }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) +"gV" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating, +/area/maintenance/nsv/starboard_substation) "gW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2582,6 +2655,7 @@ dir = 1 }, /obj/machinery/door/airlock/ship/public/glass, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "gX" = ( @@ -2621,6 +2695,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/storage/eva) "ha" = ( @@ -2772,6 +2847,10 @@ }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering) +"hu" = ( +/obj/effect/landmark/carpspawn, +/turf/open/space/basic, +/area/space) "hv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3194,6 +3273,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering) "iB" = ( @@ -3315,6 +3395,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/aisat/hallway) "iT" = ( @@ -3392,6 +3473,16 @@ }, /turf/open/floor/plating, /area/maintenance/nsv/port_substation) +"jf" = ( +/obj/structure/hull_plate/end{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "jg" = ( /obj/machinery/porta_turret/ai, /turf/open/floor/circuit, @@ -3550,6 +3641,7 @@ dir = 10 }, /obj/structure/lattice, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "jE" = ( @@ -3648,6 +3740,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/cargo/lobby) "jP" = ( @@ -3921,6 +4014,7 @@ /obj/machinery/computer/operating{ dir = 8 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/monotile/light, /area/medical/medbay) "kB" = ( @@ -4123,6 +4217,14 @@ /obj/machinery/light/small, /turf/open/floor/wood, /area/crew_quarters/dorms) +"lf" = ( +/obj/machinery/conveyor/slow{ + dir = 5; + id = "atlas_torp" + }, +/obj/structure/lattice/catwalk/over/ship/dark, +/turf/open/floor/carpet/ship/beige_carpet, +/area/nsv/weapons/port) "lh" = ( /obj/structure/table/reinforced, /obj/machinery/computer/med_data/laptop{ @@ -4148,6 +4250,7 @@ dir = 1 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "lj" = ( @@ -4296,6 +4399,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, +/obj/machinery/door/airlock/ship/public/glass{ + name = "Cryogenics" + }, /turf/open/floor/carpet/ship/blue, /area/crew_quarters/cryopods) "lF" = ( @@ -4406,6 +4513,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/carpet/ship/purple_carpet, /area/science) +"lV" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "lW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, @@ -4456,6 +4567,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -4531,6 +4643,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -4584,6 +4697,7 @@ /area/engine/engineering/reactor_core) "mt" = ( /obj/structure/table/reinforced, +/obj/machinery/recharger, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/bar/mess_hall) "mu" = ( @@ -4778,6 +4892,7 @@ id = "chapel_shutters_space" }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/robotics) "mV" = ( @@ -4927,6 +5042,13 @@ }, /turf/open/floor/carpet/ship/red_carpet, /area/security/brig) +"nr" = ( +/obj/structure/hull_plate/end{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "ns" = ( /obj/machinery/camera/autoname{ dir = 5 @@ -5390,6 +5512,7 @@ /area/science/lab) "oH" = ( /obj/structure/grille, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "oI" = ( @@ -5511,6 +5634,7 @@ dir = 8 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/purple_carpet, /area/science) "oZ" = ( @@ -5525,6 +5649,7 @@ /obj/effect/turf_decal/tile/blue/flat_side{ dir = 8 }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "pb" = ( @@ -5555,6 +5680,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering) "pd" = ( @@ -5566,7 +5692,6 @@ "pe" = ( /obj/structure/closet/secure_closet/hos, /obj/item/radio/intercom/directional/north, -/obj/item/gun/energy/e_gun/mini/heads, /turf/open/floor/carpet/ship/red_carpet, /area/crew_quarters/heads/hos) "pf" = ( @@ -5838,6 +5963,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/wood, /area/crew_quarters/dorms) "pT" = ( @@ -5894,6 +6020,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/xenobiology) "qa" = ( @@ -5919,6 +6046,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "qd" = ( @@ -5974,6 +6102,7 @@ name = " Nanite lab"; req_one_access_txt = "55" }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/xenobiology) "qk" = ( @@ -6191,6 +6320,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/medical/medbay) "qP" = ( @@ -6247,6 +6377,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet, /area/nsv/weapons) "qW" = ( @@ -6357,6 +6488,7 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "ro" = ( @@ -6421,8 +6553,26 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/ship/command{ + name = "Gravity Generator Room"; + req_one_access_txt = "10" + }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/engine/gravity_generator) +"rx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/mob/living/simple_animal/bot/secbot/beepsky, +/turf/open/floor/carpet/ship, +/area/hallway/primary/port) "ry" = ( /obj/structure/cable/yellow, /obj/machinery/shieldgen, @@ -6576,6 +6726,9 @@ icon_state = "1-2" }, /obj/structure/table/glass/plasma, +/obj/machinery/recharger{ + pixel_x = 7 + }, /turf/open/floor/circuit, /area/bridge/cic) "sb" = ( @@ -6777,6 +6930,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay) "sB" = ( @@ -7006,6 +7160,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering) "tg" = ( @@ -7064,6 +7219,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/security/brig) "tp" = ( @@ -7450,6 +7606,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/ship/public/glass, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "uq" = ( @@ -7475,6 +7632,13 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/port) +"ut" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/mob/living/simple_animal/mothroach, +/turf/open/floor/durasteel/techfloor_grid, +/area/science/robotics) "uu" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -7606,6 +7770,7 @@ /obj/machinery/camera/autoname{ dir = 10 }, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "uM" = ( @@ -7690,6 +7855,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "uY" = ( @@ -7856,6 +8022,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -7891,6 +8058,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/bridge/cic) "vx" = ( @@ -8078,6 +8246,7 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/mob/living/simple_animal/hostile/carp/cayenne, /turf/open/floor/carpet/ship/red_carpet, /area/crew_quarters/heads/hos) "vU" = ( @@ -8092,6 +8261,9 @@ icon_state = "2-8" }, /obj/structure/table/glass/plasma, +/obj/machinery/recharger{ + pixel_x = 7 + }, /turf/open/floor/circuit, /area/bridge/cic) "vX" = ( @@ -8145,6 +8317,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/teleporter) "wb" = ( @@ -8411,6 +8584,13 @@ }, /turf/open/floor/carpet/ship/red_carpet, /area/security/brig) +"wM" = ( +/obj/structure/hull_plate/end{ + dir = 5 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "wN" = ( /obj/structure/cable{ icon_state = "1-4" @@ -8483,6 +8663,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, +/mob/living/simple_animal/bot/secbot/pingsky, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/aisat/hallway) "wV" = ( @@ -8694,6 +8875,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "xv" = ( @@ -8764,6 +8946,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/landmark/nuclear_waste_spawner, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "xE" = ( @@ -8912,6 +9095,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -9012,6 +9196,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/aisat_interior) "yj" = ( @@ -9036,6 +9221,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "yl" = ( @@ -9072,6 +9258,7 @@ dir = 1 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "yp" = ( @@ -9295,6 +9482,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/maintenance/nsv/ftlroom) "yU" = ( @@ -9401,6 +9589,7 @@ /obj/structure/hull_plate/end{ dir = 8 }, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "zm" = ( @@ -9531,6 +9720,10 @@ name = "nanoweave carpet (puce)" }, /area/nsv/weapons/fore) +"zD" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/maintenance/nsv/port_substation) "zE" = ( /obj/machinery/ai_slipper, /obj/structure/cable{ @@ -9704,6 +9897,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/maintenance/nsv/bunker) "zW" = ( @@ -9782,6 +9976,10 @@ name = "nanoweave carpet (puce)" }, /area/nsv/weapons/fore) +"Ad" = ( +/obj/effect/landmark/start/randommaint, +/turf/open/floor/plating, +/area/maintenance/nsv/starboard_substation) "Ae" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -9905,6 +10103,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/engine/engineering/reactor_core) "Ax" = ( @@ -9991,6 +10190,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/purple_carpet, /area/science/lab) "AL" = ( @@ -10055,6 +10255,7 @@ dir = 8 }, /obj/structure/closet/radiation, +/obj/machinery/firealarm/directional/west, /turf/open/floor/circuit, /area/bridge/cic) "AT" = ( @@ -10118,6 +10319,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/engine/shield_generator) "Ba" = ( @@ -10299,11 +10501,11 @@ req_one_access_txt = "69" }, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/airlock/ship/public/glass, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet{ color = "#CC8899"; name = "nanoweave carpet (puce)" @@ -10363,6 +10565,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/plasteel, /area/science/lobby) "BM" = ( @@ -10440,6 +10643,12 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/port) +"BZ" = ( +/obj/structure/hull_plate/end, +/obj/machinery/camera/autoname, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "Cb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10471,6 +10680,10 @@ "Cf" = ( /turf/closed/wall/r_wall/ship, /area/crew_quarters/dorms) +"Cg" = ( +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/ship, +/area/ai_monitored/turret_protected/ai) "Ch" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10510,6 +10723,13 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) +"Cl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/carpet/ship, +/area/hallway/primary/port) "Cm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -10545,7 +10765,8 @@ "Cr" = ( /obj/machinery/conveyor/slow{ dir = 10; - id = "atlas_torp" + id = "atlas_torp"; + verted = -1 }, /obj/structure/lattice/catwalk/over/ship/dark, /obj/item/ship_weapon/ammunition/torpedo/plushtide, @@ -10681,6 +10902,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"CK" = ( +/obj/structure/lattice, +/obj/structure/grille/wall, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "CM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10739,6 +10966,7 @@ dir = 8 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "CW" = ( @@ -10770,6 +10998,7 @@ name = "Warden Office"; req_one_access_txt = "3" }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/security/armory) "Dc" = ( @@ -11129,6 +11358,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/purple_carpet, /area/crew_quarters/heads/hor) "Ea" = ( @@ -11166,6 +11396,7 @@ dir = 1 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "Ee" = ( @@ -11352,6 +11583,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/red_carpet, /area/security/brig) "EE" = ( @@ -11386,6 +11618,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "EG" = ( @@ -11493,6 +11726,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/teleporter) "EX" = ( @@ -11784,6 +12018,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/maintenance/nsv/ftlroom) "FF" = ( @@ -11857,6 +12092,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/aisat_interior) "FK" = ( @@ -11974,6 +12210,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hydroponics) "Ga" = ( @@ -11993,7 +12230,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/item/gun/energy/laser/retro/sc_retro, +/obj/item/gun/energy/laser/retro/old, /turf/open/floor/carpet/ship, /area/ai_monitored/security/armory) "Gc" = ( @@ -12319,6 +12556,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "GY" = ( @@ -12347,6 +12585,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/ai_upload_foyer) "Ha" = ( @@ -12358,6 +12597,16 @@ name = "nanoweave carpet (bluer)" }, /area/crew_quarters/heads/captain/private) +"Hb" = ( +/obj/structure/hull_plate/end{ + dir = 9 + }, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "Hd" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ dir = 4 @@ -12455,6 +12704,7 @@ /obj/machinery/camera/autoname{ dir = 8 }, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "Hv" = ( @@ -12860,6 +13110,7 @@ /area/tcommsat/server) "IC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/mob/living/simple_animal/bot/medbot/catmedbot, /turf/open/floor/monotile/light, /area/medical/medbay) "ID" = ( @@ -13030,6 +13281,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/crew_quarters/heads/cmo) "Ja" = ( @@ -13391,6 +13643,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/monotile/light, /area/medical/medbay) "JZ" = ( @@ -13545,6 +13798,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/engine/engineering) "KB" = ( @@ -13587,6 +13841,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/maintenance/nsv/bunker) "KI" = ( @@ -13659,6 +13914,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) "KT" = ( @@ -13775,6 +14031,7 @@ dir = 8 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "Lo" = ( @@ -13828,6 +14085,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet, /area/nsv/weapons/port) "Lr" = ( @@ -14054,6 +14312,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) "LU" = ( @@ -14458,6 +14717,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet, /area/nsv/weapons/port) "Ne" = ( @@ -14529,6 +14789,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/aisat/hallway) "Nk" = ( @@ -14651,6 +14912,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hydroponics) "NA" = ( @@ -14783,6 +15045,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/cargo/lobby) "NQ" = ( @@ -14822,6 +15085,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine/light, /area/maintenance/nsv/ftlroom) "NU" = ( @@ -14869,6 +15133,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/tcommsat/computer) "Oa" = ( @@ -15272,6 +15537,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/robotics) "Pb" = ( @@ -15281,6 +15547,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/carpet/ship/orange_carpet, /area/maintenance/nsv/ftlroom) +"Pc" = ( +/obj/structure/hull_plate/end{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "Pd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -15386,6 +15659,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering) "Pr" = ( @@ -15524,6 +15798,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/cargo/lobby) "PH" = ( @@ -15662,7 +15937,7 @@ /obj/item/storage/box/chemimp, /obj/machinery/camera/motion, /obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/laser/retro/sc_retro, +/obj/item/gun/energy/laser/retro/old, /turf/open/floor/carpet/ship/red_carpet, /area/ai_monitored/security/armory) "PY" = ( @@ -15807,6 +16082,13 @@ /obj/machinery/smartfridge/drying_rack, /turf/open/floor/carpet/ship, /area/hydroponics) +"Qv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/ship, +/area/hallway/primary/port) "Qx" = ( /obj/machinery/power/apc/auto_name/east, /obj/structure/cable{ @@ -15834,6 +16116,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/red_carpet, /area/crew_quarters/heads/hos) "Qz" = ( @@ -16027,6 +16310,7 @@ /obj/machinery/camera/motion{ dir = 10 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/carpet/ship, /area/teleporter) "Re" = ( @@ -16328,6 +16612,19 @@ }, /turf/open/floor/engine, /area/engine/shield_generator) +"Sb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/mob/living/simple_animal/hostile/mimic/crate, +/turf/open/floor/plating, +/area/maintenance/nsv/port_substation) "Sc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16369,6 +16666,14 @@ /obj/machinery/computer/lore_terminal, /turf/open/floor/carpet/ship, /area/hallway/primary/port) +"Si" = ( +/obj/structure/hull_plate/end{ + dir = 6 + }, +/obj/machinery/camera/autoname, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "Sk" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/tile/yellow/flat_side{ @@ -17168,6 +17473,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/blue{ color = "#9999DD"; name = "nanoweave carpet (bluer)" @@ -17471,6 +17777,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/security) "Vn" = ( @@ -17486,6 +17793,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/nsv/hanger) "Vo" = ( @@ -17504,6 +17812,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/engine/gravity_generator) "Vp" = ( @@ -17631,6 +17940,7 @@ /area/ai_monitored/security/armory) "VF" = ( /obj/structure/grille/wall, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "VG" = ( @@ -17751,6 +18061,19 @@ }, /turf/open/floor/carpet/ship, /area/hallway/primary/starboard) +"VV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/carpet/ship, +/area/hallway/primary/port) "VW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17812,6 +18135,7 @@ dir = 8 }, /obj/machinery/door/firedoor/heavy, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "Wd" = ( @@ -17868,6 +18192,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/ship, /area/hallway/primary/port) "Wn" = ( @@ -18161,6 +18486,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/robotics) "WX" = ( @@ -18254,6 +18580,9 @@ /area/maintenance/nsv/ftlroom) "Xk" = ( /obj/structure/closet/wardrobe/atmospherics_yellow, +/obj/machinery/camera/motion{ + dir = 4 + }, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/atmos/port_atmos) "Xn" = ( @@ -18351,6 +18680,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine/light, /area/tcommsat/computer) "Xz" = ( @@ -18380,6 +18710,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet, /area/nsv/weapons/port) "XC" = ( @@ -18420,6 +18751,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/durasteel/techfloor_grid, /area/science/robotics) "XJ" = ( @@ -18451,6 +18783,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine/light, /area/maintenance/nsv/starboard_substation) "XO" = ( @@ -18526,6 +18859,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/carpet/ship/beige_carpet, /area/nsv/crew_quarters/heads/maa) "XZ" = ( @@ -18587,6 +18921,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/engine/armour_pump) "Yg" = ( @@ -18720,8 +19055,8 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos/port_atmos) "Yy" = ( -/obj/structure/grille, -/obj/structure/grille, +/obj/structure/lattice, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "Yz" = ( @@ -19072,6 +19407,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/landmark/zebra_interlock_point, /turf/open/floor/engine, /area/maintenance/nsv/bunker) "ZE" = ( @@ -25378,7 +25714,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -26802,23 +27138,23 @@ fh fh fh fh -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy fh fh fh @@ -27004,7 +27340,7 @@ fh fh fh fh -gM +fy zl zl zl @@ -27020,8 +27356,7 @@ zl Hu zl zl -xX -fh +nr fh fh fh @@ -27030,6 +27365,7 @@ fh fh fh fh +hu fh fh fh @@ -27607,7 +27943,7 @@ fh fh fh VF -gM +fy qG qG qG @@ -27809,7 +28145,7 @@ fh fh fh VF -wB +cK qG qG Pz @@ -28011,7 +28347,7 @@ fh fh fh VF -wB +cK qG qG ZS @@ -28235,7 +28571,7 @@ SX ZS qG qG -dR +cA VF fh fh @@ -28415,7 +28751,7 @@ fh fh fh VF -Id +Yy bk qG ZS @@ -28617,7 +28953,7 @@ fh fh fh VF -Id +Yy xk qG ZS @@ -28801,7 +29137,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -28819,7 +29155,7 @@ fh fh fh VF -Id +Yy xk qG ZS @@ -28866,7 +29202,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -29021,7 +29357,7 @@ fh fh fh VF -Id +Yy xk qG ZS @@ -29223,7 +29559,7 @@ fh fh fh VF -Id +Yy gM qG ZS @@ -29425,7 +29761,7 @@ fh fh fh VF -Je +Hb qG qG ZS @@ -29447,7 +29783,7 @@ SX ZS qG qG -xX +nr VF fh fh @@ -29626,7 +29962,7 @@ fh fh fh fh -gM +fy qG qG qG @@ -31683,7 +32019,7 @@ nF pM ml Wj -Mv +gV Ak Mv Wj @@ -31887,7 +32223,7 @@ Sl Ei Mv Ho -Mv +Ad Wj Sp Sp @@ -33248,7 +33584,7 @@ qG qG yf wl -iB +Sb Vt sd kS @@ -33651,7 +33987,7 @@ er Sp Sp yf -wl +zD iB ta rP @@ -33839,7 +34175,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -36698,7 +37034,7 @@ NK Nq bL iL -ZM +rx GO QM yy @@ -37512,7 +37848,7 @@ mX yy Ci Nl -FU +ut FU Pa Nr @@ -37545,7 +37881,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -38113,7 +38449,7 @@ nG sA ur qU -zM +Cl xB Iv GO @@ -38706,8 +39042,8 @@ fh fh fh fh -Id -gM +Yy +fy cj cj Xg @@ -38908,8 +39244,8 @@ fh fh fh VF -Id -wB +Yy +cK cj Xg OU @@ -39110,8 +39446,8 @@ fh fh fh VF -Id -wB +Yy +cK cj Xg cj @@ -39312,8 +39648,8 @@ fh fh fh VF -Id -wB +Yy +cK cj Xg cj @@ -39514,8 +39850,8 @@ fh fh fh VF -Id -wB +Yy +cK cj Xg cj @@ -39528,7 +39864,7 @@ Ja cj Xg cj -ZM +VV iL FZ GK @@ -39716,8 +40052,8 @@ fh fh fh VF -Id -wB +Yy +cK cj Xg OU @@ -39918,8 +40254,8 @@ fh fh fh VF -Id -wB +Yy +cK cj cj Xg @@ -40120,8 +40456,8 @@ fh fh fh VF -Id -mq +Yy +jf cj cj cj @@ -40322,8 +40658,8 @@ fh fh fh VF -Id -wB +Yy +cK cj cj cj @@ -40365,9 +40701,8 @@ fG Tt Tt bB -bB -dR -fh +ea +cA fh fh fh @@ -40382,6 +40717,7 @@ fh fh fh fh +hu fh fh fh @@ -40539,7 +40875,7 @@ Vq CZ cj ZM -iL +Qv wz yz wz @@ -40567,7 +40903,7 @@ fG Tt Tt bB -nV +eL Id VF fh @@ -40769,7 +41105,7 @@ og EX Tt bB -nV +eL Id VF fh @@ -40971,7 +41307,7 @@ lZ sy Tt bB -nV +eL Id VF fh @@ -41173,7 +41509,7 @@ DJ lL Tt bB -nV +eL Id VF fh @@ -41375,7 +41711,7 @@ NE lL Tt bB -nV +eL Id VF fh @@ -41559,7 +41895,7 @@ wz Ij wz iQ -Yn +Cg wz yz wz @@ -41577,7 +41913,7 @@ kK qn Tt bB -nV +eL Id VF fh @@ -41779,7 +42115,7 @@ kK qn Tt bB -nV +eL Id VF fh @@ -41981,7 +42317,7 @@ kK qn Tt bB -nV +eL Id VF fh @@ -42183,7 +42519,7 @@ Bh Es Tt bB -nV +eL Id VF fh @@ -42358,7 +42694,7 @@ pR Cf ZM ur -zM +Cl XD dx vL @@ -42386,8 +42722,8 @@ xg Tt bB rn -xX -fh +nr +fu fh fh fh @@ -42588,7 +42924,7 @@ Lq gt Re gt -nV +eL Id VF fh @@ -42730,7 +43066,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -42790,7 +43126,7 @@ Ng XB Gm gt -nV +eL Id VF fh @@ -42980,7 +43316,7 @@ iT gt cE NX -Cd +lf Ob Ob Ob @@ -42992,7 +43328,7 @@ Qp gt gt gt -nV +eL Id VF fh @@ -43150,7 +43486,7 @@ fh fh VF Id -wB +cK KV KV KV @@ -43194,7 +43530,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -43352,7 +43688,7 @@ fh fh VF Id -wB +cK KV Rs UK @@ -43396,7 +43732,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -43554,7 +43890,7 @@ fh fh VF Id -wB +cK KV ey Lj @@ -43578,7 +43914,7 @@ qx GA yK mL -it +eP GT YV oR @@ -43598,7 +43934,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -43756,7 +44092,7 @@ fh fh VF Id -wB +cK KV KV bT @@ -43800,7 +44136,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -43958,7 +44294,7 @@ fh fh VF Id -wB +cK KV KV Jn @@ -44002,7 +44338,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -44160,7 +44496,7 @@ fh fh VF Id -wB +cK PP PP Zg @@ -44204,7 +44540,7 @@ Hn gB gt gt -nV +eL Id VF fh @@ -44362,7 +44698,7 @@ fh fh VF Id -wB +cK PP PP RD @@ -44406,7 +44742,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -44564,7 +44900,7 @@ fh fh VF Id -wB +cK PP PP cQ @@ -44608,7 +44944,7 @@ Hn mx gt gt -nV +eL Id VF fh @@ -44764,8 +45100,8 @@ fh fh fh fh -fh -fh +CK +lV PP PP PP @@ -44820,7 +45156,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -45014,7 +45350,7 @@ oq ee gm Id -Id +Yy fh fh fh @@ -45371,8 +45707,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP oQ @@ -45573,8 +45909,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP tD @@ -45775,8 +46111,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP hI @@ -45977,8 +46313,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP hI @@ -46022,7 +46358,7 @@ ub TZ Ki ae -WH +BZ Id VF fh @@ -46179,8 +46515,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP NY @@ -46224,7 +46560,7 @@ nK dk Ki ae -nV +eL Id VF fh @@ -46381,8 +46717,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP tz @@ -46426,7 +46762,7 @@ BJ EO Ki ae -nV +eL Id VF fh @@ -46583,8 +46919,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP ES @@ -46607,7 +46943,7 @@ nP nP cO la -cO +fm qT qT qT @@ -46628,7 +46964,7 @@ VY gH Ki ae -nV +eL Id VF fh @@ -46785,8 +47121,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP hI @@ -46830,7 +47166,7 @@ IM iz ae ae -nV +eL Id VF fh @@ -46987,8 +47323,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP hI @@ -47032,7 +47368,7 @@ Hg gA ae ae -nV +eL Id VF fh @@ -47189,8 +47525,8 @@ fh fh fh VF -Id -wB +Yy +cK PP PP hI @@ -47234,7 +47570,7 @@ HX iz ae ae -nV +eL Id VF fh @@ -47391,8 +47727,8 @@ fh fh fh VF -Id -mq +Yy +jf PP PP nI @@ -47436,7 +47772,7 @@ iz iz ae ae -nV +eL Id VF fh @@ -47638,7 +47974,7 @@ uY ae ae ae -nV +eL Id VF fh @@ -47840,7 +48176,7 @@ wI ae ae ae -nV +eL Id VF fh @@ -48042,7 +48378,7 @@ gA ae ae ae -WH +BZ Id VF fh @@ -48244,7 +48580,7 @@ oI ae ae ae -dR +cA Id VF fh @@ -48445,7 +48781,7 @@ QF iz ae ae -nV +eL Id VF fh @@ -48647,7 +48983,7 @@ QF iz ae ae -nV +eL Id VF fh @@ -48663,7 +48999,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -48849,7 +49185,7 @@ QF ae ae ae -dR +cA Id VF fh @@ -49050,7 +49386,7 @@ WU mv ae ae -nV +eL Id VF fh @@ -49252,7 +49588,7 @@ QF QF ae ae -nV +eL Id VF fh @@ -49454,7 +49790,7 @@ Hf QF ae ae -nV +eL Id VF fh @@ -49627,9 +49963,9 @@ bB bB bB ks -ks -ks -bB +Pc +Pc +ea nT nT nT @@ -49656,7 +49992,7 @@ lc xR ae ae -nV +eL Id VF fh @@ -49829,26 +50165,26 @@ bB bB nV fh -Id -Id -wB -bB -bB -bB -bB -bB -bB -bB -bB -bB -bB -bB -bB -bB -nV -Id -Id -wB +Yy +Yy +cK +ea +ea +ea +ea +ea +ea +ea +ea +ea +ea +ea +ea +ea +eL +Yy +Yy +cK ae ae xO @@ -49858,7 +50194,7 @@ xR ae ae ae -dR +cA Id VF fh @@ -50032,25 +50368,25 @@ bB nV fh oH -Id -SA -ks -ks -ks -ks -ks -ks -ks -ks -ks -ks -ks -ks -ks -dR -Id +Yy +wM +Pc +Pc +Pc +Pc +Pc +Pc +Pc +Pc +Pc +Pc +Pc +Pc +Pc +cA +Yy oH -wB +cK ae ae xO @@ -50059,7 +50395,7 @@ QF sL ae ae -nV +eL Id VF fh @@ -50234,25 +50570,25 @@ bB nV fh oH -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id -Id +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy oH -wB +cK ae ae xO @@ -50261,7 +50597,7 @@ QF iz ae ae -nV +eL Id VF fh @@ -50438,7 +50774,6 @@ fh oH oH oH -Yy oH oH oH @@ -50454,7 +50789,8 @@ oH oH oH oH -wB +oH +cK ae ae jT @@ -50463,7 +50799,7 @@ IM ae ae ae -cD +Si Id VF fh @@ -50664,7 +51000,7 @@ iz Zy ae ae -nV +eL Id VF fh @@ -50866,7 +51202,7 @@ We Fr ae ae -nV +eL Id VF fh @@ -51068,7 +51404,7 @@ iz HX ae ae -nV +eL Id VF fh @@ -51270,7 +51606,7 @@ iz iz ae ae -dR +cA Id VF fh @@ -52635,7 +52971,7 @@ fh fh fh fh -fh +hu fh fh fh @@ -53674,7 +54010,7 @@ fh fh fh fh -fh +hu fh fh fh diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index b8a1d69898e..7df88b99f5a 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -27,11 +27,11 @@ /obj/item/gun/energy/e_gun/mini/heads name = "Personal Tiny Self Defense Gun" - desc = "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Nanotrasen. It has two settings: disable and kill." - ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser) ///uses the hos disabler rounds to slightly weaken the disabler count and also to avoid encountering a visual bug where the gun is out of charge but displays that it has one enough for another shot. + desc = "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Solgov. It has two settings: disable and kill." + ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser) ///uses the hos disabler rounds to slightly weaken the disabler count and also to avoid encountering a visual bug where the gun is out of charge but displays that it has one enough for another shot. selfcharge = 1 charge_delay = 20 - can_charge = FALSE ///Not compatible with fast charging stations, must recharge slowly. + can_charge = FALSE ///Not compatible with fast charging stations, must recharge slowly. icon_state = "personal" item_state = "gun" ammo_x_offset = 2 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 281440ffb02..5edfa32d2e7 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -19,13 +19,13 @@ /obj/item/gun/energy/laser/retro name ="retro laser gun" icon_state = "retro" - desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws." + desc = "A modern lasergun, used by Solgov's private security or military forces. it is quite deadly and easy to maintain, making it a favorite." ammo_x_offset = 3 /obj/item/gun/energy/laser/retro/old name ="laser gun" icon_state = "retro" - desc = "First generation lasergun, developed by Nanotrasen. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate. You really hope someone has developed a better lasergun while you were in cryo." + desc = "First generation lasergun, developed by Nanotrasen. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate." ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old) ammo_x_offset = 3