From 521c149627f8487ae775b78eb1ada37c434217c6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 5 Aug 2017 12:30:21 -0500 Subject: [PATCH] [Pubby] added turrets to AI sat bridge area (#2235) --- _maps/map_files/PubbyStation/PubbyStation.dmm | 96 +++++++++++++------ 1 file changed, 67 insertions(+), 29 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index b46901c890..4cc0b5c158 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -1037,6 +1037,7 @@ icon_state = "1-8" }, /obj/machinery/turretid{ + control_area = "AI Chamber"; name = "AI Chamber turret control"; pixel_x = 5; pixel_y = -24 @@ -1055,7 +1056,8 @@ /area/wreck/ai) "acs" = ( /obj/machinery/turretid{ - name = "AI Chamber turret control"; + control_area = "AI Satellite Antechamber"; + name = "AI Satellite turret control"; pixel_x = -5; pixel_y = -24 }, @@ -1777,10 +1779,12 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "aeg" = ( -/obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAP) +/obj/machinery/porta_turret/ai{ + installation = /obj/item/weapon/gun/energy/e_gun + }, +/turf/open/floor/plating/airless, +/area/ai_monitored/turret_protected/aisat_interior) "aeh" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, @@ -1794,10 +1798,12 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) "aej" = ( -/obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/space, -/area/ai_monitored/turret_protected/AIsatextAS) +/obj/machinery/porta_turret/ai{ + installation = /obj/item/weapon/gun/energy/e_gun + }, +/turf/open/floor/plating/airless, +/area/ai_monitored/turret_protected/aisat_interior) "aek" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, @@ -47042,7 +47048,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black, /area/engine/engine_smes) "bYi" = ( @@ -53682,6 +53687,39 @@ dir = 4 }, /area/science/research/lobby) +"cnC" = ( +/obj/machinery/turretid{ + control_area = "AI Satellite Antechamber"; + name = "AI Satellite turret control"; + pixel_x = -5; + pixel_y = -24 + }, +/turf/open/floor/plasteel/darkblue/side{ + dir = 8 + }, +/area/ai_monitored/turret_protected/aisat_interior) +"cnD" = ( +/turf/open/space/basic, +/area/ai_monitored/turret_protected/AIsatextAP) +"cnE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/lattice, +/turf/open/space/basic, +/area/ai_monitored/turret_protected/AIsatextAP) +"cnF" = ( +/turf/open/space/basic, +/area/ai_monitored/turret_protected/AIsatextAP) +"cnG" = ( +/turf/open/space/basic, +/area/ai_monitored/turret_protected/AIsatextAS) +"cnH" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/space/basic, +/area/ai_monitored/turret_protected/AIsatextAS) +"cnI" = ( +/turf/open/space/basic, +/area/ai_monitored/turret_protected/AIsatextAS) (1,1,1) = {" aaa @@ -71585,7 +71623,7 @@ bWV bWV bWV bWV -ccI +cbR bWV bWV ceP @@ -84314,7 +84352,7 @@ aaa aaa aaa aaa -aaa +aby aby aby aby @@ -84557,7 +84595,6 @@ aaa aaa aaa aaa -aaa aby aby aby @@ -84581,6 +84618,7 @@ aaa abI aaa aaa +aaa acP acP acP @@ -84816,7 +84854,6 @@ aaa aaa aaa aaa -aaa abI aaa aaa @@ -84838,6 +84875,7 @@ adS adS adS adS +adS aeJ aeY aft @@ -85071,7 +85109,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -85094,6 +85131,7 @@ adH adT aee aee +aee aev adv aeZ @@ -85328,7 +85366,6 @@ aaa aaa aaa aaa -aaa aby abI abO @@ -85351,6 +85388,7 @@ adI adU aef aef +aef aew aeK afa @@ -85585,7 +85623,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -85607,6 +85644,7 @@ adu adJ adV adV +cnD adV adV aeL @@ -85842,7 +85880,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -85864,6 +85901,7 @@ adv adK adW aeg +cnE aeg aex aeM @@ -86099,7 +86137,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -86121,6 +86158,7 @@ adw adL adV adV +cnF adV adV aeN @@ -86356,7 +86394,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -86379,12 +86416,13 @@ adL adX aeh aeh +aeh adX aeN afe afx afx -afx +cnC adX adX adX @@ -86613,7 +86651,6 @@ aaa aaa aaa aaa -aaa aby abJ abO @@ -86636,6 +86673,7 @@ adM adY aei aei +aei aey aeO aff @@ -86870,7 +86908,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -86893,6 +86930,7 @@ adL adX aeh aeh +aeh adX aeN afg @@ -87127,7 +87165,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -87149,6 +87186,7 @@ adA adL adZ adZ +cnG adZ adZ aeP @@ -87384,7 +87422,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -87406,6 +87443,7 @@ adB adN aea aej +cnH aej aez aeQ @@ -87641,7 +87679,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -87663,6 +87700,7 @@ adC adO adZ adZ +cnI adZ adZ aeR @@ -87898,7 +87936,6 @@ aaa aaa aaa aaa -aaa aby abI abO @@ -87921,6 +87958,7 @@ adP aeb aek aek +aek aeA adF afk @@ -88155,7 +88193,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -88178,6 +88215,7 @@ adQ aec ael ael +ael aeB aeS afl @@ -88414,7 +88452,6 @@ aaa aaa aaa aaa -aaa abI aaa aaa @@ -88437,6 +88474,7 @@ acU acU acU acU +acU afm afB afT @@ -88669,7 +88707,6 @@ aaa aaa aaa aaa -aaa aby aby aby @@ -88693,6 +88730,7 @@ aaa abI aaa aaa +aaa acU acU acU @@ -88939,7 +88977,6 @@ aaa aaa aaa aaa -aaa acO aby aby @@ -88949,6 +88986,7 @@ aby aby aby aby +aby aaa abI aaa