From 19ea0313fc3d70a91eca7a8640098aaa13764106 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Sat, 1 Feb 2025 04:32:54 -0500 Subject: [PATCH 1/3] fuck you --- code/modules/projectiles/gun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index faf596a7d42e..1cf94f80c93f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1002,10 +1002,10 @@ if(at_risk == human_holder.s_store) chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW * at_risk.safety_multiplier) if(at_risk.safety == FALSE && prob(chance_to_fire)) - var/bodyzone = pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG,BODY_ZONE_R_LEG) + var/bodyzone = pick_weight(list(BODY_ZONE_HEAD = 6, BODY_ZONE_CHEST = 12, BODY_ZONE_L_ARM = 9, BODY_ZONE_R_ARM = 9, BODY_ZONE_L_LEG = 32, BODY_ZONE_R_LEG = 32)) if(at_risk.process_fire(src,src,FALSE, null, bodyzone) == TRUE) log_combat(src,src,"misfired",at_risk,"caused by [cause]") - visible_message(span_danger("\The [at_risk.name]'s trigger gets caught as [src] falls, suddenly going off into [src]'s [bodyzone]!"), span_danger("\The [at_risk.name]'s trigger gets caught on something as you fall, suddenly going off into your [bodyzone]!")) + visible_message(span_danger("\The [at_risk.name]'s trigger gets caught as [src] falls, suddenly going off into [src]'s [get_bodypart(bodyzone)]!"), span_danger("\The [at_risk.name]'s trigger gets caught on something as you fall, suddenly going off into your [get_bodypart(bodyzone)]!")) human_holder.force_scream() //I need to refactor this into an attachment From 449ddef23e0add077c084ac6745265fa67963600 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:04:22 -0500 Subject: [PATCH 2/3] Update gun.dm --- code/modules/projectiles/gun.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 1cf94f80c93f..af5997f163af 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -997,12 +997,13 @@ human_holder = src for(var/obj/item/gun/at_risk in get_all_contents()) var/chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_MEDIUM * at_risk.safety_multiplier) + var/bodyzone = pick_weight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 15, BODY_ZONE_L_ARM = 8, BODY_ZONE_R_ARM = 8, BODY_ZONE_L_LEG = 34, BODY_ZONE_R_LEG = 34)) if(human_holder) // gun is less likely to go off in a holster if(at_risk == human_holder.s_store) chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW * at_risk.safety_multiplier) + bodyzone = pick_weight(list(BODY_ZONE_CHEST = 16, BODY_ZONE_L_LEG = 42, BODY_ZONE_R_LEG = 42)) if(at_risk.safety == FALSE && prob(chance_to_fire)) - var/bodyzone = pick_weight(list(BODY_ZONE_HEAD = 6, BODY_ZONE_CHEST = 12, BODY_ZONE_L_ARM = 9, BODY_ZONE_R_ARM = 9, BODY_ZONE_L_LEG = 32, BODY_ZONE_R_LEG = 32)) if(at_risk.process_fire(src,src,FALSE, null, bodyzone) == TRUE) log_combat(src,src,"misfired",at_risk,"caused by [cause]") visible_message(span_danger("\The [at_risk.name]'s trigger gets caught as [src] falls, suddenly going off into [src]'s [get_bodypart(bodyzone)]!"), span_danger("\The [at_risk.name]'s trigger gets caught on something as you fall, suddenly going off into your [get_bodypart(bodyzone)]!")) From ddd19c4976a2dada3dcdd5d54f6d00e4c01ce740 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:00:52 -0500 Subject: [PATCH 3/3] most inane fucking pr to date --- code/modules/projectiles/gun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index af5997f163af..c86f94f6ec29 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -997,12 +997,12 @@ human_holder = src for(var/obj/item/gun/at_risk in get_all_contents()) var/chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_MEDIUM * at_risk.safety_multiplier) - var/bodyzone = pick_weight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 15, BODY_ZONE_L_ARM = 8, BODY_ZONE_R_ARM = 8, BODY_ZONE_L_LEG = 34, BODY_ZONE_R_LEG = 34)) + var/bodyzone = pick_weight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 9, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 41, BODY_ZONE_R_LEG = 41)) if(human_holder) // gun is less likely to go off in a holster if(at_risk == human_holder.s_store) chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW * at_risk.safety_multiplier) - bodyzone = pick_weight(list(BODY_ZONE_CHEST = 16, BODY_ZONE_L_LEG = 42, BODY_ZONE_R_LEG = 42)) + bodyzone = pick_weight(list(BODY_ZONE_CHEST = 10, BODY_ZONE_L_LEG = 45, BODY_ZONE_R_LEG = 45)) if(at_risk.safety == FALSE && prob(chance_to_fire)) if(at_risk.process_fire(src,src,FALSE, null, bodyzone) == TRUE) log_combat(src,src,"misfired",at_risk,"caused by [cause]")