From 08c709937da618adc2c4a2d710dd6d528a8b0c8f Mon Sep 17 00:00:00 2001 From: BLUNTFORCE420 <65368125+BLUNTFORCE420@users.noreply.github.com> Date: Mon, 11 Jul 2022 06:34:03 -0400 Subject: [PATCH] Resprites the Tanto, again. (#14401) --- code/modules/projectiles/ammunition/boxes.dm | 3 +- .../projectiles/guns/projectile/pistol.dm | 6 +-- html/changelogs/bluntforce420_tec9.yml | 41 ++++++++++++++++++ icons/obj/guns/c05r.dmi | Bin 810 -> 881 bytes 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/bluntforce420_tec9.yml diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 6d440dd4668..8d16d960c1e 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -135,7 +135,8 @@ /obj/item/ammo_magazine/mc10mm name = "magazine (10mm)" - icon_state = "tommy-mag" + desc = "A detachable magazine for a modified NanoTrasen Mk1, made from stamped sheet metal." + icon_state = "12mm" mag_type = MAGAZINE ammo_type = /obj/item/ammo_casing/c10mm matter = list(DEFAULT_WALL_MATERIAL = 475) //metal costs are very roughly based around 1 .45 casing = 75 metal diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index f97540861e2..bbf070b06fd 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -162,9 +162,9 @@ icon_state = "secgunauto-e" /obj/item/gun/projectile/tanto - desc = "A crude-looking open-bolt machine pistol manufactured by a multitude of arms companies, or in some cases, particularly handy individuals. \ - Owing to their low cost and relative effectiveness, weapons like these are very common all across the Spur, from the tunnels of Oran to fringe colonies along the frontier. \ - This pistol is made almost entirely from sheet metal and has cloth wrappings around the grip for shooter comfort." + desc = "An automatic variant of the NanoTrasen Mk1 Everyman handgun that has been built to accept detachable magazines, negating one of the original \ + weapon's biggest shortcomings. It is marketed towards lower-echelon security companies as a machine pistol named the Tanto, and features a burst-fire selector \ + and sturdier barrel with heatshield to better take advantage of the higher capacity." name = "10mm auto-pistol" icon = 'icons/obj/guns/c05r.dmi' icon_state = "c05r" diff --git a/html/changelogs/bluntforce420_tec9.yml b/html/changelogs/bluntforce420_tec9.yml new file mode 100644 index 00000000000..cdebd8b5e31 --- /dev/null +++ b/html/changelogs/bluntforce420_tec9.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: BLUNTFORCE420 + +# 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: + - tweak: "Updates the Tanto/c05r to better fit the Aurora artstyle, mimicking the design of the new Everyman sprite." diff --git a/icons/obj/guns/c05r.dmi b/icons/obj/guns/c05r.dmi index e3d72218c5cdc6d4dbb67f0f61722c6f3e12f343..f7474bda6badbac9d6734b9620da65e2e63e1444 100644 GIT binary patch delta 801 zcmV++1K#|q2Jr@eiBL{Q4GJ0x0000DNk~Le0001>0001h2m=5B0K2`CDF6TfFi=cX zMZmzoC@3gtaC$*TOpTPF8y_ZhdxmCjbwox_6&xyhfsQykJ|8102@nw~DJj6fz<&~% zLI3~&0d!JMQvg8b*k%9#0ET*0Sad{Xb7OL8aCB*JZU6w0i(Y>s)urYZlvEOJDnvDI zvy~NG{anBS1po#pRS$lcHQoRK0$oW&K~#90?VI6}f-nq(iB&nk6>)lA=JEOh zukIRgHxK!XTO5DxwvGpZWxT$?)fQf_G>w}qULA7xOF}&4`9KBn6BJ(Vmsm1<5*Ebq z>i8XUp`zcE_NyxkC-LUgr%PJDr|{qi0$;|3OAbf$tdo8HdlcZuV?$sXmzL;<1N*#6 zp6WmEsSSZyTnJHCgmfF4CpRwEe_nWjYlT@{TEg%6B8q>8UX`6CKku;ls@%dnE)?h$ ze$PdQUYDOGhf9|WTq&eoPrT912Q_??a)Bf{Do79T(UuB#Jn=?1jzc^sf4=0#oyl8x zgG3nJ}*v$nDh1`+HkE zdkpxcL|1siBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cJWxzj zMZmzoC@3g;fsP*|DmXhnK}JkzaC!+45dZ)HQe0>p92_MuA}KW{J4`ke94aq8D?~<5 zW^Z*WDJj6fz-M^4VE_OC0d!JMQvg8b*k%9#0D5{Xa2+{anDF0RYZn zIng-HU(o;n0v1U`K~!jg?U>tkgdhw>jmS(Zj<^5+*anstRDwjY?L)SGs75#m3^VJb zC6a~T zqI!c>EWg}U!7+bs@#9$%_+D{^EjMr;zYSXsJ|>9Y<<({!CF+`6`f>ic1z zz#1>kwH*MP3?RB7wm@U1n^yIvY3X=k27oKJisJW5^ksin;EXcer-{VVz>@>-C4;Jr z?gzZQ0t?fbrisK;8TGOY`0c9W8E7wV4lA&YC+m-6<#qwrAM_Z1+y7m)E3n^Z{_n0D ztfX53Ok*6+GVm~F*q;JE%A3NSfN@at+qAXPqTk!hBWt3l|d!y`Bi|(00^6FpL5+?w1KfP_x>QXnbdP`0?`)A#@u^4gw1x( zxd{+8PI%^i9YNUa6#E?*6|Qm7pUu4oWwW{Vd(ogiX&ZCzLD_7s{hsv$H7@!QCrjDv zbo)JNglb$Siw&iMEc+d;@mKh3eL)ZeK@bE%h;c=sH;`99)*JYZ1lYZS>~MPn*