From a01dcd96b158bd3843ef4c4dfd10f7b9f8e8b31b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 10 May 2024 00:52:44 +0000 Subject: [PATCH 1/7] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15809.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15814.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15818.yml | 4 ---- html/changelogs/archive/2024-05.yml | 6 ++++++ 4 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15809.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15814.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15818.yml diff --git a/html/changelogs/AutoChangeLog-pr-15809.yml b/html/changelogs/AutoChangeLog-pr-15809.yml deleted file mode 100644 index 6bef24d8b7b99..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-15809.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Xander3359" -delete-after: True -changes: - - code_imp: "adds proc/wash() to clean stuff" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-15814.yml b/html/changelogs/AutoChangeLog-pr-15814.yml deleted file mode 100644 index 196e0cea73e7f..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-15814.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Lumipharon" -delete-after: True -changes: - - bugfix: "fixed an issue with minimap code and z-levels after entering vehicles" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-15818.yml b/html/changelogs/AutoChangeLog-pr-15818.yml deleted file mode 100644 index 46601af00a8c1..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-15818.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Xander3359" -delete-after: True -changes: - - code_imp: "Playing a sound uses SFX defines" \ No newline at end of file diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml index 6fc376591e036..03c0631f76706 100644 --- a/html/changelogs/archive/2024-05.yml +++ b/html/changelogs/archive/2024-05.yml @@ -87,3 +87,9 @@ - imageadd: new pilot armor - imageadd: new pilot uniform - imageadd: new pilot helmet +2024-05-10: + Lumipharon: + - bugfix: fixed an issue with minimap code and z-levels after entering vehicles + Xander3359: + - code_imp: adds proc/wash() to clean stuff + - code_imp: Playing a sound uses SFX defines From 84f5e017ec8f042920928adda7dbe120e03a570d Mon Sep 17 00:00:00 2001 From: Xander3359 <66163761+Xander3359@users.noreply.github.com> Date: Thu, 9 May 2024 22:31:56 -0400 Subject: [PATCH 2/7] Roomba no longer permanently curses storages that get vacuumed (#15826) --- code/game/objects/machinery/cryopod.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/objects/machinery/cryopod.dm b/code/game/objects/machinery/cryopod.dm index 8345ffa69f90b..26e95cc5db1b7 100644 --- 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(.) From fee4c6a8872950bb9df313b88af905907b148053 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 02:37:03 +0000 Subject: [PATCH 3/7] Automatic changelog for PR #15826 [ci skip] --- html/changelogs/AutoChangeLog-pr-15826.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15826.yml diff --git a/html/changelogs/AutoChangeLog-pr-15826.yml b/html/changelogs/AutoChangeLog-pr-15826.yml new file mode 100644 index 0000000000000..9a544e5ef2d59 --- /dev/null +++ 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" \ No newline at end of file From aed7a79b0e53cff5ecfc0bd4551f4127c9e50ba6 Mon Sep 17 00:00:00 2001 From: chizzy376 <80391698+chizzy376@users.noreply.github.com> Date: Fri, 10 May 2024 16:35:29 +0200 Subject: [PATCH 4/7] Removes Slumbridge's CAS prop, replaces with tank AND fixes lava prison tiles (#15821) --- _maps/map_files/slumbridge/slumbridge.dmm | 234 ++++------------------ 1 file changed, 43 insertions(+), 191 deletions(-) diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm index 1b68a189ccea6..b801c25c0d27a 100644 --- a/_maps/map_files/slumbridge/slumbridge.dmm +++ b/_maps/map_files/slumbridge/slumbridge.dmm @@ -3842,16 +3842,9 @@ /turf/open/floor/tile/dark/brown2, /area/slumbridge/inside/colony/orestorage) "cRm" = ( -/obj/structure/somcas/four{ - dir = 1 - }, /obj/effect/ai_node, /turf/open/floor/mainship/stripesquare, /area/slumbridge/inside/sombase/hangar) -"cRr" = ( -/obj/structure/window/framed/prison/reinforced, -/turf/open/liquid/lava/autosmoothing, -/area/slumbridge/inside/prison/outerringnorth) "cSc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tracks/wheels/bloody, @@ -3932,11 +3925,6 @@ /obj/effect/landmark/patrol_point/som/som_12, /turf/open/floor/tile/dark, /area/slumbridge/landingzonetwo) -"cUX" = ( -/obj/structure/somcas/two, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "cVk" = ( /obj/item/ore/slag{ pixel_y = -5 @@ -4071,10 +4059,9 @@ /turf/open/floor/mainship/ai, /area/slumbridge/inside/houses/recreational) "dbX" = ( -/obj/structure/somcas/three{ - dir = 1 - }, -/turf/open/floor/mainship/stripesquare, +/obj/structure/table/mainship, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/prison/blackfloor, /area/slumbridge/inside/sombase/hangar) "dcd" = ( /obj/effect/decal/cleanable/blood, @@ -4706,10 +4693,9 @@ /turf/open/floor/tile/green/whitegreenfull, /area/slumbridge/inside/hydrotreatment) "dCO" = ( -/obj/structure/somcas/two{ - dir = 1 - }, -/turf/open/floor/mainship/stripesquare, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/floodlight, +/turf/open/floor/mainship/floor, /area/slumbridge/inside/sombase/hangar) "dCW" = ( /obj/effect/ai_node, @@ -4770,7 +4756,6 @@ /turf/open/floor/plating/ground/snow/layer2, /area/slumbridge/outside/southwest) "dFf" = ( -/obj/machinery/floodlight, /turf/open/floor/mainship/silver{ dir = 8 }, @@ -8173,11 +8158,8 @@ /turf/open/floor/engine, /area/slumbridge/inside/engi/engineroom) "goJ" = ( -/obj/structure/somcas/one{ - dir = 4 - }, -/obj/structure/table/mainship, -/turf/open/floor/prison/blackfloor, +/obj/structure/prop/vehicle/tank, +/turf/open/floor/mainship/stripesquare, /area/slumbridge/inside/sombase/hangar) "goL" = ( /obj/effect/decal/cleanable/dirt, @@ -8695,7 +8677,9 @@ /turf/open/floor/plating/ground/dirt, /area/slumbridge/outside/southeast) "gJm" = ( -/obj/structure/somcas/three, +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/mainship/gelida/smallwire, +/obj/structure/prop/vehicle/tank, /turf/open/floor/mainship/stripesquare, /area/slumbridge/inside/sombase/hangar) "gJA" = ( @@ -11311,12 +11295,6 @@ /obj/effect/turf_decal/tracks/claw2/bloody, /turf/open/floor/mainship/mono, /area/slumbridge/caves/mining/dropship) -"iza" = ( -/obj/structure/somcas/three{ - dir = 4 - }, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "izv" = ( /obj/structure/bed, /obj/machinery/light, @@ -12138,12 +12116,6 @@ "jhF" = ( /turf/open/floor/wood/variable/wide/damaged, /area/slumbridge/caves/southeastcaves/garbledradio) -"jhO" = ( -/obj/structure/somcas/two{ - dir = 8 - }, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "jhU" = ( /obj/structure/sign/biohazard{ dir = 4 @@ -12445,12 +12417,6 @@ }, /turf/closed/mineral/smooth/bigred, /area/slumbridge/caves/rock/nearlz) -"jst" = ( -/obj/structure/somcas/four{ - dir = 8 - }, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "jsu" = ( /obj/machinery/light{ dir = 4 @@ -13739,13 +13705,6 @@ /obj/structure/barricade/guardrail, /turf/open/floor/plating/ground/snow/layer2, /area/slumbridge/outside/southwest) -"krH" = ( -/obj/structure/table/mainship, -/obj/structure/somcas/one{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/slumbridge/inside/sombase/hangar) "krL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -14414,13 +14373,6 @@ /obj/effect/ai_node, /turf/open/floor/plating, /area/slumbridge/inside/engi/central) -"kRg" = ( -/obj/structure/somcas/five{ - dir = 1 - }, -/obj/structure/table/mainship, -/turf/open/floor/prison/blackfloor, -/area/slumbridge/inside/sombase/hangar) "kRj" = ( /obj/effect/turf_decal/tracks/claw1/bloody{ dir = 1 @@ -14579,14 +14531,6 @@ /obj/effect/landmark/weed_node, /turf/open/floor/plating/asteroidplating, /area/slumbridge/caves/northeastcaves) -"kWk" = ( -/obj/structure/somcas/two{ - dir = 4 - }, -/turf/open/floor/mainship/silver{ - dir = 4 - }, -/area/slumbridge/inside/sombase/hangar) "kWl" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ on = 1 @@ -16754,10 +16698,6 @@ /obj/structure/cable, /turf/open/floor/iron/freezer, /area/slumbridge/inside/sombase/west) -"mzL" = ( -/obj/structure/somcas/four, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "mzM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/weed_node, @@ -16936,7 +16876,6 @@ /turf/open/floor/wood/broken, /area/slumbridge/inside/sombase/east) "mHI" = ( -/obj/structure/somcas, /obj/structure/table/mainship, /turf/open/floor/mainship/floor, /area/slumbridge/inside/sombase/west) @@ -17728,12 +17667,6 @@ /obj/structure/rock/basalt/pile, /turf/open/floor/plating/ground/mars/random/cave/darker, /area/slumbridge/caves/mining) -"nmQ" = ( -/obj/structure/somcas/four{ - dir = 4 - }, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "nmX" = ( /obj/effect/landmark/excavation_site_spawner, /obj/effect/landmark/weed_node, @@ -18778,13 +18711,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/snow/layer0, /area/slumbridge/outside/southwest) -"nXL" = ( -/obj/structure/somcas/five{ - dir = 4 - }, -/obj/structure/table/mainship, -/turf/open/floor/prison/blackfloor, -/area/slumbridge/inside/sombase/hangar) "nYi" = ( /obj/structure/prop/mainship/gelida/smallwire, /obj/structure/cable, @@ -20000,9 +19926,7 @@ }, /area/slumbridge/inside/prison/innerring) "oUU" = ( -/obj/structure/somcas{ - dir = 8 - }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/stripesquare, /area/slumbridge/inside/sombase/hangar) "oVn" = ( @@ -20073,9 +19997,6 @@ /turf/open/floor/plating/icefloor/warnplate, /area/shuttle/drop2/lz2) "oYP" = ( -/obj/structure/somcas/one{ - dir = 8 - }, /obj/structure/table/mainship, /obj/machinery/light, /turf/open/floor/prison/blackfloor, @@ -22006,24 +21927,12 @@ dir = 8 }, /area/slumbridge/inside/sombase/hangar) -"qvb" = ( -/obj/structure/somcas/eight, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "qvl" = ( /obj/structure/curtain/medical, /obj/item/bedsheet/medical, /obj/structure/bed, /turf/open/floor/prison/whitegreen/full, /area/slumbridge/inside/prison/outerringsouth) -"qvx" = ( -/obj/structure/somcas/six{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/mainship/gelida/smallwire, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "qvG" = ( /obj/effect/decal/cleanable/blood/oil/armorblood, /turf/open/floor/plating/icefloor, @@ -22119,11 +22028,6 @@ /obj/effect/ai_node, /turf/open/floor/tile/yellow, /area/slumbridge/inside/engi/west) -"qxI" = ( -/obj/structure/somcas/five, -/obj/structure/table/mainship, -/turf/open/floor/prison/blackfloor, -/area/slumbridge/inside/sombase/hangar) "qxT" = ( /obj/structure/closet/wardrobe/engineering_yellow, /obj/item/storage/backpack/satchel/eng, @@ -23820,9 +23724,6 @@ /turf/open/floor/plating, /area/slumbridge/inside/houses/swcargo) "rIP" = ( -/obj/structure/somcas{ - dir = 1 - }, /obj/structure/table/mainship, /turf/open/floor/mainship/floor, /area/slumbridge/inside/sombase/hangar) @@ -25223,14 +25124,6 @@ dir = 8 }, /area/slumbridge/inside/sombase/hangar) -"sKa" = ( -/obj/structure/somcas/six{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/mainship/gelida/smallwire, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "sKm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/green/hidden, @@ -25305,13 +25198,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/scorched/two, /area/slumbridge/inside/pmcdome) -"sOk" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/cable, -/turf/open/floor/mainship/silver{ - dir = 8 - }, -/area/slumbridge/inside/sombase/hangar) "sOn" = ( /turf/closed/gm/dense, /area/slumbridge/outside/southeast) @@ -25591,7 +25477,7 @@ "sXX" = ( /obj/structure/table/mainship, /obj/machinery/computer3{ - name = "Manta Jet Monitoring" + name = "SOM Tank Monitoring" }, /obj/machinery/light{ dir = 1 @@ -26037,9 +25923,6 @@ /turf/closed/wall/r_wall, /area/slumbridge/inside/houses/surgery/garbledradio) "tqM" = ( -/obj/structure/somcas/five{ - dir = 8 - }, /obj/structure/table/mainship, /obj/structure/prop/mainship/weapon_recharger, /obj/effect/decal/cleanable/dirt, @@ -26113,23 +25996,9 @@ /obj/structure/lattice, /turf/open/floor/plating/ground/mars/random/dirt, /area/slumbridge/outside/northwest/nearlz) -"tsM" = ( -/obj/machinery/floodlight, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/slumbridge/inside/sombase/hangar) "tti" = ( /turf/closed/wall, /area/slumbridge/inside/colony/dorms) -"ttD" = ( -/obj/structure/somcas{ - dir = 4 - }, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "tuh" = ( /obj/machinery/light{ dir = 8 @@ -28462,10 +28331,6 @@ /obj/structure/cable, /turf/open/floor/mainship/sterile/dark, /area/slumbridge/inside/sombase/west) -"vkG" = ( -/obj/structure/somcas/one, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "vkH" = ( /obj/effect/spawner/random/misc/trash, /obj/effect/decal/cleanable/dirt, @@ -30941,12 +30806,6 @@ }, /turf/open/floor/mainship_hull, /area/slumbridge/inside/zeta/south) -"wTS" = ( -/obj/structure/somcas/three{ - dir = 8 - }, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "wUo" = ( /obj/structure/cable, /obj/machinery/light{ @@ -32416,10 +32275,6 @@ dir = 9 }, /area/shuttle/drop1/lz1) -"ych" = ( -/obj/effect/landmark/weed_node, -/turf/open/floor/mainship/stripesquare, -/area/slumbridge/inside/sombase/hangar) "ycz" = ( /obj/structure/stairs, /obj/machinery/atmospherics/pipe/simple/green/hidden, @@ -32535,9 +32390,6 @@ /turf/open/floor/tile/blue, /area/slumbridge/inside/medical/chemistry) "yfr" = ( -/obj/structure/somcas/eight{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mainship/stripesquare, /area/slumbridge/inside/sombase/hangar) @@ -41867,8 +41719,8 @@ tWE asu asu asu -cRr -cRr +iAS +iAS asu asu gZN @@ -53419,7 +53271,7 @@ nIh iFi oCR uDW -oCR +dCO oCR nxG adH @@ -53591,10 +53443,10 @@ elP liM liM gLQ -uMl +dbX uMl wpD -sOk +evp xBF evp uhY @@ -53777,9 +53629,9 @@ rLj nYi bbU bbU -jhO bbU -gVp +bbU +gJm pQi mKM pQi @@ -53957,9 +53809,9 @@ oCR rLj lDZ bbU -iza -dCO -nmQ +bbU +bbU +bbU gVp mKM mKM @@ -54138,10 +53990,10 @@ lee atY kSG bbU -gJm -qvb +bbU +bbU cRm -qvx +gVp hIT qWh nka @@ -54315,13 +54167,13 @@ elP qhA mHI rIP -krH +rIP rLj qlI bbU -ttD +bbU oUU -vkG +bbU xnD hyr jFI @@ -54501,8 +54353,8 @@ sXX nAB bbU bbU -ych bbU +goJ xnD eIh jzR @@ -54681,10 +54533,10 @@ rUY hWn qlI bbU -dbX +bbU yfr -mzL -sKa +bbU +gVp mKM mKM mKM @@ -54862,9 +54714,9 @@ ycW ars huS bbU -wTS -cUX -jst +bbU +yfr +bbU xnD pQi mKM @@ -55041,10 +54893,10 @@ neV paK rUY xgb -tsM +nxG jun qnQ -kWk +qnQ aRV qnQ dxl @@ -55404,7 +55256,7 @@ mHB wQG xdC qbx -oCR +dCO quu oCR dhO @@ -55949,7 +55801,7 @@ uMl qqu uDW tqM -kRg +uMl kTH qqX noy @@ -56129,7 +55981,7 @@ oeQ uDW ecs oCR -goJ +uMl oYP noy noy @@ -56310,8 +56162,8 @@ wjw gYp qgZ aEA -nXL -qxI +uMl +uMl noy pRb pRb From 7332b7fbba12cb351052f329a6af1e2bead41558 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 14:35:47 +0000 Subject: [PATCH 5/7] Automatic changelog for PR #15821 [ci skip] --- html/changelogs/AutoChangeLog-pr-15821.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15821.yml diff --git a/html/changelogs/AutoChangeLog-pr-15821.yml b/html/changelogs/AutoChangeLog-pr-15821.yml new file mode 100644 index 0000000000000..3096885862a76 --- /dev/null +++ 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" \ No newline at end of file From 2d27e0dd4b2e1dbfdea5d81b6a72f8c60490cdc8 Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Sat, 11 May 2024 04:38:13 +1200 Subject: [PATCH 6/7] Campaign end of mission/game messaging (#15828) --- code/datums/gamemodes/_game_mode.dm | 6 ++- code/datums/gamemodes/campaign.dm | 54 +++++++++++++++++-- .../gamemodes/campaign/campaign_mission.dm | 7 +-- code/datums/gamemodes/combat_patrol.dm | 4 +- code/datums/gamemodes/extended.dm | 5 +- code/datums/gamemodes/infestation.dm | 7 ++- 6 files changed, 70 insertions(+), 13 deletions(-) diff --git a/code/datums/gamemodes/_game_mode.dm b/code/datums/gamemodes/_game_mode.dm index 2f4932ce1c677..486f6966016e1 100644 --- 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 = "
[span_notice("Roundstart logout report")]
" diff --git a/code/datums/gamemodes/campaign.dm b/code/datums/gamemodes/campaign.dm index 2699437dd85f3..6c90c1d9cad5f 100644 --- 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 index 25c112b4e06b5..0d5e42f8d6ef2 100644 --- 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 index 7d672f80dffb6..a40c6afceab55 100644 --- 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 index 747b3b1d53118..959069d4cd916 100644 --- 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 index 7200ec23ecebe..9e16b7b7696c9 100644 --- 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(!.) From 0eb1cb8195771ff9d570857946b2e98afe7b72e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 16:38:29 +0000 Subject: [PATCH 7/7] Automatic changelog for PR #15828 [ci skip] --- html/changelogs/AutoChangeLog-pr-15828.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15828.yml diff --git a/html/changelogs/AutoChangeLog-pr-15828.yml b/html/changelogs/AutoChangeLog-pr-15828.yml new file mode 100644 index 0000000000000..399a04702a3a1 --- /dev/null +++ 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" \ No newline at end of file