Merge pull request #12834 from silicons/clickcd_experimental

Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
This commit is contained in:
Lin
2020-07-28 21:51:10 -05:00
committed by GitHub
350 changed files with 1127 additions and 1207 deletions
+3 -3
View File
@@ -37,11 +37,11 @@
if(!proximity_flag)
return
else
if(istype(target, /obj/)) //do far more damage to non mobs so we can get through airlocks
if(istype(target, /obj)) //do far more damage to non mobs so we can get through airlocks
var/obj/target_object = target
target_object.take_damage(force * 3, BRUTE, "melee", 0)
else
if(isliving(target) && ishuman(target))
else if(isliving(target))
if(ishuman(target))
try_to_zombie_infect(target)
else
check_feast(target, user)