From 29d5249962245932e97c331bf8ce546fd3900b79 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:56:48 +0100 Subject: [PATCH] [MIRROR] Makes the SC/FISHER a bit better - more range/accessibility/pacifist-usability [MDB IGNORE] (#25135) * Makes the SC/FISHER a bit better - more range/accessibility/pacifist-usability (#79835) ## About The Pull Request - SC/FISHER is now pacifist-usable. - SC/FISHER black-market availability prob up to 75, from 50. - SC/FISHER range bumped from 14 to 21. ## Why It's Good For The Game The SC/FISHER does no damage (except against ethereals, where it does a grand total of 3 per shot), which I think is negligible but can be removed if it's that bad to allow pacifists a gimmick method of murdering another guy, so I think pacifists should be allowed to use it. The range buff and black-market availability are just because I felt like it, since I don't think it's available enough, especially for a doohickey whose sole purpose is "break lightbulbs". ## Changelog :cl: balance: The SC/FISHER disruptor pistol is now more likely to show up in black market uplinks. balance: The SC/FISHER now has more range (21 tiles up from 14), and is usable by pacifists. /:cl: --------- Co-authored-by: Hatterhat * Makes the SC/FISHER a bit better - more range/accessibility/pacifist-usability --------- Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Co-authored-by: Hatterhat --- code/modules/cargo/markets/market_items/weapons.dm | 2 +- code/modules/projectiles/ammunition/energy/special.dm | 3 ++- code/modules/projectiles/projectile/special/lightbreaker.dm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm index 6115b1e1557..ee16daae7d5 100644 --- a/code/modules/cargo/markets/market_items/weapons.dm +++ b/code/modules/cargo/markets/market_items/weapons.dm @@ -72,4 +72,4 @@ price_min = CARGO_CRATE_VALUE * 2 price_max = CARGO_CRATE_VALUE * 4 stock_max = 1 - availability_prob = 50 + availability_prob = 75 diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm index 9a733dbc47a..5a83a944e41 100644 --- a/code/modules/projectiles/ammunition/energy/special.dm +++ b/code/modules/projectiles/ammunition/energy/special.dm @@ -81,6 +81,7 @@ /obj/item/ammo_casing/energy/fisher projectile_type = /obj/projectile/energy/fisher - select_name = "light-buster" + select_name = "light disruptor" + harmful = FALSE e_cost = LASER_SHOTS(2, STANDARD_CELL_CHARGE * 0.5) fire_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' // fwip fwip fwip fwip diff --git a/code/modules/projectiles/projectile/special/lightbreaker.dm b/code/modules/projectiles/projectile/special/lightbreaker.dm index fd7d3d89e7a..2be6d9e4470 100644 --- a/code/modules/projectiles/projectile/special/lightbreaker.dm +++ b/code/modules/projectiles/projectile/special/lightbreaker.dm @@ -4,7 +4,7 @@ damage = 0 damage_type = BRUTE armor_flag = BOMB - range = 14 + range = 21 projectile_phasing = PASSTABLE | PASSMOB | PASSMACHINE | PASSSTRUCTURE hitscan = TRUE var/disrupt_duration = 10 SECONDS