From c6b650afa5a3c6bfc4c085d66bf7d223c4be5057 Mon Sep 17 00:00:00 2001 From: Spades Date: Thu, 2 Jun 2016 17:16:21 -0400 Subject: [PATCH] Changed some new gun names based on feedback. People prefer fantasy names for modern guns! Left names like the Mosin and Tommygun because they're too ironic to change, even in the 26th century. --- code/datums/supplypacks.dm | 4 ++-- code/datums/uplink/visible_weapons.dm | 2 +- code/game/antagonist/outsider/raider.dm | 2 +- code/game/antagonist/station/renegade.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 14 +++++++------- code/modules/projectiles/guns/projectile/pistol.dm | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index f408208c289..66b7a375b96 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -893,8 +893,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/randomised/automatic/hidden name = "Assault weapon crate" contains = list( - /obj/item/weapon/gun/projectile/automatic/fn3000, - /obj/item/weapon/gun/projectile/automatic/fn3000 + /obj/item/weapon/gun/projectile/automatic/wt3000, + /obj/item/weapon/gun/projectile/automatic/wt3000 ) cost = 100 hidden = 1 diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 3020674a4a7..ee99ccf5425 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -68,7 +68,7 @@ /datum/uplink_item/item/visible_weapons/bullpuprifle name = "Assault Rifle (5.56mm)" item_cost = 7 - path = /obj/item/weapon/gun/projectile/automatic/fn3000 + path = /obj/item/weapon/gun/projectile/automatic/wt3000 /datum/uplink_item/item/visible_weapons/combatshotgun name = "Combat Shotgun" diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 590ca3711ea..a7dbaf26e2f 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -80,7 +80,7 @@ var/datum/antagonist/raider/raiders /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/weapon/gun/projectile/automatic/wt550, /obj/item/weapon/gun/projectile/automatic/sts35, - /obj/item/weapon/gun/projectile/automatic/fn3000, + /obj/item/weapon/gun/projectile/automatic/wt3000, /obj/item/weapon/gun/projectile/automatic/p90, /obj/item/weapon/gun/projectile/automatic/tommygun, /obj/item/weapon/gun/projectile/silenced, diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index 40698c30e94..dfcfe45b495 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -37,7 +37,7 @@ var/datum/antagonist/renegade/renegades /obj/item/weapon/gun/projectile/automatic/mini_uzi, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/weapon/gun/projectile/automatic/sts35, - /obj/item/weapon/gun/projectile/automatic/fn3000, + /obj/item/weapon/gun/projectile/automatic/wt3000, /obj/item/weapon/gun/projectile/automatic/wt550, /obj/item/weapon/gun/projectile/automatic/z8, /obj/item/weapon/gun/projectile/automatic/tommygun, diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index f74ee699890..672ea9dadb3 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -103,7 +103,7 @@ return /obj/item/weapon/gun/projectile/automatic/z8 - name = "bullpup assault rifle" + name = "\improper Z8 bullpup rifle" desc = "The Z8 Bulldog is an older model bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it." icon_state = "carbine" item_state = "z8carbine" @@ -300,8 +300,8 @@ icon_state = "mini-uzi-empty" /obj/item/weapon/gun/projectile/automatic/p90 - name = "\improper FN P90" - desc = "Despite its fierce reputation, it still manages to feel like a toy. Uses 5mm rounds." + name = "\improper H90K" + desc = "A compact, high capacity SMG produced by Hephaistos Industries. Despite its fierce reputation, it still manages to feel like a toy. Uses 5mm rounds." icon_state = "p90smg" item_state = "p90" w_class = 3 @@ -343,9 +343,9 @@ icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty" // update_held_icon() -/obj/item/weapon/gun/projectile/automatic/fn3000 - name = "bullpup assault rifle" - desc = "The tacticool bullpup configured FN3000 is a light, compact, military-grade assault rifle that is most definitely illegal for civilians to own. What fun! Uses 5.56mm rounds." +/obj/item/weapon/gun/projectile/automatic/wt3000 + name = "\improper WT3000" + desc = "The bullpup configured WT3000 is a light, compact, military-grade assault rifle that is most definitely illegal for civilians to own. What fun! Uses 5.56mm rounds." icon_state = "bullpupm" item_state = "bullpup" w_class = 4 @@ -364,7 +364,7 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-1,-2), dispersion=list(0.0, 0.6, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/fn3000/update_icon(var/ignore_inhands) +/obj/item/weapon/gun/projectile/automatic/wt3000/update_icon(var/ignore_inhands) ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m)) icon_state = "bullpupm" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 529fb362dd0..a1f871987f0 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -134,7 +134,7 @@ item_state = "deagleg" /obj/item/weapon/gun/projectile/fiveseven - name = "\improper FiveSeven" + name = "\improper WT-AP57" desc = "This tacticool pistol makes you feel like you're playing Counter Strike in Space. Uses 5mm rounds." icon_state = "fnseven" origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)