From 4bd9bc6a20e81fccb239855d6d622fe442f2cb45 Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Tue, 21 Jul 2020 23:59:31 +0800
Subject: [PATCH] Fixes invisible foam swords (#9417)

---
 aurorastation.dme                      |  2 +-
 code/game/objects/items/toys.dm        |  3 +-
 html/changelogs/wezzy_foamswordfix.yml | 41 ++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/wezzy_foamswordfix.yml

diff --git a/aurorastation.dme b/aurorastation.dme
index fa5b95a8f43..85e90f312a6 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1998,8 +1998,8 @@
 #include "code\modules\mob\living\silicon\robot\items\auto_harvester.dm"
 #include "code\modules\mob\living\silicon\robot\items\electric_arm.dm"
 #include "code\modules\mob\living\silicon\robot\items\form_printer.dm"
-#include "code\modules\mob\living\silicon\robot\items\inductive_charger.dm"
 #include "code\modules\mob\living\silicon\robot\items\gripper.dm"
+#include "code\modules\mob\living\silicon\robot\items\inductive_charger.dm"
 #include "code\modules\mob\living\silicon\robot\items\overdrive.dm"
 #include "code\modules\mob\living\silicon\robot\items\portable_destructive_analyzer.dm"
 #include "code\modules\mob\living\silicon\robot\items\robot_id.dm"
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 5d30d502e71..d94f5629b67 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -807,11 +807,12 @@
 /obj/item/toy/cultsword
 	name = "foam sword"
 	desc = "An arcane weapon wielded by the followers of the hit Saturday morning cartoon \"King Nursee and the Acolytes of Heroism\"."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/sword.dmi'
 	icon_state = "cultblade"
 	item_state = "cultblade"
 	w_class = ITEMSIZE_LARGE
 	attack_verb = list("attacked", "slashed", "stabbed", "poked")
+	contained_sprite = TRUE
 
 /* NYET.
 /obj/item/toddler
diff --git a/html/changelogs/wezzy_foamswordfix.yml b/html/changelogs/wezzy_foamswordfix.yml
new file mode 100644
index 00000000000..ee085d68008
--- /dev/null
+++ b/html/changelogs/wezzy_foamswordfix.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 (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 invisible foam swords."