From ed3d50871acfdb3ca3d92c99897097c1e92a66e8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 2 Jan 2022 13:59:49 +0100 Subject: [PATCH] [MIRROR] Fixes Russian Roulette [MDB IGNORE] (#10396) * Fixes Russian Roulette (#63636) * Cheater. * Fixes Russian Roulette Co-authored-by: SarmentiCampbell <61919894+SarmentiCampbell@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic.dm | 4 +++- code/modules/projectiles/guns/ballistic/revolver.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 8ca7f6aede0..3cd1706f1b2 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -89,6 +89,8 @@ var/flip_cooldown = 0 var/suppressor_x_offset ///pixel offset for the suppressor overlay on the x axis. var/suppressor_y_offset ///pixel offset for the suppressor overlay on the y axis. + /// Check if you are able to see if a weapon has a bullet loaded in or not. + var/hidden_chambered = FALSE ///Gun internal magazine modification and misfiring @@ -494,7 +496,7 @@ var/count_chambered = !(bolt_type == BOLT_TYPE_NO_BOLT || bolt_type == BOLT_TYPE_OPEN) . += "It has [get_ammo(count_chambered)] round\s remaining." - if (!chambered) + if (!chambered && !hidden_chambered) . += "It does not seem to have a round chambered." if (bolt_locked) . += "The [bolt_wording] is locked back and needs to be released before firing or de-fouling." diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index b39c671bddb..b3c6cc61561 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -188,6 +188,7 @@ icon_state = "russianrevolver" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357 var/spun = FALSE + hidden_chambered = TRUE //Cheater. /obj/item/gun/ballistic/revolver/russian/do_spin() . = ..()