shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleans Up Rejected Mirror files (#414)

Browse Source 
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
This commit is contained in:
TalkingCactus
2017-04-15 17:55:53 -04:00
committed by GitHub
parent 2373e2e485
commit abd7f2b348
15 changed files with 131004 additions and 3114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/TgStation/tgstation.2.1.3.041517.dmm
+128234
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+572 -569
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
-215
View File
@@ -1,215 +0,0 @@
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
@@ -7936,7 +7936,9 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start/cargo_technician,
+/obj/effect/landmark/start{
+ name = "Cargo Technician"
+ },
/turf/open/floor/plasteel,
/area/quartermaster/office)
"aqV" = (
@@ -15366,7 +15368,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"aHt" = (
-/obj/effect/landmark/observer_start,
+/obj/effect/landmark{
+ name = "Observer-Start"
+ },
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"aHu" = (
@@ -26739,7 +26743,9 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start/roboticist,
+/obj/effect/landmark/start{
+ name = "Roboticist"
+ },
/turf/open/floor/plasteel/white,
/area/assembly/robotics)
"biN" = (
@@ -59513,7 +59519,7 @@
anchored = 1
},
/obj/structure/light_construct,
-/turf/open/floor/plasteel/shuttle/white,
+/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"czo" = (
/turf/open/space,
@@ -64916,8 +64928,22 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"cMC" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching the Engine.";
+ dir = 8;
+ layer = 4;
+ name = "Engine Monitor";
+ network = list("Engine");
+ pixel_x = 30;
+ pixel_y = 0
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cMD" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
@@ -64928,21 +64954,33 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"cMG" = (
-/turf/open/floor/engine,
+/turf/closed/wall/r_wall,
/area/engine/supermatter)
"cMH" = (
/turf/open/floor/engine,
/area/engine/supermatter)
"cMI" = (
-/turf/closed/wall/r_wall,
+/obj/machinery/power/rad_collector{
+ anchored = 1
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/open/floor/engine,
/area/engine/supermatter)
"cMJ" = (
-/turf/closed/wall/r_wall,
+/obj/machinery/power/rad_collector{
+ anchored = 1
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/open/floor/engine,
/area/engine/supermatter)
"cMK" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/highpressure/fulltile,
-/turf/open/floor/plating,
+/turf/open/floor/engine,
/area/engine/supermatter)
"cML" = (
/turf/closed/wall/r_wall,
@@ -64951,37 +64989,15 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"cMN" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the Engine.";
- dir = 8;
- layer = 4;
- name = "Engine Monitor";
- network = list("Engine");
- pixel_x = 30;
- pixel_y = 0
- },
-/turf/open/floor/plasteel,
-/area/engine/engineering)
+/obj/structure/grille,
+/obj/structure/window/reinforced/highpressure/fulltile,
+/turf/open/floor/plating,
+/area/engine/supermatter)
"cMO" = (
-/obj/machinery/power/rad_collector{
- anchored = 1
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/camera{
- c_tag = "Supermatter Chamber";
- dir = 2;
- network = list("Engine");
- pixel_x = 23
- },
-/turf/open/floor/engine,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"cMP" = (
+/turf/closed/wall/r_wall,
/area/engine/supermatter)
(1,1,1) = {"
@@ -93185,11 +93201,11 @@ cpy
cDv
cDD
cqU
-cMC
-cMO
-cEu
+cMF
cEu
-cMC
+cMI
+cMJ
+cML
cFL
cGf
cGw
@@ -93441,12 +93457,12 @@ chV
cDq
cqf
cqD
-cMC
+cME
crs
cEv
cEv
cFe
-cMC
+cMM
cFM
czE
cGx
@@ -94468,13 +94484,13 @@ ccw
cii
cDq
cqi
-cMC
+cMD
cAP
crv
cEy
cEy
cFh
-cMC
+cMO
cFQ
czE
cGx
@@ -94727,11 +94743,11 @@ cDr
cDw
cDE
cEa
-cMC
+cMG
cEz
cEz
cEz
-cMC
+cMP
cFR
cGf
cGz