From b3f6f6b3922bae697997355f502470fecde6808e Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 7 Aug 2017 21:04:25 -0400 Subject: [PATCH 1/2] Assault rifle tweaks and fixes - STS-35 no longer has "This one is unmarked" because it literally means nothing useful. - Assault Carbine name has been changed to Bullpup Rifle. - Bullpup Rifle starts with only 10 rounds as opposed to 20, making it slightly less useful than the Z8 marksman rifle. - Fixed the Bullpup Rifle not using the correct sprites, hopefully. - Bullpup Rifle's 3 round burst is nerfed to 2 rounds. --- .../projectiles/guns/projectile/automatic.dm | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 85cb07264f..d12fb96a2c 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -51,7 +51,7 @@ /obj/item/weapon/gun/projectile/automatic/sts35 name = "assault rifle" - desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds. This one is unmarked." + desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds." icon_state = "arifle" item_state = null w_class = ITEMSIZE_LARGE @@ -341,10 +341,10 @@ icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty" // update_held_icon() -/obj/item/weapon/gun/projectile/automatic/carbine // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. - name = "assault carbine" - desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.45mm rounds." - icon_state = "bullpup" +/obj/item/weapon/gun/projectile/automatic/bullpup // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. + name = "bullpup rifle" + desc = "The bullpup configured GP3000 is a battle rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. Uses 7.62mm rounds." + icon_state = "bullpup-small" item_state = "bullpup" w_class = ITEMSIZE_LARGE force = 10 @@ -352,21 +352,22 @@ origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/m762m + magazine_type = /obj/item/ammo_magazine/m762 allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762m) one_handed_penalty = 4 firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), - 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)) + list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(0,-1), dispersion=list(0.0, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/carbine/update_icon(var/ignore_inhands) +/obj/item/weapon/gun/projectile/automatic/bullpup/update_icon(var/ignore_inhands) ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)) - icon_state = "bullpup-small" // If using the smaller magazines, use the small mag sprite. + icon_state = "bullpup-small" + else if(istype(ammo_magazine,/obj/item/ammo_magazine/m762m)) + icon_state = "bullpup" else - icon_state = "bullpup-empty" - item_state = (ammo_magazine)? "bullpup" : "bullpup-empty" + item_state = "bullpup-empty" if(!ignore_inhands) update_held_icon() \ No newline at end of file From 8498880ee61e297a377eb28a1d56761718821595 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 7 Aug 2017 23:53:23 -0400 Subject: [PATCH 2/2] Fixed the only few instances this gun appears --- code/game/antagonist/outsider/raider.dm | 2 +- code/game/antagonist/station/renegade.dm | 2 +- code/modules/random_map/drop/drop_types.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 7ac0a4729b..596ac1451e 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/carbine, + /obj/item/weapon/gun/projectile/automatic/bullpup, /obj/item/weapon/gun/projectile/automatic/tommygun, /obj/item/weapon/gun/projectile/silenced, /obj/item/weapon/gun/projectile/shotgun/pump, diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index d9e3671546..d9796432c0 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/carbine, + /obj/item/weapon/gun/projectile/automatic/bullpup, /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/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index 722aeec09e..f66198e095 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -82,7 +82,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/weapon/storage/belt/security/tactical/bandolier, /obj/item/clothing/accessory/storage/black_drop_pouches, /obj/item/weapon/storage/backpack/dufflebag/sec, - /obj/item/weapon/gun/projectile/automatic/carbine, + /obj/item/weapon/gun/projectile/automatic/bullpup, /obj/item/ammo_magazine/m762/ap, /obj/item/ammo_magazine/m762, /obj/item/weapon/shield/energy,