From 74df19e8cd78a53a47882f502fe32c8e15547e98 Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Sun, 5 Jan 2025 21:37:45 -0300
Subject: [PATCH 1/7] reverts the roulette nerf
---
.../projectiles/guns/projectile/roulette.dm | 31 -------------------
1 file changed, 31 deletions(-)
diff --git a/code/modules/projectiles/guns/projectile/roulette.dm b/code/modules/projectiles/guns/projectile/roulette.dm
index 1f04f49d3f05..96060474a9f6 100644
--- a/code/modules/projectiles/guns/projectile/roulette.dm
+++ b/code/modules/projectiles/guns/projectile/roulette.dm
@@ -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
@@ -69,23 +59,6 @@ var/list/restrict_with_subtypes = list(
else
to_chat(user, "\The [src] has [shots_left] shots left.")
-/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, "\The [CK] needs to be open to use.")
- return 1
- if(do_after(user, src, 3 SECONDS))
- desc += "The barrel and chamber assembly seems to have been modified."
- to_chat(user, "You finish modifying \the [src]!")
- 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
@@ -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)
From 4fd64638ee816609c24d7269276fbacd238ada60 Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Sun, 5 Jan 2025 21:44:08 -0300
Subject: [PATCH 2/7] .
---
code/game/machinery/turrets.dm | 2 --
1 file changed, 2 deletions(-)
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 73c8bab8cc32..c1a3faaf4b00 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -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)
..()
From 483f054121328e447c69f72aaf9e6813969933de Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:13:57 -0300
Subject: [PATCH 3/7] blocking the hookshot
---
code/modules/projectiles/guns/projectile/roulette.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/projectiles/guns/projectile/roulette.dm b/code/modules/projectiles/guns/projectile/roulette.dm
index 96060474a9f6..60bb8e04bb42 100644
--- a/code/modules/projectiles/guns/projectile/roulette.dm
+++ b/code/modules/projectiles/guns/projectile/roulette.dm
@@ -12,6 +12,7 @@ var/list/restricted_roulette_projectiles = list(
/obj/item/projectile/stickybomb,
/obj/item/projectile/beam/lightlaser,
/obj/item/projectile/portalgun,
+ /obj/item/projectile/hookshot,
)
/obj/item/weapon/gun/projectile/roulette_revolver
From cad9e07d1f6cea6fa160324a009bb96526fb89be Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:53:19 -0300
Subject: [PATCH 4/7] .
---
code/modules/projectiles/guns/projectile/roulette.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/projectiles/guns/projectile/roulette.dm b/code/modules/projectiles/guns/projectile/roulette.dm
index 60bb8e04bb42..4b4c77690908 100644
--- a/code/modules/projectiles/guns/projectile/roulette.dm
+++ b/code/modules/projectiles/guns/projectile/roulette.dm
@@ -13,6 +13,7 @@ var/list/restricted_roulette_projectiles = list(
/obj/item/projectile/beam/lightlaser,
/obj/item/projectile/portalgun,
/obj/item/projectile/hookshot,
+ /obj/item/projectile/friendlyCheck,
)
/obj/item/weapon/gun/projectile/roulette_revolver
From e94693e3e8c4ce1dd2d5b492d40d5758c3b97a11 Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:56:07 -0300
Subject: [PATCH 5/7] that other thing west said
---
code/modules/projectiles/guns/projectile/roulette.dm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/code/modules/projectiles/guns/projectile/roulette.dm b/code/modules/projectiles/guns/projectile/roulette.dm
index 4b4c77690908..4fddcb78363a 100644
--- a/code/modules/projectiles/guns/projectile/roulette.dm
+++ b/code/modules/projectiles/guns/projectile/roulette.dm
@@ -12,10 +12,12 @@ var/list/restricted_roulette_projectiles = list(
/obj/item/projectile/stickybomb,
/obj/item/projectile/beam/lightlaser,
/obj/item/projectile/portalgun,
- /obj/item/projectile/hookshot,
/obj/item/projectile/friendlyCheck,
)
+var/list/restrict_with_subtypes = list(
+ /obj/item/projectile/hookshot,
+ )
/obj/item/weapon/gun/projectile/roulette_revolver
name = "\improper Roulette Revolver"
desc = "A strange-looking revolver. Its construction appears somewhat slapdash."
@@ -70,6 +72,10 @@ var/list/restricted_roulette_projectiles = 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)
From aee18d87078542ef537257cf4159e33808cd4c8a Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:57:07 -0300
Subject: [PATCH 6/7] ditto
---
code/game/machinery/turrets.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index c1a3faaf4b00..73c8bab8cc32 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -611,6 +611,8 @@
/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)
..()
From 726e45963fed42e234d57cbdf0e5d2a6382f3646 Mon Sep 17 00:00:00 2001
From: Eneocho <67024428+Eneocho@users.noreply.github.com>
Date: Tue, 7 Jan 2025 20:35:13 -0300
Subject: [PATCH 7/7] blocks the blob too
---
code/modules/projectiles/guns/projectile/roulette.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/projectiles/guns/projectile/roulette.dm b/code/modules/projectiles/guns/projectile/roulette.dm
index 4fddcb78363a..710027130c78 100644
--- a/code/modules/projectiles/guns/projectile/roulette.dm
+++ b/code/modules/projectiles/guns/projectile/roulette.dm
@@ -17,6 +17,7 @@ var/list/restricted_roulette_projectiles = list(
var/list/restrict_with_subtypes = list(
/obj/item/projectile/hookshot,
+ /obj/item/projectile/meteor/blob, //includes the nodes
)
/obj/item/weapon/gun/projectile/roulette_revolver
name = "\improper Roulette Revolver"