Removes the shuttle timid var (#39445)

Now that shuttles are all loaded via template we no longer have a need for the
timid var on shuttles.

Well not all shuttles, it seems I forgot to template the backup shuttle so it
wouldn't have been working until now. This got fixed here as well.
This commit is contained in:
Emmett Gaines
2018-08-01 21:19:16 -07:00
committed by Tad Hardesty
parent e7338e125a
commit e248d342b8
22 changed files with 212 additions and 150 deletions
-1
View File
@@ -1,7 +1,6 @@
/obj/docking_port/mobile/assault_pod
name = "assault pod"
id = "steel_rain"
timid = FALSE
dwidth = 3
width = 7
height = 7
-1
View File
@@ -1,7 +1,6 @@
/obj/docking_port/mobile/elevator
name = "elevator"
id = "elevator"
timid = FALSE
dwidth = 3
width = 7
height = 7
+1 -2
View File
@@ -273,7 +273,7 @@
if(prevent)
return FALSE
return has_people && hijacker_present
/obj/docking_port/mobile/emergency/proc/ShuttleDBStuff()
@@ -422,7 +422,6 @@
/obj/docking_port/mobile/pod
name = "escape pod"
id = "pod"
timid = FALSE
dwidth = 1
width = 3
height = 4
+1 -9
View File
@@ -233,7 +233,7 @@
preview_shuttle.movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
preview_shuttle.initiate_docking(D)
preview_shuttle.movement_force = force_memory
. = preview_shuttle
// Shuttle state involves a mode and a timer based on world.time, so
@@ -267,18 +267,10 @@
for(var/T in affected)
for(var/obj/docking_port/P in T)
if(istype(P, /obj/docking_port/mobile))
var/obj/docking_port/mobile/M = P
found++
if(found > 1)
qdel(P, force=TRUE)
log_world("Map warning: Shuttle Template [S.mappath] has multiple mobile docking ports.")
else if(!M.timid)
// The shuttle template we loaded isn't "timid" which means
// it's already registered with the shuttles subsystem.
// This is a bad thing.
stack_trace("Template [S] is non-timid! Unloading.")
M.jumpToNullSpace()
return
else
preview_shuttle = P
if(istype(P, /obj/docking_port/stationary))
-7
View File
@@ -253,11 +253,6 @@
var/list/movement_force = list("KNOCKDOWN" = 3, "THROW" = 2)
// A timid shuttle will not register itself with the shuttle subsystem
// All shuttle templates MUST be timid, imports will fail if they're not
// Shuttle defined already on the map MUST NOT be timid, or they won't work
var/timid = TRUE
var/list/ripples = list()
var/engine_coeff = 1 //current engine coeff
var/current_engines = 0 //current engine power
@@ -280,8 +275,6 @@
/obj/docking_port/mobile/Initialize(mapload)
. = ..()
if(!timid)
register()
if(!id)
id = "[SSshuttle.mobile.len]"