cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-24 21:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9601 from Ghommie/Ghommie-cit265

Browse Source 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
This commit is contained in:
kevinz000
2020-10-03 19:35:47 -03:00
committed by Dip
parent 76f9c30103
commit b8bc551d51
120 changed files with 563 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/monkey/combat.dm
+1 -1
View File
@@ -405,7 +405,7 @@
retaliate(Proj.firer)
..()
/mob/living/carbon/monkey/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE)
/mob/living/carbon/monkey/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.throwforce < src.health && I.thrownby && ishuman(I.thrownby))