cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed some new gun names based on feedback.

Browse Source 
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.
This commit is contained in:
Spades
2016-06-02 17:16:21 -04:00
parent 093ab24339
commit c6b650afa5
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 <i>definitely</i> 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 <i>definitely</i> 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"

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

@@ -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)