From fa6be5f91da7fb30dc2c350b4ef3f10430e53133 Mon Sep 17 00:00:00 2001
From: D4C-420 <75496851+D4C-420@users.noreply.github.com>
Date: Tue, 14 Nov 2023 08:50:00 -0500
Subject: [PATCH] Makes the spelling of 'mjollnir' consistant and renames
 singularityhammer.dm to wizard_weapons.dm 2 (#79700)

## About The Pull Request

All the below copied from #79588

Does as the tin says and renames all instances of 'mjolnir' to
'mjollnir' . They are TECHNICALLY both correct but because 'mjolnir' was
only used for the spelling in game for the hammer itself and the icon
when worn on the back I decided on two l's. This also means I had to
change the icon name for the back sprite

If I'm missing any files with it spelt 'mjolnir' please tell me

While I was at it i also decided to change singularityhammer.dm to
wizard_weapons.dm because apparently the file is supposed to be where
wizard weapon are stored and having it be named after a single weapon is
confusing incase people add more weapons later on.




## Why It's Good For The Game
More consistent spelling.

Code wise it makes it more clear what the intended use for a file is


## Changelog
:cl:
spellcheck: hopefully changed all instances of the word 'mjolnir' to
'mjollnir'
/:cl:
---
 ...singularityhammer.dm => wizard_weapons.dm} |   4 ++--
 icons/mob/clothing/back.dmi                   | Bin 119812 -> 119809 bytes
 tgstation.dme                                 |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename code/game/objects/items/{singularityhammer.dm => wizard_weapons.dm} (98%)

diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/wizard_weapons.dm
similarity index 98%
rename from code/game/objects/items/singularityhammer.dm
rename to code/game/objects/items/wizard_weapons.dm
index 50a97c215d8..b16f5be5bfd 100644
--- a/code/game/objects/items/singularityhammer.dm
+++ b/code/game/objects/items/wizard_weapons.dm
@@ -77,12 +77,12 @@
 	return .
 
 /obj/item/mjollnir
-	name = "Mjolnir"
+	name = "Mjollnir"
 	desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
 	icon = 'icons/obj/weapons/hammer.dmi'
 	icon_state = "mjollnir0"
 	base_icon_state = "mjollnir"
-	worn_icon_state = "mjolnir"
+	worn_icon_state = "mjollnir"
 	lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
 	flags_1 = CONDUCT_1
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index ab4f8c85f30b5cc9a86ffb68cfdc42ecc0b22d2e..9b8417d882b45ff602afd993655e178b1ad8996e 100644
GIT binary patch
delta 1446
zcmV;X1zGxps0V?l2aqIxi+WU8bVOxyV{&P5bZKvH004NLrI}H0+c*q>pPOG{Y_DFC
zq|I(GeYiu1!ydK+Zg&rRGH98$Sksax$w_m+{vMh%P8)|zhpq(%d?H1PqDcCE_Q&Tx
zzkJK?zkZpmF+}n%yUT8`=d-H~Rmo;|+0AlxWsw@2p8gXPB+TxAvUkX6Qt&;PcK&X5
zRZ)o9U3NRWssnTwv%73@5?+X~f7~|cM65xFfs9gIQLDiql0XW^VN4d2VuufydN8e)
z``{;>vz%R3$gs`svSq$}y{_a-w3PfSx(xIQNIu0E{G0W4<VdZoBS({(ZVsAO`7&S3
zt^#hzRnwwebCG6$*Sy)vwWmt0Ywf9;)O35$w3z3M{5Bs+*ibU|ux@c$PfY>g5#`%o
zf~!0e%9kcupPE6Anm|5jS#v2UU)V}3lC)s#5rPKXAXgYv>7s=M4rJA4o2=p#V}iQ&
zwXxtDJWa0-L3Nw&eokMXoiK3JK_W$vuJTpB%2#KlSp=RCzKq9rD_`WV{+_bcNA=cT
zld%C8e-ED7QIL;t0|`S3rd7pH@Ey1!T0)kS&XMQ`P$c6X`~I*bqI~U+bU^B+&SqSA
zJZ-<2im=zHCYynS3j`l6kWZ6B@Zqf6k793ry~-E)i`*zDChr2(JaLatfO2r{Nx8t=
zlS?&uqb6@fk|AO+;GE*<My%|B5iI*)1j}w1f5EaRMzHLRe&C4rpTGa}_g_CIEF9&{
zoBZbVQrX@yEgL+hWsAqO(&U(isS`bGZ%l*YaGz17r7;bPgMCJoHnzn478_e)R@&GS
zv(m<vn3XoR#4OvmudU*lH-A*JVNK=WNKTFW;;xW$bw6;FQ|Plm)}y^1RoK2q<sLX%
zf5i0f_uu8$(qU+}g|f!%8Da+=xFUg*D-Xl4?R=13y9bNLE1uTqsMj<hj(Q9qI*>gZ
zhtTsNmmxb&CA0GslN*`_<yh^8*s8Ij57fy%#dB^NC61$_W4B07H>Xy~$z})2sb&Yt
ziDn1NX~tOW)FpE{n3feG){|-BadZ}+f2P_(C0J=e>p3P2DBl+6lODF-wF<j!9q{LX
z&TJJ^1Mjd<%@>}UXNDM+>{B{Y!if?%8oCQ)U$~_7U8(d(>=6`=UI|_4y_QbEExD$M
z8z1DO4nVH-n^JWlVvo!vLp70iemi7_Px&HW<g0v<FY?>b{R>01iqQHw&{`9Lf1bBm
zlrZ?-f=h+rp}dqYN(7_mF<veU2-Q{|+U1Mmw(q2vvwJuvEvCWs!7JX>9auPTkmU;J
znFo_-JrNb75$s}~&#yn`^Xrc<kGilBDyGKD?_bT-*wlk*C;Rmi&Nw-08i^{sj}yAz
zAkEiubyhP(tDGZ@*rH~LRz8|`e_NCTH;RnAA2DmDHY4`pxp(Pfg1VMB)c7hUsOt|U
z4|0j~OlzLDr}^kajWSi)9F3}s#qP4<mY3^)Wzfe2iojxTS`0eY`k+W^KDa{jnauj&
zbk%z`XbLbWk#%-BG{Ni84fUua`#@7q-HC~<vTsuLOxF8W{k1`5O9{<@e<{i4Kn0yL
zD@Ah6zz`^H3kzL0`3%nw7i)g~H02b2NAAT0Y?r#?(F~k^sX&PvA1cK=-wm8-jbUnH
zu$sMmGsX#}r(|sHgW_X*Zy|WFMKstaMH9VG(A4$8uPG{W;_D@osr|^+i6P3}GQ%3q
zgy=ZuejJ}f?YY9Lu$|mwe<x&A4az&L$N<M}AlIPk+a#6{9!tN8TUU|n{%2k{8PGNH
z*7H^)a*eL?q0l9SWU<&lS;E6)>Hq0O5Wfs%hFB;E7Y9^1yok_R=SA#4OBQ5|$vZo^
zq-Yk<84E69Rh<2<@;>|g?LNEz`epV%pciIc_^$hI001BWNkl<ZgTn>4!vz6B&SQAj
A+W-In

delta 1446
zcmV;X1zGxms0W0o2aqIxj(SvBbVOxyV{&P5bZKvH004NLrJ2oc+ei$6&+$_T?NtqI
zC+_x=!!A-RdT1BepTnL6YD8%mQ8Vhy$gcP4_Ygal9m}LsqzO>q8*<3ua7gNX_S@&*
zzkJIczkZpmF+}n%d&ur@=d+s)Rmo-#+1+w>W04x0p8pdQB+MRvvUkX6Qt&;PcK&X5
zQ&EW7Lv}yAsRMKvvxjVP7G8+3|FLb*iCBXU0~w{bqE>@JB!Lu+!<Z~4#SWh^^<Y{p
z_rXs%XF0p6kYSrWWXpW{dR@uaXes$;bQ$OqkbH_K{G0W4<VdZoBS({(?hcw(`7&S3
zZUSz|RnwwebCqU)*Sy)vwWmt0Ywf9;)O3H)w3z3M{5~H^*ibU|ux@c)PfY>g2g<j<
z1Xp<`lrK%RJ~e|JHGzE6vgTS)zOa>6Bx%9eBLoe&L9Q^U(nSji9LTE8Hd)0f#sqck
zYh%GRc%EJzg6cls{hYr(J7M6cgG7oTUFEBMm9H*Jvj{v8eHoAMR=&tz{XJ)^kLs<R
zld%C8e@~v-QIL;t0|`S3rd7pH@Ey1!T0)kS&XMRRP$c6X`~I*bqI~U+bU^B+&SqSA
zJa504im=zHCYynSD+C`ckWZ6B@ZqA{k793ryUG{&Np6%AlXrn?p18+nKsmVfq+H<b
z$)%dSQ<L{1$q+FZa87Y_BUX062$p>?f@L?1e_+`YBUpAuKXAmy&wu^>=O6!0SUAd?
zclq7<rLw(aS~hr0%NCDmrO7c3Qzv@S-k1i(;l7|sOJf=o2m695ZET78EjG5qthBKu
zW~GfSF)M9siCMOBUt7fsZ~mxc!<x#$k(?U$#a$ui>VDuTr_dLHtVer2s<3^J$~|zj
ze~9UyzkZcpONXJ^7Rnm4XNVni;EDuJt~?CGw(~)D?H()|uXtLcqh8a5IO;Kc=s@;t
z974~7T!!p8mCVjlOm1izlw-9UVyniAK2Rt76fe1HlsJxxj@=?T-JDw`Cz~B8r<xro
zCz>57rx|0hQ<u!;U|Lp$SWl*fAEUGQe>Bw=D#1z%TF)_IK>4;fpY*Wxu2tA=>ww<}
zbY`oV8hD3=YQFH?JTt_oWS`TK5>AxB(a>EX`^qJy?@FaVVvnF`^h)ST@3nLSZpk%8
z-1s0LbpUdu-;}Bg5qo4V8LElA^UEPKe99O3B46c;e39Re?q3+9RfN{}f!3M`fAqZ7
zqJ+Ws7F;R}59PIdQ6d;ck8!#zAXHm<XqPXJ+rG16F7Dxyw3r6h2d{WjcVOYXL6$3=
z7amNa^+Z&RMzD){KEM5#&u>4T9(7?MR7{PP-@lrvv8e~sPWJ0(oN;#4G!j*MA18Fb
zL7K1S>a1pnRyju)u|>@gt$Z}?f3_$GZWI}JKVsHQZAR?XbMMl}1a&QMsPR=yP}d(y
z9^?||h1NW6&-2lV8fB`oIT}?Ni`{j@Eic#q%Ak)46oJLwv>0@(^+A!;d~k*4Gnw_l
z>8kf?&=g=$BJ1pMXoA<F8|qO<_JO9Jx|4~mQ#j|jPEoZ?*85idu|Z`@e+kWiDaqDA
z1)VY}MRLu+5GZX63tcz)3eOMsYJU4X<P?5K-o*rLm%7@~44i(dK8YJ2D#bJ34V-9=
zVQOHonw>rw<9yOnGPd?X@vXhL5Ioo-8tjvzhu-IB>iXc<6cs7)^^(cVe&p)J5ani>
zVGS2TbewWOj!&ZYTwzt%e@^bP6Edpi<Q-OIfa5lhYf$xR5=#g_O23I)SCQ=g7hX3Q
z(Dm@v^Hw8rjjr;c&?SUqvDiRa!qa5s|LIH+pN29+ER=JL1FD=|L};z^BKDsp3o^#!
zogG|K^a|*V1(&cYE`C;dpMC!Jm_2^|GW#EKsAcgOkmZN~03ZNKgS`c}y#)b8&KHo;
AT>t<8

diff --git a/tgstation.dme b/tgstation.dme
index 9de6a577042..8cd790be99d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2227,7 +2227,6 @@
 #include "code\game\objects\items\shooting_range.dm"
 #include "code\game\objects\items\shrapnel.dm"
 #include "code\game\objects\items\signs.dm"
-#include "code\game\objects\items\singularityhammer.dm"
 #include "code\game\objects\items\skub.dm"
 #include "code\game\objects\items\spear.dm"
 #include "code\game\objects\items\sticker.dm"
@@ -2247,6 +2246,7 @@
 #include "code\game\objects\items\wall_mounted.dm"
 #include "code\game\objects\items\weaponry.dm"
 #include "code\game\objects\items\wiki_manuals.dm"
+#include "code\game\objects\items\wizard_weapons.dm"
 #include "code\game\objects\items\AI_modules\_AI_modules.dm"
 #include "code\game\objects\items\AI_modules\freeform.dm"
 #include "code\game\objects\items\AI_modules\full_lawsets.dm"