cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes a missed announcement (#12699)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-04-21 03:34:42 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent dd91ee3bb9
commit 300ecd96ae
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/event/horde_infestation.dm
+2 -2
View File
@@ -33,7 +33,7 @@
/datum/event/horde_infestation/announce()
if(spiders) //Horrible way of doing this
GLOB.command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
GLOB.command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = ANNOUNCER_MSG_UNIDENTIFIED_LIFESIGNS)
if(metroids) //Horrible way of doing this
GLOB.command_announcement.Announce("High-energy lifeforms detected coming aboard [station_name()]. All crew members, stay alert, and listen to security instructions.", "Lifesign Alert", new_sound = 'sound/misc/alarm1.ogg')
@@ -95,4 +95,4 @@
area_names |= metroid_area.name
if(area_names.len)
var/english_list = english_list(area_names)
GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert")
GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert") //No sound intentionally.
modular_chomp/code/modules/event/metroid_infestation.dm
+3 -3
View File
@@ -14,12 +14,12 @@
spawncount = rand(2 * severity, 4 * severity)
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in GLOB.machines)
//CHOMPEdit: Added a couple areas to the exclusion. Also made this actually work.
//Added a couple areas to the exclusion. Also made this actually work.
var/area/in_area = get_area(temp_vent)
if(in_area.flag_check(AREA_FORBID_EVENTS))
continue
if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.
if(temp_vent.network.normal_members.len > 10) //Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.
vents += temp_vent
/datum/event/metroid_infestation/announce()
@@ -55,4 +55,4 @@
area_names |= metroid_area.name
if(area_names.len && active_metroid_event == TRUE)
var/english_list = english_list(area_names)
GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert")
GLOB.command_announcement.Announce("Sensors have narrowed down remaining lifeforms to the following areas: [english_list]", "Lifesign Alert") //No sound intentionally.