mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] next new to init (#10524)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
9156a08bf0
commit
55d696e503
@@ -16,7 +16,8 @@
|
||||
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(mapload, var/new_projector)
|
||||
. = ..()
|
||||
if(new_projector)
|
||||
projector = new_projector
|
||||
var/turf/us = get_turf(src)
|
||||
@@ -26,7 +27,6 @@
|
||||
y_offset = us.y - them.y
|
||||
else
|
||||
update_color()
|
||||
..(newloc)
|
||||
|
||||
/obj/effect/directional_shield/proc/relocate()
|
||||
if(!projector)
|
||||
|
||||
@@ -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(mapload, var/new_gen)
|
||||
. = ..()
|
||||
my_gen = new_gen
|
||||
update_nearby_tiles()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user