From c26edd49809f39e4fb8191fd9f64598aaee86612 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Tue, 11 Jul 2023 02:36:35 -0400 Subject: [PATCH 1/6] Telebaton stun rebalance (#3811) # About the pull request This PR lowers the base stun force of a telebaton to 40. This PR creates multipliers for the stun force based on the user's policing skill. The stun force is offset by melee armor rather than energy armor (regular stun batons). Melee armor is far more abundant on just about every role and so a little more beef is required for it to be an effective non-lethal tool. # Explain why it's good for the game I'd like to see the roles that have access to a telebaton be able to effectively handle situations non-lethally as they see fit. A CO or synth hitting someone a few times with a conveniently storable telebaton is preferable to a CO insta-BE'ing someone or a synth getting rudely bullied and relying on CQC luck. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow balance: Telebaton now scales in stunforce effectiveness based on policing skill /:cl: --- .../objects/items/weapons/swords_axes_etc.dm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index ec7ee0b173da..cdab7db87ed7 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -45,7 +45,7 @@ w_class = SIZE_SMALL force = MELEE_FORCE_WEAK var/on = 0 - var/stunforce = 60 + var/stun_force = 10 /obj/item/weapon/telebaton/attack(mob/living/carbon/human/target, mob/living/user) if(!istype(target) || !on) @@ -67,6 +67,7 @@ item_state = "telebaton_1" w_class = SIZE_MEDIUM force = MELEE_FORCE_VERY_STRONG + stun_force = 40 attack_verb = list("smacked", "struck", "slapped", "beat") else user.visible_message(SPAN_NOTICE("Using a smooth, practiced movement, [user] collapses \his [src]."),\ @@ -75,7 +76,8 @@ icon_state = "telebaton_0" item_state = "telebaton_0" w_class = SIZE_SMALL - force = MELEE_FORCE_WEAK//not so robust now + force = MELEE_FORCE_WEAK + stun_force = initial(stun_force) attack_verb = list("hit", "punched") if(istype(user,/mob/living/carbon/human)) @@ -100,8 +102,17 @@ user.flick_attack_overlay(target, "punch") log_interact(user, target, "[key_name(user)] stunned [key_name(target)] with \the [src]") // Hit 'em + var/final_stun_force = stun_force + var/datum/skills/user_skills = user.skills + if(user_skills) + switch(user_skills.get_skill_level(SKILL_POLICE)) + if(SKILL_POLICE_FLASH) + final_stun_force *= 1.5 + if(SKILL_POLICE_SKILLED) + final_stun_force *= 3 + var/target_zone = check_zone(user.zone_selected) - target.apply_stamina_damage(stunforce, target_zone, ARMOR_MELEE) + target.apply_stamina_damage(final_stun_force, target_zone, ARMOR_MELEE) if(target.stamina.current_stamina <= 0) user.visible_message(SPAN_DANGER("[user] knocks down [target] with \the [src]!"),\ SPAN_WARNING("You knock down [target] with \the [src]!")) From d4a70e4d9bf33fad13cd0e1b60e1c38cbdeb7d7c Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:46:21 +0100 Subject: [PATCH 2/6] Automatic changelog for PR #3811 [ci skip] --- html/changelogs/AutoChangeLog-pr-3811.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3811.yml diff --git a/html/changelogs/AutoChangeLog-pr-3811.yml b/html/changelogs/AutoChangeLog-pr-3811.yml new file mode 100644 index 000000000000..7c54d0e2b52e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3811.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - balance: "Telebaton now scales in stunforce effectiveness based on policing skill" \ No newline at end of file From fcb70de874d1f508cf5ebee50966d3ce3f965397 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Tue, 11 Jul 2023 02:36:57 -0400 Subject: [PATCH 3/6] Foxtrot total number nerf (#3801) # About the pull request This PR reduces max marines from foxtrot from 15 to 10. # Explain why it's good for the game Current potential gain from foxtrot is too high. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow balance: Marines called with foxtrot nerfed from 15 to 10. /:cl: --- code/datums/emergency_calls/cryo_marines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 9bec8b3593dd..eb914e198b37 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -3,7 +3,7 @@ //whiskey outpost extra marines /datum/emergency_call/cryo_squad name = "Marine Cryo Reinforcements (Squad)" - mob_max = 15 + mob_max = 10 mob_min = 1 probability = 0 objectives = "Assist the USCM forces" From f83f8b72fa01a03f98cb683fc62a3baf6f96c7d8 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 11 Jul 2023 08:05:51 +0100 Subject: [PATCH 4/6] Automatic changelog for PR #3801 [ci skip] --- html/changelogs/AutoChangeLog-pr-3801.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3801.yml diff --git a/html/changelogs/AutoChangeLog-pr-3801.yml b/html/changelogs/AutoChangeLog-pr-3801.yml new file mode 100644 index 000000000000..5b7e82c62f86 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3801.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - balance: "Marines called with foxtrot nerfed from 15 to 10." \ No newline at end of file From 259940ccc5778cbcefe7c5c346296461645f865c Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Tue, 11 Jul 2023 02:37:47 -0400 Subject: [PATCH 5/6] Stops xenos from bypassing dead moving via roller beds (#3810) # About the pull request This PR makes it so a roller bed with a dead person on it now is unmovable. Can still be moved if unconscious or alive so as to mimic current restrictions. # Explain why it's good for the game This has been a longstanding ruling issue that we can now just let be mechanically prevented. Less rule bloat good. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow fix: Stops xenos from bypassing dead moving via roller beds /:cl: --- .../objects/structures/stool_bed_chair_nest/bed.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index bda4b60ca21e..7979994915f4 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -208,6 +208,20 @@ return ..() +/obj/structure/bed/roller/Collided(atom/movable/moving_atom) + if(!isxeno(moving_atom)) + return ..() + + if(buckled_mob && buckled_mob.stat != DEAD) + return ..() + + if(buckled_bodybag) + var/mob/mob_in_bodybag = locate(/mob) in buckled_bodybag + if(mob_in_bodybag && mob_in_bodybag.stat != DEAD) + return ..() + + return + /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around." From ef76cec2379881b52cddc690d9895444fa322aa4 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 11 Jul 2023 08:24:24 +0100 Subject: [PATCH 6/6] Automatic changelog for PR #3810 [ci skip] --- html/changelogs/AutoChangeLog-pr-3810.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-3810.yml diff --git a/html/changelogs/AutoChangeLog-pr-3810.yml b/html/changelogs/AutoChangeLog-pr-3810.yml new file mode 100644 index 000000000000..1ad038db0f7b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3810.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - bugfix: "Stops xenos from bypassing dead moving via roller beds" \ No newline at end of file