Skip to content

Commit

Permalink
reverts the roulette nerf
Browse files Browse the repository at this point in the history
  • Loading branch information
Eneocho authored Jan 6, 2025
1 parent d221546 commit 74df19e
Showing 1 changed file with 0 additions and 31 deletions.
31 changes: 0 additions & 31 deletions code/modules/projectiles/guns/projectile/roulette.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,13 @@ var/list/restricted_roulette_projectiles = list(
/obj/item/projectile/beam/lightning,
/obj/item/projectile/beam/procjectile,
/obj/item/projectile/beam/lightning/spell,
/obj/item/projectile/rocket,
/obj/item/projectile/rocket/nikita,
/obj/item/projectile/rocket/lowyield/extreme,
/obj/item/projectile/test,
/obj/item/projectile/friendlyCheck,
/obj/item/projectile/beam/emitter,
/obj/item/projectile/spell_projectile,
/obj/item/projectile/stickybomb,
/obj/item/projectile/beam/lightlaser,
/obj/item/projectile/portalgun,
/obj/item/projectile/soulbullet,
)

var/list/restrict_with_subtypes = list(
/obj/item/projectile/meteor,
/obj/item/projectile/hookshot,
/obj/item/projectile/immovablerod
)

/obj/item/weapon/gun/projectile/roulette_revolver
Expand Down Expand Up @@ -69,23 +59,6 @@ var/list/restrict_with_subtypes = list(
else
to_chat(user, "<span class='info'>\The [src] has [shots_left] shots left.</span>")

/obj/item/weapon/gun/projectile/roulette_revolver/attackby(obj/item/A, mob/user)
if(istype(A, /obj/item/weapon/conversion_kit) && restrict_with_subtypes?.len)
var/obj/item/weapon/conversion_kit/CK = A
if(!CK.open)
to_chat(user, "<span class='notice'>\The [CK] needs to be open to use.</span>")
return 1
if(do_after(user, src, 3 SECONDS))
desc += "The barrel and chamber assembly seems to have been modified."
to_chat(user, "<span class='danger'>You finish modifying \the [src]!</span>")
restrict_with_subtypes.Cut()
restricted_roulette_projectiles -= /obj/item/projectile/rocket
restricted_roulette_projectiles -= /obj/item/projectile/rocket/nikita
restricted_roulette_projectiles -= /obj/item/projectile/rocket/lowyield/extreme
return 1
else
..()

/obj/item/weapon/gun/projectile/roulette_revolver/proc/choose_projectile()
if(bullet_type_override)
in_chamber = new bullet_type_override
Expand All @@ -95,10 +68,6 @@ var/list/restrict_with_subtypes = list(
if(chosen_projectile == I)
choose_projectile()
return
for(var/I in restrict_with_subtypes)
if(ispath(chosen_projectile, I))
choose_projectile()
return
var/P = new chosen_projectile()
in_chamber = P
if(!in_chamber)
Expand Down

0 comments on commit 74df19e

Please sign in to comment.