Fixes long hair not being caught in some machines (#7819)

This feature was broken due to some hair name changes. The entire stuff was remade to be a proc in the machinery object, that also checks for any hair with a length longer than four.
This commit is contained in:
Alberyk
2019-12-28 20:10:38 +02:00
committed by Erki
parent e54fdecba1
commit b58463fe61
6 changed files with 48 additions and 38 deletions
@@ -7,7 +7,6 @@
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
flags_inv = BLOCKHAIR
item_state_slots = list(
slot_l_hand_str = "s_helmet",
slot_r_hand_str = "s_helmet"
+1 -8
View File
@@ -641,14 +641,7 @@
var/beaker_contents = ""
var/dat = ""
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/M = user
if(M.h_style == "Floorlength Braid" || M.h_style == "Very Long Hair")
if(prob(10))
M.apply_damage(30, BRUTE, BP_HEAD)
M.apply_damage(45, PAIN)
M.visible_message("<span class='warning'>[user]'s hair catches in the [src]!</span>", "<span class='danger'>Your hair gets caught in the [src]!</span>")
M.say("*scream")
do_hair_pull(user)
if(!inuse)
for (var/obj/item/O in holdingitems)