New() goes in the trash, we've gotta Initialize()
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
var/admin_controlled
|
||||
var/no_destination_swap = 0
|
||||
|
||||
/obj/machinery/computer/shuttle/New(location, obj/item/weapon/circuitboard/computer/shuttle/C)
|
||||
..()
|
||||
/obj/machinery/computer/shuttle/Initialize(mapload, obj/item/weapon/circuitboard/computer/shuttle/C)
|
||||
. = ..()
|
||||
if(istype(C))
|
||||
possible_destinations = C.possible_destinations
|
||||
shuttleId = C.shuttleId
|
||||
|
||||
@@ -412,8 +412,8 @@
|
||||
to_chat(usr, "<span class='warning'>Escape pods will only launch during \"Code Red\" security alert.</span>")
|
||||
return 1
|
||||
|
||||
/obj/docking_port/mobile/pod/New()
|
||||
..()
|
||||
/obj/docking_port/mobile/pod/Initialize()
|
||||
. = ..()
|
||||
if(id == "pod")
|
||||
WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
|
||||
|
||||
@@ -492,8 +492,7 @@
|
||||
icon_state = "safe"
|
||||
var/unlocked = FALSE
|
||||
|
||||
/obj/item/weapon/storage/pod/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/pod/PopulateContents()
|
||||
new /obj/item/clothing/head/helmet/space/orange(src)
|
||||
new /obj/item/clothing/head/helmet/space/orange(src)
|
||||
new /obj/item/clothing/suit/space/orange(src)
|
||||
@@ -533,13 +532,13 @@
|
||||
dir = EAST
|
||||
roundstart_move = "backup_away"
|
||||
|
||||
/obj/docking_port/mobile/emergency/backup/New()
|
||||
/obj/docking_port/mobile/emergency/backup/Initialize()
|
||||
// We want to be a valid emergency shuttle
|
||||
// but not be the main one, keep whatever's set
|
||||
// valid.
|
||||
// backup shuttle ignores `timid` because THERE SHOULD BE NO TOUCHING IT
|
||||
var/current_emergency = SSshuttle.emergency
|
||||
..()
|
||||
. = ..()
|
||||
SSshuttle.emergency = current_emergency
|
||||
SSshuttle.backup_shuttle = src
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
var/obj/docking_port/mobile/preview_shuttle
|
||||
var/datum/map_template/shuttle/preview_template
|
||||
|
||||
/obj/machinery/shuttle_manipulator/New()
|
||||
/obj/machinery/shuttle_manipulator/Initialize()
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -145,8 +145,8 @@
|
||||
var/area_type = /area/space
|
||||
var/last_dock_time
|
||||
|
||||
/obj/docking_port/stationary/New()
|
||||
..()
|
||||
/obj/docking_port/stationary/Initialize()
|
||||
. = ..()
|
||||
SSshuttle.stationary += src
|
||||
if(!id)
|
||||
id = "[SSshuttle.stationary.len]"
|
||||
@@ -168,8 +168,8 @@
|
||||
var/area/shuttle/transit/assigned_area
|
||||
var/obj/docking_port/mobile/owner
|
||||
|
||||
/obj/docking_port/stationary/transit/New()
|
||||
..()
|
||||
/obj/docking_port/stationary/transit/Initialize()
|
||||
. = ..()
|
||||
SSshuttle.transit += src
|
||||
|
||||
/obj/docking_port/stationary/transit/proc/dezone()
|
||||
@@ -223,8 +223,8 @@
|
||||
|
||||
var/list/ripples = list()
|
||||
|
||||
/obj/docking_port/mobile/New()
|
||||
..()
|
||||
/obj/docking_port/mobile/Initialize()
|
||||
. = ..()
|
||||
if(!timid)
|
||||
register()
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
diff a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm (rejected hunks)
|
||||
@@ -316,7 +316,7 @@
|
||||
if(!check_dock(S))
|
||||
testing("check_dock failed on request for [src]")
|
||||
return
|
||||
-
|
||||
+
|
||||
if(mode == SHUTTLE_IGNITING && destination == S)
|
||||
return
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
var/tables_required = 2
|
||||
active = FALSE
|
||||
|
||||
/obj/machinery/power/emitter/energycannon/magical/New()
|
||||
/obj/machinery/power/emitter/energycannon/magical/Initialize()
|
||||
. = ..()
|
||||
if(prob(50))
|
||||
desc = "Oh no, not again."
|
||||
|
||||
@@ -31,9 +31,9 @@
|
||||
var/challenge = FALSE
|
||||
var/moved = FALSE
|
||||
|
||||
/obj/item/weapon/circuitboard/computer/syndicate_shuttle/New()
|
||||
/obj/item/weapon/circuitboard/computer/syndicate_shuttle/Initialize()
|
||||
. = ..()
|
||||
GLOB.syndicate_shuttle_boards += src
|
||||
..()
|
||||
|
||||
/obj/item/weapon/circuitboard/computer/syndicate_shuttle/Destroy()
|
||||
GLOB.syndicate_shuttle_boards -= src
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "at_shield1"
|
||||
|
||||
/obj/effect/landmark/transit/New()
|
||||
/obj/effect/landmark/transit/Initialize()
|
||||
. = ..()
|
||||
GLOB.transit_markers += src
|
||||
|
||||
|
||||
Reference in New Issue
Block a user