|
109 | 109 | density = FALSE |
110 | 110 | var/boing = 0 |
111 | 111 |
|
| 112 | +/obj/effect/anomaly/grav/Initialize(mapload) |
| 113 | + . = ..() |
| 114 | + var/static/list/loc_connections = list( |
| 115 | + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), |
| 116 | + ) |
| 117 | + AddElement(/datum/element/connect_loc, loc_connections) |
| 118 | + |
112 | 119 | /obj/effect/anomaly/grav/anomalyEffect() |
113 | 120 | ..() |
114 | 121 | boing = 1 |
|
126 | 133 | if(target && !target.stat) |
127 | 134 | O.throw_at(target, 5, 10) |
128 | 135 |
|
129 | | -/obj/effect/anomaly/grav/Crossed(atom/movable/AM) |
130 | | - . = ..() |
| 136 | +/obj/effect/anomaly/grav/proc/on_entered(datum/source, atom/movable/AM, ...) |
131 | 137 | gravShock(AM) |
132 | 138 |
|
133 | 139 | /obj/effect/anomaly/grav/Bump(atom/A) |
|
171 | 177 | /obj/effect/anomaly/flux/explosion |
172 | 178 | explosive = ANOMALY_FLUX_EXPLOSION |
173 | 179 |
|
| 180 | +/obj/effect/anomaly/flux/Initialize(mapload) |
| 181 | + . = ..() |
| 182 | + var/static/list/loc_connections = list( |
| 183 | + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), |
| 184 | + ) |
| 185 | + AddElement(/datum/element/connect_loc, loc_connections) |
| 186 | + |
174 | 187 | /obj/effect/anomaly/flux/anomalyEffect(delta_time) |
175 | 188 | ..() |
176 | 189 | canshock = 1 |
|
179 | 192 | if(prob(delta_time * 2)) // shocks everyone nearby |
180 | 193 | tesla_zap(src, 5, shockdamage*500, TESLA_MOB_DAMAGE) |
181 | 194 |
|
182 | | -/obj/effect/anomaly/flux/Crossed(atom/movable/AM) |
183 | | - . = ..() |
| 195 | +/obj/effect/anomaly/flux/proc/on_entered(datum/source, atom/movable/AM, ...) |
184 | 196 | mobShock(AM) |
185 | 197 |
|
186 | 198 | /obj/effect/anomaly/flux/Bump(atom/A) |
|
0 commit comments