cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3694 from SpadesNeil/gun-stuff

Browse Source 
Gun stuff. Some fixes, some changes, and a shiny new SVD
This commit is contained in:
Anewbe
2017-08-20 11:21:50 -04:00
committed by GitHub
parent 7198ea086e e7a4fbcba0
commit 676fb6daf6
9 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -23,7 +23,7 @@
/obj/item/weapon/gun/projectile/automatic/c20r
name = "submachine gun"
desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. Uses 10mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. It has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock. Uses 10mm rounds."
icon_state = "c20r"
item_state = "c20r"
w_class = ITEMSIZE_NORMAL
@@ -173,7 +173,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "light machine gun"
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever"
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. 'Aussec Armoury-2531' is engraved on the reciever. Uses 5.45mm rounds. It's also compatible with magazines from STS-35 assault rifles."
icon_state = "l6closed100"
item_state = "l6closed"
w_class = ITEMSIZE_LARGE
@@ -245,7 +245,7 @@
/obj/item/weapon/gun/projectile/automatic/as24
name = "automatic shotgun"
desc = "The AS-24 is a durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
desc = "The AS-24 is a rugged looking automatic shotgun produced for the military by Gurov Projectile Weapons LLC. For very obvious reasons, it's illegal to own in many juristictions. Uses 12g rounds."
icon_state = "ashot"
item_state = null
w_class = ITEMSIZE_LARGE
@@ -276,7 +276,7 @@
/obj/item/weapon/gun/projectile/automatic/mini_uzi
name = "\improper Uzi"
desc = "A lightweight, compact, fast firing gun, for when you want someone really dead. Uses .45 rounds."
desc = "The iconic Uzi is a lightweight, compact, fast firing machine pistol. Cybersun Industries famously still produces these designs, which have changed little since the 20th century. Uses .45 rounds."
icon_state = "mini-uzi"
w_class = ITEMSIZE_NORMAL
load_method = MAGAZINE