Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverts the Roulette Revolver nerf (#35752) #37362

Open
wants to merge 7 commits into
base: Bleeding-Edge
Choose a base branch
from
Open

Reverts the Roulette Revolver nerf (#35752) #37362

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74df19e
reverts the roulette nerf
Eneocho Jan 6, 2025
4fd6463
.
Eneocho Jan 6, 2025
483f054
blocking the hookshot
Eneocho Jan 6, 2025
cad9e07
.
Eneocho Jan 7, 2025
e94693e
that other thing west said
Eneocho Jan 7, 2025
aee18d8
ditto
Eneocho Jan 7, 2025
726e459
blocks the blob too
Eneocho Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions code/game/machinery/turrets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,8 +611,6 @@
/obj/structure/turret/gun_turret/New()
..()
roulette_projectiles = existing_typesof(/obj/item/projectile) - restricted_roulette_projectiles
for(var/projectile_types in restrict_with_subtypes)
roulette_projectiles -= typesof(projectile_types)

/obj/structure/turret/gun_turret/examine(mob/user)
..()
Expand Down
32 changes: 1 addition & 31 deletions code/modules/projectiles/guns/projectile/roulette.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,14 @@ 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,
Eneocho marked this conversation as resolved.
Show resolved Hide resolved
/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/projectile/hookshot,
)

/obj/item/weapon/gun/projectile/roulette_revolver
Expand Down Expand Up @@ -69,23 +60,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 +69,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
Eneocho marked this conversation as resolved.
Show resolved Hide resolved
var/P = new chosen_projectile()
in_chamber = P
if(!in_chamber)
Expand Down
Loading