From 44908503bfb863b0f4b4d296bff8d198a07c5493 Mon Sep 17 00:00:00 2001
From: cebutris <cebutris2000@gmail.com>
Date: Sun, 4 Feb 2018 23:10:21 -0500
Subject: [PATCH] Stunswords! (#5179)

* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
---
 code/game/objects/items/stunbaton.dm          |   4 +--
 .../code/game/objects/items/stunsword.dm      |  31 ++++++++++++++++++
 .../icons/mob/inhands/stunsword_left.dmi      | Bin 0 -> 367 bytes
 .../icons/mob/inhands/stunsword_right.dmi     | Bin 0 -> 364 bytes
 modular_citadel/icons/obj/stunsword.dmi       | Bin 0 -> 1763 bytes
 tgstation.dme                                 |   1 +
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 modular_citadel/code/game/objects/items/stunsword.dm
 create mode 100644 modular_citadel/icons/mob/inhands/stunsword_left.dmi
 create mode 100644 modular_citadel/icons/mob/inhands/stunsword_right.dmi
 create mode 100644 modular_citadel/icons/obj/stunsword.dmi

diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index bda1714f7b..05599597af 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -63,9 +63,9 @@
 /obj/item/melee/baton/examine(mob/user)
 	..()
 	if(cell)
-		to_chat(user, "<span class='notice'>The baton is [round(cell.percent())]% charged.</span>")
+		to_chat(user, "<span class='notice'>\The [src] is [round(cell.percent())]% charged.</span>")
 	else
-		to_chat(user, "<span class='warning'>The baton does not have a power source installed.</span>")
+		to_chat(user, "<span class='warning'>\The [src] does not have a power source installed.</span>")
 
 /obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stock_parts/cell))
diff --git a/modular_citadel/code/game/objects/items/stunsword.dm b/modular_citadel/code/game/objects/items/stunsword.dm
new file mode 100644
index 0000000000..3d541bb139
--- /dev/null
+++ b/modular_citadel/code/game/objects/items/stunsword.dm
@@ -0,0 +1,31 @@
+/obj/item/melee/baton/stunsword
+	name = "stunsword"
+	desc = "not actually sharp, this sword is functionally identical to a stunbaton"
+	icon = 'modular_citadel/icons/obj/stunsword.dmi'
+	icon_state = "stunsword"
+	item_state = "sword"
+	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
+
+/obj/item/device/ssword_kit
+	name = "stunsword kit"
+	desc = "a modkit for making a stunbaton into a stunsword"
+	icon = 'icons/obj/vending_restock.dmi'
+	icon_state = "refill_donksoft"
+	var/product = /obj/item/melee/baton/stunsword //what it makes
+	var/list/fromitem = list(/obj/item/melee/baton, /obj/item/melee/baton/loaded) //what it needs
+	afterattack(obj/O, mob/user as mob)
+		if(istype(O, product))
+			to_chat(user,"<span class='warning'>[O] is already modified!")
+		else if(O.type in fromitem) //makes sure O is the right thing
+			var/obj/item/melee/baton/B = O
+			if(!B.cell) //checks for a powercell in the baton. If there isn't one, continue. If there is, warn the user to take it out
+				new product(usr.loc) //spawns the product
+				user.visible_message("<span class='warning'>[user] modifies [O]!","<span class='warning'>You modify the [O]!")
+				qdel(O) //Gets rid of the baton
+				qdel(src) //gets rid of the kit
+
+			else
+				to_chat(user,"<span class='warning'>Remove the powercell first!</span>") //We make this check because the stunsword starts without a battery.
+		else
+			to_chat(user, "<span class='warning'> You can't modify [O] with this kit!</span>")
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/inhands/stunsword_left.dmi b/modular_citadel/icons/mob/inhands/stunsword_left.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..68adffaa616d91cf84ca72342f3b27d1c90b52fb
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4*8>L*XliQyZ*bVW|FVOF
zgRhysAW(|2B*-tA!Qt7BG$1FdDkP%BCAB!YD6^m>Ge3`kp<+&OSV2+g_b<T(AHP1)
z^48TlcjkQXhERix#t$CpocGZ@$xzhOyTigb$oR6cm%^M!la5RZQ3zhS!)CvRYiGBy
z>gE*^OMvuR4MTI$BW6#6!V10?GfHza*tkpChUB-o0&Sh)>EamT(fM{tAXkHefQzVA
zgPZsVu7`|o{!QoNEEG?_yJX*~pC`-Or?VIz`{N<UyLR>StBlODw-^|5*aSDpp0sy=
zvAyAc5|3b#t@H7DA}%4{+?WNrGh%NfXL(H*Keb3heS`FbJ#UVFxm7A~-OFtXLw9Q6
z4WUKnTBAdZ^tie91<r}iesFYV)M3YXhK6=2hPI{Kk4VS=?DO+`$R3$rZp;pJBZH@_
KpUXO@geCxw!;FRi

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/mob/inhands/stunsword_right.dmi b/modular_citadel/icons/mob/inhands/stunsword_right.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..57ef58126e8d3808d7f925abdc6f448b14620827
GIT binary patch
literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-t_Kbr(A3oY-{1fQVlp<X
zf#QrML4Lsu4$p3+0XbP!ArU1msl~}fnFS@8`FRWs6?1~a3W`d<e+e%5`1OgFx31Q?
zGv|Xhgc@8le(*@=ypQHdhN7O{9Tvtx#+Qw~6y`jdbYxP9Lh#BRHv2VPJG+flH?NRb
z0;Jb!7@CV7F?$jeR`9i$QJR~<#$C!bB)`oSXzL757sn8b-sA)c2LT2p7lE2%oC-lg
ziU*!GC`ev-qM*Ri%WufUsgT*m5Llud#35P8o5<3V+Lgzmzl*_G&ThupW}Rw=*xwor
z3}GHZjtqfcIQ$*Gg$|r>?k!Z{H+6FS*q_9q@oyq8qqe(Qi|COwm!eLU7<rZt%M>`9
z8H|s(nYB#gPM9RCn82VGIEhiqqT!gke^4_p?2hf>=cw>div+rn!PC{xWt~$(69C`(
BcbotK

literal 0
HcmV?d00001

diff --git a/modular_citadel/icons/obj/stunsword.dmi b/modular_citadel/icons/obj/stunsword.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..bfe4b45cd94ff292145c32b2cc00cd855a24c034
GIT binary patch
literal 1763
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
FV1g;KhGYN$

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index cebe192cc2..08aaf3e9ad 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2512,6 +2512,7 @@
 #include "modular_citadel\code\game\machinery\Sleeper.dm"
 #include "modular_citadel\code\game\objects\ids.dm"
 #include "modular_citadel\code\game\objects\items\handcuffs.dm"
+#include "modular_citadel\code\game\objects\items\stunsword.dm"
 #include "modular_citadel\code\game\objects\items\devices\aicard.dm"
 #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"