mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-03 05:52:17 +00:00
/atom New() => Initialize() [MDB IGNORE] (#8298)
* Find and replace argless atom New() to Initialize(). * Manual replacement of no-arg New() to Initialize(). * Manually replacing remaining New() overrides. * Fixing linter issues with now-removed New() args. * Tidying area init overrides. * Porting Neb's atom subsystem. * Trying to isolate init problems. * Adjusting Init code post-test. * Merging duplicate Initialize() procs. * Merge resolution.
This commit is contained in:
@@ -35,8 +35,8 @@ var/global/list/light_type_cache = list()
|
||||
|
||||
var/cell_connectors = TRUE
|
||||
|
||||
/obj/machinery/light_construct/New(var/atom/newloc, var/newdir, var/building = 0, var/datum/frame/frame_types/frame_type, var/obj/machinery/light/fixture = null)
|
||||
..(newloc)
|
||||
/obj/machinery/light_construct/Initialize(var/ml, var/newdir, var/building = 0, var/datum/frame/frame_types/frame_type, var/obj/machinery/light/fixture = null)
|
||||
. = ..(ml)
|
||||
if(fixture)
|
||||
fixture_type = fixture.type
|
||||
fixture.transfer_fingerprints_to(src)
|
||||
@@ -280,15 +280,14 @@ var/global/list/light_type_cache = list()
|
||||
construct_type = /obj/machinery/light_construct/flamp
|
||||
var/lamp_shade = 1
|
||||
|
||||
/obj/machinery/light/flamp/New(atom/newloc, obj/machinery/light_construct/construct = null)
|
||||
..(newloc, construct)
|
||||
/obj/machinery/light/flamp/Initialize(var/ml, obj/machinery/light_construct/construct = null)
|
||||
. = ..(ml, construct)
|
||||
if(construct)
|
||||
start_with_cell = FALSE
|
||||
lamp_shade = 0
|
||||
update_icon()
|
||||
else
|
||||
if(start_with_cell && !no_emergency)
|
||||
cell = new/obj/item/weapon/cell/emergency_light(src)
|
||||
else if(start_with_cell && !no_emergency)
|
||||
cell = new/obj/item/weapon/cell/emergency_light(src)
|
||||
|
||||
|
||||
/obj/machinery/light/flamp/flicker
|
||||
@@ -310,8 +309,8 @@ var/global/list/light_type_cache = list()
|
||||
auto_flicker = TRUE
|
||||
|
||||
// create a new lighting fixture
|
||||
/obj/machinery/light/New(atom/newloc, obj/machinery/light_construct/construct = null)
|
||||
..(newloc)
|
||||
/obj/machinery/light/Initialize(var/ml, obj/machinery/light_construct/construct = null)
|
||||
. = ..(ml)
|
||||
|
||||
if(construct)
|
||||
start_with_cell = FALSE
|
||||
@@ -921,8 +920,8 @@ var/global/list/light_type_cache = list()
|
||||
desc = "A broken [name]."
|
||||
|
||||
|
||||
/obj/item/weapon/light/New(atom/newloc, obj/machinery/light/fixture = null)
|
||||
..()
|
||||
/obj/item/weapon/light/Initialize(var/ml, obj/machinery/light/fixture = null)
|
||||
. = ..(ml)
|
||||
if(fixture)
|
||||
status = fixture.status
|
||||
rigged = fixture.rigged
|
||||
|
||||
Reference in New Issue
Block a user