Merge branch 'master' into master

cmss13-devs · Aug 12, 2024 · dc4235e · dc4235e
2 parents 70ab1fe + 0a1cfe3
commit dc4235e
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 15 deletions.
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -280,7 +280,8 @@ DEFINE_BITFIELD(whitelist_status, list(
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
 #define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
-#define FACTION_LIST_ERT list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
+#define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO)
+#define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_UPP list(FACTION_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -124,6 +124,7 @@ SUBSYSTEM_DEF(ticker)
 /datum/controller/subsystem/ticker/proc/request_start()
 	if(current_state == GAME_STATE_PREGAME)
 		time_left = 0
+		delay_start = FALSE
 
 	// Killswitch if hanging or interrupted
 	if(SSnightmare.stat != NIGHTMARE_STATUS_DONE)

diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm
@@ -32,7 +32,7 @@
 	cell_explosion(get_turf(mob), 150, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 	smoke.set_up(1, get_turf(mob))
 	if(ishuman_strict(mob)) // No yautya or synths. Makes humans gib on direct hit.
-		mob.ex_act(350, projectile.dir, projectile.weapon_cause_data, 100)
+		mob.ex_act(350, null, projectile.weapon_cause_data, 100)
 	smoke.start()
 
 /datum/ammo/rocket/on_hit_obj(obj/object, obj/projectile/projectile)
@@ -69,7 +69,7 @@
 	mob.apply_effect(3, WEAKEN)
 	mob.apply_effect(3, PARALYZE)
 	if(ishuman_strict(mob)) // No yautya or synths. Makes humans gib on direct hit.
-		mob.ex_act(300, projectile.dir, projectile.weapon_cause_data, 100)
+		mob.ex_act(300, null, projectile.weapon_cause_data, 100)
 	cell_explosion(turf, 100, 50, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 	smoke.set_up(1, turf)
 	smoke.start()

diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm
@@ -20,6 +20,7 @@
 	var/total_time_alive
 	var/total_damage_taken
 	var/total_revives_done = 0
+	var/total_ib_fixed = 0
 
 	var/total_brute = 0
 	var/total_burn = 0
@@ -53,6 +54,7 @@
 		"total_time_alive" = DB_FIELDTYPE_BIGINT,
 		"total_damage_taken" = DB_FIELDTYPE_INT,
 		"total_revives_done" = DB_FIELDTYPE_INT,
+		"total_ib_fixed" = DB_FIELDTYPE_INT,
 
 		"total_brute" = DB_FIELDTYPE_INT,
 		"total_burn" = DB_FIELDTYPE_INT,
@@ -132,6 +134,7 @@
 	new_death.total_time_alive = life_time_total
 	new_death.total_damage_taken = life_damage_taken_total
 	new_death.total_revives_done = life_revives_total
+	new_death.total_ib_fixed = life_ib_total
 
 	if(GLOB.round_statistics)
 		GLOB.round_statistics.track_death(new_death)

diff --git a/code/datums/statistics/random_facts/ib_fact.dm b/code/datums/statistics/random_facts/ib_fact.dm
@@ -0,0 +1,9 @@
+/datum/random_fact/ib
+	statistic_name = "people"
+	statistic_verb = "fixed internal bleeding for"
+
+/datum/random_fact/ib/life_grab_stat(mob/fact_mob)
+	return fact_mob.life_ib_total
+
+/datum/random_fact/ib/death_grab_stat(datum/entity/statistic/death/fact_death)
+	return fact_death.total_ib_fixed
diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
@@ -318,14 +318,13 @@
 
 /obj/structure/ship_ammo/rocket/harpoon
 	name = "\improper AGM-184 'Harpoon II'"
-	desc = "The AGM-184 Harpoon II is an Anti-Ship Missile, designed and used to effectively take down enemy ships with a huge blast wave with low explosive power. This one is modified to use ground signals. Can be loaded into the LAU-444 Guided Missile Launcher."
+	desc = "The AGM-184 Harpoon II is an Anti-Ship Missile, designed and used to effectively take down enemy ships with a huge blast wave with low explosive power. This one is modified to use ground signals and can be seen as a cheaper alternative to conventional ordnance. Can be loaded into the LAU-444 Guided Missile Launcher."
 	icon_state = "harpoon"
 	ammo_id = "s"
 	travelling_time = 50
-	point_cost = 300
+	point_cost = 200
 	fire_mission_delay = 4
 
-//Looks kinda OP but all it can actually do is just to blow windows and some of other things out, cant do much damage.
 /obj/structure/ship_ammo/rocket/harpoon/detonate_on(turf/impact, obj/structure/dropship_equipment/weapon/fired_from)
 	impact.ceiling_debris_check(3)
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cell_explosion), impact, 150, 16, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name)), source_mob), 0.5 SECONDS)

diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -9,6 +9,7 @@
 	storage_slots = 14
 	slowdown = 1
 	can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in.
+	max_w_class = 0
 	foldable = null
 
 /obj/item/storage/box/spec/update_icon()

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
@@ -144,15 +144,15 @@
 				else
 					serialized["background_color"] = human.assigned_equipment_preset?.minimap_background
 
-				if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT))
+				if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT_ALL))
 					escaped += list(serialized)
 				else if(human.faction in FACTION_LIST_WY)
 					wy += list(serialized)
 				else if(issynth(human) && !isinfiltratorsynthetic(human))
 					synthetics += list(serialized)
 				else if(isyautja(human))
 					predators += list(serialized)
-				else if(human.faction in FACTION_LIST_ERT)
+				else if(human.faction in FACTION_LIST_ERT_OTHER)
 					ert_members += list(serialized)
 				else if(human.faction in FACTION_LIST_UPP)
 					upp += list(serialized)

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
@@ -74,7 +74,7 @@
 
 /mob/living/carbon/ex_act(severity, direction, datum/cause_data/cause_data)
 
-	if(body_position == LYING_DOWN)
+	if(body_position == LYING_DOWN && direction)
 		severity *= EXPLOSION_PRONE_MULTIPLIER
 
 	if(severity >= 30)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -133,7 +133,7 @@
 			. += "Self Destruct Status: [SShijack.get_sd_eta()]"
 
 /mob/living/carbon/human/ex_act(severity, direction, datum/cause_data/cause_data)
-	if(body_position == LYING_DOWN)
+	if(body_position == LYING_DOWN && direction)
 		severity *= EXPLOSION_PRONE_MULTIPLIER
 
 

diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
@@ -46,7 +46,7 @@
 
 /mob/living/carbon/xenomorph/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0)
 
-	if(body_position == LYING_DOWN)
+	if(body_position == LYING_DOWN && direction)
 		severity *= EXPLOSION_PRONE_MULTIPLIER
 
 	if(severity >= 30)

diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
@@ -113,6 +113,7 @@
 	var/life_kills_total = 0
 	var/life_damage_taken_total = 0
 	var/life_revives_total = 0
+	var/life_ib_total = 0
 	var/festivizer_hits_total = 0
 
 	var/life_value = 1 // when killed, the killee gets this much added to its life_kills_total

diff --git a/code/modules/surgery/internal_bleeding.dm b/code/modules/surgery/internal_bleeding.dm
@@ -39,6 +39,7 @@
 
 /datum/surgery_step/fix_vein/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery)
 	user.count_niche_stat(STATISTICS_NICHE_SURGERY_IB)
+	user.life_ib_total++
 
 	user.affected_message(target,
 		SPAN_NOTICE("You finish repairing [target]'s damaged vein."),

diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -660,6 +660,7 @@
 #include "code\datums\statistics\entities\xeno_stats.dm"
 #include "code\datums\statistics\random_facts\christmas_fact.dm"
 #include "code\datums\statistics\random_facts\damage_fact.dm"
+#include "code\datums\statistics\random_facts\ib_fact.dm"
 #include "code\datums\statistics\random_facts\kills_fact.dm"
 #include "code\datums\statistics\random_facts\random_fact.dm"
 #include "code\datums\statistics\random_facts\revives_fact.dm"

diff --git a/html/changelogs/AutoChangeLog-pr-6876.yml b/html/changelogs/AutoChangeLog-pr-6876.yml
@@ -0,0 +1,4 @@
+author: "MarpleJones"
+delete-after: True
+changes:
+  - balance: "Reduces the cost of the AGM-184 'Harpoon II' from 300 to 200."
diff --git a/html/changelogs/AutoChangeLog-pr-6888.yml b/html/changelogs/AutoChangeLog-pr-6888.yml
@@ -0,0 +1,5 @@
+author: "Git-Nivrak"
+delete-after: True
+changes:
+  - balance: "Explosions now always deal full damage at the source tile"
+  - bugfix: "Fixed sadar rockets not gibbing humans on direct hit"
diff --git a/html/changelogs/AutoChangeLog-pr-6908.yml b/html/changelogs/AutoChangeLog-pr-6908.yml
@@ -0,0 +1,4 @@
+author: "Doubleumc"
+delete-after: True
+changes:
+  - admin: "\"Start Round\" can start a delayed round"
diff --git a/html/changelogs/AutoChangeLog-pr-6909.yml b/html/changelogs/AutoChangeLog-pr-6909.yml
@@ -0,0 +1,4 @@
+author: "Adamix147"
+delete-after: True
+changes:
+  - maptweak: "Moved the unfixable APC at Kutjevo Botany to make it fixable again."
diff --git a/html/changelogs/AutoChangeLog-pr-6910.yml b/html/changelogs/AutoChangeLog-pr-6910.yml
@@ -0,0 +1,4 @@
+author: "Contrabang"
+delete-after: True
+changes:
+  - bugfix: "ERT no longer show up in the orbit escape section"
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
@@ -192,3 +192,9 @@
       the box.
   cuberound:
   - rscdel: removes gravity generator (ugly legacy stuff)
+2024-08-12:
+  Git-Nivrak:
+  - bugfix: You can no longer put items back in the specialist case after taking them
+      out
+  zzzmike:
+  - rscadd: fun fact for internal bleeding fixed
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -11208,9 +11208,8 @@
 /turf/open/gm/river/desert/deep/toxic,
 /area/kutjevo/interior/oob)
 "qwT" = (
-/obj/item/tool/wirecutters/clippers,
 /obj/structure/machinery/power/apc/no_power/north,
-/turf/open/auto_turf/sand/layer0,
+/turf/open/floor/kutjevo/multi_tiles,
 /area/kutjevo/interior/complex/botany)
 "qxc" = (
 /obj/structure/barricade/metal/wired{
@@ -33382,7 +33381,7 @@ lHs
 kDS
 xQM
 mbS
-nCM
+qwT
 bds
 qGA
 mbS
@@ -33884,7 +33883,7 @@ kDS
 alh
 mbS
 mbS
-qwT
+qGA
 xfW
 nCM
 mbS