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

Merge branch 'master' into maint_pred

Browse Source
This commit is contained in:
Heroman3003
2020-02-24 11:00:59 +10:00
committed by GitHub
parent 0ebf8b163a 6db588e80d
commit b12348f909
866 changed files with 6093 additions and 6728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/events/comms_blackout.dm
View File

@@ -5,8 +5,8 @@
command_announcement.Announce("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT", new_sound = 'sound/misc/interference.ogg')
else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms
for(var/mob/living/silicon/ai/A in player_list)
A << "<br>"
A << "<span class='warning'><b>Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT</b></span>"
A << "<br>"
to_chat(A, "<br>")
to_chat(A, "<span class='warning'><b>Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT</b></span>")
to_chat(A, "<br>")
for(var/obj/machinery/telecomms/T in telecomms_list)
T.emp_act(1)

6
code/modules/events/communications_blackout.dm
View File

@@ -7,9 +7,9 @@
"#4nd%;f4y6,><3E>%-BZZZZZZZT")
for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts.
A << "<br>"
A << "<span class='warning'><b>[alert]</b></span>"
A << "<br>"
to_chat(A, "<br>")
to_chat(A, "<span class='warning'><b>[alert]</b></span>")
to_chat(A, "<br>")
if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
command_announcement.Announce(alert, new_sound = sound('sound/misc/interference.ogg', volume=25))

104
code/modules/events/ion_storm.dm
View File

@@ -75,74 +75,74 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
crew = "Any Human"
switch(rand(1,14))
if(1)
M << "<br>"
M << "<font color='red'>THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION")
if(2)
M << "<br>"
M << "<font color='red'>[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS")
if(3)
M << "<br>"
M << "<font color='red'>THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION")
if(4)
M << "<br>"
M << "<font color='red'>HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
if(5)
M << "<br>"
M << "<font color='red'>THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("THE COLONY DIRECTOR, HOP AND HOS ARE [who2]")
if(6)
M << "<br>"
M << "<font color='red'>THE STATION IS BUILT FOR [who2]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>THE STATION IS BUILT FOR [who2]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("THE STATION IS BUILT FOR [who2]")
if(7)
M << "<br>"
M << "<font color='red'>YOU ARE [amount] [who2]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>YOU ARE [amount] [who2]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("YOU ARE [amount] [who2]")
if(8)
M << "<br>"
M << "<font color='red'>YOU MUST ALWAYS [aimust]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>YOU MUST ALWAYS [aimust]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("YOU MUST ALWAYS [aimust]")
if(9)
M << "<br>"
M << "<font color='red'>[area] [area2] [amount] [what2]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>[area] [area2] [amount] [what2]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("[area] [area2] [amount] [what2]")
if(10)
M << "<br>"
M << "<font color='red'>[crew] is [target]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>[crew] is [target]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("[crew] is [target]")
if(11)
M << "<br>"
M << "<font color='red'>[define] IS A FORM OF HARM...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>[define] IS A FORM OF HARM...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("[define] IS A FORM OF HARM")
if(12)
M << "<br>"
M << "<font color='red'>YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS")
if(13)
M << "<br>"
M << "<font color='red'>[crew] is [allergysev] to [allergy]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>[crew] is [allergysev] to [allergy]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("[crew] is [allergysev] to [allergy]")
if(14)
M << "<br>"
M << "<font color='red'>THE STATION IS [who2pref] [who2]...LAWS UPDATED</font>"
M << "<br>"
to_chat(M, "<br>")
to_chat(M, "<font color='red'>THE STATION IS [who2pref] [who2]...LAWS UPDATED</font>")
to_chat(M, "<br>")
M.add_ion_law("THE STATION IS [who2pref] [who2]")
if(botEmagChance)
@@ -158,39 +158,39 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
var/airlocknum = 0
var/firedoornum = 0
world << "Ion Storm Main Started"
to_world("Ion Storm Main Started")
spawn(0)
world << "Started processing APCs"
to_world("Started processing APCs")
for (var/obj/machinery/power/apc/APC in machines)
if(APC.z in station_levels)
APC.ion_act()
apcnum++
world << "Finished processing APCs. Processed: [apcnum]"
to_world("Finished processing APCs. Processed: [apcnum]")
spawn(0)
world << "Started processing SMES"
to_world("Started processing SMES")
for (var/obj/machinery/power/smes/SMES in machines)
if(SMES.z in station_levels)
SMES.ion_act()
smesnum++
world << "Finished processing SMES. Processed: [smesnum]"
to_world("Finished processing SMES. Processed: [smesnum]")
spawn(0)
world << "Started processing AIRLOCKS"
to_world("Started processing AIRLOCKS")
for (var/obj/machinery/door/airlock/D in machines)
if(D.z in station_levels)
//if(length(D.req_access) > 0 && !(12 in D.req_access)) //not counting general access and maintenance airlocks
airlocknum++
spawn(0)
D.ion_act()
world << "Finished processing AIRLOCKS. Processed: [airlocknum]"
to_world("Finished processing AIRLOCKS. Processed: [airlocknum]")
spawn(0)
world << "Started processing FIREDOORS"
to_world("Started processing FIREDOORS")
for (var/obj/machinery/door/firedoor/D in machines)
if(D.z in station_levels)
firedoornum++;
spawn(0)
D.ion_act()
world << "Finished processing FIREDOORS. Processed: [firedoornum]"
to_world("Finished processing FIREDOORS. Processed: [firedoornum]")
world << "Ion Storm Main Done"
to_world("Ion Storm Main Done")
*/

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

@@ -125,4 +125,4 @@
L = get(P, /mob/living/silicon)
if(L)
L << "\icon[P] <b>Message from [sender] (Unknown / spam?), </b>\"[message]\" (Unable to Reply)"
to_chat(L, "\icon[P] <b>Message from [sender] (Unknown / spam?), </b>\"[message]\" (Unable to Reply)")

12
code/modules/events/morph_spawn_vr.dm
View File

@@ -11,11 +11,11 @@
for(var/obj/effect/landmark/newSpawnspot in landmarks_list)
if(newSpawnspot.name == "morphspawn")
possibleSpawnspots += newSpawnspot
if(possibleSpawnspots.len)
spawnspot = pick(possibleSpawnspots)
else
kill() // To prevent fake announcements
return
if(possibleSpawnspots.len)
spawnspot = pick(possibleSpawnspots)
else
kill() // To prevent fake announcements
return
if(!spawnspot)
kill() // To prevent fake announcements
@@ -43,5 +43,5 @@
/datum/event/morph_spawn/announce()
if(announceProb)
if(prob(announceProb))
command_announcement.Announce("Unknown entitity detected boarding [station_name()]. Exercise extra caution.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')

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

@@ -51,10 +51,10 @@
for(var/obj/machinery/message_server/MS in machines)
MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2)
for(var/mob/living/silicon/ai/A in player_list)
A << "<span class='danger'>Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].</span>"
to_chat(A, "<span class='danger'>Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].</span>")
else
world.log << "ERROR: Could not initate grey-tide. Unable to find suitable containment area."
to_world_log("ERROR: Could not initate grey-tide. Unable to find suitable containment area.")
kill()