From 453f315d137afcc553206b58f6775d3ca67b9aba Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sat, 25 Nov 2023 23:09:48 -0500 Subject: [PATCH 1/5] Removes roundstart announcements --- code/datums/map_config.dm | 9 --------- code/game/gamemodes/colonialmarines/colonialmarines.dm | 6 ------ code/game/gamemodes/extended/infection.dm | 9 --------- maps/bigredv2.json | 1 - maps/corsat.json | 1 - maps/derelict_almayer.json | 1 - maps/desert_dam.json | 1 - maps/fiorina_sciannex.json | 1 - maps/ice_colony_v2.json | 1 - maps/kutjevo.json | 1 - maps/lv522_chances_claim.json | 1 - maps/lv624.json | 1 - maps/new_varadero.json | 1 - maps/override_ground.json | 1 - maps/prison_station_fop.json | 1 - maps/shivas_snowball.json | 1 - maps/sorokyne_strata.json | 1 - 17 files changed, 38 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 3bf5c601ce..0873dc0e5c 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -30,9 +30,6 @@ var/allow_custom_shuttles = TRUE var/shuttles = list() - var/announce_text = "" - var/infection_announce_text = "" - var/squads_max_num = 4 var/weather_holder @@ -339,12 +336,6 @@ if(json["vote_cycle"]) vote_cycle = json["vote_cycle"] - if(json["announce_text"]) - announce_text = json["announce_text"] - - if(json["infection_announce_text"]) - infection_announce_text = json["infection_announce_text"] - if(json["weather_holder"]) weather_holder = text2path(json["weather_holder"]) if(!weather_holder) diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 8f0f4da2e1..f6cb67127d 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -119,7 +119,6 @@ flags_round_type |= MODE_BASIC_RT addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) - addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) return ..() @@ -141,11 +140,6 @@ var/monkey_to_spawn = pick(monkey_types) new monkey_to_spawn(T) -/datum/game_mode/colonialmarines/proc/map_announcement() - if(SSmapping.configs[GROUND_MAP].announce_text) - var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) - marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") - /datum/game_mode/colonialmarines/proc/ares_conclude() ai_silent_announcement("Bioscan complete. No unknown lifeform signature detected.", ".V") ai_silent_announcement("Saving operational report to archive.", ".V") diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index a6b909022a..af2fcbe8b7 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -27,17 +27,8 @@ np.new_player_panel_proc() addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) - addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) return ..() -/datum/game_mode/infection/proc/map_announcement() - if(SSmapping.configs[GROUND_MAP].infection_announce_text) - var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].infection_announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) - marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") - else if(SSmapping.configs[GROUND_MAP].announce_text) //if we missed a infection text for above, or just don't need a special one, we just use default announcement - var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) - marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") - /datum/game_mode/infection/proc/initialize_post_survivor_list() if(synth_survivor) transform_survivor(synth_survivor, TRUE) diff --git a/maps/bigredv2.json b/maps/bigredv2.json index 0a6db01cd4..f2894e5121 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -24,7 +24,6 @@ 0.0 ], "map_item_type": "/obj/item/map/big_red_map", - "announce_text": "We've lost contact with Weyland-Yutani's research facility, Solaris Ridge. The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "neaera" ], diff --git a/maps/corsat.json b/maps/corsat.json index e819264405..3539db56e6 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -26,7 +26,6 @@ ], "survivor_message": "You are a survivor of the containment breach on the Corporate Orbital Research Station for Advanced Technology (CORSAT). You worked or lived on the station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/corsat", - "announce_text": "An automated distress signal has been received from Weyland-Yutani's Corporate Orbital Research Station for Advanced Technology, or CORSAT. The ###SHIPNAME### has been dispatched to investigate.", "monkey_types": [ "yiren", "farwa", diff --git a/maps/derelict_almayer.json b/maps/derelict_almayer.json index 0d0fc08da4..1d0a84138e 100644 --- a/maps/derelict_almayer.json +++ b/maps/derelict_almayer.json @@ -4,7 +4,6 @@ "map_file": "derelict_almayer.dmm", "webmap_url": "Almayer", "map_item_type": "/obj/item/map/almayer", - "announce_text": "An automated distress signal has been received from the \"USS Almayer\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/derelict_almayer/", "camouflage": "classic", diff --git a/maps/desert_dam.json b/maps/desert_dam.json index b4e535e893..540a716374 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -24,7 +24,6 @@ 0.0 ], "map_item_type": "/obj/item/map/desert_dam", - "announce_text": "We've lost contact with Weyland-Yutani's extra-solar colony, \"Trijent Dam\", on the planet \"Raijin.\" The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "stok" ], diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index dfc7365541..842d6342c6 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -25,7 +25,6 @@ ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/FOP_map_v3", - "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/FOP_v3_Sciannex/", "xvx_hives": { diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index d8baaab7dc..829d68973f 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -23,7 +23,6 @@ ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/ice_colony_map", - "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], diff --git a/maps/kutjevo.json b/maps/kutjevo.json index 83a0ff90c5..ecb8ce024a 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -22,7 +22,6 @@ 0.0 ], "map_item_type": "/obj/item/map/kutjevo_map", - "announce_text": "An automated distress signal has been received from Weyland-Yutani colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate.", "monkey_types": [ "neaera", "stok" diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index ac7dfa5f1d..507c63862a 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -23,7 +23,6 @@ 0.0 ], "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", - "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", "map_item_type": "/obj/item/map/lv522_map", "monkey_types": [ "neaera", diff --git a/maps/lv624.json b/maps/lv624.json index bec99892a3..8838682060 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -17,7 +17,6 @@ "/datum/equipment_preset/survivor/civilian" ], "map_item_type": "/obj/item/map/lazarus_landing_map", - "announce_text": "An automated distress signal has been received from archaeology site Lazarus Landing, on border world LV-624. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "farwa", "monkey", diff --git a/maps/new_varadero.json b/maps/new_varadero.json index d695652d0c..0e9a71f68c 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -30,7 +30,6 @@ ], "survivor_message": "You are an employee for the United Americas on the island outpost of New Varadero. A newfound discovery has unleashed unspeakable horrors. Do everything you can to survive.", "map_item_type": "/obj/item/map/new_varadero", - "announce_text": "An automated distress signal has been received from UA Outpost New Varadero. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.\nDesignation: Island research station and mining facility\n\nPopulation: 47\nCurrent Temperature: 68F Interior, 97F Exterior\nOutpost Commander: UA Rep. Steve Haifisch\nTelecommunications Array: Repairs required\n\nNo further information available at this time.", "monkey_types": [ "monkey" ], diff --git a/maps/override_ground.json b/maps/override_ground.json index 94d3c70757..7ce69744e5 100644 --- a/maps/override_ground.json +++ b/maps/override_ground.json @@ -6,7 +6,6 @@ "/datum/equipment_preset/survivor/goon" ], "map_item_type": "/obj/item/map/big_red_map", - "announce_text": "We've lost contact with a Weyland-Yutani's research facility. The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "neaera" ], diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index b29f7255c2..749ec6a579 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -23,7 +23,6 @@ ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/FOP_map", - "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "environment_traits": { "Lockdown": true }, "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/FOP_v2_Cellblocks/", diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json index 60ee8b27c9..adba25b9a3 100644 --- a/maps/shivas_snowball.json +++ b/maps/shivas_snowball.json @@ -26,7 +26,6 @@ ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/ice_colony_map", - "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json index 61c3a7fd3f..7206c53184 100644 --- a/maps/sorokyne_strata.json +++ b/maps/sorokyne_strata.json @@ -22,7 +22,6 @@ 0.0 ], "map_item_type": "/obj/item/map/sorokyne_map", - "announce_text": "An automated distress signal has been recieved from a mining colony on border world LV-976, \"Sorokyne Outpost\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], From 8ececba642a2b322d958dd508078a9fffd506985 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sat, 25 Nov 2023 23:19:20 -0500 Subject: [PATCH 2/5] kills ARES ONLINE text as well --- code/datums/emergency_calls/emergency_call.dm | 5 ----- code/game/gamemodes/colonialmarines/colonialmarines.dm | 2 -- code/game/gamemodes/extended/infection.dm | 3 --- 3 files changed, 10 deletions(-) diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 9db46955a5..344267d9f5 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -10,11 +10,6 @@ var/datum/emergency_call/picked_calls[] = list() //Which distress calls are currently active var/ert_dispatched = FALSE -/datum/game_mode/proc/ares_online() - var/name = "ARES Online" - var/input = "ARES. Online. Good morning, marines." - shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg') - /datum/game_mode/proc/request_ert(user, ares = FALSE) if(!user) return FALSE diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index f6cb67127d..0bc74b9078 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -118,8 +118,6 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_BASIC_RT]) flags_round_type |= MODE_BASIC_RT - addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) - return ..() #define MONKEYS_TO_TOTAL_RATIO 1/32 diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index af2fcbe8b7..381043cbb0 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -26,9 +26,6 @@ for(var/mob/new_player/np in GLOB.new_player_list) np.new_player_panel_proc() - addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) - return ..() - /datum/game_mode/infection/proc/initialize_post_survivor_list() if(synth_survivor) transform_survivor(synth_survivor, TRUE) From 5aa2d9d557a0c89b8a095f4378d7a0ab60ecb9b1 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Sun, 26 Nov 2023 16:51:46 -0500 Subject: [PATCH 3/5] does this work --- code/game/gamemodes/extended/infection.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index 381043cbb0..f6b58076ef 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -25,6 +25,7 @@ initialize_post_marine_gear_list() for(var/mob/new_player/np in GLOB.new_player_list) np.new_player_panel_proc() + return ..() /datum/game_mode/infection/proc/initialize_post_survivor_list() if(synth_survivor) From 3ca384666e4205a786f11f7e0ee9227b3e6d13fd Mon Sep 17 00:00:00 2001 From: private-tristan Date: Tue, 28 Nov 2023 19:26:40 -0500 Subject: [PATCH 4/5] reverts everything --- code/datums/map_config.dm | 9 +++++++++ .../gamemodes/colonialmarines/colonialmarines.dm | 11 +++++++++++ code/game/gamemodes/extended/infection.dm | 14 ++++++++++++++ maps/bigredv2.json | 1 + maps/corsat.json | 1 + maps/derelict_almayer.json | 1 + maps/desert_dam.json | 1 + maps/fiorina_sciannex.json | 1 + maps/ice_colony_v2.json | 1 + maps/kutjevo.json | 1 + maps/lv522_chances_claim.json | 1 + maps/lv624.json | 1 + maps/new_varadero.json | 1 + maps/override_ground.json | 1 + maps/prison_station_fop.json | 1 + maps/shivas_snowball.json | 1 + maps/sorokyne_strata.json | 1 + 17 files changed, 48 insertions(+) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 0873dc0e5c..3bf5c601ce 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -30,6 +30,9 @@ var/allow_custom_shuttles = TRUE var/shuttles = list() + var/announce_text = "" + var/infection_announce_text = "" + var/squads_max_num = 4 var/weather_holder @@ -336,6 +339,12 @@ if(json["vote_cycle"]) vote_cycle = json["vote_cycle"] + if(json["announce_text"]) + announce_text = json["announce_text"] + + if(json["infection_announce_text"]) + infection_announce_text = json["infection_announce_text"] + if(json["weather_holder"]) weather_holder = text2path(json["weather_holder"]) if(!weather_holder) diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 0bc74b9078..09c0fca57c 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -118,6 +118,12 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_BASIC_RT]) flags_round_type |= MODE_BASIC_RT +<<<<<<< HEAD +======= + addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) + +>>>>>>> parent of 453f315d13 (Removes roundstart announcements) return ..() #define MONKEYS_TO_TOTAL_RATIO 1/32 @@ -138,6 +144,11 @@ var/monkey_to_spawn = pick(monkey_types) new monkey_to_spawn(T) +/datum/game_mode/colonialmarines/proc/map_announcement() + if(SSmapping.configs[GROUND_MAP].announce_text) + var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) + marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") + /datum/game_mode/colonialmarines/proc/ares_conclude() ai_silent_announcement("Bioscan complete. No unknown lifeform signature detected.", ".V") ai_silent_announcement("Saving operational report to archive.", ".V") diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index f6b58076ef..68a9a80cc0 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -25,8 +25,22 @@ initialize_post_marine_gear_list() for(var/mob/new_player/np in GLOB.new_player_list) np.new_player_panel_proc() +<<<<<<< HEAD +======= + + addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) +>>>>>>> parent of 453f315d13 (Removes roundstart announcements) return ..() +/datum/game_mode/infection/proc/map_announcement() + if(SSmapping.configs[GROUND_MAP].infection_announce_text) + var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].infection_announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) + marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") + else if(SSmapping.configs[GROUND_MAP].announce_text) //if we missed a infection text for above, or just don't need a special one, we just use default announcement + var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) + marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") + /datum/game_mode/infection/proc/initialize_post_survivor_list() if(synth_survivor) transform_survivor(synth_survivor, TRUE) diff --git a/maps/bigredv2.json b/maps/bigredv2.json index f2894e5121..0a6db01cd4 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -24,6 +24,7 @@ 0.0 ], "map_item_type": "/obj/item/map/big_red_map", + "announce_text": "We've lost contact with Weyland-Yutani's research facility, Solaris Ridge. The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "neaera" ], diff --git a/maps/corsat.json b/maps/corsat.json index 3539db56e6..e819264405 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -26,6 +26,7 @@ ], "survivor_message": "You are a survivor of the containment breach on the Corporate Orbital Research Station for Advanced Technology (CORSAT). You worked or lived on the station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/corsat", + "announce_text": "An automated distress signal has been received from Weyland-Yutani's Corporate Orbital Research Station for Advanced Technology, or CORSAT. The ###SHIPNAME### has been dispatched to investigate.", "monkey_types": [ "yiren", "farwa", diff --git a/maps/derelict_almayer.json b/maps/derelict_almayer.json index 1d0a84138e..0d0fc08da4 100644 --- a/maps/derelict_almayer.json +++ b/maps/derelict_almayer.json @@ -4,6 +4,7 @@ "map_file": "derelict_almayer.dmm", "webmap_url": "Almayer", "map_item_type": "/obj/item/map/almayer", + "announce_text": "An automated distress signal has been received from the \"USS Almayer\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/derelict_almayer/", "camouflage": "classic", diff --git a/maps/desert_dam.json b/maps/desert_dam.json index 540a716374..b4e535e893 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -24,6 +24,7 @@ 0.0 ], "map_item_type": "/obj/item/map/desert_dam", + "announce_text": "We've lost contact with Weyland-Yutani's extra-solar colony, \"Trijent Dam\", on the planet \"Raijin.\" The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "stok" ], diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index 842d6342c6..dfc7365541 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -25,6 +25,7 @@ ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/FOP_map_v3", + "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/FOP_v3_Sciannex/", "xvx_hives": { diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index 829d68973f..d8baaab7dc 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -23,6 +23,7 @@ ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/ice_colony_map", + "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], diff --git a/maps/kutjevo.json b/maps/kutjevo.json index ecb8ce024a..83a0ff90c5 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -22,6 +22,7 @@ 0.0 ], "map_item_type": "/obj/item/map/kutjevo_map", + "announce_text": "An automated distress signal has been received from Weyland-Yutani colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate.", "monkey_types": [ "neaera", "stok" diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 507c63862a..ac7dfa5f1d 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -23,6 +23,7 @@ 0.0 ], "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", + "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", "map_item_type": "/obj/item/map/lv522_map", "monkey_types": [ "neaera", diff --git a/maps/lv624.json b/maps/lv624.json index 8838682060..bec99892a3 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -17,6 +17,7 @@ "/datum/equipment_preset/survivor/civilian" ], "map_item_type": "/obj/item/map/lazarus_landing_map", + "announce_text": "An automated distress signal has been received from archaeology site Lazarus Landing, on border world LV-624. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "farwa", "monkey", diff --git a/maps/new_varadero.json b/maps/new_varadero.json index 0e9a71f68c..d695652d0c 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -30,6 +30,7 @@ ], "survivor_message": "You are an employee for the United Americas on the island outpost of New Varadero. A newfound discovery has unleashed unspeakable horrors. Do everything you can to survive.", "map_item_type": "/obj/item/map/new_varadero", + "announce_text": "An automated distress signal has been received from UA Outpost New Varadero. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.\nDesignation: Island research station and mining facility\n\nPopulation: 47\nCurrent Temperature: 68F Interior, 97F Exterior\nOutpost Commander: UA Rep. Steve Haifisch\nTelecommunications Array: Repairs required\n\nNo further information available at this time.", "monkey_types": [ "monkey" ], diff --git a/maps/override_ground.json b/maps/override_ground.json index 7ce69744e5..94d3c70757 100644 --- a/maps/override_ground.json +++ b/maps/override_ground.json @@ -6,6 +6,7 @@ "/datum/equipment_preset/survivor/goon" ], "map_item_type": "/obj/item/map/big_red_map", + "announce_text": "We've lost contact with a Weyland-Yutani's research facility. The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "neaera" ], diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index 749ec6a579..b29f7255c2 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -23,6 +23,7 @@ ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/FOP_map", + "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "environment_traits": { "Lockdown": true }, "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/FOP_v2_Cellblocks/", diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json index adba25b9a3..60ee8b27c9 100644 --- a/maps/shivas_snowball.json +++ b/maps/shivas_snowball.json @@ -26,6 +26,7 @@ ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/ice_colony_map", + "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json index 7206c53184..61c3a7fd3f 100644 --- a/maps/sorokyne_strata.json +++ b/maps/sorokyne_strata.json @@ -22,6 +22,7 @@ 0.0 ], "map_item_type": "/obj/item/map/sorokyne_map", + "announce_text": "An automated distress signal has been recieved from a mining colony on border world LV-976, \"Sorokyne Outpost\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], From c13a60e8e006086be63c63ccdf0144962d657c56 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Thu, 30 Nov 2023 17:10:24 -0500 Subject: [PATCH 5/5] Revert "reverts everything" This reverts commit 3ca384666e4205a786f11f7e0ee9227b3e6d13fd. --- code/datums/map_config.dm | 9 --------- .../gamemodes/colonialmarines/colonialmarines.dm | 11 ----------- code/game/gamemodes/extended/infection.dm | 14 -------------- maps/bigredv2.json | 1 - maps/corsat.json | 1 - maps/derelict_almayer.json | 1 - maps/desert_dam.json | 1 - maps/fiorina_sciannex.json | 1 - maps/ice_colony_v2.json | 1 - maps/kutjevo.json | 1 - maps/lv522_chances_claim.json | 1 - maps/lv624.json | 1 - maps/new_varadero.json | 1 - maps/override_ground.json | 1 - maps/prison_station_fop.json | 1 - maps/shivas_snowball.json | 1 - maps/sorokyne_strata.json | 1 - 17 files changed, 48 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 3bf5c601ce..0873dc0e5c 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -30,9 +30,6 @@ var/allow_custom_shuttles = TRUE var/shuttles = list() - var/announce_text = "" - var/infection_announce_text = "" - var/squads_max_num = 4 var/weather_holder @@ -339,12 +336,6 @@ if(json["vote_cycle"]) vote_cycle = json["vote_cycle"] - if(json["announce_text"]) - announce_text = json["announce_text"] - - if(json["infection_announce_text"]) - infection_announce_text = json["infection_announce_text"] - if(json["weather_holder"]) weather_holder = text2path(json["weather_holder"]) if(!weather_holder) diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 09c0fca57c..0bc74b9078 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -118,12 +118,6 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_BASIC_RT]) flags_round_type |= MODE_BASIC_RT -<<<<<<< HEAD -======= - addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) - addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) - ->>>>>>> parent of 453f315d13 (Removes roundstart announcements) return ..() #define MONKEYS_TO_TOTAL_RATIO 1/32 @@ -144,11 +138,6 @@ var/monkey_to_spawn = pick(monkey_types) new monkey_to_spawn(T) -/datum/game_mode/colonialmarines/proc/map_announcement() - if(SSmapping.configs[GROUND_MAP].announce_text) - var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) - marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") - /datum/game_mode/colonialmarines/proc/ares_conclude() ai_silent_announcement("Bioscan complete. No unknown lifeform signature detected.", ".V") ai_silent_announcement("Saving operational report to archive.", ".V") diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index 68a9a80cc0..f6b58076ef 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -25,22 +25,8 @@ initialize_post_marine_gear_list() for(var/mob/new_player/np in GLOB.new_player_list) np.new_player_panel_proc() -<<<<<<< HEAD -======= - - addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS) - addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS) ->>>>>>> parent of 453f315d13 (Removes roundstart announcements) return ..() -/datum/game_mode/infection/proc/map_announcement() - if(SSmapping.configs[GROUND_MAP].infection_announce_text) - var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].infection_announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) - marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") - else if(SSmapping.configs[GROUND_MAP].announce_text) //if we missed a infection text for above, or just don't need a special one, we just use default announcement - var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) - marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") - /datum/game_mode/infection/proc/initialize_post_survivor_list() if(synth_survivor) transform_survivor(synth_survivor, TRUE) diff --git a/maps/bigredv2.json b/maps/bigredv2.json index 0a6db01cd4..f2894e5121 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -24,7 +24,6 @@ 0.0 ], "map_item_type": "/obj/item/map/big_red_map", - "announce_text": "We've lost contact with Weyland-Yutani's research facility, Solaris Ridge. The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "neaera" ], diff --git a/maps/corsat.json b/maps/corsat.json index e819264405..3539db56e6 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -26,7 +26,6 @@ ], "survivor_message": "You are a survivor of the containment breach on the Corporate Orbital Research Station for Advanced Technology (CORSAT). You worked or lived on the station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/corsat", - "announce_text": "An automated distress signal has been received from Weyland-Yutani's Corporate Orbital Research Station for Advanced Technology, or CORSAT. The ###SHIPNAME### has been dispatched to investigate.", "monkey_types": [ "yiren", "farwa", diff --git a/maps/derelict_almayer.json b/maps/derelict_almayer.json index 0d0fc08da4..1d0a84138e 100644 --- a/maps/derelict_almayer.json +++ b/maps/derelict_almayer.json @@ -4,7 +4,6 @@ "map_file": "derelict_almayer.dmm", "webmap_url": "Almayer", "map_item_type": "/obj/item/map/almayer", - "announce_text": "An automated distress signal has been received from the \"USS Almayer\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/derelict_almayer/", "camouflage": "classic", diff --git a/maps/desert_dam.json b/maps/desert_dam.json index b4e535e893..540a716374 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -24,7 +24,6 @@ 0.0 ], "map_item_type": "/obj/item/map/desert_dam", - "announce_text": "We've lost contact with Weyland-Yutani's extra-solar colony, \"Trijent Dam\", on the planet \"Raijin.\" The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "stok" ], diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index dfc7365541..842d6342c6 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -25,7 +25,6 @@ ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/FOP_map_v3", - "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/FOP_v3_Sciannex/", "xvx_hives": { diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index d8baaab7dc..829d68973f 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -23,7 +23,6 @@ ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/ice_colony_map", - "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], diff --git a/maps/kutjevo.json b/maps/kutjevo.json index 83a0ff90c5..ecb8ce024a 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -22,7 +22,6 @@ 0.0 ], "map_item_type": "/obj/item/map/kutjevo_map", - "announce_text": "An automated distress signal has been received from Weyland-Yutani colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate.", "monkey_types": [ "neaera", "stok" diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index ac7dfa5f1d..507c63862a 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -23,7 +23,6 @@ 0.0 ], "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", - "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", "map_item_type": "/obj/item/map/lv522_map", "monkey_types": [ "neaera", diff --git a/maps/lv624.json b/maps/lv624.json index bec99892a3..8838682060 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -17,7 +17,6 @@ "/datum/equipment_preset/survivor/civilian" ], "map_item_type": "/obj/item/map/lazarus_landing_map", - "announce_text": "An automated distress signal has been received from archaeology site Lazarus Landing, on border world LV-624. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "farwa", "monkey", diff --git a/maps/new_varadero.json b/maps/new_varadero.json index d695652d0c..0e9a71f68c 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -30,7 +30,6 @@ ], "survivor_message": "You are an employee for the United Americas on the island outpost of New Varadero. A newfound discovery has unleashed unspeakable horrors. Do everything you can to survive.", "map_item_type": "/obj/item/map/new_varadero", - "announce_text": "An automated distress signal has been received from UA Outpost New Varadero. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.\nDesignation: Island research station and mining facility\n\nPopulation: 47\nCurrent Temperature: 68F Interior, 97F Exterior\nOutpost Commander: UA Rep. Steve Haifisch\nTelecommunications Array: Repairs required\n\nNo further information available at this time.", "monkey_types": [ "monkey" ], diff --git a/maps/override_ground.json b/maps/override_ground.json index 94d3c70757..7ce69744e5 100644 --- a/maps/override_ground.json +++ b/maps/override_ground.json @@ -6,7 +6,6 @@ "/datum/equipment_preset/survivor/goon" ], "map_item_type": "/obj/item/map/big_red_map", - "announce_text": "We've lost contact with a Weyland-Yutani's research facility. The ###SHIPNAME### has been dispatched to assist.", "monkey_types": [ "neaera" ], diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index b29f7255c2..749ec6a579 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -23,7 +23,6 @@ ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/FOP_map", - "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "environment_traits": { "Lockdown": true }, "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/FOP_v2_Cellblocks/", diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json index 60ee8b27c9..adba25b9a3 100644 --- a/maps/shivas_snowball.json +++ b/maps/shivas_snowball.json @@ -26,7 +26,6 @@ ], "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.", "map_item_type": "/obj/item/map/ice_colony_map", - "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ], diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json index 61c3a7fd3f..7206c53184 100644 --- a/maps/sorokyne_strata.json +++ b/maps/sorokyne_strata.json @@ -22,7 +22,6 @@ 0.0 ], "map_item_type": "/obj/item/map/sorokyne_map", - "announce_text": "An automated distress signal has been recieved from a mining colony on border world LV-976, \"Sorokyne Outpost\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ "yiren" ],