diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm index 64fe8abcbbb..ece33a6b874 100644 --- a/code/datums/uplink/highly visible and dangerous weapons.dm +++ b/code/datums/uplink/highly visible and dangerous weapons.dm @@ -36,7 +36,7 @@ /datum/uplink_item/item/visible_weapons/revolver name = "Revolver" - item_cost = 12 + item_cost = 8 path = /obj/item/gun/projectile/revolver /datum/uplink_item/item/visible_weapons/submachinegun diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 19ab31f7ec5..1aa1fb36551 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -61,7 +61,7 @@ ammo_type = /obj/item/ammo_casing/c45 matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal caliber = ".45" - max_ammo = 7 + max_ammo = 9 multiple_sprites = 1 /obj/item/ammo_magazine/c45m/empty @@ -114,7 +114,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 600) caliber = "9mm" ammo_type = /obj/item/ammo_casing/c9mm - max_ammo = 10 + max_ammo = 12 multiple_sprites = 1 /obj/item/ammo_magazine/mc9mm/empty @@ -191,7 +191,7 @@ caliber = "a556" matter = list(DEFAULT_WALL_MATERIAL = 1800) ammo_type = /obj/item/ammo_casing/a556 - max_ammo = 10 + max_ammo = 30 multiple_sprites = 1 /obj/item/ammo_magazine/a556/empty diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 7086eba4117..e70e5867ee8 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -20,7 +20,7 @@ list(mode_name="semiauto", can_autofire=0, burst=1), list(mode_name="3-round bursts", can_autofire=0, burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 10, 15)), list(mode_name="short bursts", can_autofire=0, burst=5, burst_accuracy=list(1,0,,-1,-1), dispersion=list(5, 10, 15, 20)), - list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)) + list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)) ) //Submachine guns and personal defence weapons, go. @@ -121,7 +121,7 @@ list(mode_name="semiauto", burst=1, fire_delay=10), list(mode_name="3-round bursts", burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 5, 10)), list(mode_name="short bursts", burst=5, burst_accuracy=list(1,0,0,-1,-1), dispersion=list(5, 5, 15)), - list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)), + list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)), ) //slower to regain aim, more inaccurate if not wielding @@ -276,7 +276,7 @@ firemodes = list( list(mode_name="short bursts", burst=5, burst_accuracy = list(1,0,0,-1,-1), dispersion = list(3, 6, 9)), list(mode_name="long bursts", burst=8, burst_accuracy = list(1,0,0,-1,-1,-1,-2,-2), dispersion = list(8)), - list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)) + list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)) ) var/cover_open = 0 diff --git a/code/modules/projectiles/guns/projectile/minigun.dm b/code/modules/projectiles/guns/projectile/minigun.dm index 49c1c09837e..cffc5ac214b 100644 --- a/code/modules/projectiles/guns/projectile/minigun.dm +++ b/code/modules/projectiles/guns/projectile/minigun.dm @@ -129,7 +129,7 @@ firemodes = list( list(mode_name="short bursts", can_autofire=0, burst=6, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(3, 6, 9)), list(mode_name="long bursts", can_autofire=0, burst=12, move_delay=9, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(8)), - list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)) + list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, one_hand_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)) ) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 080d7818dc7..0df487db807 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -128,11 +128,11 @@ damage = 25 /obj/item/projectile/bullet/pistol/strong - damage = 60 + damage = 30 + armor_penetration = 15 /obj/item/projectile/bullet/pistol/revolver - damage = 45 - armor_penetration = 15 + damage = 30 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets name = "rubber bullet" @@ -181,17 +181,17 @@ /* "Rifle" rounds */ /obj/item/projectile/bullet/rifle - armor_penetration = 20 penetrating = 1 + armor_penetration = 20 /obj/item/projectile/bullet/rifle/a762 - damage = 25 + damage = 35 /obj/item/projectile/bullet/rifle/a556 damage = 30 /obj/item/projectile/bullet/rifle/a556/ap - damage = 25 + damage = 30 armor_penetration = 25 /obj/item/projectile/bullet/rifle/a145 @@ -339,7 +339,7 @@ /obj/item/projectile/bullet/gauss name = "slug" icon_state = "heavygauss" - damage = 30 + damage = 45 muzzle_type = /obj/effect/projectile/muzzle/gauss embed = 0 @@ -398,4 +398,4 @@ muzzle_type = /obj/effect/projectile/muzzle/bolt /obj/item/projectile/bullet/shard/heavy - damage = 30 \ No newline at end of file + damage = 30 diff --git a/html/changelogs/dansemacabre-woodmanstillbad.yml b/html/changelogs/dansemacabre-woodmanstillbad.yml new file mode 100644 index 00000000000..f36b13eb860 --- /dev/null +++ b/html/changelogs/dansemacabre-woodmanstillbad.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DanseMacabre + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Changed the STS, WT-550, gauss gun, and blaster sprites." + - balance: "Full auto nerf, rifle damage buff." diff --git a/icons/obj/guns/arifle.dmi b/icons/obj/guns/arifle.dmi index f98364d755c..2ad8a58f09c 100644 Binary files a/icons/obj/guns/arifle.dmi and b/icons/obj/guns/arifle.dmi differ diff --git a/icons/obj/guns/wt550.dmi b/icons/obj/guns/wt550.dmi index f9eb6b1e47d..db6440d547e 100644 Binary files a/icons/obj/guns/wt550.dmi and b/icons/obj/guns/wt550.dmi differ