mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 13:39:16 +01:00
Added a small fix to the pipe system that should reduce lag.
Added new AI/announcer sound files for when events happen, when game starts or ends, when shuttle is called/recalled/docks and when a new AI is chosen. Removed traitor.ogg and main.ogg because they weren't being used and were quite large files. Fixed flash effect and crit-state effect. But now shroom effect is a bit broken. (to-do) Added a sound effect when a robot comes to life. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@87 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -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
|
||||
if(network)
|
||||
network.update = 1
|
||||
@@ -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 << "<B>The Emergency Shuttle has docked with the station! You have [timeleft()/60] minutes to board the Emergency Shuttle.</B>"
|
||||
world << sound('shuttledock.ogg')
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
@@ -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]")
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -91,6 +91,9 @@ var/global/datum/controller/gameticker/ticker
|
||||
|
||||
//Start master_controller.process()
|
||||
world << "<FONT color='blue'><B>Enjoy the game!</B></FONT>"
|
||||
spawn(50)
|
||||
world << sound('welcome.ogg') // Skie
|
||||
|
||||
|
||||
spawn (3000)
|
||||
start_events()
|
||||
|
||||
@@ -390,6 +390,7 @@
|
||||
|
||||
emergency_shuttle.incall()
|
||||
world << "\blue <B>Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.</B>"
|
||||
world << sound('shuttlecalled.ogg')
|
||||
|
||||
return
|
||||
|
||||
@@ -400,6 +401,7 @@
|
||||
return
|
||||
|
||||
world << "\blue <B>Alert: The shuttle is going back!</B>" //marker4
|
||||
world << sound('shuttlerecalled.ogg')
|
||||
|
||||
emergency_shuttle.recall()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -136,6 +136,7 @@
|
||||
O.name = newname
|
||||
|
||||
world << text("<b>[O.real_name] is the AI!</b>")
|
||||
world << sound('newAI.ogg')
|
||||
if (ticker.mode.name == "AI malfunction")
|
||||
for (var/obj/landmark/start/A in world)
|
||||
if (A.name == "AI")
|
||||
|
||||
@@ -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"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user