From b86d6dab13fd8741b648465b2fac0f3f23f2ccee Mon Sep 17 00:00:00 2001 From: Spades Date: Tue, 22 Jan 2019 23:21:30 -0500 Subject: [PATCH] Tommygun now Tommy Gun (#5875) * Tommygun now Tommy Gun https://github.com/PolarisSS13/Polaris/pull/5837 * Corrects sprite names I figure this can stay as it is. --- code/datums/autolathe/arms.dm | 8 ++++---- code/datums/uplink/ammunition.dm | 8 ++++---- code/datums/uplink/visible_weapons.dm | 2 +- code/modules/projectiles/ammunition/magazines.dm | 8 ++++---- code/modules/projectiles/guns/projectile/automatic.dm | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index e5831cec71f..e170d8c885b 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -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 diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index ebadbdaa8df..3ed884316a2 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -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 diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 6415365bd30..e8a69d2aafa 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -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 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index cfd96ac2aad..41595d9a6de 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -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 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index a1afc075b53..ddaa6439c95 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -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