From 304c07fb7ebde728090224e8c2ba1cae7c7d73d8 Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 10 Oct 2017 21:07:21 +1300 Subject: [PATCH] Merge pull request #31394 from ninjanomnom/asteroid-shuttle Makes the asteroid escape shuttle throw people --- _maps/shuttles/emergency_meteor.dmm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency_meteor.dmm index dcfd38acf8..014649014e 100644 --- a/_maps/shuttles/emergency_meteor.dmm +++ b/_maps/shuttles/emergency_meteor.dmm @@ -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