diff --git a/code/defines/mob/dead/observer.dm b/code/defines/mob/dead/observer.dm
index 3a3af24c7ba..bf94240f4bf 100644
--- a/code/defines/mob/dead/observer.dm
+++ b/code/defines/mob/dead/observer.dm
@@ -10,4 +10,5 @@
blinded = 0
anchored = 1 // don't get pushed around
var/mob/corpse = null // observer mode
- var/datum/hud/living/carbon/hud = null // hud
\ No newline at end of file
+ var/datum/hud/living/carbon/hud = null // hud
+ var/bootime = 0
\ No newline at end of file
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 23020437bd2..7bd9351933c 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -141,6 +141,7 @@
C.cell.charge = 0
/proc/power_restore()
+
command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal")
world << sound('poweron.ogg')
for(var/obj/machinery/power/apc/C in world)
@@ -273,6 +274,11 @@
world << sound('aliens.ogg')
/proc/high_radiation_event()
+
+ for(var/obj/machinery/light/L in world)
+ if(L.z != 1) continue
+ L.flicker(50)
+ sleep(100)
command_alert("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert")
world << sound('radiation.ogg')
for(var/mob/living/carbon/human/H in world)
@@ -289,9 +295,19 @@
domutcheck(H,null,1)
for(var/mob/living/carbon/monkey/M in world)
M.apply_effect((rand(15,75)),IRRADIATE,0)
+ sleep(300)
+ command_alert("High levels of radiation has ceased. Please report to the Med-bay if you feel strange.", "Anomaly Alert")
+
+
//Changing this to affect the main station. Blame Urist. --Pete
/proc/prison_break() // -- Callagan
+
+ for(var/obj/machinery/light/L in world)
+ if(!istype(get_area(L), /area/security/prison) && !istype(get_area(L), /area/security/brig)) continue
+ L.flicker(10)
+ sleep(100)
+
for (var/obj/machinery/power/apc/temp_apc in world)
if(istype(get_area(temp_apc), /area/security/prison))
temp_apc.overload_lighting()
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index f125fc41e2b..3adc6437fd3 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -402,7 +402,7 @@
if(!P.owner || P.toff) continue
sendPDAs += P
if(PDAs && PDAs.len > 0)
- customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortNames(sendPDAs)
+ customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortAtom(sendPDAs)
else
customrecepient = null
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 0402bd36640..a62fb9af4b1 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -32,8 +32,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/ttone = "beep" //The ringtone!
var/honkamt = 0 //How many honks left when infected with honk.exe
var/mimeamt = 0 //How many silence left when infected with mime.exe
- var/note = "" //Current note in the notepad function, without HTML.
- var/notehtml = "Congratulations, your station has chosen the Thinktronic 5230 Personal Data Assistant!" //Current note in the notepad function, with HTML.
+ var/note = "Congratulations, your station has chosen the Thinktronic 5230 Personal Data Assistant!" //Current note in the notepad function
+ var/notehtml = ""
var/cart = "" //A place to stick cartridge menu information
var/detonate = 1 // Can the PDA be blown up?
@@ -334,7 +334,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += " Lock
"
else
dat += " Edit
"
- dat += notehtml
+ dat += note
if (2)
dat += "
SpaceMessenger V3.9.4