diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm
index 488ba84a29b..40c07ca2529 100644
--- a/code/ATMOSPHERICS/datum_pipeline.dm
+++ b/code/ATMOSPHERICS/datum_pipeline.dm
@@ -161,8 +161,8 @@ datum/pipeline
if(target.air)
if(target.air.check_tile_graphic())
target.update_visuals(target.air)
-
- network.update = 1
+ if(network)
+ network.update = 1
proc/temperature_interact(turf/target, share_volume, thermal_conductivity)
var/total_heat_capacity = air.heat_capacity()
@@ -227,5 +227,5 @@ datum/pipeline
(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
air.temperature -= heat/total_heat_capacity
-
- network.update = 1
\ No newline at end of file
+ if(network)
+ network.update = 1
\ No newline at end of file
diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm
index 4d15f138f3e..9ac038c4bdc 100644
--- a/code/datums/shuttle_controller.dm
+++ b/code/datums/shuttle_controller.dm
@@ -83,7 +83,7 @@ datum/shuttle_controller
location = 1
var/area/start_location = locate(/area/shuttle/escape/centcom)
var/area/end_location = locate(/area/shuttle/escape/station)
-
+
var/list/dstturfs = list()
var/throwy = world.maxy
@@ -111,6 +111,7 @@ datum/shuttle_controller
start_location.move_contents_to(end_location)
settimeleft(SHUTTLELEAVETIME)
world << "The Emergency Shuttle has docked with the station! You have [timeleft()/60] minutes to board the Emergency Shuttle."
+ world << sound('shuttledock.ogg')
return 1
diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm
index cf2f2a9dbe5..c917c324f4f 100644
--- a/code/game/cellautomata.dm
+++ b/code/game/cellautomata.dm
@@ -117,14 +117,15 @@
//Crispy fullban
/world/Reboot(var/reason)
spawn(0)
- if(prob(40))
- for(var/mob/M in world)
- if(M.client)
- M << sound('NewRound2.ogg')
- else
- for(var/mob/M in world)
- if(M.client)
- M << sound('NewRound.ogg')
+ world << sound(pick('newroundsexy.ogg','newroundsexy2.ogg')) // Skie
+ //if(prob(40))
+ // for(var/mob/M in world)
+ // if(M.client)
+ // M << sound('NewRound2.ogg')
+ //else
+ // for(var/mob/M in world)
+ // if(M.client)
+ // M << sound('NewRound.ogg')
for(var/client/C)
C << link("byond://[world.address]:[world.port]")
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 848c3731883..ca64d8fe1e1 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -12,6 +12,7 @@
if(1)
event = 1
command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
+ world << sound('meteors.ogg')
spawn(100)
meteor_wave()
meteor_wave()
@@ -22,6 +23,7 @@
if(2)
event = 1
command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+ world << sound('granomalies.ogg')
var/turf/T = pick(blobstart)
var/obj/bhole/bh = new /obj/bhole( T.loc, 30 )
spawn(rand(50, 300))
@@ -30,6 +32,7 @@
if(3)
event = 1
command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+ world << sound('spanomalies.ogg')
var/list/turfs = list( )
var/turf/picked
for(var/turf/T in world)
@@ -51,6 +54,7 @@
if(4)
event = 1
command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+ world << sound('outbreak5.ogg')
var/turf/T = pick(blobstart)
var/obj/blob/bl = new /obj/blob( T.loc, 30 )
spawn(0)
@@ -68,6 +72,7 @@
if(5)
event = 1
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)
H.radiation += rand(5,25)
if (prob(5))
@@ -185,6 +190,7 @@
/proc/power_failure()
command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure")
+ world << sound('poweroff.ogg')
for(var/obj/machinery/power/apc/C in world)
if(C.cell && C.z == 1)
C.cell.charge = 0
@@ -205,6 +211,7 @@
/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)
if(C.cell && C.z == 1)
C.cell.charge = C.cell.maxcharge
@@ -225,6 +232,7 @@
/proc/viral_outbreak()
command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+ world << sound('outbreak7.ogg')
var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold)
for(var/mob/living/carbon/human/H in world)
if((H.virus) || (H.stat == 2))
@@ -248,6 +256,7 @@
/proc/alien_infestation() // -- TLE
command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
+ world << sound('aliens.ogg')
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
if(temp_vent.loc.z == 1 && !temp_vent.welded)
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index c64dcf6413f..0b89977fef8 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -91,6 +91,9 @@ var/global/datum/controller/gameticker/ticker
//Start master_controller.process()
world << "Enjoy the game!"
+ spawn(50)
+ world << sound('welcome.ogg') // Skie
+
spawn (3000)
start_events()
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 889f33a6c56..4158bf81a5c 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -390,6 +390,7 @@
emergency_shuttle.incall()
world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes."
+ world << sound('shuttlecalled.ogg')
return
@@ -400,6 +401,7 @@
return
world << "\blue Alert: The shuttle is going back!" //marker4
+ world << sound('shuttlerecalled.ogg')
emergency_shuttle.recall()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 4b95b94fe46..c9c1808b398 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -983,17 +983,21 @@ var/showadminmessages = 1
if ((src.rank in list("Primary Administrator", "Shit Guy", "Coder", "Host" )))
meteor_wave()
message_admins("[key_name_admin(usr)] has spawned meteors", 1)
+ command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
+ world << sound('meteors.ogg')
else
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
if("gravanomalies")
command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+ world << sound('granomalies.ogg')
var/turf/T = pick(blobstart)
var/obj/bhole/bh = new /obj/bhole( T.loc, 30 )
spawn(rand(50, 300))
del(bh)
if("timeanomalies")
command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+ world << sound('spanomalies.ogg')
var/list/turfs = list( )
var/turf/picked
for(var/turf/T in world)
@@ -1014,6 +1018,7 @@ var/showadminmessages = 1
del(P)
if("goblob")
command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+ world << sound('outbreak5.ogg')
var/turf/T = pick(blobstart)
var/obj/blob/bl = new /obj/blob( T.loc, 30 )
spawn(0)
@@ -1059,6 +1064,7 @@ var/showadminmessages = 1
W.item_state = "w_suit"
W.color = "schoolgirl"
message_admins("[key_name_admin(usr)] activated Japanese Animes mode")
+ world << sound('animes.ogg')
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm
index b3db6a954d1..de7dda595ab 100644
--- a/code/modules/mob/living/carbon/human/hud.dm
+++ b/code/modules/mob/living/carbon/human/hud.dm
@@ -396,13 +396,13 @@
mymob.blind = new /obj/screen( null )
mymob.blind.icon_state = "black"
mymob.blind.name = " "
- mymob.blind.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
+ mymob.blind.screen_loc = "1,1 to 15,15"
mymob.blind.layer = 0
mymob.flash = new /obj/screen( null )
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
- mymob.flash.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
+ mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.layer = 17
mymob.hands = new /obj/screen( null )
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 87cb63ae5db..3b29a2db32e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -2,6 +2,7 @@
spawn (1)
src << "\blue Your icons have been generated!"
+ playsound(src.loc, 'liveagain.ogg', 50, 1, -3)
src.modtype = "robot"
updateicon()
src.syndicate = syndie
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 6ae098abd7e..ecdbb2728a2 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -136,6 +136,7 @@
O.name = newname
world << text("[O.real_name] is the AI!")
+ world << sound('newAI.ogg')
if (ticker.mode.name == "AI malfunction")
for (var/obj/landmark/start/A in world)
if (A.name == "AI")
diff --git a/goonstation.dme b/goonstation.dme
index 1d023bd4a38..a6c90e6bfa8 100644
--- a/goonstation.dme
+++ b/goonstation.dme
@@ -114,6 +114,7 @@
#define FILE_DIR "maps/backup"
#define FILE_DIR "sound"
#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/announcer"
#define FILE_DIR "sound/effects"
#define FILE_DIR "sound/items"
#define FILE_DIR "sound/machines"
diff --git a/sound/announcer/aliens.ogg b/sound/announcer/aliens.ogg
new file mode 100644
index 00000000000..7488682cd1e
Binary files /dev/null and b/sound/announcer/aliens.ogg differ
diff --git a/sound/announcer/animes.ogg b/sound/announcer/animes.ogg
new file mode 100644
index 00000000000..04b4f5ef259
Binary files /dev/null and b/sound/announcer/animes.ogg differ
diff --git a/sound/announcer/granomalies.ogg b/sound/announcer/granomalies.ogg
new file mode 100644
index 00000000000..9debabcd065
Binary files /dev/null and b/sound/announcer/granomalies.ogg differ
diff --git a/sound/announcer/meteors.ogg b/sound/announcer/meteors.ogg
new file mode 100644
index 00000000000..d6d5d8ec7b2
Binary files /dev/null and b/sound/announcer/meteors.ogg differ
diff --git a/sound/announcer/newAI.ogg b/sound/announcer/newAI.ogg
new file mode 100644
index 00000000000..35aba34564f
Binary files /dev/null and b/sound/announcer/newAI.ogg differ
diff --git a/sound/announcer/newroundsexy.ogg b/sound/announcer/newroundsexy.ogg
new file mode 100644
index 00000000000..d0db1d95261
Binary files /dev/null and b/sound/announcer/newroundsexy.ogg differ
diff --git a/sound/announcer/newroundsexy2.ogg b/sound/announcer/newroundsexy2.ogg
new file mode 100644
index 00000000000..59215766787
Binary files /dev/null and b/sound/announcer/newroundsexy2.ogg differ
diff --git a/sound/announcer/outbreak5.ogg b/sound/announcer/outbreak5.ogg
new file mode 100644
index 00000000000..ef240d4d0c6
Binary files /dev/null and b/sound/announcer/outbreak5.ogg differ
diff --git a/sound/announcer/outbreak7.ogg b/sound/announcer/outbreak7.ogg
new file mode 100644
index 00000000000..1ee09e4497f
Binary files /dev/null and b/sound/announcer/outbreak7.ogg differ
diff --git a/sound/announcer/poweroff.ogg b/sound/announcer/poweroff.ogg
new file mode 100644
index 00000000000..c842b931f50
Binary files /dev/null and b/sound/announcer/poweroff.ogg differ
diff --git a/sound/announcer/poweron.ogg b/sound/announcer/poweron.ogg
new file mode 100644
index 00000000000..891ad3beb26
Binary files /dev/null and b/sound/announcer/poweron.ogg differ
diff --git a/sound/announcer/radiation.ogg b/sound/announcer/radiation.ogg
new file mode 100644
index 00000000000..29deae8342a
Binary files /dev/null and b/sound/announcer/radiation.ogg differ
diff --git a/sound/announcer/shuttlecalled.ogg b/sound/announcer/shuttlecalled.ogg
new file mode 100644
index 00000000000..4ccbb26172f
Binary files /dev/null and b/sound/announcer/shuttlecalled.ogg differ
diff --git a/sound/announcer/shuttledock.ogg b/sound/announcer/shuttledock.ogg
new file mode 100644
index 00000000000..460f41831b7
Binary files /dev/null and b/sound/announcer/shuttledock.ogg differ
diff --git a/sound/announcer/shuttlerecalled.ogg b/sound/announcer/shuttlerecalled.ogg
new file mode 100644
index 00000000000..c1a8638a781
Binary files /dev/null and b/sound/announcer/shuttlerecalled.ogg differ
diff --git a/sound/announcer/spanomalies.ogg b/sound/announcer/spanomalies.ogg
new file mode 100644
index 00000000000..47b482e2225
Binary files /dev/null and b/sound/announcer/spanomalies.ogg differ
diff --git a/sound/announcer/welcome.ogg b/sound/announcer/welcome.ogg
new file mode 100644
index 00000000000..20d804b8b70
Binary files /dev/null and b/sound/announcer/welcome.ogg differ
diff --git a/sound/misc/liveagain.ogg b/sound/misc/liveagain.ogg
new file mode 100644
index 00000000000..9d07629ae42
Binary files /dev/null and b/sound/misc/liveagain.ogg differ
diff --git a/sound/misc/main.ogg b/sound/misc/main.ogg
deleted file mode 100644
index b9e37cb65c4..00000000000
Binary files a/sound/misc/main.ogg and /dev/null differ
diff --git a/sound/misc/traitor.ogg b/sound/misc/traitor.ogg
deleted file mode 100644
index 383d1edbe4b..00000000000
Binary files a/sound/misc/traitor.ogg and /dev/null differ