mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-15 20:52:07 +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:
@@ -16,7 +16,7 @@
|
||||
var/x_offset = 0 // Offset from the 'center' of where the projector is, so that if it moves, the shield can recalc its position.
|
||||
var/y_offset = 0 // Ditto.
|
||||
|
||||
/obj/effect/directional_shield/New(var/newloc, var/new_projector)
|
||||
/obj/effect/directional_shield/Initialize(var/ml, var/new_projector)
|
||||
if(new_projector)
|
||||
projector = new_projector
|
||||
var/turf/us = get_turf(src)
|
||||
@@ -26,7 +26,7 @@
|
||||
y_offset = us.y - them.y
|
||||
else
|
||||
update_color()
|
||||
..(newloc)
|
||||
. = ..(ml)
|
||||
|
||||
/obj/effect/directional_shield/proc/relocate()
|
||||
if(!projector)
|
||||
|
||||
@@ -28,16 +28,16 @@
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/machinery/shield/New()
|
||||
/obj/machinery/shield/Initialize()
|
||||
src.set_dir(pick(1,2,3,4))
|
||||
..()
|
||||
. = ..()
|
||||
update_nearby_tiles(need_rebuild=1)
|
||||
|
||||
/obj/machinery/shield/Destroy()
|
||||
opacity = 0
|
||||
density = 0
|
||||
update_nearby_tiles()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(!istype(W)) return
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
var/ticks_recovering = 10
|
||||
var/max_strength = 10
|
||||
|
||||
/obj/effect/energy_field/New(var/newloc, var/new_gen)
|
||||
..(newloc)
|
||||
/obj/effect/energy_field/Initialize(var/ml, var/new_gen)
|
||||
. = ..(ml)
|
||||
my_gen = new_gen
|
||||
update_nearby_tiles()
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
var/enabled = 0
|
||||
|
||||
|
||||
/obj/item/weapon/shield_diffuser/New()
|
||||
/obj/item/weapon/shield_diffuser/Initialize()
|
||||
cell = new(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/shield_diffuser/Destroy()
|
||||
qdel(cell)
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
var/field_dir = get_dir(T2,get_step(T2, NSEW))
|
||||
T = get_step(T2, NSEW)
|
||||
T2 = T
|
||||
var/obj/machinery/shieldwall/CF = new/obj/machinery/shieldwall/(src, G) //(ref to this gen, ref to connected gen)
|
||||
var/obj/machinery/shieldwall/CF = new /obj/machinery/shieldwall(src, src, G) //(ref to this gen, ref to connected gen)
|
||||
CF.loc = T
|
||||
CF.set_dir(field_dir)
|
||||
|
||||
@@ -239,19 +239,19 @@
|
||||
var/power_usage = 2500 //how much power it takes to sustain the shield
|
||||
var/generate_power_usage = 7500 //how much power it takes to start up the shield
|
||||
|
||||
/obj/machinery/shieldwall/New(var/obj/machinery/shieldwallgen/A, var/obj/machinery/shieldwallgen/B)
|
||||
..()
|
||||
/obj/machinery/shieldwall/Initialize(var/ml, var/obj/machinery/shieldwallgen/A, var/obj/machinery/shieldwallgen/B)
|
||||
. = ..(ml)
|
||||
update_nearby_tiles()
|
||||
src.gen_primary = A
|
||||
src.gen_secondary = B
|
||||
if(A && B && A.active && B.active)
|
||||
if(istype(A) && istype(B) && A.active && B.active)
|
||||
needs_power = 1
|
||||
if(prob(50))
|
||||
A.storedpower -= generate_power_usage
|
||||
else
|
||||
B.storedpower -= generate_power_usage
|
||||
else
|
||||
qdel(src) //need at least two generator posts
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/machinery/shieldwall/Destroy()
|
||||
update_nearby_tiles()
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
var/alarm = 0
|
||||
var/enabled = 1
|
||||
|
||||
/obj/machinery/shield_diffuser/New()
|
||||
..()
|
||||
/obj/machinery/shield_diffuser/Initialize()
|
||||
. = ..()
|
||||
var/turf/T = get_turf(src)
|
||||
hide(!T.is_plating())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user