From 9d956e7c1cb3aff9cb23ae001760968b87a9025f Mon Sep 17 00:00:00 2001 From: Detective-Google <48196179+Detective-Google@users.noreply.github.com> Date: Wed, 17 Jun 2020 01:32:04 -0500 Subject: [PATCH] a couple little snaxi fixes (#12539) * a couple little snaxi fixes * way too much blasma * asd * adadadada * a * bepis * patrol beacons * aaaaa --- _maps/map_files/Snaxi/Snaxi.dmm | 164 +++++++++++++++++++++----------- 1 file changed, 107 insertions(+), 57 deletions(-) diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 7198be1c25..37576ef011 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -3310,6 +3310,19 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) +"aWM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=HOP2"; + location = "Stbd" + }, +/turf/open/floor/plasteel, +/area/storage/primary) "aXh" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -3333,6 +3346,19 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"aYf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=QM"; + location = "CHW" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "aZz" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -5121,6 +5147,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal/bin, /turf/open/floor/plasteel, /area/quartermaster/qm) "bDg" = ( @@ -7177,9 +7204,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/door/poddoor/preopen{ - id = "capshut"; - name = "privacy shutters" +/obj/machinery/door/poddoor/shutters{ + id = "capshut" }, /turf/open/floor/plating, /area/crew_quarters/heads/captain) @@ -7441,9 +7467,8 @@ icon_state = "0-2" }, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "capshut"; - name = "privacy shutters" +/obj/machinery/door/poddoor/shutters{ + id = "capshut" }, /turf/open/floor/plating, /area/crew_quarters/heads/captain) @@ -7563,9 +7588,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/door/poddoor/preopen{ - id = "capshut"; - name = "privacy shutters" +/obj/machinery/door/poddoor/shutters{ + id = "capshut" }, /turf/open/floor/plating, /area/crew_quarters/heads/captain) @@ -8980,6 +9004,14 @@ pixel_y = 7 }, /obj/item/pen/red, +/obj/item/stamp{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = -2 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "cWO" = ( @@ -11413,11 +11445,11 @@ /turf/open/floor/plasteel, /area/storage/auxiliary) "ewI" = ( -/obj/machinery/rnd/production/circuit_imprinter, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 29 }, +/obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/plasteel/white, /area/science/robotics/lab) "ewK" = ( @@ -15265,14 +15297,14 @@ /turf/closed/wall/r_wall, /area/teleporter) "gLO" = ( -/obj/machinery/door/poddoor{ - id = "trash"; - name = "disposal bay door" - }, /obj/machinery/conveyor{ dir = 4; id = "garbage" }, +/obj/machinery/door/poddoor{ + id = "trash"; + name = "disposal bay door" + }, /turf/open/floor/plating, /area/maintenance/disposal) "gMD" = ( @@ -18139,6 +18171,10 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AIW"; + location = "QM" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "inA" = ( @@ -18262,6 +18298,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Stbd"; + location = "HOP" + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "irg" = ( @@ -19169,10 +19209,6 @@ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -19636,6 +19672,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AIE"; + location = "AftH" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "jhF" = ( @@ -19701,15 +19741,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/structure/table, -/obj/item/stamp{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stamp/denied{ - pixel_x = 4; - pixel_y = -2 - }, +/obj/machinery/computer/bounty, /turf/open/floor/plasteel, /area/quartermaster/storage) "jjB" = ( @@ -19718,12 +19750,6 @@ /area/crew_quarters/dorms) "jjC" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 - }, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, @@ -22567,11 +22593,6 @@ icon_state = "0-8" }, /obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/computer/security/telescreen{ - name = "Test Chamber Monitor"; - network = list("test"); - pixel_y = -30 - }, /turf/open/floor/plasteel/white, /area/science/misc_lab) "leq" = ( @@ -24654,6 +24675,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/engine/engineering) +"muk" = ( +/obj/machinery/rnd/bepis, +/turf/open/floor/engine, +/area/science/misc_lab) "muN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -25748,9 +25773,6 @@ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "ncH" = ( @@ -25992,7 +26014,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "nhO" = ( -/obj/machinery/airalarm{ +/obj/machinery/airalarm/server{ dir = 1; pixel_y = -22 }, @@ -27527,9 +27549,6 @@ name = "Electrical Maintenance"; req_access_txt = "11" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/construction/storage) @@ -27835,6 +27854,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"okq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Dorm"; + location = "HOP2" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "okt" = ( /obj/machinery/light/small, /obj/effect/landmark/event_spawn, @@ -29490,6 +29519,7 @@ dir = 1 }, /obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, /turf/open/floor/plating, /area/engine/engineering) "piX" = ( @@ -32380,7 +32410,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -32880,6 +32909,10 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CHE"; + location = "AIE" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "rfj" = ( @@ -36951,6 +36984,11 @@ "tDO" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/computer/security/telescreen{ + name = "Test Chamber Monitor"; + network = list("test"); + pixel_x = -30 + }, /turf/open/floor/plasteel/white, /area/science/misc_lab) "tDY" = ( @@ -39545,6 +39583,13 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"veC" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CHW"; + location = "Dorm" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "veF" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -42215,9 +42260,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/machinery/door/airlock/atmos/abandoned{ name = "Atmospherics Maintenance"; req_access_txt = "12;24" @@ -43558,6 +43600,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/maintenance/disposal) +"xzn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=HOP"; + location = "CHE" + }, +/turf/open/floor/carpet, +/area/hallway/secondary/exit/departure_lounge) "xzL" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -66113,7 +66163,7 @@ xUL dYZ jKV fYx -oDm +aYf xSN wje jrH @@ -77974,7 +78024,7 @@ qGn lud ngB joq -wdk +xzn wdk iOW wdk @@ -79545,7 +79595,7 @@ gZG dRF lep bEa -bcp +muk bcp bEa udT @@ -82543,7 +82593,7 @@ qFH tYo dJb iJs -mtP +veC unt raA lfV @@ -87661,7 +87711,7 @@ avT bBh avT aKf -gLO +irQ huF cfp gxY @@ -89208,7 +89258,7 @@ irQ emH cfp gmH -gNI +okq skK vKa vgH @@ -89974,7 +90024,7 @@ avT bBh avT aKf -irQ +gLO jvV evO cfp @@ -93595,7 +93645,7 @@ qgm hcu vju eYu -xOj +aWM vUs gUa sda