diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b6e7b6a25f4..cf986fb07e7 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -379,11 +379,11 @@ if(use_check_and_message(usr, USE_ALLOW_NON_ADJACENT|USE_ALLOW_NON_ADV_TOOL_USR)) //You're always adjacent to your inventory in practice. return TRUE switch(name) - if(BP_R_HAND) + if("right hand") if(iscarbon(usr)) var/mob/living/carbon/C = usr C.activate_hand("r") - if(BP_L_HAND) + if("left hand") if(iscarbon(usr)) var/mob/living/carbon/C = usr C.activate_hand("l") @@ -485,4 +485,4 @@ else if(O && (!O.is_usable() || O.is_malfunctioning())) add_overlay(disabled_hand_overlay) if(H.handcuffed) - add_overlay(handcuff_overlay) \ No newline at end of file + add_overlay(handcuff_overlay) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index cbf721e2755..9667121ab22 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -123,4 +123,4 @@ return layer = TURF_LAYER + 0.2 - to_chat(usr, SPAN_NOTICE("You hide \the [src].")) \ No newline at end of file + to_chat(usr, SPAN_NOTICE("You hide \the [src].")) diff --git a/html/changelogs/wezzy_wristfixes.yml b/html/changelogs/wezzy_wristfixes.yml new file mode 100644 index 00000000000..c74fbf89569 --- /dev/null +++ b/html/changelogs/wezzy_wristfixes.yml @@ -0,0 +1,42 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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 bug with swapping hands." + - bugfix: "Adds proper icons for white hud." diff --git a/icons/mob/screen/white.dmi b/icons/mob/screen/white.dmi index e33852a2244..7124e337c5c 100644 Binary files a/icons/mob/screen/white.dmi and b/icons/mob/screen/white.dmi differ