diff --git a/code/modules/projectiles/guns/projectile/roulette.dm b/code/modules/projectiles/guns/projectile/roulette.dm index 1f04f49d3f05..710027130c78 100644 --- a/code/modules/projectiles/guns/projectile/roulette.dm +++ b/code/modules/projectiles/guns/projectile/roulette.dm @@ -5,25 +5,20 @@ 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, + /obj/item/projectile/friendlyCheck, ) var/list/restrict_with_subtypes = list( - /obj/item/projectile/meteor, /obj/item/projectile/hookshot, - /obj/item/projectile/immovablerod + /obj/item/projectile/meteor/blob, //includes the nodes ) - /obj/item/weapon/gun/projectile/roulette_revolver name = "\improper Roulette Revolver" desc = "A strange-looking revolver. Its construction appears somewhat slapdash." @@ -69,23 +64,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