cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add \the when practical

Browse Source 
Also `[station_name()]` to `the [station_name()]` in dust.dm
This commit is contained in:
Lorwp
2018-05-02 08:58:07 +10:00
parent dbcc4efb7c
commit 2d793fb738
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/defines/procs/announce.dm
View File

@@ -119,10 +119,10 @@ datum/announcement/proc/Log(message as text, message_title as text)
return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name
/proc/level_seven_announcement() /proc/level_seven_announcement()
command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard \the [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
/proc/ion_storm_announcement() /proc/ion_storm_announcement()
command_announcement.Announce("It has come to our attention that the [station_name()] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert") command_announcement.Announce("It has come to our attention that \the [station_name()] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")
/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message) /proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
if (ticker.current_state == GAME_STATE_PLAYING) if (ticker.current_state == GAME_STATE_PLAYING)

6
code/game/gamemodes/events.dm
View File

@@ -135,7 +135,7 @@ var/hadevent = 0
spawncount-- spawncount--
spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes. spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes.
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') command_announcement.Announce("Unidentified lifesigns detected coming aboard \the [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
/proc/high_radiation_event() /proc/high_radiation_event()
@@ -164,7 +164,7 @@ var/hadevent = 0
randmutg(H) randmutg(H)
domutcheck(H,null,MUTCHK_FORCED) domutcheck(H,null,MUTCHK_FORCED)
sleep(100) sleep(100)
command_announcement.Announce("High levels of radiation detected near the [station_name()]. Please report to the Med-bay if you feel strange.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') command_announcement.Announce("High levels of radiation detected near \the [station_name()]. Please report to the Med-bay if you feel strange.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
@@ -213,7 +213,7 @@ var/hadevent = 0
new /mob/living/simple_animal/hostile/carp(C.loc) new /mob/living/simple_animal/hostile/carp(C.loc)
//sleep(100) //sleep(100)
spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes. spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
command_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", new_sound = 'sound/AI/commandreport.ogg') command_announcement.Announce("Unknown biological entities have been detected near \the [station_name()], please stand-by.", "Lifesign Alert", new_sound = 'sound/AI/commandreport.ogg')
/proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights
if(isEvent) if(isEvent)

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -219,7 +219,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No") var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
if(show_log == "Yes") if(show_log == "Yes")
command_announcement.Announce("Ion storm detected near the [station_name()]. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg') command_announcement.Announce("Ion storm detected near \the [station_name()]. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg')
IonStorm(0) IonStorm(0)
feedback_add_details("admin_verb","ION") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","ION") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

4
code/modules/events/dust.dm
View File

@@ -3,13 +3,13 @@
endWhen = 30 endWhen = 30
/datum/event/dust/announce() /datum/event/dust/announce()
command_announcement.Announce("Debris resulting from activity on another nearby asteroid is approaching [station_name()]", "Dust Alert") command_announcement.Announce("Debris resulting from activity on another nearby asteroid is approaching \the [station_name()]", "Dust Alert")
/datum/event/dust/start() /datum/event/dust/start()
dust_swarm(get_severity()) dust_swarm(get_severity())
/datum/event/dust/end() /datum/event/dust/end()
command_announcement.Announce("The [station_name()] is no longer in danger of impact from space debris.", "Dust Notice") command_announcement.Announce("\The [station_name()] is no longer in danger of impact from space debris.", "Dust Notice")
/datum/event/dust/proc/get_severity() /datum/event/dust/proc/get_severity()
switch(severity) switch(severity)

8
code/modules/events/meteors.dm
View File

@@ -13,9 +13,9 @@
/datum/event/meteor_wave/announce() /datum/event/meteor_wave/announce()
switch(severity) switch(severity)
if(EVENT_LEVEL_MAJOR) if(EVENT_LEVEL_MAJOR)
command_announcement.Announce("Meteors have been detected on collision course with the [station_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') command_announcement.Announce("Meteors have been detected on collision course with \the [station_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
else else
command_announcement.Announce("The [station_name()] is now in a meteor shower.", "Meteor Alert") command_announcement.Announce("\The [station_name()] is now in a meteor shower.", "Meteor Alert")
/datum/event/meteor_wave/tick() /datum/event/meteor_wave/tick()
if(waves && activeFor >= next_meteor) if(waves && activeFor >= next_meteor)
@@ -32,9 +32,9 @@
/datum/event/meteor_wave/end() /datum/event/meteor_wave/end()
switch(severity) switch(severity)
if(EVENT_LEVEL_MAJOR) if(EVENT_LEVEL_MAJOR)
command_announcement.Announce("The [station_name()] has cleared the meteor storm.", "Meteor Alert") command_announcement.Announce("\The [station_name()] has cleared the meteor storm.", "Meteor Alert")
else else
command_announcement.Announce("The [station_name()] has cleared the meteor shower", "Meteor Alert") command_announcement.Announce("\The [station_name()] has cleared the meteor shower", "Meteor Alert")
/datum/event/meteor_wave/proc/get_meteors() /datum/event/meteor_wave/proc/get_meteors()
switch(severity) switch(severity)

2
code/modules/events/radiation_storm.dm
View File

@@ -9,7 +9,7 @@
var/postStartTicks = 0 var/postStartTicks = 0
/datum/event/radiation_storm/announce() /datum/event/radiation_storm/announce()
command_announcement.Announce("High levels of radiation detected near the [station_name()]. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') command_announcement.Announce("High levels of radiation detected near \the [station_name()]. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
/datum/event/radiation_storm/start() /datum/event/radiation_storm/start()
make_maint_all_access() make_maint_all_access()

2
code/modules/events/solar_storm.dm
View File

@@ -9,7 +9,7 @@
endWhen = startWhen + rand(30,90) + rand(30,90) //2-6 minute duration endWhen = startWhen + rand(30,90) + rand(30,90) //2-6 minute duration
/datum/event/solar_storm/announce() /datum/event/solar_storm/announce()
command_announcement.Announce("A solar storm has been detected approaching the [station_name()]. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') command_announcement.Announce("A solar storm has been detected approaching \the [station_name()]. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
adjust_solar_output(1.5) adjust_solar_output(1.5)
/datum/event/solar_storm/proc/adjust_solar_output(var/mult = 1) /datum/event/solar_storm/proc/adjust_solar_output(var/mult = 1)

2
code/modules/events/viral_infection.dm
View File

@@ -28,7 +28,7 @@ datum/event/viral_infection/announce()
level = "five" level = "five"
if (severity == EVENT_LEVEL_MAJOR || prob(60)) if (severity == EVENT_LEVEL_MAJOR || prob(60))
command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard the [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg') command_announcement.Announce("Confirmed outbreak of level [level] biohazard aboard \the [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak5.ogg')
datum/event/viral_infection/start() datum/event/viral_infection/start()
if(!viruses.len) return if(!viruses.len) return

2
code/modules/events/wallrot.dm
View File

@@ -15,7 +15,7 @@
/datum/event/wallrot/announce() /datum/event/wallrot/announce()
if(center) if(center)
command_announcement.Announce("Harmful fungi detected on the [station_name()] nearby [center.loc.name]. Station structures may be contaminated.", "Biohazard Alert") command_announcement.Announce("Harmful fungi detected on \the [station_name()] nearby [center.loc.name]. Station structures may be contaminated.", "Biohazard Alert")
/datum/event/wallrot/start() /datum/event/wallrot/start()
spawn() spawn()