cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors move procs to support multitle objects (#6423)

Browse Source 
* Refactors move procs to support multitle objects

* Update _blob.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-22 22:40:04 +01:00
committed by GitHub
co-authored by Rohesie Gandalf
parent 3d784d4c1e
commit d85a02babd
82 changed files with 349 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_smoke.dm
+4 -4
View File
@@ -140,11 +140,11 @@
M.emote("cough")
return TRUE
/obj/effect/particle_effect/smoke/bad/proc/on_entered(datum/source, atom/movable/AM, oldloc)
/obj/effect/particle_effect/smoke/bad/proc/on_entered(datum/source, atom/movable/arrived, direction)
SIGNAL_HANDLER
if(istype(AM, /obj/projectile/beam))
var/obj/projectile/beam/B = AM
B.damage = (B.damage/2)
if(istype(arrived, /obj/projectile/beam))
var/obj/projectile/beam/beam = arrived
beam.damage *= 0.5
/datum/effect_system/smoke_spread/bad
effect_type = /obj/effect/particle_effect/smoke/bad
code/game/objects/effects/portals.dm
+4 -4
View File
@@ -52,13 +52,13 @@
/obj/effect/portal/attack_tk(mob/user)
return
/obj/effect/portal/proc/on_entered(atom/newloc, atom/movable/entering_movable, atom/oldloc)
/obj/effect/portal/proc/on_entered(datum/source, atom/movable/arrived, direction)
SIGNAL_HANDLER
if(isobserver(entering_movable))
if(isobserver(arrived))
return
if(linked && (get_turf(oldloc) == get_turf(linked)))
if(linked && (get_step(source, REVERSE_DIR(direction)) == get_turf(linked)))
return
teleport(entering_movable)
teleport(arrived)
/obj/effect/portal/attack_hand(mob/user, list/modifiers)
. = ..()
code/game/objects/effects/proximity.dm
+1 -1
View File
@@ -113,7 +113,7 @@
)
AddElement(/datum/element/connect_loc, src, loc_connections)
/obj/effect/abstract/proximity_checker/proc/on_uncrossed(datum/source, atom/movable/AM)
/obj/effect/abstract/proximity_checker/proc/on_uncrossed(datum/source, atom/movable/gone, direction)
SIGNAL_HANDLER
return