Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · May 10, 2024 · 5053eb8 · 5053eb8
2 parents 401ab00 + 0eb1cb8
commit 5053eb8
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 210 deletions.
diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm
diff --git a/code/datums/gamemodes/_game_mode.dm b/code/datums/gamemodes/_game_mode.dm
@@ -199,7 +199,7 @@ GLOBAL_VAR(common_report) //Contains common part of roundend report
 
 
 /datum/game_mode/proc/declare_completion()
-	to_chat(world, span_round_body("Thus ends the story of the brave men and women of the [SSmapping.configs[SHIP_MAP].map_name] and their struggle on [SSmapping.configs[GROUND_MAP].map_name]."))
+	end_round_fluff()
 	log_game("The round has ended.")
 	SSdbcore.SetRoundEnd()
 	if(time_between_round)
@@ -209,9 +209,11 @@ GLOBAL_VAR(common_report) //Contains common part of roundend report
 		SSpersistence.CollectData()
 	display_report()
 	addtimer(CALLBACK(src, PROC_REF(end_of_round_deathmatch)), ROUNDEND_EORG_DELAY)
-	//end_of_round_deathmatch()
 	return TRUE
 
+///End of round messaging
+/datum/game_mode/proc/end_round_fluff()
+	to_chat(world, span_round_body("Thus ends the story of the brave men and women of the [SSmapping.configs[SHIP_MAP].map_name] and their struggle on [SSmapping.configs[GROUND_MAP].map_name]."))
 
 /datum/game_mode/proc/display_roundstart_logout_report()
 	var/msg = "<hr>[span_notice("<b>Roundstart logout report</b>")]<br>"

diff --git a/code/datums/gamemodes/campaign.dm b/code/datums/gamemodes/campaign.dm
@@ -110,11 +110,59 @@
 			message_admins("Round finished: [round_finished]")
 			return TRUE
 
-/datum/game_mode/hvh/campaign/declare_completion() //todo: update fluff message
+/datum/game_mode/hvh/campaign/declare_completion()
 	. = ..()
-	to_chat(world, span_round_header("|[round_finished]|"))
 	log_game("[round_finished]\nGame mode: [name]\nRound time: [duration2text()]\nEnd round player population: [length(GLOB.clients)]\nTotal TGMC spawned: [GLOB.round_statistics.total_humans_created[FACTION_TERRAGOV]]\nTotal SOM spawned: [GLOB.round_statistics.total_humans_created[FACTION_SOM]]")
-	to_chat(world, span_round_body("Thus ends the story of the brave men and women of both the TGMC and SOM, and their struggle on Palmaria."))
+
+/datum/game_mode/hvh/campaign/end_round_fluff()
+	to_chat(world, span_round_header("Campaign concluded"))
+	to_chat(world, span_round_header("|[round_finished]|"))
+
+	switch(round_finished)
+		if(MODE_COMBAT_PATROL_SOM_MINOR)
+			to_chat(world, span_round_body("Brave SOM forces are reporting decisive victories against the imperialist TerraGov forces across the planet, forcing their disorganised and chaotic retreat. \
+			With the planet now liberated, the Sons of Mars welcome the people of Palmaria into the light of a new day, ready to help them into a better future as brothers."))
+		if(MODE_COMBAT_PATROL_MARINE_MINOR)
+			to_chat(world, span_round_body("TGMC forces have routed the terrorist SOM forces across the planet, destroying their strongholds and returning possession of stolen property to their legitimate corporate owners. \
+			With the SOM threat removed, TerraGov peacekeeping forces begin to move in to ensure a rapid return to law and order, restoring stability, safety, and a guarantee of Palmaria's economic development to the benefit of all citizens."))
+
+	var/sound/som_track
+	var/sound/tgmc_track
+	var/sound/ghost_track
+	switch(round_finished)
+		if(MODE_COMBAT_PATROL_SOM_MAJOR)
+			som_track = pick('sound/theme/winning_triumph1.ogg', 'sound/theme/winning_triumph2.ogg')
+			tgmc_track = pick('sound/theme/sad_loss1.ogg', 'sound/theme/sad_loss2.ogg')
+			ghost_track = som_track
+		if(MODE_COMBAT_PATROL_MARINE_MAJOR)
+			som_track = pick('sound/theme/sad_loss1.ogg', 'sound/theme/sad_loss2.ogg')
+			tgmc_track = pick('sound/theme/winning_triumph1.ogg', 'sound/theme/winning_triumph2.ogg')
+			ghost_track = tgmc_track
+		if(MODE_COMBAT_PATROL_SOM_MINOR)
+			som_track = pick('sound/theme/winning_triumph1.ogg', 'sound/theme/winning_triumph2.ogg')
+			tgmc_track = pick('sound/theme/neutral_melancholy1.ogg', 'sound/theme/neutral_melancholy2.ogg')
+			ghost_track = som_track
+		if(MODE_COMBAT_PATROL_MARINE_MINOR)
+			som_track = pick('sound/theme/neutral_melancholy1.ogg', 'sound/theme/neutral_melancholy2.ogg')
+			tgmc_track = pick('sound/theme/winning_triumph1.ogg', 'sound/theme/winning_triumph2.ogg')
+			ghost_track = tgmc_track
+		if(MODE_COMBAT_PATROL_DRAW)
+			som_track = pick('sound/theme/neutral_hopeful1.ogg', 'sound/theme/neutral_hopeful2.ogg')
+			tgmc_track = pick('sound/theme/neutral_hopeful1.ogg', 'sound/theme/neutral_hopeful2.ogg')
+			ghost_track = tgmc_track
+
+	som_track = sound(som_track, channel = CHANNEL_CINEMATIC)
+	tgmc_track = sound(tgmc_track, channel = CHANNEL_CINEMATIC)
+	ghost_track = sound(ghost_track, channel = CHANNEL_CINEMATIC)
+
+	for(var/mob/mob AS in GLOB.player_list)
+		switch(mob.faction)
+			if(FACTION_SOM)
+				SEND_SOUND(mob, som_track)
+			if(FACTION_TERRAGOV)
+				SEND_SOUND(mob, tgmc_track)
+			else
+				SEND_SOUND(mob, ghost_track)
 
 /datum/game_mode/hvh/campaign/get_status_tab_items(datum/dcs, mob/source, list/items)
 	. = ..()

diff --git a/code/datums/gamemodes/campaign/campaign_mission.dm b/code/datums/gamemodes/campaign/campaign_mission.dm
@@ -369,10 +369,11 @@
 	map_text_broadcast(hostile_faction, intro_message[MISSION_HOSTILE_FACTION], op_name_hostile)
 
 ///Outro when the mission is finished
-/datum/campaign_mission/proc/play_outro() //todo: make generic
-	to_chat(world, span_round_header("|[starting_faction] [outcome]|"))
+/datum/campaign_mission/proc/play_outro()
 	log_game("[outcome]\nMission: [name]")
-	to_chat(world, span_round_body("Thus ends the story of the brave men and women of both the [starting_faction] and [hostile_faction], and their struggle on [map_name]."))
+
+	to_chat(world, span_round_header("[name] completed"))
+	to_chat(world, span_round_header("|[starting_faction] [outcome]|"))
 
 	map_text_broadcast(starting_faction, outro_message[outcome][MISSION_STARTING_FACTION], op_name_starting)
 	map_text_broadcast(hostile_faction, outro_message[outcome][MISSION_HOSTILE_FACTION], op_name_hostile)

diff --git a/code/datums/gamemodes/combat_patrol.dm b/code/datums/gamemodes/combat_patrol.dm
@@ -115,8 +115,10 @@
 
 /datum/game_mode/hvh/combat_patrol/declare_completion()
 	. = ..()
-	to_chat(world, span_round_header("|[round_finished]|"))
 	log_game("[round_finished]\nGame mode: [name]\nRound time: [duration2text()]\nEnd round player population: [length(GLOB.clients)]\nTotal TGMC spawned: [GLOB.round_statistics.total_humans_created[FACTION_TERRAGOV]]\nTotal SOM spawned: [GLOB.round_statistics.total_humans_created[FACTION_SOM]]")
+
+/datum/game_mode/hvh/combat_patrol/end_round_fluff()
+	to_chat(world, span_round_header("|[round_finished]|"))
 	to_chat(world, span_round_body("Thus ends the story of the brave men and women of both the TGMC and SOM, and their struggle on [SSmapping.configs[GROUND_MAP].map_name]."))
 
 /datum/game_mode/hvh/combat_patrol/get_deploy_point_message(mob/living/user)

diff --git a/code/datums/gamemodes/extended.dm b/code/datums/gamemodes/extended.dm
@@ -40,8 +40,9 @@
 
 /datum/game_mode/extended/declare_completion()
 	. = ..()
+	log_game("[round_finished]\nGame mode: [name]\nRound time: [duration2text()]\nEnd round player population: [length(GLOB.clients)]\nTotal xenos spawned: [GLOB.round_statistics.total_xenos_created]\nTotal humans spawned: [GLOB.round_statistics.total_humans_created]")
+
+/datum/game_mode/extended/end_round_fluff()
 	to_chat(world, span_round_header("|[round_finished]|"))
 	var/sound/S = sound(pick('sound/theme/neutral_hopeful1.ogg','sound/theme/neutral_hopeful2.ogg'), channel = CHANNEL_CINEMATIC)
 	SEND_SOUND(world, S)
-
-	log_game("[round_finished]\nGame mode: [name]\nRound time: [duration2text()]\nEnd round player population: [length(GLOB.clients)]\nTotal xenos spawned: [GLOB.round_statistics.total_xenos_created]\nTotal humans spawned: [GLOB.round_statistics.total_humans_created]")
diff --git a/code/datums/gamemodes/infestation.dm b/code/datums/gamemodes/infestation.dm
@@ -214,8 +214,13 @@
 
 
 /datum/game_mode/infestation/declare_completion()
+	. = ..()
+	log_game("[round_finished]\nGame mode: [name]\nRound time: [duration2text()]\nEnd round player population: [length(GLOB.clients)]\nTotal xenos spawned: [GLOB.round_statistics.total_xenos_created]\nTotal humans spawned: [GLOB.round_statistics.total_humans_created]")
+
+/datum/game_mode/infestation/end_round_fluff()
 	. = ..()
 	to_chat(world, span_round_header("|[round_finished]|"))
+
 	var/sound/xeno_track
 	var/sound/human_track
 	var/sound/ghost_track
@@ -268,8 +273,6 @@
 
 		SEND_SOUND(M, ghost_track)
 
-	log_game("[round_finished]\nGame mode: [name]\nRound time: [duration2text()]\nEnd round player population: [length(GLOB.clients)]\nTotal xenos spawned: [GLOB.round_statistics.total_xenos_created]\nTotal humans spawned: [GLOB.round_statistics.total_humans_created]")
-
 /datum/game_mode/infestation/can_start(bypass_checks = FALSE)
 	. = ..()
 	if(!.)

diff --git a/code/game/objects/machinery/cryopod.dm b/code/game/objects/machinery/cryopod.dm
@@ -141,7 +141,7 @@
 	updateUsrDialog()
 
 	if(href_list["item"])
-		var/obj/item/I 
+		var/obj/item/I
 		switch(state)
 			if(STATE_GUN)
 				I = locate(href_list["item"]) in GLOB.cryoed_item_list_gun
@@ -354,6 +354,10 @@
 		if(!QDELETED(src))
 			qdel(src)
 		return
+	if(storage_datum)
+		for(var/obj/item/item_in_storage AS in src)
+			storage_datum.remove_from_storage(item_in_storage)
+			item_in_storage.store_in_cryo()
 	moveToNullspace()
 	if(istype(src, /obj/item/weapon/gun))
 		GLOB.cryoed_item_list_gun += src
@@ -374,11 +378,6 @@
 	else
 		GLOB.cryoed_item_list_other += src
 
-/obj/item/storage/store_in_cryo()
-	for(var/obj/item/I AS in src)
-		I.store_in_cryo()
-	return ..()
-
 /obj/machinery/cryopod/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE)
 	. = ..()
 	if(.)

diff --git a/html/changelogs/AutoChangeLog-pr-15821.yml b/html/changelogs/AutoChangeLog-pr-15821.yml
@@ -0,0 +1,5 @@
+author: "chizzy376"
+delete-after: True
+changes:
+  - bugfix: "Slumbridge's SOM hangar is open again"
+  - bugfix: "Slumbridge lava prison no longer has a hole in the western reception"
diff --git a/html/changelogs/AutoChangeLog-pr-15826.yml b/html/changelogs/AutoChangeLog-pr-15826.yml
@@ -0,0 +1,4 @@
+author: "Xander3359"
+delete-after: True
+changes:
+  - bugfix: "Roomba no longer curses your storage if it sends it to cryo"
diff --git a/html/changelogs/AutoChangeLog-pr-15828.yml b/html/changelogs/AutoChangeLog-pr-15828.yml
@@ -0,0 +1,4 @@
+author: "Lumipharon"
+delete-after: True
+changes:
+  - qol: "Improved messaging around end of mission/game for campaign"