Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.

This commit is contained in:
Chinsky
2014-08-16 05:28:45 +04:00
parent f71e43d06c
commit 03cdfaf896
4 changed files with 918 additions and 918 deletions
+18 -1
View File
@@ -22,7 +22,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/poweralm = 1
var/party = null
level = null
name = "Space"
name = "Unknown"
icon = 'icons/turf/areas.dmi'
icon_state = "unknown"
layer = 10
@@ -92,7 +92,24 @@ var/list/ghostteleportlocs = list()
return 1
/*-----------------------------------------------------------------------------*/
/area/space
name = "\improper Space"
requires_power = 1
always_unpowered = 1
lighting_use_dynamic = 1
power_light = 0
power_equip = 0
power_environ = 0
ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg')
/area/space/firealert()
return
/area/space/readyalert()
return
/area/space/partyalert()
return
/area/engine/
ambience = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg')
/area/turret_protected/
+2 -19
View File
@@ -16,16 +16,6 @@
active_areas += src
all_areas += src
if(type == /area) // override defaults for space. TODO: make space areas of type /area/space rather than /area
requires_power = 1
always_unpowered = 1
lighting_use_dynamic = 1
power_light = 0
power_equip = 0
power_environ = 0
// lighting_state = 4
//has_gravity = 0 // Space has gravity. Because.. because.
if(requires_power)
luminosity = 0
else
@@ -183,8 +173,6 @@
a.cancelAlarm("Fire", src, src)
/area/proc/readyalert()
if(name == "Space")
return
if(!eject)
eject = 1
updateicon()
@@ -197,8 +185,6 @@
return
/area/proc/partyalert()
if(name == "Space") //no parties in space!!!
return
if (!( party ))
party = 1
updateicon()
@@ -323,11 +309,8 @@
L.client.ambience_playing = 1
L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
if((src.ambience.len || type == /area) && prob(35)) //hate hate space being /area hate hate
if(type == /area)
sound = pick('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg')
else
sound = pick(ambience)
if(src.ambience.len && prob(35))
sound = pick(ambience)
if(world.time > L.client.played + 600)
L << sound(sound, repeat = 0, wait = 0, volume = musVolume, channel = 1)
+1 -1
View File
@@ -1,7 +1,7 @@
/world
mob = /mob/new_player
turf = /turf/space
area = /area
area = /area/space
view = "15x15"
cache_lifespan = 0 //stops player uploaded stuff from being kept in the rsc past the current session
+897 -897
View File
File diff suppressed because it is too large Load Diff