Merge branch 'cmss13-devs:master' into Faction-Minors

cmss13-devs · Jul 11, 2023 · ad14644 · ad14644
2 parents 2103dfc + ef76cec
commit ad14644
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 4 deletions.
diff --git 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"

diff --git 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]!"))

diff --git 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."

diff --git a/html/changelogs/AutoChangeLog-pr-3801.yml 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."
diff --git a/html/changelogs/AutoChangeLog-pr-3810.yml 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"
diff --git a/html/changelogs/AutoChangeLog-pr-3811.yml 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"