Merge pull request #29635

This commit is contained in:
Cyberboss
2017-08-02 18:42:21 -04:00
+67 -29
View File
@@ -1035,6 +1035,7 @@
icon_state = "1-8"
},
/obj/machinery/turretid{
control_area = "AI Chamber";
name = "AI Chamber turret control";
pixel_x = 5;
pixel_y = -24
@@ -1053,7 +1054,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
},
@@ -1771,10 +1773,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,
@@ -1788,10 +1792,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,
@@ -46842,7 +46848,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" = (
@@ -53468,6 +53473,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
@@ -71371,7 +71409,7 @@ bWV
bWV
bWV
bWV
ccI
cbR
bWV
bWV
ceP
@@ -84100,7 +84138,7 @@ aaa
aaa
aaa
aaa
aaa
aby
aby
aby
aby
@@ -84343,7 +84381,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aby
aby
@@ -84367,6 +84404,7 @@ aaa
abI
aaa
aaa
aaa
acP
acP
acP
@@ -84602,7 +84640,6 @@ aaa
aaa
aaa
aaa
aaa
abI
aaa
aaa
@@ -84624,6 +84661,7 @@ adS
adS
adS
adS
adS
aeJ
aeY
aft
@@ -84857,7 +84895,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -84880,6 +84917,7 @@ adH
adT
aee
aee
aee
aev
adv
aeZ
@@ -85114,7 +85152,6 @@ aaa
aaa
aaa
aaa
aaa
aby
abI
abO
@@ -85137,6 +85174,7 @@ adI
adU
aef
aef
aef
aew
aeK
afa
@@ -85371,7 +85409,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -85393,6 +85430,7 @@ adu
adJ
adV
adV
cnD
adV
adV
aeL
@@ -85628,7 +85666,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -85650,6 +85687,7 @@ adv
adK
adW
aeg
cnE
aeg
aex
aeM
@@ -85885,7 +85923,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -85907,6 +85944,7 @@ adw
adL
adV
adV
cnF
adV
adV
aeN
@@ -86142,7 +86180,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -86165,12 +86202,13 @@ adL
adX
aeh
aeh
aeh
adX
aeN
afe
afx
afx
afx
cnC
adX
adX
adX
@@ -86399,7 +86437,6 @@ aaa
aaa
aaa
aaa
aaa
aby
abJ
abO
@@ -86422,6 +86459,7 @@ adM
adY
aei
aei
aei
aey
aeO
aff
@@ -86656,7 +86694,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -86679,6 +86716,7 @@ adL
adX
aeh
aeh
aeh
adX
aeN
afg
@@ -86913,7 +86951,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -86935,6 +86972,7 @@ adA
adL
adZ
adZ
cnG
adZ
adZ
aeP
@@ -87170,7 +87208,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -87192,6 +87229,7 @@ adB
adN
aea
aej
cnH
aej
aez
aeQ
@@ -87427,7 +87465,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -87449,6 +87486,7 @@ adC
adO
adZ
adZ
cnI
adZ
adZ
aeR
@@ -87684,7 +87722,6 @@ aaa
aaa
aaa
aaa
aaa
aby
abI
abO
@@ -87707,6 +87744,7 @@ adP
aeb
aek
aek
aek
aeA
adF
afk
@@ -87941,7 +87979,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aaa
abO
@@ -87964,6 +88001,7 @@ adQ
aec
ael
ael
ael
aeB
aeS
afl
@@ -88200,7 +88238,6 @@ aaa
aaa
aaa
aaa
aaa
abI
aaa
aaa
@@ -88223,6 +88260,7 @@ acU
acU
acU
acU
acU
afm
afB
afT
@@ -88455,7 +88493,6 @@ aaa
aaa
aaa
aaa
aaa
aby
aby
aby
@@ -88479,6 +88516,7 @@ aaa
abI
aaa
aaa
aaa
acU
acU
acU
@@ -88725,7 +88763,6 @@ aaa
aaa
aaa
aaa
aaa
acO
aby
aby
@@ -88735,6 +88772,7 @@ aby
aby
aby
aby
aby
aaa
abI
aaa