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

Game folder

Browse Source
This commit is contained in:
Poojawa
2018-09-11 04:06:45 -05:00
parent b6430559e9
commit 8b9ef1e400
270 changed files with 3120 additions and 2523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas.dm
+12 -12
View File
@@ -499,18 +499,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "Theatre"
/area/library
name = "Library"
icon_state = "library"
flags_1 = NONE
name = "Library"
icon_state = "library"
flags_1 = NONE
/area/library/lounge
name = "Library Lounge"
icon_state = "library"
name = "Library Lounge"
icon_state = "library"
/area/library/abandoned
name = "Abandoned Library"
icon_state = "library"
flags_1 = NONE
name = "Abandoned Library"
icon_state = "library"
flags_1 = NONE
/area/chapel
icon_state = "chapel"
@@ -559,9 +559,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "engine"
/area/engine/atmos
name = "Atmospherics"
icon_state = "atmos"
flags_1 = NONE
name = "Atmospherics"
icon_state = "atmos"
flags_1 = NONE
/area/engine/atmospherics_engine
name = "Atmospherics Engine"
@@ -1297,7 +1297,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
clockwork_warp_allowed = FALSE
clockwork_warp_fail = "For safety reasons, warping here is disallowed; the radio and bluespace noise could cause catastrophic results."
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\
'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg')
'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg')
/area/tcommsat/entrance
name = "Telecomms Teleporter"
code/game/area/areas.dm
+23 -25
View File
@@ -29,8 +29,6 @@
var/outdoors = FALSE //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
var/totalbeauty = 0 //All beauty in this area combined, only includes indoor area.
var/beauty = 0 // Beauty average per open turf in the area
var/areasize = 0 //Size of the area in open turfs, only calculated for indoors areas.
var/power_equip = TRUE
@@ -48,6 +46,8 @@
var/noteleport = FALSE //Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
var/hidden = FALSE //Hides area from player Teleport function.
var/safe = FALSE //Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers
/// If false, loading multiple maps with this area type will create multiple instances.
var/unique = TRUE
var/no_air = null
@@ -84,6 +84,12 @@ GLOBAL_LIST_EMPTY(teleportlocs)
// ===
/area/New()
// This interacts with the map loader, so it needs to be set immediately
// rather than waiting for atoms to initialize.
if (unique)
GLOB.areas_by_type[type] = src
return ..()
/area/Initialize()
icon_state = ""
@@ -135,9 +141,10 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/LateInitialize()
power_change() // all machines set to current power level, also updates icon
update_beauty()
/area/Destroy()
if(GLOB.areas_by_type[type] == src)
GLOB.areas_by_type[type] = null
STOP_PROCESSING(SSobj, src)
return ..()
@@ -448,26 +455,22 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(!T)
return 0
//Gravity forced on the atom
var/datum/component/forced_gravity/FG = GetComponent(/datum/component/forced_gravity)
if(FG)
if(!FG.ignore_space && isspaceturf(T))
return 0
else
return FG.gravity
var/list/forced_gravity = list()
SEND_SIGNAL(src, COMSIG_ATOM_HAS_GRAVITY, T, forced_gravity)
if(!forced_gravity.len)
SEND_SIGNAL(T, COMSIG_TURF_HAS_GRAVITY, src, forced_gravity)
if(forced_gravity.len)
var/max_grav
for(var/i in forced_gravity)
max_grav = max(max_grav, i)
if(max_grav)
return max_grav
//Gravity forced on the turf
FG = T.GetComponent(/datum/component/forced_gravity)
if(FG)
if(!FG.ignore_space && isspaceturf(T))
return 0
else
return FG.gravity
var/area/A = get_area(T)
if(isspaceturf(T)) // Turf never has gravity
return 0
else if(A.has_gravity) // Areas which always has gravity
var/area/A = get_area(T)
if(A.has_gravity) // Areas which always has gravity
return A.has_gravity
else
// There's a gravity generator on our z level
@@ -488,11 +491,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
blob_allowed = FALSE
addSorted()
/area/proc/update_beauty()
if(!areasize)
return FALSE
beauty = totalbeauty / areasize
/area/proc/update_areasize()
if(outdoors)
return FALSE
code/game/area/areas/shuttles.dm
+32 -4
View File
@@ -10,6 +10,8 @@
always_unpowered = FALSE
valid_territory = FALSE
icon_state = "shuttle"
// Loading the same shuttle map at a different time will produce distinct area instances.
unique = FALSE
/area/shuttle/Initialize()
if(!canSmoothWithAreas)
@@ -62,6 +64,35 @@
name = "Pirate Shuttle Vault"
requires_power = FALSE
////////////////////////////White Ship////////////////////////////
/area/shuttle/abandoned
name = "Abandoned Ship"
blob_allowed = FALSE
requires_power = TRUE
canSmoothWithAreas = /area/shuttle/abandoned
/area/shuttle/abandoned/bridge
name = "Abandoned Ship Bridge"
/area/shuttle/abandoned/engine
name = "Abandoned Ship Engine"
/area/shuttle/abandoned/bar
name = "Abandoned Ship Bar"
/area/shuttle/abandoned/crew
name = "Abandoned Ship Crew Quarters"
/area/shuttle/abandoned/cargo
name = "Abandoned Ship Cargo Bay"
/area/shuttle/abandoned/medbay
name = "Abandoned Ship Medbay"
/area/shuttle/abandoned/pod
name = "Abandoned Ship Pod"
////////////////////////////Single-area shuttles////////////////////////////
/area/shuttle/transit
@@ -74,6 +105,7 @@
/area/shuttle/arrival
name = "Arrival Shuttle"
unique = TRUE // SSjob refers to this area for latejoiners
/area/shuttle/pod_1
name = "Escape Pod One"
@@ -125,10 +157,6 @@
name = "Steel Rain"
blob_allowed = FALSE
/area/shuttle/abandoned
name = "Abandoned Ship"
blob_allowed = FALSE
/area/shuttle/sbc_starfury
name = "SBC Starfury"
blob_allowed = FALSE