cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +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/datums/ai/monkey/monkey_controller.dm
+3 -3
View File
@@ -310,11 +310,11 @@ have ways of interacting with a specific mob and control it.
var/mob/living/carbon/human/H = thrown_by
retaliate(H)
/datum/ai_controller/monkey/proc/on_entered(datum/source, atom/movable/AM)
/datum/ai_controller/monkey/proc/on_entered(datum/source, atom/movable/arrived, direction)
SIGNAL_HANDLER
var/mob/living/living_pawn = pawn
if(!IS_DEAD_OR_INCAP(living_pawn) && ismob(AM))
var/mob/living/in_the_way_mob = AM
if(!IS_DEAD_OR_INCAP(living_pawn) && isliving(arrived))
var/mob/living/in_the_way_mob = arrived
in_the_way_mob.knockOver(living_pawn)
return