diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 6d1c6b6cc78..f0ff242d57f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -86,7 +86,6 @@ /obj/structure/bed/chair/wheelchair/Move() . = ..() - cut_overlays() playsound(src, 'sound/effects/roll.ogg', 75, 1) if(buckled_mob) var/mob/living/occupant = buckled_mob diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 40208691fb7..938fd535260 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -176,7 +176,7 @@ /obj/item/clothing/head/justice name = "justice hat" - desc = "fight for what's righteous!" + desc = "Fight for what's righteous!" icon_state = "justicered" flags_inv = BLOCKHAIR body_parts_covered = HEAD|EYES diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index d553306c0ad..44ff1c46462 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -323,7 +323,7 @@ user.visible_message("[user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ "You hold \the [P] up to \the [src], burning it slowly.") playsound(src.loc, 'sound/bureaucracy/paperburn.ogg', 50, 1) - icon_state = "paper_onfire" + flick("paper_onfire", src) //I was going to add do_after in here, but keeping the current method allows people to burn papers they're holding, while they move. That seems fine to keep -Nanako spawn(20) diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 05d25733e19..0257d89e9d4 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -152,7 +152,7 @@ user.visible_message("[user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \ "You hold \the [P] up to \the [src], burning it slowly.") playsound(src.loc, 'sound/bureaucracy/paperburn.ogg', 50, 1) - icon_state = "shredp_onfire" //no do_after here, so people can walk n' burn at the same time. -wezzy + flick("shredp_onfire", src) //no do_after here, so people can walk n' burn at the same time. -wezzy spawn(20) if(get_dist(src, user) < 2 && user.get_active_hand() == P) diff --git a/html/changelogs/wezzyspritefixes.yml b/html/changelogs/wezzyspritefixes.yml new file mode 100644 index 00000000000..679106353eb --- /dev/null +++ b/html/changelogs/wezzyspritefixes.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: Wowzewow + +# 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 eyepatch, wheelchair overlay and justice hat not displaying properly." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d72bd4d2290..42e9c970dd1 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 686b42cbd57..b040594c0a3 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ