cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 15:10:38 -03:00
committed by Erki
parent e54fdecba1
commit b58463fe61
6 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/reagents/Chemistry-Machinery.dm
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)