From 1d6d8b454c46f3051911d7953356823c44fa8098 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 19 Mar 2018 21:12:46 -0500 Subject: [PATCH] [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017) * Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE * FUCK (#36483) F A L S E semicolon be gone --- _maps/RandomZLevels/snowdin.dmm | 1 - _maps/map_files/BoxStation/BoxStation.dmm | 15 +++++---------- _maps/map_files/Deltastation/DeltaStation2.dmm | 12 ++++-------- _maps/map_files/MetaStation/MetaStation.dmm | 15 +++++---------- _maps/map_files/generic/CentCom.dmm | 3 +-- code/modules/mining/aux_base.dm | 1 + code/modules/shuttle/assault_pod.dm | 1 + code/modules/shuttle/elevator.dm | 1 + code/modules/shuttle/emergency.dm | 1 + 9 files changed, 19 insertions(+), 31 deletions(-) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index c3280b2327..38ae9f91da 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -13827,7 +13827,6 @@ height = 5; id = "snowdin_mining"; name = "mining elevator"; - timid = 0; width = 5 }, /obj/docking_port/stationary{ diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 4c51f61812..bcf8a765b9 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2200,8 +2200,7 @@ id = "pod3"; name = "escape pod 3"; port_direction = 2; - preferred_direction = 4; - timid = 0 + preferred_direction = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_3) @@ -7394,8 +7393,7 @@ dir = 4; dwidth = 4; height = 9; - width = 9; - timid = 0 + width = 9 }, /obj/machinery/bluespace_beacon, /obj/machinery/computer/auxillary_base, @@ -47307,8 +47305,7 @@ id = "pod4"; name = "escape pod 4"; port_direction = 2; - preferred_direction = 4; - timid = 0 + preferred_direction = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_4) @@ -47531,8 +47528,7 @@ dir = 8; id = "pod2"; name = "escape pod 2"; - port_direction = 2; - timid = 0 + port_direction = 2 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_2) @@ -49894,8 +49890,7 @@ dir = 8; id = "pod1"; name = "escape pod 1"; - port_direction = 2; - timid = 0 + port_direction = 2 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 403334d4e0..f8f1fe3d35 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -302,8 +302,7 @@ /obj/docking_port/mobile/pod{ id = "pod1"; name = "escape pod 1"; - port_direction = 2; - timid = 0 + port_direction = 2 }, /obj/effect/turf_decal/stripes/end, /turf/open/floor/plasteel/white, @@ -319,8 +318,7 @@ /obj/docking_port/mobile/pod{ id = "pod2"; name = "escape pod 2"; - port_direction = 2; - timid = 0 + port_direction = 2 }, /obj/effect/turf_decal/stripes/end, /turf/open/floor/plasteel/white, @@ -1455,8 +1453,7 @@ dir = 2; dwidth = 4; height = 9; - width = 9; - timid = 0 + width = 9 }, /obj/machinery/bluespace_beacon, /obj/docking_port/mobile/auxillary_base, @@ -23081,8 +23078,7 @@ id = "pod3"; name = "escape pod 3"; port_direction = 2; - preferred_direction = 4; - timid = 0 + preferred_direction = 4 }, /obj/effect/turf_decal/stripes/end{ dir = 8 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 81a5201a93..16224128f0 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -481,8 +481,7 @@ /obj/docking_port/mobile/pod{ id = "pod2"; name = "escape pod 2"; - port_direction = 2; - timid = 0 + port_direction = 2 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_2) @@ -1546,8 +1545,7 @@ id = "pod3"; name = "escape pod 3"; port_direction = 2; - preferred_direction = 4; - timid = 0 + preferred_direction = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_3) @@ -20222,8 +20220,7 @@ /obj/docking_port/mobile/pod{ id = "pod1"; name = "escape pod 1"; - port_direction = 2; - timid = 0 + port_direction = 2 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) @@ -28147,8 +28144,7 @@ id = "pod4"; name = "escape pod 4"; port_direction = 2; - preferred_direction = 4; - timid = 0 + preferred_direction = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_4) @@ -71591,8 +71587,7 @@ dir = 2; dwidth = 4; height = 9; - width = 9; - timid = 0 + width = 9 }, /obj/machinery/bluespace_beacon, /obj/machinery/computer/auxillary_base, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 91c0fdac6f..4c663f9219 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -8542,8 +8542,7 @@ dwidth = 3; name = "steel rain"; port_direction = 4; - preferred_direction = 4; - timid = 0 + preferred_direction = 4 }, /turf/open/floor/plating, /area/shuttle/assault_pod) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 397436bda8..fcb8dc9d1d 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -244,6 +244,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/docking_port/mobile/auxillary_base name = "auxillary base" id = "colony_drop" + timid = FALSE //Reminder to map-makers to set these values equal to the size of your base. dheight = 4 dwidth = 4 diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index 57c6e303f7..f2b1bd5e08 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -1,6 +1,7 @@ /obj/docking_port/mobile/assault_pod name = "assault pod" id = "steel_rain" + timid = FALSE dwidth = 3 width = 7 height = 7 diff --git a/code/modules/shuttle/elevator.dm b/code/modules/shuttle/elevator.dm index 4584cd5958..959cc2dae7 100644 --- a/code/modules/shuttle/elevator.dm +++ b/code/modules/shuttle/elevator.dm @@ -1,6 +1,7 @@ /obj/docking_port/mobile/elevator name = "elevator" id = "elevator" + timid = FALSE dwidth = 3 width = 7 height = 7 diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 1e78462eaa..de669df143 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -407,6 +407,7 @@ /obj/docking_port/mobile/pod name = "escape pod" id = "pod" + timid = FALSE dwidth = 1 width = 3 height = 4