diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 3a444be020e..373607e53dd 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -245,6 +245,10 @@ var/is_target_face = zone == BODY_ZONE_HEAD || zone == BODY_ZONE_PRECISE_EYES || zone == BODY_ZONE_PRECISE_MOUTH var/loaded_rounds = get_ammo(FALSE, FALSE) // check before it is fired + if(HAS_TRAIT(user, TRAIT_CURSED)) // I cannot live, I cannot die, trapped in myself, body my holding cell. + to_chat(user, span_warning("What a horrible night... To have a curse!")) + return + if(loaded_rounds && is_target_face) add_memory_in_range(user, 7, /datum/memory/witnessed_russian_roulette, \ protagonist = user, \ @@ -255,9 +259,6 @@ ) if(chambered) - if(HAS_TRAIT(user, TRAIT_CURSED)) // I cannot live, I cannot die, trapped in myself, body my holding cell. - to_chat(user, span_warning("What a horrible night... To have a curse!")) - return var/obj/item/ammo_casing/AC = chambered if(AC.fire_casing(user, user, params, distro = 0, quiet = 0, zone_override = null, spread = 0, fired_from = src)) playsound(user, fire_sound, fire_sound_volume, vary_fire_sound) diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 5e3d9d3b055..33fefd08d2e 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -81,6 +81,7 @@ /obj/item/dice/fudge = 9, /obj/item/clothing/shoes/wheelys/skishoes = 4, /obj/item/instrument/musicalmoth = 1, + /obj/item/gun/ballistic/revolver/russian = 1, //the most dangerous game ) premium = list( /obj/item/disk/holodisk = 5,