Merge pull request #3265 from Citadel-Station-13/upstream-merge-31394

[MIRROR] Makes the asteroid escape shuttle throw people
This commit is contained in:
LetterJay
2017-10-10 05:52:26 -04:00
committed by GitHub
+15 -14
View File
@@ -1,4 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/space,
/area/space)
@@ -50,18 +50,6 @@
"i" = (
/obj/effect/station_crash,
/turf/open/floor/plating/asteroid,
/area/shuttle/escape{
luminosity = 0
})
"j" = (
/obj/docking_port/mobile/emergency{
dwidth = 20;
height = 40;
name = "a meteor with engines strapped to it";
timid = 1;
width = 40
},
/turf/open/floor/plating/asteroid,
/area/shuttle/escape{
luminosity = 0
})
@@ -89,6 +77,19 @@
"n" = (
/obj/structure/shuttle/engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/escape{
luminosity = 0
})
"L" = (
/obj/docking_port/mobile/emergency{
dwidth = 20;
height = 40;
movement_force = list("KNOCKDOWN" = 3, "THROW" = 6);
name = "a meteor with engines strapped to it";
timid = 1;
width = 40
},
/turf/open/floor/plating/asteroid,
/area/shuttle/escape{
luminosity = 0
})
@@ -114,7 +115,7 @@ b
d
d
d
j
L
d
d
b