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

Tommygun now Tommy Gun (#5875)

Browse Source 
* Tommygun now Tommy Gun

https://github.com/PolarisSS13/Polaris/pull/5837

* Corrects sprite names

I figure this can stay as it is.
This commit is contained in:
Spades
2019-01-22 23:21:30 -05:00
committed by VirgoBot
parent 30ab44613d
commit b86d6dab13
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/autolathe/arms.dm
View File

@@ -70,12 +70,12 @@
hidden = 1
/datum/category_item/autolathe/arms/tommymag
name = "Tommygun magazine (.45)"
name = "Tommy Gun magazine (.45)"
path =/obj/item/ammo_magazine/m45tommy
hidden = 1
/datum/category_item/autolathe/arms/tommydrum
name = "Tommygun drum magazine (.45)"
name = "Tommy Gun drum magazine (.45)"
path =/obj/item/ammo_magazine/m45tommydrum
hidden = 1
@@ -234,13 +234,13 @@
hidden = 1
/datum/category_item/autolathe/arms/tommymag
name = "Tommygun magazine (.45)"
name = "Tommy Gun magazine (.45)"
path =/obj/item/ammo_magazine/m45tommy/empty
category = "Arms and Ammunition"
hidden = 1
/datum/category_item/autolathe/arms/tommydrum
name = "Tommygun drum magazine (.45)"
name = "Tommy Gun drum magazine (.45)"
path =/obj/item/ammo_magazine/m45tommydrum/empty
category = "Arms and Ammunition"
hidden = 1

8
code/datums/uplink/ammunition.dm
View File

@@ -40,20 +40,20 @@
path = /obj/item/ammo_magazine/s45/ap
/datum/uplink_item/item/ammo/tommymag
name = "Tommygun Magazine (.45)"
name = "Tommy Gun Magazine (.45)"
path = /obj/item/ammo_magazine/m45tommy
/datum/uplink_item/item/ammo/tommymagap
name = "Tommygun Magazine (.45 AP)"
name = "Tommy Gun Magazine (.45 AP)"
path = /obj/item/ammo_magazine/m45tommy/ap
/datum/uplink_item/item/ammo/tommydrum
name = "Tommygun Drum Magazine (.45)"
name = "Tommy Gun Drum Magazine (.45)"
path = /obj/item/ammo_magazine/m45tommydrum
item_cost = 40
/datum/uplink_item/item/ammo/tommydrumap
name = "Tommygun Drum Magazine (.45 AP)"
name = "Tommy Gun Drum Magazine (.45 AP)"
path = /obj/item/ammo_magazine/m45tommydrum/ap
/datum/uplink_item/item/ammo/darts

2
code/datums/uplink/visible_weapons.dm
View File

@@ -139,7 +139,7 @@
path = /obj/item/weapon/storage/secure/briefcase/fuelrod
/datum/uplink_item/item/visible_weapons/tommygun
name = "Tommygun (.45)" // We're keeping this because it's CLASSY. -Spades
name = "Tommy Gun (.45)" // We're keeping this because it's CLASSY. -Spades
item_cost = 60
path = /obj/item/weapon/gun/projectile/automatic/tommygun

8
code/modules/projectiles/ammunition/magazines.dm
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

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

@@ -351,7 +351,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