mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Response to feedback.
Tried to make descriptions better. SAW magazine no longer fits in pockets.
This commit is contained in:
@@ -351,6 +351,7 @@
|
||||
caliber = "a762"
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 10000)
|
||||
ammo_type = /obj/item/ammo_casing/a762
|
||||
w_class = 3 // This should NOT fit in your pocket!!
|
||||
max_ammo = 50
|
||||
multiple_sprites = 1
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/wt550
|
||||
name = "machine pistol"
|
||||
desc = "The WT550 Saber is a cheap self-defense weapon, mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
|
||||
desc = "The WT550 Saber is a cheap personal defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
|
||||
icon_state = "wt550"
|
||||
item_state = "wt550"
|
||||
w_class = 3
|
||||
@@ -323,7 +323,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/tommygun
|
||||
name = "\improper Tommygun"
|
||||
desc = "Some little typewriter, huh? I'm gonna write my name all over this town with big letters! Uses .45 rounds."
|
||||
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 = 3
|
||||
caliber = ".45"
|
||||
@@ -345,7 +345,7 @@
|
||||
|
||||
/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."
|
||||
desc = "The bullpup configured WT3000 is a lightweight, compact, military-grade assault rifle produced by Ward-Takahashi that is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds."
|
||||
icon_state = "bullpupm"
|
||||
item_state = "bullpup"
|
||||
w_class = 4
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
|
||||
name = "ceremonial bolt-action rifle"
|
||||
desc = "A bolt-action rifle decorated with dazzling engravings across the stock. Usually loaded with blanks, but can fire live rounds. Popular among well-dressed guardsmen. Uses 7.62mm rounds."
|
||||
desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds."
|
||||
ammo_type = /obj/item/ammo_casing/a762/blank
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin
|
||||
name = "\improper Mosin Nagant"
|
||||
desc = "How else are you going to arm five people for just $400? Uses 7.62mm rounds."
|
||||
desc = "Despite its age, the Mosin Nagant continues to be a favorite weapon among colonists, conscripts, and militias across the cosmos. It's hard to say who built this one, considering the design has been ripped off by just about every arms manufacturer in the galaxy. Uses 7.62mm rounds."
|
||||
icon_state = "mosin"
|
||||
item_state = "mosin"
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
playsound(user, fire_sound, 50, 1)
|
||||
user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>The rifle goes off in your face!</span>")
|
||||
return
|
||||
if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY
|
||||
if(do_after(user, 30))
|
||||
icon_state = "obrez"
|
||||
w_class = 3
|
||||
recoil = 2 // Owch
|
||||
@@ -46,7 +46,7 @@
|
||||
slot_flags &= ~SLOT_BACK //you can't sling it on your back
|
||||
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
|
||||
name = "\improper Obrez"
|
||||
desc = "cheeki breeki"
|
||||
desc = "The firepower of a Mosin, now the size of a pistol, with an effective combat range of about three feet. Uses 7.62mm rounds."
|
||||
user << "<span class='warning'>You shorten the barrel and stock of \the [src]!</span>"
|
||||
else
|
||||
..()
|
||||
@@ -135,7 +135,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/fiveseven
|
||||
name = "\improper WT-AP57"
|
||||
desc = "This tacticool pistol makes you feel like you're playing Counter Strike in Space. Uses 5mm rounds."
|
||||
desc = "This tacticool pistol made by Ward-Takahashi trades stopping power for armor piercing and a high capacity. Uses 5mm rounds."
|
||||
icon_state = "fnseven"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
|
||||
caliber = "5mm"
|
||||
@@ -151,7 +151,7 @@
|
||||
else
|
||||
icon_state = "fnseven-empty"
|
||||
|
||||
/obj/item/weapon/gun/projectile/gyropistol
|
||||
/obj/item/weapon/gun/projectile/gyropistol // Does this even appear anywhere outside of admin abuse?
|
||||
name = "gyrojet pistol"
|
||||
desc = "Speak softly, and carry a big gun. Fires rare .75 caliber self-propelled exploding bolts--because fuck you and everything around you."
|
||||
icon_state = "gyropistol"
|
||||
@@ -281,7 +281,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/luger
|
||||
name = "\improper P08 Luger"
|
||||
desc = "Not some cheap Scheisse .45 caliber Martian knockoff! This Luger is an authentic reproduction by RauMauser. Accuracy, easy handling, and its signature appearance make it popular among collectors... and space Nazis. Uses 9mm rounds."
|
||||
desc = "Not some cheap Scheisse .45 caliber Martian knockoff! This Luger is an authentic reproduction by RauMauser. Accuracy, easy handling, and its signature appearance make it popular among historic gun collectors. Uses 9mm rounds."
|
||||
icon_state = "p08"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
|
||||
caliber = "9mm"
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/revolver/mateba
|
||||
name = "mateba"
|
||||
desc = "This unique looking handgun is named after an Italian company famous for the manufacture of these revolvers, and pasta kneading machines. Uses .357 rounds." // Yes I'm serious. -Spades
|
||||
icon_state = "mateba"
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
|
||||
|
||||
@@ -100,7 +101,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/revolver/judge
|
||||
name = "\"The Judge\""
|
||||
desc = "A revolving hand-shotgun by Cybersun Industries that packs the power of a 12 guage in the palm of your hand (if you don't break your wrist). \"It's never been easier to be Judge, Jury, and Executioner.\"<sup>TM</sup> Uses 12 shotgun rounds."
|
||||
desc = "A revolving hand-shotgun by Cybersun Industries that packs the power of a 12 guage in the palm of your hand (if you don't break your wrist). Uses 12 shotgun rounds."
|
||||
icon_state = "judge"
|
||||
caliber = "shotgun"
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
|
||||
|
||||
@@ -44,6 +44,7 @@ changes:
|
||||
- tweak: "Corrects and improves a number of icons for guns, including a couple of energy guns, and adds fallback icons so they do not turn invisible when held or strapped to your back."
|
||||
- tweak: "Made the icons for some guns look differently depending on what magazine is loaded into them."
|
||||
- tweak: "Made antag uplink menu for guns and ammo more informative."
|
||||
- tweak: "Machinegun magazines no longer fit in pockets."
|
||||
- spellcheck: "Made names and descriptions for all projectile guns and ammo consistent while removing grammar and spelling errors."
|
||||
- bugfix: "Autolathe no longer exploitable for ammo by repeatedly recycling empty magazines."
|
||||
- bugfix: "Guns now check a list of compatible magazines."
|
||||
|
||||
Reference in New Issue
Block a user