This gives most projectile guns less generic names.

This commit is contained in:
Firecage
2015-09-06 13:43:38 +02:00
parent cbe2e310c6
commit 9c341fb128
7 changed files with 21 additions and 20 deletions
@@ -9,7 +9,7 @@
action_button_name = "Toggle Firemode"
/obj/item/weapon/gun/projectile/automatic/proto
name = "prototype SMG"
name = "NanoTrasen Saber SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
@@ -80,7 +80,7 @@
return
/obj/item/weapon/gun/projectile/automatic/c20r
name = "syndicate SMG"
name = "C-20r SMG"
desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
@@ -110,7 +110,7 @@
return
/obj/item/weapon/gun/projectile/automatic/mini_uzi
name = "uzi"
name = "'Type U3' SMG"
desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
icon_state = "mini-uzi"
origin_tech = "combat=5;materials=2;syndicate=8"
@@ -118,7 +118,7 @@
burst_size = 2
/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "syndicate LMG"
name = "L6 SAW LMG"
desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
icon_state = "l6closed100"
item_state = "l6closedmag"
@@ -178,7 +178,7 @@
..()
/obj/item/weapon/gun/projectile/automatic/m90
name = "syndicate carbine"
name = "M-90gl Carbine"
desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
icon_state = "m90"
item_state = "m90"
@@ -252,7 +252,7 @@
return
/obj/item/weapon/gun/projectile/automatic/tommygun
name = "thompson SMG"
name = "Thompson SMG"
desc = "Based on the classic 'Chicago Typewriter'."
icon_state = "tommygun"
item_state = "shotgun"
@@ -266,7 +266,7 @@
fire_delay = 1
/obj/item/weapon/gun/projectile/automatic/ar
name = "ARG"
name = "NT-ARG 'Boarder'"
desc = "A robust assault rile used by Nanotrasen fighting forces."
icon_state = "arg"
item_state = "arg"
@@ -30,7 +30,7 @@
return
/obj/item/weapon/gun/projectile/automatic/gyropistol
name = "gyrojet pistol"
name = "Gyrojet pistol"
desc = "A prototype pistol designed to fire self propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
@@ -1,5 +1,5 @@
/obj/item/weapon/gun/projectile/automatic/pistol
name = "syndicate pistol"
name = "Stetchkin Pistol"
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
icon_state = "pistol"
w_class = 2
@@ -24,7 +24,7 @@
can_suppress = 0
/obj/item/weapon/gun/projectile/automatic/pistol/deagle
name = "desert eagle"
name = "Desert Eagle"
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14
@@ -1,5 +1,5 @@
/obj/item/weapon/gun/projectile/revolver
name = "revolver"
name = ".357 Revolver"
desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
@@ -57,6 +57,7 @@
user << "[get_ammo(0,0)] of those are live rounds."
/obj/item/weapon/gun/projectile/revolver/detective
name = ".38 Mars Special"
desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
icon_state = "detective"
origin_tech = "combat=2;materials=2"
@@ -115,8 +116,8 @@
/obj/item/weapon/gun/projectile/revolver/mateba
name = "autorevolver"
desc = "A retro high-powered mateba autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
name = "Unica 6 auto-revolver"
desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
icon_state = "mateba"
origin_tech = "combat=2;materials=2"
@@ -65,7 +65,7 @@
// RIOT SHOTGUN //
/obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory
name = "riot shotgun"
name = "Washington 227 Shotgun"
desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
icon_state = "riotshotgun"
mag_type = /obj/item/ammo_box/magazine/internal/shotriot
@@ -85,8 +85,8 @@
///////////////////////
/obj/item/weapon/gun/projectile/shotgun/boltaction
name = "bolt action rifle"
desc = "This piece of junk looks like something that could have been used 700 years ago."
name = "Mosin Nagant Rifle"
desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
icon_state = "moistnugget"
item_state = "moistnugget"
slot_flags = 0 //no SLOT_BACK sprite, alas
@@ -248,7 +248,7 @@
// Bulldog shotgun //
/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
name = "syndicate shotgun"
name = "MLG-12 Bulldog Shotgun"
desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
icon_state = "bulldog"
item_state = "bulldog"
@@ -294,7 +294,7 @@
// COMBAT SHOTGUN //
/obj/item/weapon/gun/projectile/shotgun/automatic/combat
name = "combat shotgun"
name = "J6 'Smacker' shotgun"
desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
icon_state = "cshotgun"
origin_tech = "combat=5;materials=2"
@@ -126,7 +126,7 @@
category = list("Weapons")
/datum/design/smg
name = "Prototype Submachine Gun"
name = "NanoTrasen Saber SMG"
desc = "A prototype weapon made using lightweight materials on a traditional frame, designed to fire standard 9mm rounds."
id = "smg"
req_tech = list("combat" = 4, "materials" = 3)