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 e3d72218c5c..f7474bda6ba 100644 Binary files a/icons/obj/guns/c05r.dmi and b/icons/obj/guns/c05r.dmi differ