From 008bc38701987bfcf7a660db1d086aed199cadd4 Mon Sep 17 00:00:00 2001 From: Arturlang Date: Fri, 10 Jan 2020 14:52:07 +0200 Subject: [PATCH] Adds sanity checks to hair styling (#7953) Adds sanity checks to hair styling --- .../mob/living/carbon/human/human_powers.dm | 4 ++ html/changelogs/Arturlang-PR-#7953.yml | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 html/changelogs/Arturlang-PR-#7953.yml diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 1cc9e8ab6d3..5caabff8fa4 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -5,6 +5,10 @@ set name = "Tie Hair" set desc = "Style your hair." set category = "IC" + + if(!use_check_and_message()) + to_chat(src, span("warning", "You can't tie your hair when you are incapacitated!")) + return if(h_style) var/datum/sprite_accessory/hair/hair_style = hair_styles_list[h_style] diff --git a/html/changelogs/Arturlang-PR-#7953.yml b/html/changelogs/Arturlang-PR-#7953.yml new file mode 100644 index 00000000000..74d8aa29bd4 --- /dev/null +++ b/html/changelogs/Arturlang-PR-#7953.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Arturlang + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes being able to tie your hair while unconcious or immobile."