Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
This commit is contained in:
Poojawa
2018-03-14 16:49:40 -05:00
committed by GitHub
parent be23070f67
commit 6c7da493d9
122 changed files with 12848 additions and 12563 deletions
+12 -34
View File
@@ -34,9 +34,7 @@
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
"al" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/closet/secure_closet/atmospherics,
@@ -64,9 +62,7 @@
/turf/open/space,
/area/space/nearstation)
"ap" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -98,9 +94,7 @@
/obj/machinery/power/smes{
charge = 5e+006
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/cable{
@@ -313,8 +307,7 @@
"aU" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Gravity Generator";
req_access_txt = "11";
req_one_access_txt = "0"
req_access_txt = "11"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -345,8 +338,7 @@
"aX" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Gravity Generator";
req_access_txt = "11";
req_one_access_txt = "0"
req_access_txt = "11"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -538,9 +530,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/autolathe/hacked,
@@ -570,9 +560,7 @@
/turf/open/floor/plasteel,
/area/science)
"bG" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -633,9 +621,7 @@
/obj/item/reagent_containers/glass/beaker/bluespace,
/obj/item/reagent_containers/glass/beaker/bluespace,
/obj/item/reagent_containers/syringe,
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel/dark,
@@ -658,9 +644,7 @@
/turf/open/floor/plasteel/dark,
/area/medical/chemistry)
"bU" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -992,9 +976,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"cW" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/structure/cable,
@@ -1023,9 +1005,7 @@
/turf/open/floor/plasteel,
/area/construction)
"da" = (
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/obj/machinery/power/apc{
@@ -1453,9 +1433,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/airalarm{
frequency = 1439;
locked = 0;
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
/turf/open/floor/plasteel,