Merge pull request #5526 from Citadel-Station-13/upstream-merge-35687

[MIRROR] Fixes delta whiteship
2018-02-16 14:15:51 +00:00
parent e7b832df1f 5b6bc34a82
commit 0cd914bf96
39 changed files with 18 additions and 57 deletions
@@ -17,7 +17,6 @@
 	dwidth = 4;
 	height = 17;
 	name = "delta arrivals shuttle";
-	timid = 1;
 	width = 9
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -112,8 +112,7 @@
 	},
 /obj/docking_port/mobile/supply{
 	dwidth = 3;
-	width = 10;
-	timid = 1
+	width = 10
 	},
 /turf/open/floor/plating,
 /area/shuttle/supply)
@@ -49,8 +49,7 @@
 	},
 /obj/docking_port/mobile/supply{
 	dwidth = 5;
-	width = 12;
-	timid = 1
+	width = 12
 	},
 /turf/open/floor/plating,
 /area/shuttle/supply)
@@ -92,7 +92,6 @@
 /obj/docking_port/mobile/supply{
 	dir = 4;
 	dwidth = 4;
-	timid = 1;
 	width = 12
 	},
 /turf/open/floor/plating,
@@ -37,7 +37,6 @@
 	name = "Shuttle Under Construction";
 	port_direction = 4;
 	preferred_direction = 2;
-	timid = 1;
 	width = 30
 	},
 /turf/open/floor/plating/airless,
@@ -57,8 +57,7 @@
 "o" = (
 /obj/effect/forcefield/arena_shuttle_entrance,
 /obj/docking_port/mobile/emergency{
-	name = "The Arena";
-	timid = 1
+	name = "The Arena"
 	},
 /turf/open/indestructible/necropolis/air,
 /area/shuttle/escape/arena)
@@ -35,8 +35,7 @@
 	dwidth = 10;
 	height = 13;
 	name = "Asteroid emergency shuttle";
-	width = 28;
-	timid = 1
+	width = 28
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
@@ -242,8 +242,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	name = "The Emergency Escape Bar";
-	timid = 1
+	name = "The Emergency Escape Bar"
 	},
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
@@ -201,7 +201,6 @@
 	height = 18;
 	port_direction = 4;
 	width = 14;
-	timid = 1;
 	name = "Birdboat emergency escape shuttle"
 	},
 /turf/open/floor/mineral/titanium,
@@ -203,8 +203,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	name = "Box emergency shuttle";
-	timid = 1
+	name = "Box emergency shuttle"
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -551,7 +551,6 @@
 	name = "Cere emergency shuttle";
 	port_direction = 4;
 	preferred_direction = 2;
-	timid = 1;
 	width = 42
 	},
 /turf/open/floor/plating,
@@ -191,8 +191,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	name = "Snappop(tm)!";
-	timid = 1
+	name = "Snappop(tm)!"
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -62,8 +62,7 @@
 	dwidth = 3;
 	height = 5;
 	name = "Secure Transport Vessel 5";
-	width = 14;
-	timid = 1
+	width = 14
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -443,8 +443,7 @@
 	name = "Delta emergency shuttle";
 	width = 30;
 	preferred_direction = 2;
-	port_direction = 4;
-	timid = 1
+	port_direction = 4
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -103,8 +103,7 @@
 /area/shuttle/escape)
 "u" = (
 /obj/docking_port/mobile/emergency{
-	name = "Disco Inferno";
-	timid = 1
+	name = "Disco Inferno"
 	},
 /obj/machinery/door/airlock/gold{
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100);
@@ -39,8 +39,7 @@
 	dir = 2;
 	dwidth = 9;
 	name = "NES Port";
-	width = 19;
-	timid = 1
+	width = 19
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
@@ -13,8 +13,7 @@
 	dwidth = 1;
 	height = 10;
 	name = "Oh Hi Mark";
-	width = 12;
-	timid = 1
+	width = 12
 	},
 /obj/machinery/door/airlock/wood,
 /turf/open/floor/wood,
@@ -24,7 +24,6 @@
 	dwidth = 5;
 	height = 14;
 	name = "Luxury emergency shuttle";
-	timid = 1;
 	width = 25
 	},
 /obj/machinery/door/airlock/gold,
@@ -28,7 +28,6 @@
 	dwidth = 5;
 	height = 14;
 	name = "Meta emergency shuttle";
-	timid = 1;
 	width = 25
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -63,7 +63,6 @@
 	height = 40;
 	movement_force = list("KNOCKDOWN" = 3, "THROW" = 6);
 	name = "\proper a meteor with engines strapped to it";
-	timid = 1;
 	width = 40
 	},
 /turf/open/floor/plating/asteroid,
@@ -170,7 +170,6 @@
 	dwidth = 8;
 	height = 9;
 	name = "Mini emergency shuttle";
-	timid = 1;
 	width = 21
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -159,8 +159,7 @@
 "E" = (
 /obj/machinery/door/airlock/cult/friendly,
 /obj/docking_port/mobile/emergency{
-	name = "shuttle 667";
-	timid = 1
+	name = "shuttle 667"
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -288,7 +288,6 @@
 	height = 15;
 	name = "Pubby emergency shuttle";
 	port_direction = 4;
-	timid = 1;
 	width = 18
 	},
 /turf/open/floor/plating,
@@ -614,7 +614,6 @@
 	dwidth = 14;
 	height = 18;
 	name = "CentCom Raven Battlecruiser";
-	timid = 1;
 	width = 32
 	},
 /obj/machinery/door/airlock/hatch,
@@ -277,8 +277,7 @@
 "aW" = (
 /obj/docking_port/mobile/emergency{
 	height = 15;
-	name = "Box emergency shuttle";
-	timid = 1
+	name = "Box emergency shuttle"
 	},
 /obj/machinery/door/airlock/security/glass{
 	name = "Emergency Shuttle Airlock"
@@ -217,8 +217,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	name = "Scrapheap Challenge";
-	timid = 1
+	name = "Scrapheap Challenge"
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -141,8 +141,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	name = "Hyperfractal Gigashuttle";
-	timid = 1
+	name = "Hyperfractal Gigashuttle"
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -154,7 +154,6 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	timid = 1;
 	name = "NT Lepton Violet"
 	},
 /turf/open/floor/plating,
@@ -55,8 +55,7 @@
 	id = "ferry";
 	name = "ferry shuttle";
 	port_direction = 2;
-	width = 5;
-	timid = 1
+	width = 5
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/transport)
@@ -72,7 +72,6 @@
 	name = "ferry shuttle";
 	port_direction = 1;
 	preferred_direction = 4;
-	timid = 1;
 	width = 5
 	},
 /turf/open/floor/pod/light,
@@ -165,7 +165,6 @@
 	height = 27;
 	id = "ferry";
 	name = "The Lighthouse";
-	timid = 1;
 	port_direction = 2;
 	width = 16
 	},
@@ -111,8 +111,7 @@
 	id = "ferry";
 	name = "ferry shuttle";
 	port_direction = 2;
-	width = 5;
-	timid = 1
+	width = 5
 	},
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/transport)
@@ -111,7 +111,6 @@
 	id = "laborcamp";
 	name = "labor camp shuttle";
 	port_direction = 4;
-	timid = 1;
 	width = 9
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -41,7 +41,6 @@
 	id = "mining";
 	name = "mining shuttle";
 	port_direction = 4;
-	timid = 1;
 	width = 7
 	},
 /turf/open/floor/plating,
@@ -19,7 +19,6 @@
 	name = "NT Medical Ship";
 	port_direction = 8;
 	preferred_direction = 4;
-	timid = 1;
 	width = 35
 	},
 /turf/open/floor/mineral/titanium,
@@ -23,7 +23,6 @@
 	name = "NT Recovery White-Ship";
 	port_direction = 8;
 	preferred_direction = 1;
-	timid = 1;
 	width = 16
 	},
 /turf/open/floor/plating,
@@ -1518,7 +1518,6 @@
 	name = "White-Ship";
 	port_direction = 8;
 	preferred_direction = 8;
-	timid = 0;
 	width = 32
 	},
 /turf/open/floor/plasteel/neutral,
@@ -39,7 +39,6 @@
 	name = "NT Recovery White-Ship";
 	port_direction = 8;
 	preferred_direction = 4;
-	timid = 1;
 	width = 28
 	},
 /turf/open/floor/mineral/titanium/blue,
@@ -94,7 +94,6 @@
 	name = "White Ship";
 	port_direction = 4;
 	preferred_direction = 1;
-	timid = 1;
 	width = 9
 	},
 /turf/open/floor/plasteel/dark,