upstream fixes

cmss13-devs · Oct 19, 2023 · 9d65680 · 9d65680
1 parent 64b11c9
commit 9d65680
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 19 deletions.
diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm
@@ -164,9 +164,9 @@
 /datum/ammo/proc/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile)
 	if(iscarbonsizexeno(living_mob))
 		var/mob/living/carbon/xenomorph/target = living_mob
-		target.apply_effect(0.7, WEAKEN) // 0.9 seconds of stun, per agreement from Balance Team when switched from MC stuns to exact stuns
-		target.apply_effect(1, SUPERSLOW)
-		target.apply_effect(2, SLOW)
+		target.apply_effect(1, WEAKEN)
+		target.apply_effect(2, SUPERSLOW)
+		target.apply_effect(4, SLOW)
 		to_chat(target, SPAN_XENODANGER("You are shaken by the sudden impact!"))
 	else
 		living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET)

diff --git a/code/datums/ammo/bullet/shotgun.dm b/code/datums/ammo/bullet/shotgun.dm
@@ -153,6 +153,16 @@
 /datum/ammo/bullet/shotgun/buckshot/on_hit_mob(mob/M,obj/projectile/P)
 	knockback(M,P)
 
+/datum/ammo/bullet/shotgun/buckshot/special
+	name = "buckshot shell, USCM special type"
+	bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/special
+
+	accurate_range = 8
+	max_range = 8
+	damage = 140
+	penetration = ARMOR_PENETRATION_TIER_4
+	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_6
+
 //buckshot variant only used by the masterkey shotgun attachment.
 /datum/ammo/bullet/shotgun/buckshot/masterkey
 	bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/masterkey
@@ -166,7 +176,7 @@
 	accuracy_var_low = PROJECTILE_VARIANCE_TIER_6
 	accuracy_var_high = PROJECTILE_VARIANCE_TIER_6
 	accurate_range = 4
-	max_range = 6
+	max_range = 4
 	damage = 65
 	damage_var_low = PROJECTILE_VARIANCE_TIER_8
 	damage_var_high = PROJECTILE_VARIANCE_TIER_8
@@ -179,6 +189,14 @@
 /datum/ammo/bullet/shotgun/spread/masterkey
 	damage = 20
 
+/datum/ammo/bullet/shotgun/spread/special
+	name = "additional buckshot, USCM special type"
+
+	accurate_range = 8
+	max_range = 8
+	damage = 140
+	penetration = ARMOR_PENETRATION_TIER_4
+
 /*
 					8 GAUGE SHOTGUN AMMO
 */

diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm
@@ -11,7 +11,7 @@
 
 	max_range = 12
 	accuracy = HIT_ACCURACY_TIER_4
-	damage = 30
+	damage = 36
 	penetration = 0
 
 /datum/ammo/bullet/smartgun/armor_piercing
@@ -20,7 +20,7 @@
 
 	accurate_range = 12
 	accuracy = HIT_ACCURACY_TIER_2
-	damage = 20
+	damage = 24
 	penetration = ARMOR_PENETRATION_TIER_8
 	damage_armor_punch = 1
 

diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
@@ -61,19 +61,15 @@ United States Colonial Marines
 /datum/skills/tl
 	name = "Fireteam Leader"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
-		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
-		SKILL_JTAC = SKILL_JTAC_EXPERT,
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
 	)
 
 /datum/skills/SL
 	name = "Squad Leader"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
-		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
-		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -287,15 +283,11 @@ COMMAND STAFF
 /datum/skills/SO
 	name = "Staff Officer"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
-		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
-		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 		SKILL_INTEL = SKILL_INTEL_TRAINED,
 	)

diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm
@@ -605,12 +605,12 @@
 		if(JOB_SQUAD_MEDIC)
 			old_lead.comm_title = "HM"
 		if(JOB_SQUAD_TEAM_LEADER)
-			old_lead.comm_title = "FTL"
+			old_lead.comm_title = "SqSgt"
 		if(JOB_SQUAD_SMARTGUN)
 			old_lead.comm_title = "SG"
 		if(JOB_SQUAD_LEADER)
 			if(!leader_killed)
-				old_lead.comm_title = "Sgt"
+				old_lead.comm_title = "PlSgt"
 		if(JOB_MARINE_RAIDER)
 			old_lead.comm_title = "Op."
 		if(JOB_MARINE_RAIDER_SL)