From 1599e1f61159619e3c3067c8fbf540daeb5621a9 Mon Sep 17 00:00:00 2001 From: solwashere Date: Thu, 2 Mar 2023 05:22:08 -0500 Subject: [PATCH 1/5] Update revolver.dm --- code/modules/projectiles/guns/ballistic/revolver.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 9a57b6ea36c6..7384c4a05a28 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -231,7 +231,8 @@ /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD) user.apply_damage(300, BRUTE, affecting) - user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_userdanger("You fire [src] at your head!"), span_italics("You hear a gunshot!")) + user.gain_trauma_type(rand(BRAIN_TRAUMA_SEVERE, BRAIN_TRAUMA_MILD),TRAUMA_RESILIENCE_LOBOTOMY) + user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_userdanger("You fire [src] at your head!"), span_italics("You hear a gunshot, then everything goes silent.")) /obj/item/gun/ballistic/revolver/russian/soul name = "cursed Russian revolver" From d5aeef5f0b03f904906302e4de509c1c245252b1 Mon Sep 17 00:00:00 2001 From: solwashere Date: Thu, 2 Mar 2023 05:33:38 -0500 Subject: [PATCH 2/5] Update revolver.dm --- code/modules/projectiles/guns/ballistic/revolver.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 7384c4a05a28..f1f831072ce8 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -230,8 +230,8 @@ user.visible_message(span_danger("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot."), span_danger("\The [src]'s anti-combat mechanism prevents you from firing it at the same time!")) /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD) - user.apply_damage(300, BRUTE, affecting) user.gain_trauma_type(rand(BRAIN_TRAUMA_SEVERE, BRAIN_TRAUMA_MILD),TRAUMA_RESILIENCE_LOBOTOMY) + user.apply_damage(300, BRUTE, affecting) user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_userdanger("You fire [src] at your head!"), span_italics("You hear a gunshot, then everything goes silent.")) /obj/item/gun/ballistic/revolver/russian/soul From 088b58701c1e222f2b37c3c9d2f0c057ac6a3ec3 Mon Sep 17 00:00:00 2001 From: solwashere Date: Thu, 2 Mar 2023 17:41:09 -0500 Subject: [PATCH 3/5] Update revolver.dm --- code/modules/projectiles/guns/ballistic/revolver.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index f1f831072ce8..a4f8657eee36 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -230,10 +230,10 @@ user.visible_message(span_danger("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot."), span_danger("\The [src]'s anti-combat mechanism prevents you from firing it at the same time!")) /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD) - user.gain_trauma_type(rand(BRAIN_TRAUMA_SEVERE, BRAIN_TRAUMA_MILD),TRAUMA_RESILIENCE_LOBOTOMY) - user.apply_damage(300, BRUTE, affecting) + user.gain_trauma_type(pick(BRAIN_TRAUMA_SEVERE, BRAIN_TRAUMA_MILD),TRAUMA_RESILIENCE_LOBOTOMY) + user.apply_damage(300, BRUTE, affecting) user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_userdanger("You fire [src] at your head!"), span_italics("You hear a gunshot, then everything goes silent.")) - + /obj/item/gun/ballistic/revolver/russian/soul name = "cursed Russian revolver" desc = "To play with this revolver requires wagering your very soul." From 5ef73b8788c4a82db9b59c5a58585e41322819db Mon Sep 17 00:00:00 2001 From: solwashere Date: Thu, 2 Mar 2023 19:32:09 -0500 Subject: [PATCH 4/5] Update revolver.dm --- code/modules/projectiles/guns/ballistic/revolver.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index a4f8657eee36..ec7fdeb2293f 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -230,7 +230,11 @@ user.visible_message(span_danger("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot."), span_danger("\The [src]'s anti-combat mechanism prevents you from firing it at the same time!")) /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD) - user.gain_trauma_type(pick(BRAIN_TRAUMA_SEVERE, BRAIN_TRAUMA_MILD),TRAUMA_RESILIENCE_LOBOTOMY) + switch(rand(1,3)) + if (1 to 2) + user.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_LOBOTOMY) + if (3) + user.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY) user.apply_damage(300, BRUTE, affecting) user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_userdanger("You fire [src] at your head!"), span_italics("You hear a gunshot, then everything goes silent.")) From e1a73eb0857301c92383a64a92e321ca504417e9 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Sun, 5 Mar 2023 13:35:10 +0500 Subject: [PATCH 5/5] Update revolver.dm --- code/modules/projectiles/guns/ballistic/revolver.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index ec7fdeb2293f..6670b3af6603 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -26,7 +26,7 @@ /obj/item/gun/ballistic/revolver/shoot_with_empty_chamber(mob/living/user as mob|obj) ..() chamber_round(TRUE) - + /obj/item/gun/ballistic/revolver/AltClick(mob/user) ..() spin()