From 5e9cd28b63510c5933e11caf47de75cac1bedf88 Mon Sep 17 00:00:00 2001 From: shizcalev Date: Tue, 1 Aug 2017 15:45:41 -0400 Subject: [PATCH 1/3] added turrets to AI sat bridge area --- _maps/map_files/PubbyStation/PubbyStation.dmm | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index b46901c8900..5db658d14ef 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, @@ -53682,6 +53688,17 @@ 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) (1,1,1) = {" aaa @@ -71585,7 +71602,7 @@ bWV bWV bWV bWV -ccI +cbR bWV bWV ceP @@ -86376,15 +86393,15 @@ ada adl adx adL -adX aeh aeh -adX +aeh +aeh aeN afe afx afx -afx +cnC adX adX adX @@ -86890,10 +86907,10 @@ adc adn adz adL -adX aeh aeh -adX +aeh +aeh aeN afg afz From da70787dc9a38cee62fa0b9de1df177b0f44a052 Mon Sep 17 00:00:00 2001 From: shizcalev Date: Tue, 1 Aug 2017 21:04:28 -0400 Subject: [PATCH 2/3] Made the AI sat bridge longer. --- _maps/map_files/PubbyStation/PubbyStation.dmm | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 5db658d14ef..5b6f49ad72c 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -53699,6 +53699,28 @@ 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 @@ -84331,7 +84353,7 @@ aaa aaa aaa aaa -aaa +aby aby aby aby @@ -84574,7 +84596,6 @@ aaa aaa aaa aaa -aaa aby aby aby @@ -84598,6 +84619,7 @@ aaa abI aaa aaa +aaa acP acP acP @@ -84833,7 +84855,6 @@ aaa aaa aaa aaa -aaa abI aaa aaa @@ -84855,6 +84876,7 @@ adS adS adS adS +adS aeJ aeY aft @@ -85088,7 +85110,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -85111,6 +85132,7 @@ adH adT aee aee +aee aev adv aeZ @@ -85345,7 +85367,6 @@ aaa aaa aaa aaa -aaa aby abI abO @@ -85368,6 +85389,7 @@ adI adU aef aef +aef aew aeK afa @@ -85602,7 +85624,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -85624,6 +85645,7 @@ adu adJ adV adV +cnD adV adV aeL @@ -85859,7 +85881,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -85881,6 +85902,7 @@ adv adK adW aeg +cnE aeg aex aeM @@ -86116,7 +86138,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -86138,6 +86159,7 @@ adw adL adV adV +cnF adV adV aeN @@ -86373,7 +86395,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -86393,10 +86414,11 @@ ada adl adx adL +adX aeh aeh aeh -aeh +adX aeN afe afx @@ -86630,7 +86652,6 @@ aaa aaa aaa aaa -aaa aby abJ abO @@ -86653,6 +86674,7 @@ adM adY aei aei +aei aey aeO aff @@ -86887,7 +86909,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -86907,10 +86928,11 @@ adc adn adz adL +adX aeh aeh aeh -aeh +adX aeN afg afz @@ -87144,7 +87166,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -87166,6 +87187,7 @@ adA adL adZ adZ +cnG adZ adZ aeP @@ -87401,7 +87423,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -87423,6 +87444,7 @@ adB adN aea aej +cnH aej aez aeQ @@ -87658,7 +87680,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -87680,6 +87701,7 @@ adC adO adZ adZ +cnI adZ adZ aeR @@ -87915,7 +87937,6 @@ aaa aaa aaa aaa -aaa aby abI abO @@ -87938,6 +87959,7 @@ adP aeb aek aek +aek aeA adF afk @@ -88172,7 +88194,6 @@ aaa aaa aaa aaa -aaa aby aaa abO @@ -88195,6 +88216,7 @@ adQ aec ael ael +ael aeB aeS afl @@ -88431,7 +88453,6 @@ aaa aaa aaa aaa -aaa abI aaa aaa @@ -88454,6 +88475,7 @@ acU acU acU acU +acU afm afB afT @@ -88686,7 +88708,6 @@ aaa aaa aaa aaa -aaa aby aby aby @@ -88710,6 +88731,7 @@ aaa abI aaa aaa +aaa acU acU acU @@ -88956,7 +88978,6 @@ aaa aaa aaa aaa -aaa acO aby aby @@ -88966,6 +88987,7 @@ aby aby aby aby +aby aaa abI aaa From 747d82090440a197914321e99ce3053505d129c6 Mon Sep 17 00:00:00 2001 From: shizcalev Date: Tue, 1 Aug 2017 21:12:30 -0400 Subject: [PATCH 3/3] Cleaned up stacked pipes in engineering noticed dream daemon spitting out errors about it. --- _maps/map_files/PubbyStation/PubbyStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 5b6f49ad72c..4cc0b5c1589 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -47048,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" = (