diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 2c6b23179fa..a7d79d51a75 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -145,6 +145,37 @@
 	..()
 	icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
 
+/obj/item/gun/projectile/automatic/rifle/shorty
+	name = "short-barreled assault rifle"
+	desc = "A durable, rugged-looking automatic weapon that has been heavily modified. \
+	Key changes include significant shortening of the barrel and the addition of an improvised vertical foregrip, \
+	condensing heavy firepower into a relatively small and maneuverable package intended for close-in \
+	fighting aboard ships and space stations. Affectionately referred to as the \"Shorty\" in some circles. Uses 7.62mm rounds."
+	desc_fluff = "The STS35 is a durable, reliable, and cheap fully-automatic assault rifle with many licensed manufacturers across \
+	the galaxy. It comes in many different versions and calibres; this one uses 7.62mm rounds. This example has been heavily modified and is illegal in some jurisdictions. \
+	Much of the barrel has been lopped off to decrease overall length, while a pistol grip from another STS35 has been clamped on below what remains of the handguard \
+	to improve handling. The fire control group has been altered as well, sacrificing the burst-fire function in favor of a smoother trigger pull. Born from \
+	extensive experience fighting in claustrophobic environments aboard ships and stations, weapons like these are common among Coalition Rangers conducting high-risk boarding operations \
+	along the Frontier, who rely on its ability to rapidly gain fire superiority in the event of an ambush. While no formal name exists for it, \
+	and two no examples are quite alike, weapons of this type are commonly just referred to as the \"Shorty\"."
+	icon = 'icons/obj/guns/shorty.dmi'
+	icon_state = "shorty"
+	item_state = "shorty"
+	can_bayonet = TRUE
+	knife_x_offset = 23
+	knife_y_offset = 13
+	firemodes = list(
+		list(mode_name="semiauto",       burst=1, fire_delay=8),
+		list(mode_name="full auto",		can_autofire=1, burst=1, fire_delay=1, one_hand_fa_penalty=22, burst_accuracy = list(0,-1,-1,-1,-2,-2,-2,-3), dispersion = list(5, 5, 10, 15, 20)),
+		)
+
+	fire_delay = 8
+	accuracy = 2
+
+/obj/item/gun/projectile/automatic/rifle/shorty/update_icon()
+	..()
+	icon_state = (ammo_magazine)? "shorty" : "shorty-empty"
+
 /obj/item/gun/projectile/automatic/rifle/carbine
 	name = "ballistic carbine"
 	desc = "A durable, rugged looking semi-automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds and does not accept large \
diff --git a/html/changelogs/BLUNTFORCE420 - Whip&NaeNae.yml b/html/changelogs/BLUNTFORCE420 - Whip&NaeNae.yml
new file mode 100644
index 00000000000..7d1cc899a21
--- /dev/null
+++ b/html/changelogs/BLUNTFORCE420 - Whip&NaeNae.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: "Added a modified assault rifle for Coalition/Frontier factions."
diff --git a/icons/obj/guns/shorty.dmi b/icons/obj/guns/shorty.dmi
new file mode 100644
index 00000000000..82be220eb57
Binary files /dev/null and b/icons/obj/guns/shorty.dmi differ