shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New Title Screen Music & Splashscreens (#72)

Browse Source 
* music

* hsghberhbnsrh

* k

* i like this better

* fugoff leon

* oops

* afgegwsrgvewsrg
This commit is contained in:
L.E.D
2016-11-25 14:14:38 -05:00
committed by TalkingCactus
parent 094d767111
commit cd91d2d9ce
10 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+1 -2
View File
@@ -55,7 +55,7 @@ var/datum/subsystem/ticker/ticker
/datum/subsystem/ticker/New()
NEW_SS_GLOBAL(ticker)
login_music = pickweight(list('sound/ambience/title1.ogg' = 31, 'sound/ambience/title2.ogg' = 31, 'sound/ambience/title3.ogg' = 31, 'sound/ambience/title4.ogg' = 31, 'sound/ambience/title5.ogg' = 31, 'sound/ambience/title6.ogg' = 31, 'sound/ambience/clown.ogg' = 7)) // choose title music!
login_music = pickweight(list('sound/ambience/title1.ogg' = 30, 'sound/ambience/title2.ogg' = 30, 'sound/ambience/title3.ogg' = 30, 'sound/ambience/title4.ogg' = 30, 'sound/ambience/title5.ogg' = 30, 'sound/ambience/title6.ogg' = 30, 'sound/ambience/title7.ogg' = 30, 'sound/ambience/clown.ogg' = 3)) // choose title music!
if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
login_music = 'sound/ambience/clown.ogg'
@@ -553,4 +553,3 @@ var/datum/subsystem/ticker/ticker
/datum/subsystem/ticker/proc/send_gamemode_vote(var/)
SSvote.initiate_vote("roundtype","server")
code/game/area/Space_Station_13_areas.dm
+1 -1
View File
@@ -104,7 +104,7 @@ var/list/teleportlocs = list()
power_environ = 0
valid_territory = 0
outdoors = 1
ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',)
ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title3.ogg',)
blob_allowed = 0 //Eating up space doesn't count for victory as a blob.
/area/space/nearstation
code/game/turfs/closed.dm
+4 -5
View File
@@ -24,14 +24,13 @@
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
icon = 'icons/misc/fullscreen.dmi'
icon_state = "title"
icon_state = "title1"
layer = FLY_LAYER
var/titlescreen = TITLESCREEN
/turf/closed/indestructible/splashscreen/New()
..()
if(titlescreen)
icon_state = titlescreen
icon_state = pick("title1","title2","title3","title4","title5")
/turf/closed/indestructible/riveted
icon_state = "riveted"
@@ -79,4 +78,4 @@
name = "iced rock"
desc = "Extremely densely-packed sheets of ice and rock, forged over the years of the harsh cold."
icon = 'icons/turf/walls.dmi'
icon_state = "icerock"
icon_state = "icerock"