cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4711 from VOREStation/upstream-merge-5875

Browse Source 
[MIRROR] Tommygun now Tommy Gun
This commit is contained in:
Novacat
2019-03-27 20:45:46 -04:00
committed by GitHub
parent 893976536e 6f59432bf4
commit 1e5b351f43
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/magazines.dm
+4 -4
View File
@@ -106,7 +106,7 @@
initial_ammo = 0
/obj/item/ammo_magazine/m45tommy
name = "tommygun magazine (.45)"
name = "Tommy Gun magazine (.45)"
icon_state = "tommy-mag"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a45
@@ -115,14 +115,14 @@
max_ammo = 20
/obj/item/ammo_magazine/m45tommy/ap
name = "tommygun magazine (.45 AP)"
name = "Tommy Gun magazine (.45 AP)"
ammo_type = /obj/item/ammo_casing/a45/ap
/obj/item/ammo_magazine/m45tommy/empty
initial_ammo = 0
/obj/item/ammo_magazine/m45tommydrum
name = "tommygun drum magazine (.45)"
name = "Tommy Gun drum magazine (.45)"
icon_state = "tommy-drum"
w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
mag_type = MAGAZINE
@@ -132,7 +132,7 @@
max_ammo = 50
/obj/item/ammo_magazine/m45tommydrum/ap
name = "tommygun drum magazine (.45 AP)"
name = "Tommy Gun drum magazine (.45 AP)"
ammo_type = /obj/item/ammo_casing/a45/ap
/obj/item/ammo_magazine/m45tommydrum/empty
code/modules/projectiles/guns/projectile/automatic.dm
+1 -1
View File
@@ -346,7 +346,7 @@
icon_state = "p90smg-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 6) : "empty"]"
/obj/item/weapon/gun/projectile/automatic/tommygun
name = "\improper Tommygun"
name = "\improper Tommy Gun"
desc = "This weapon was made famous by gangsters in the 20th century. Cybersun Industries is currently reproducing these for a target market of historic gun collectors and classy criminals. Uses .45 rounds."
icon_state = "tommygun"
w_class = ITEMSIZE_NORMAL