Death to earmuff duping (and other fixes/tweaks) (#7216)

* earmuff *scream

* don't limit limb breaking that hard
This commit is contained in:
JohnWildkins
2019-10-27 12:27:38 +01:00
committed by Werner
parent cd8682a3b5
commit 76adc1d93a
8 changed files with 97 additions and 12 deletions
@@ -470,6 +470,9 @@
//Used to attack a joint through grabbing
/mob/living/carbon/human/proc/grab_joint(var/mob/living/user, var/def_zone)
var/has_grab = 0
if(user.limb_breaking)
return 0
for(var/obj/item/weapon/grab/G in list(user.l_hand, user.r_hand))
if(G.affecting == src && G.state == GRAB_NECK)
has_grab = 1
@@ -487,12 +490,15 @@
return 0
user.visible_message("<span class='warning'>[user] begins to dislocate [src]'s [organ.joint]!</span>")
user.limb_breaking = TRUE
if(do_after(user, 100))
organ.dislocate(1)
admin_attack_log(user, src, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of")
src.visible_message("<span class='danger'>[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!</span>")
user.limb_breaking = FALSE
return 1
user.visible_message("<span class='warning'>[user] fails to dislocate [src]'s [organ.joint]!</span>")
user.limb_breaking = FALSE
return 0
//Breaks all grips and pulls that the mob currently has.
@@ -332,6 +332,9 @@ This saves us from having to call add_fingerprint() any time something is put in
check_flags = EYES
if(slot_gloves, slot_w_uniform)
covering = src.wear_suit
if(slot_l_ear, slot_r_ear)
covering = src.head
check_flags = HEAD
if(covering && (covering.body_parts_covered & (I.body_parts_covered|check_flags)))
to_chat(user, "<span class='warning'>\The [covering] is in the way.</span>")
+3 -1
View File
@@ -77,4 +77,6 @@
var/stop_sight_update = 0 //If true, it won't reset the mob vision flags
var/burn_mod = 1
var/brute_mod = 1
var/brute_mod = 1
var/limb_breaking = FALSE // used to limit people from queuing up limb-breaks