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

[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

Browse Source 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
This commit is contained in:
CitadelStationBot
2017-08-02 04:56:44 -05:00
committed by Poojawa
parent 76f7fcef9a
commit 8a4ddbe8a8
74 changed files with 62713 additions and 61428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/challenge.dmm
+32 -176
View File
@@ -160,17 +160,8 @@
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/main)
"aI" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 2;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 2
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -200,17 +191,8 @@
/area/awaymission/challenge/main)
"aO" = (
/obj/structure/window/reinforced,
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 2;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 2
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -228,17 +210,8 @@
/turf/open/floor/plasteel,
/area/awaymission/challenge/main)
"aS" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 4;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 4
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -261,17 +234,8 @@
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
"aW" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 8;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 8
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -341,17 +305,8 @@
/turf/open/floor/plating,
/area/awaymission/challenge/main)
"bf" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/structure/window/reinforced{
dir = 1
@@ -377,17 +332,8 @@
/turf/open/floor/plasteel,
/area/awaymission/challenge/main)
"bi" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/structure/window/reinforced{
dir = 8
@@ -402,17 +348,8 @@
/turf/open/floor/plating,
/area/awaymission/challenge/main)
"bk" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/machinery/light,
/turf/open/floor/plating,
@@ -421,17 +358,8 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -446,17 +374,8 @@
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/challenge/main)
"bo" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 2;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 2
},
/obj/structure/window/reinforced{
dir = 8
@@ -528,17 +447,8 @@
/turf/open/floor/plating,
/area/awaymission/challenge/main)
"bx" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 8;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 8
},
/obj/structure/window/reinforced{
dir = 8
@@ -578,17 +488,8 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 8;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 8
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -596,17 +497,8 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 4;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 4
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -654,17 +546,8 @@
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
"bL" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/structure/window/reinforced{
dir = 1
@@ -672,32 +555,14 @@
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
"bM" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
"bN" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
@@ -705,17 +570,8 @@
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
"bO" = (
/obj/machinery/power/emitter{
active = 1;
active_power_usage = 0;
anchored = 1;
dir = 1;
idle_power_usage = 0;
locked = 1;
name = "Energy Cannon";
req_access_txt = "100";
state = 2;
use_power = 0
/obj/machinery/power/emitter/ctf{
dir = 1
},
/obj/structure/window/reinforced{
dir = 8
_maps/RandomZLevels/moonoutpost19.dmm
+1 -3
View File
@@ -3804,9 +3804,7 @@
})
"fg" = (
/obj/structure/table,
/obj/item/stack/sheet/mineral/plasma{
layer = 2.9
},
/obj/item/stack/sheet/mineral/plasma,
/obj/machinery/light/small{
active_power_usage = 0;
dir = 1;
_maps/RandomZLevels/snowdin.dmm
+1 -5
View File
@@ -2406,11 +2406,7 @@
},
/area/awaymission/snowdin/post)
"gA" = (
/obj/structure/closet/secure_closet{
anchored = 1;
name = "Contraband Locker";
req_access_txt = "3"
},
/obj/structure/closet/secure_closet/contraband/armory,
/obj/item/weapon/gun/ballistic/automatic/speargun,
/obj/item/weapon/twohanded/spear,
/obj/item/weapon/twohanded/spear,