From 0c0bd572e84645e06bd58620660636bd83c80c2b Mon Sep 17 00:00:00 2001
From: alsoandanswer <42310821+alsoandanswer@users.noreply.github.com>
Date: Sun, 19 May 2019 21:34:32 +0800
Subject: [PATCH] Sprite fixes (#6468)
---
.../stool_bed_chair_nest/wheelchair.dm | 1 -
code/modules/clothing/head/misc.dm | 2 +-
code/modules/paperwork/paper.dm | 2 +-
code/modules/paperwork/papershredder.dm | 2 +-
html/changelogs/wezzyspritefixes.yml | 41 ++++++++++++++++++
icons/mob/head.dmi | Bin 162819 -> 163878 bytes
icons/obj/clothing/glasses.dmi | Bin 12097 -> 11709 bytes
7 files changed, 44 insertions(+), 4 deletions(-)
create mode 100644 html/changelogs/wezzyspritefixes.yml
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 d72bd4d2290a7c41e154f1eb4708fba3103b3a8d..42e9c970dd1fad8767e6a5bb90c81a55803499b8 100644
GIT binary patch
literal 163878
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