diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 7e8dc449a83..a4a15534931 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -494,6 +494,21 @@ ..() icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty" +/obj/item/gun/projectile/automatic/tommygun/dom + name = "dominian submachine gun" + desc = "A .45 caliber submachine gun featuring a novel top loading configuration, used by the Empire of Dominia's armed forces." + desc_extended = "The Moroz Pattern Machine Carbine, Model of 2430 is a lightweight, handy weapon intended for use by vehicle crews, airborne troops, and other units that do not require a full-length rifle. \ + Simplistic in design and function, the MPMC-30 is highly reliable in nearly all environments, lending itself well to use by colonial forces. In particular, the Imperial Fisanduhian Gendarmerie are known to make heavy use of the weapon." + icon = 'icons/obj/guns/dom_smg.dmi' + icon_state = "owen" + item_state = "owen" + max_shells = 20 + allowed_magazines = list(/obj/item/ammo_magazine/submachinemag) + +/obj/item/gun/projectile/automatic/tommygun/update_icon() + ..() + icon_state = (ammo_magazine)? "owen" : "owen-empty" + /obj/item/gun/projectile/automatic/railgun name = "railgun" desc = "An advanced rifle that magnetically propels hyperdense rods at breakneck speeds to devastating effect." diff --git a/html/changelogs/bluntforce420owen.yml b/html/changelogs/bluntforce420owen.yml new file mode 100644 index 00000000000..01498946143 --- /dev/null +++ b/html/changelogs/bluntforce420owen.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: + - rscadd: "Adds .45 SMG for Dominia." diff --git a/icons/obj/guns/dom_smg.dmi b/icons/obj/guns/dom_smg.dmi new file mode 100644 index 00000000000..da70c47e70f Binary files /dev/null and b/icons/obj/guns/dom_smg.dmi differ