mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
LateInitialize is not allowed to call parent anymore (#82540)
## About The Pull Request I've seen a few cases in the past where LateInitialize is done cause of the init return value being set to do so for no real reason, I thought I should try to avoid that by ensuring LateInitialize isn't ever called without overriding. This fixes a ton of machine's LateInitialize not calling parent (mechpad, door buttons, message monitor, a lot of tram machines, abductor console, holodeck computer & disposal bin), avoiding having to set itself up to be connected to power. If they were intended to not connect to power, they should be using ``NO_POWER_USE`` instead. Also removes a ton of returns to LateInit when it's already getting it from parent regardless (many cases of that in machine code). ## Why It's Good For The Game I think this is better for coding standard reasons as well as just making sure we're not calling this proc on things that does absolutely nothing with them. A machine not using power can be seen evidently not using power with ``NO_POWER_USE``, not so much if it's LateInitialize not calling parent. ## Changelog 🆑 fix: Mech pads, door buttons, message monitors, tram machines, abductor consoles & holodeck computers now use power. /🆑
This commit is contained in:
@@ -3,10 +3,6 @@
|
||||
late = TRUE
|
||||
var/sort_type = SORT_TYPE_WASTE
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/Initialize(mapload)
|
||||
..()
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/mail_sorting/LateInitialize()
|
||||
var/obj/structure/disposalpipe/sorting/mail/mail_sorter = locate(/obj/structure/disposalpipe/sorting/mail) in loc
|
||||
if(mail_sorter)
|
||||
|
||||
@@ -138,7 +138,6 @@
|
||||
payload(airlock)
|
||||
|
||||
/obj/effect/mapping_helpers/airlock/LateInitialize()
|
||||
. = ..()
|
||||
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
|
||||
if(!airlock)
|
||||
qdel(src)
|
||||
@@ -283,7 +282,6 @@
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/airalarm/LateInitialize()
|
||||
. = ..()
|
||||
var/obj/machinery/airalarm/target = locate(/obj/machinery/airalarm) in loc
|
||||
|
||||
if(isnull(target))
|
||||
@@ -442,7 +440,6 @@
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/apc/LateInitialize()
|
||||
. = ..()
|
||||
var/obj/machinery/power/apc/target = locate(/obj/machinery/power/apc) in loc
|
||||
|
||||
if(isnull(target))
|
||||
@@ -1106,8 +1103,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
*/
|
||||
/obj/effect/mapping_helpers/trapdoor_placer
|
||||
name = "trapdoor placer"
|
||||
late = TRUE
|
||||
icon_state = "trapdoor"
|
||||
late = TRUE
|
||||
|
||||
/obj/effect/mapping_helpers/trapdoor_placer/LateInitialize()
|
||||
var/turf/component_target = get_turf(src)
|
||||
@@ -1187,12 +1184,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
name = "broken floor"
|
||||
icon = 'icons/turf/damaged.dmi'
|
||||
icon_state = "damaged1"
|
||||
late = TRUE
|
||||
layer = ABOVE_NORMAL_TURF_LAYER
|
||||
|
||||
/obj/effect/mapping_helpers/broken_floor/Initialize(mapload)
|
||||
.=..()
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
late = TRUE
|
||||
|
||||
/obj/effect/mapping_helpers/broken_floor/LateInitialize()
|
||||
var/turf/open/floor/floor = get_turf(src)
|
||||
@@ -1203,12 +1196,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
name = "burnt floor"
|
||||
icon = 'icons/turf/damaged.dmi'
|
||||
icon_state = "floorscorched1"
|
||||
late = TRUE
|
||||
layer = ABOVE_NORMAL_TURF_LAYER
|
||||
|
||||
/obj/effect/mapping_helpers/burnt_floor/Initialize(mapload)
|
||||
.=..()
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
late = TRUE
|
||||
|
||||
/obj/effect/mapping_helpers/burnt_floor/LateInitialize()
|
||||
var/turf/open/floor/floor = get_turf(src)
|
||||
@@ -1237,7 +1226,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/broken_machine/LateInitialize()
|
||||
. = ..()
|
||||
var/obj/machinery/target = locate(/obj/machinery) in loc
|
||||
|
||||
if(isnull(target))
|
||||
@@ -1271,7 +1259,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/damaged_window/LateInitialize()
|
||||
. = ..()
|
||||
var/obj/structure/window/target = locate(/obj/structure/window) in loc
|
||||
|
||||
if(isnull(target))
|
||||
@@ -1304,7 +1291,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/effect/mapping_helpers/requests_console/LateInitialize(mapload)
|
||||
/obj/effect/mapping_helpers/requests_console/LateInitialize()
|
||||
var/obj/machinery/airalarm/target = locate(/obj/machinery/requests_console) in loc
|
||||
if(isnull(target))
|
||||
var/area/target_area = get_area(target)
|
||||
@@ -1441,7 +1428,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/effect/mapping_helpers/basic_mob_flags/LateInitialize()
|
||||
. = ..()
|
||||
var/had_any_mobs = FALSE
|
||||
for(var/mob/living/basic/basic_mobs in loc)
|
||||
had_any_mobs = TRUE
|
||||
|
||||
Reference in New Issue
Block a user