From dff6489eebbead198bf77b0d8ff6778f91060230 Mon Sep 17 00:00:00 2001 From: BLUNTFORCE420 <65368125+BLUNTFORCE420@users.noreply.github.com> Date: Fri, 4 Feb 2022 06:21:17 -0500 Subject: [PATCH] Resprites the 10mm Machine Pistol (#13053) --- code/datums/outfits/event/outfit_megacorps.dm | 4 +- code/modules/projectiles/ammunition/boxes.dm | 2 +- code/modules/projectiles/guns/bang/pistol.dm | 4 +- .../projectiles/guns/projectile/pistol.dm | 4 +- html/changelogs/BLUNTFORCE420 - tec9.yml | 43 ++++++++++++++++++ icons/obj/guns/c05r.dmi | Bin 609 -> 810 bytes 6 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/BLUNTFORCE420 - tec9.yml diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm index 0fc138e60fe..e0a4c29b194 100644 --- a/code/datums/outfits/event/outfit_megacorps.dm +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -121,12 +121,12 @@ gloves = /obj/item/clothing/gloves/force glasses = /obj/item/clothing/glasses/thermal - accessory_contents = list(/obj/item/gun/projectile/tanto = 1) + accessory_contents = list(/obj/item/gun/projectile/revolver = 1) suit_store = /obj/item/gun/projectile/automatic/rifle/sol backpack_contents = list( - /obj/item/ammo_magazine/mc10mm = 3, + /obj/item/ammo_magazine/a357 = 3, /obj/item/ammo_magazine/c762/sol = 2 ) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 677bf03fdd6..3a93e95a856 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -103,7 +103,7 @@ /obj/item/ammo_magazine/mc10mm name = "magazine (10mm)" - icon_state = "5.56" + icon_state = "tommy-mag" 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/bang/pistol.dm b/code/modules/projectiles/guns/bang/pistol.dm index 533b289b40e..ab528a97fee 100644 --- a/code/modules/projectiles/guns/bang/pistol.dm +++ b/code/modules/projectiles/guns/bang/pistol.dm @@ -38,7 +38,9 @@ pixel_offset_y = 13 /obj/item/gun/bang/tanto - desc = "A Zavodskoi Interstellar Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds." + 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." name = "10mm pistol" icon = 'icons/obj/guns/c05r.dmi' icon_state = "c05r" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 38d6fcd064d..d5ecbf634dd 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -162,7 +162,9 @@ icon_state = "secgunauto-e" /obj/item/gun/projectile/tanto - desc = "A Zavodskoi Interstellar Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds." + 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." 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..2b54035db75 --- /dev/null +++ b/html/changelogs/BLUNTFORCE420 - tec9.yml @@ -0,0 +1,43 @@ +################################ +# 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: + - rscadd: "Updated legacy sprite for 10mm pistol/Tanto" + - rscadd: "Changed Zavod Heavy Asset Protection loadout to have a Zavod revolver instead of this thing" + diff --git a/icons/obj/guns/c05r.dmi b/icons/obj/guns/c05r.dmi index a6281f45a96af0818c1736608e0a8d07275143a9..e3d72218c5cdc6d4dbb67f0f61722c6f3e12f343 100644 GIT binary patch delta 640 zcmV-`0)PGC1gZv*Bt<+>OjJd{z`!UdD0+d8A0sL_J3c{1Olfd>2@nwg002^4XdE0I zB`_i>H6}YuHWeHyFFh+nMo(sMbt)+-z`(#~c(`GaU6p?V7D+@wRA_)QAPhx~ z$V@AaxBvgx29_68f<&?HL$-aWMmPx!GwY-%1VQ*G0Kl#IZGC&~HN5+?_-*~tUS)|> zDsOrS#4Tzczb6h*c_{y;I>xu}dkWSrYhOafK~6a2~%6 zXjC||Zoz*^JVOScUt6@+b$UEU3aFrMSvCIQzja-+;Oy0(St`(dBJ8ZXYZ9RQmQAi5y7Kx3wxR`sT7>3CuW zfGf6&;`d7QWmn*gGTo<%#M8i&1Mek+s*LUjyu5z`3)7jViNsSG^|A~2?W*G$XfJLK zE3l0x>yKmQb^+HP^ca8J|6R2!u-|9?@2(oGq+0<@V;s*i@GxfBp8`J0o5G!daZvQz zyRm(HTR(7C+T;vW2Kf*VO)Ch3AP9mW2oDkQvQ#Kfvu1`g_fVBVCF=QAfXDy{n`@tQ z-CKXOfw3|7{vfoO)N^hE(H6?a+BbEy@Bj-djr{F_69H>fYTdzMxW6ecmQ5+;0gT;y@9M;>J12j aaEBjPK@%~%yUvCH0000lcfi2Fz`($*!z{RwX_bEgSxH1eRA_>-o{ zWW>&OWKs#}g|F{<%VB73E17?6#t;4R z^I-H0Yh4;}{O6JcYQ477m@l@bXE?j0fyLJH?+NztYSnY5C2fJL<=;Cj++k`u>p;al zSnHn(WAQA|zZ_|l8gLuFz=DBTzsEqdK5O9S{7TPr*+8V<Tq!P6IWKtK-3J!IniOwNP+8B}h3&Nz zFE}V0o_LFXo8J(ZmlqNM000000002^7qlM@^rii1pflNn|3LX40Nr?f@E?$!^>)y9 fGynhq;Pd$f7pn^5&9#Wx00000NkvXXu0mjf>>kY~