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

Fixes borg buckling+searching on harm intent (#46622)

Browse Source 
* Update medicine_reagents.dm

* Update medicine_reagents.dm

* undoes an accidental change to master

* Update robot.dm

* Update buckling.dm

* Update buckling.dm

* Update buckling.dm

* Update robot.dm

* Update buckling.dm

* Update robot.dm

* Update buckling.dm

* Update robot.dm

* Update buckling.dm

* Update robot.dm

* Update robot.dm

* Update buckling.dm

* Update buckling.dm

* Update robot.dm
This commit is contained in:
ATH1909
2019-09-30 21:39:25 +02:00
committed by AnturK
parent 04be2a22d9
commit d2dad9c298
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/buckling.dm
+4 -1
View File
@@ -22,9 +22,12 @@
/atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
. = ..()
return mouse_buckle_handling(M, user)
/atom/movable/proc/mouse_buckle_handling(mob/living/M, mob/living/user)
if(can_buckle && istype(M) && istype(user))
if(user_buckle_mob(M, user))
return 1
return TRUE
/atom/movable/proc/has_buckled_mobs()
if(!buckled_mobs)
code/modules/mob/living/silicon/robot/robot.dm
+4 -4
View File
@@ -1131,10 +1131,10 @@
shell = TRUE
cell = null
/mob/living/silicon/robot/MouseDrop_T(mob/living/M, mob/living/user)
. = ..()
if(!(M in buckled_mobs) && isliving(M) && ((user!=src)||(src.a_intent != INTENT_HARM)))
buckle_mob(M)
/mob/living/silicon/robot/mouse_buckle_handling(mob/living/M, mob/living/user)
if(can_buckle && istype(M) && !(M in buckled_mobs) && ((user!=src)||(a_intent != INTENT_HARM)))
if(buckle_mob(M))
return TRUE
/mob/living/silicon/robot/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
if(!is_type_in_typecache(M, can_ride_typecache))