[MIRROR] Removes an exploit that can farm Russian revolver moodlets, …

…adds Russian revolvers to the contraband section of games vendors [MDB IGNORE] (#1032) * Removes an exploit that can farm Russian revolver moodlets, adds Russian revolvers to the contraband section of games vendors (#80159) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: ATH1909 <[email protected]> Co-authored-by: Jacquerel <hnevard@ gmail.com>
Fluffy-Frontier · Dec 9, 2023 · e0caa58 · e0caa58
1 parent 963ed4b
commit e0caa58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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,