Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977

[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
parent 0e131b50e5 0ce34e08b6
commit 70a5aed428
20 changed files with 316 additions and 6 deletions
@@ -26582,6 +26582,7 @@
 	layer = 3;
 	pixel_x = 32
 	},
+/obj/machinery/aug_manipulator,
 /turf/open/floor/plasteel/white,
 /area/science/robotics/lab)
 "bkp" = (
@@ -0,0 +1,92 @@
+diff a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm	(rejected hunks)
+@@ -33644,7 +33645,7 @@
+ /obj/machinery/atmospherics/components/unary/vent_pump/on{
+ 	dir = 4;
+ 	external_pressure_bound = 140;
+-	pressure_checks = 0
+	pressure_checks = 0;
+ 	name = "server vent"
+ 	},
+ /turf/open/floor/circuit{
+@@ -83911,12 +83912,12 @@ aaa
+ aaa
+ aaa
+ cTg
+-cTl
+-cTn
+-cTr
+-cTu
+-cTw
+-cTz
+cTg
+cTi
+cTg
+cTi
+cTg
+cTg
+ aaa
+ bCq
+ bPS
+@@ -84167,13 +84168,13 @@ aaa
+ aaa
+ aaa
+ aaa
+-cTh
+cTg
+ bGg
+ cTo
+ cMl
+ bHx
+ cTx
+-cTA
+cTg
+ aaa
+ bLv
+ bPR
+@@ -84427,7 +84428,7 @@ bDi
+ cTi
+ bGh
+ bHx
+-cTs
+cTo
+ bHx
+ bLt
+ bMF
+@@ -84681,13 +84682,13 @@ bzP
+ bAS
+ bxu
+ aaa
+-cTj
+cTg
+ bGg
+-cTp
+-cTt
+cTo
+cTo
+ bHx
+ bLs
+-cTB
+cTg
+ aaa
+ bLv
+ bPT
+@@ -84938,13 +84939,13 @@ bzR
+ byd
+ bxx
+ aaa
+-cTk
+-cTm
+-cTq
+cTg
+cTg
+cTi
+ bJc
+-cTv
+-cTy
+-cTC
+cTi
+cTg
+cTg
+ aaa
+ bCq
+ bPV
@@ -93223,6 +93223,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/aug_manipulator,
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "dxQ" = (
@@ -0,0 +1,37 @@
+diff a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm	(rejected hunks)
+@@ -156131,16 +156132,16 @@ cim
+ brN
+ brN
+ bqq
+-coe
+bkT
+ cpL
+-cqZ
+brH
+ csr
+-cub
+bmI
+ cvE
+ cwY
+-cqZ
+-cqZ
+-cqZ
+brH
+brH
+brH
+ brH
+ bkT
+ cFG
+@@ -156166,10 +156167,10 @@ djZ
+ dlM
+ dnc
+ doh
+-dpQ
+dnc
+ drt
+ dsT
+-dpQ
+dnc
+ ego
+ dwO
+ dyc
@@ -71201,6 +71201,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/aug_manipulator,
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cFe" = (
@@ -0,0 +1,37 @@
+diff a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm	(rejected hunks)
+@@ -45922,7 +45922,7 @@
+ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+ 	dir = 8;
+ 	frequency = 1441;
+-	id_tag = "n2o_out"
+	id_tag = "n2o_out";
+ 	name = "n2o out"
+ 	},
+ /turf/open/floor/engine/n2o,
+@@ -49223,7 +49223,7 @@
+ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+ 	dir = 8;
+ 	frequency = 1441;
+-	id_tag = "tox_out"
+	id_tag = "tox_out";
+ 	name = "toxin out"
+ 	},
+ /turf/open/floor/engine/plasma,
+@@ -52023,7 +52023,7 @@
+ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+ 	dir = 8;
+ 	frequency = 1441;
+-	id_tag = "co2_out"
+	id_tag = "co2_out";
+ 	name = "co2 out"
+ 	},
+ /turf/open/floor/engine/co2,
+@@ -58890,7 +58890,7 @@
+ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+ 	dir = 1;
+ 	frequency = 1441;
+-	id_tag = "n2_out"
+	id_tag = "n2_out";
+ 	name = "n2 out"
+ 	},
+ /turf/open/floor/engine/n2,