one level deeper

This commit is contained in:
Kyep
2019-05-02 21:32:30 -07:00
parent bf1eeb211f
commit cddb0a8213
2 changed files with 3 additions and 6 deletions
+1 -1
View File
@@ -24,7 +24,7 @@
return FALSE
/obj/attackby(obj/item/I, mob/living/user, params)
return ..() || (can_be_hit && istype(I) && I.attack_obj(src, user))
return ..() || (can_be_hit && I.attack_obj(src, user))
/mob/living/attackby(obj/item/I, mob/living/user, params)
user.changeNext_move(CLICK_CD_MELEE)
+2 -5
View File
@@ -87,10 +87,7 @@
if(operating || !density)
return
add_fingerprint(user)
if(!requiresID())
user = null
if(allowed(user))
if(!requiresID() || allowed(user))
open_and_close()
else
do_animate("deny")
@@ -217,7 +214,7 @@
return attack_hand(user)
/obj/machinery/door/window/attack_hand(mob/user)
return attackby(user, user)
return bumpopen(user)
/obj/machinery/door/window/emag_act(mob/user, obj/weapon)
if(!operating && density && !emagged)