diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 426ab3220d..686f431cb3 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -16,10 +16,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /*-----------------------------------------------------------------------------*/ -/area/engine/supermatter - name = "Supermatter Engine" - icon_state = "engine_sm" - /area/ai_monitored //stub defined ai_monitored.dm /area/ai_monitored/turret_protected @@ -97,12 +93,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //STATION13 -/area/atmos - name = "Atmospherics" - icon_state = "atmos" - flags = NONE - //Maintenance + /area/maintenance ambientsounds = list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', @@ -113,126 +105,320 @@ NOTE: there are two lists of areas in the end of this file: centcom and station 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg') valid_territory = 0 - -/area/maintenance/atmos_control + + +//Departments + +/area/maintenance/department/chapel + name = "Chapel Maintenance" + icon_state = "fpmaint" + +/area/maintenance/department/chapel/monastery + name = "Monastery Maintenance" + icon_state = "fpmaint" + +/area/maintenance/department/crew_quarters/bar +// /area/maintenance/fsmaint2 + name = "Bar Maintenance" + icon_state = "fsmaint" + +/area/maintenance/department/crew_quarters/dorms +// /area/maintenance/fsmaint + name = "Dormitory Maintenance" + icon_state = "fsmaint" + +/area/maintenance/department/crew_quarters/locker +// /area/maintenance/port + name = "Locker Room Maintenance" + icon_state = "pmaint" + +/area/maintenance/department/eva +// /area/maintenance/fpmaint + name = "EVA Maintenance" + icon_state = "fpmaint" + +/area/maintenance/department/electrical +// /area/maintenance/electrical + name = "Electrical Maintenance" + icon_state = "yellow" + +/area/maintenance/department/engine/atmos +// /area/maintenance/atmos_control name = "Atmospherics Maintenance" icon_state = "fpmaint" -/area/maintenance/fpmaint - name = "EVA Maintenance" +/area/maintenance/department/security + name = "Security Maintenance" + icon_state = "fpmaint" + +/area/maintenance/department/security/brig + name = "Brig Maintenance" icon_state = "fpmaint" -/area/maintenance/fpmaint2 - name = "Arrivals North Maintenance" - icon_state = "fpmaint" - -/area/maintenance/fpmaint2/port_maintenance - name = "Port Maintenance" - icon_state = "fpmaint" - -/area/maintenance/fpmaint2/fore_port_maintenance - name = "Arrivals North Maintenance" - icon_state = "fpmaint" - -/area/maintenance/fpmaint2/aft_port_maintenance - name = "Aft Port Maintenance" - icon_state = "fpmaint" - -/area/maintenance/fsmaint - name = "Dormitory Maintenance" - icon_state = "fsmaint" - -/area/maintenance/fsmaint2 - name = "Bar Maintenance" - icon_state = "fsmaint" - -/area/maintenance/asmaint +/area/maintenance/department/medical +// /area/maintenance/asmaint name = "Medbay Maintenance" icon_state = "asmaint" -/area/maintenance/asmaint2 +/area/maintenance/department/science +// /area/maintenance/asmaint2 name = "Science Maintenance" icon_state = "asmaint" -/area/maintenance/apmaint +/area/maintenance/department/cargo +// /area/maintenance/apmaint name = "Cargo Maintenance" icon_state = "apmaint" -/area/maintenance/maintcentral +/area/maintenance/department/bridge +// /area/maintenance/maintcentral name = "Bridge Maintenance" icon_state = "maintcentral" + +/area/maintenance/department/engine +// /area/maintenance/aft + name = "Engineering Maintenance" + icon_state = "amaint" + +/area/maintenance/department/science/xenobiology +// /area/maintenance/aft/xeno_maint + name = "Xenobiology Maintenance" + icon_state = "xenomaint" + + +//Maintenance - Generic +/area/maintenance/arrivals/north +// /area/maintenance/fpmaint2 + name = "Arrivals North Maintenance" + icon_state = "fpmaint" + +/area/maintenance/arrivals/north_2 +// /area/maintenance/fpmaint2/fore_port_maintenance + name = "Arrivals North Maintenance" + icon_state = "fpmaint" + +/area/maintenance/aft +// /area/maintenance/aft/Aft_Maintenance // old aft maint path was engi maint + name = "Aft Maintenance" + icon_state = "amaint" + +/area/maintenance/aft/secondary + name = "Aft Maintenance" + icon_state = "amaint_2" + +/area/maintenance/central +// /area/maintenance/maintcentral + name = "Central Maintenance" + icon_state = "maintcentral" + +/area/maintenance/central/secondary + name = "Central Maintenance" + icon_state = "maintcentral" + /area/maintenance/fore name = "Fore Maintenance" icon_state = "fmaint" - + +/area/maintenance/fore/secondary + name = "Fore Maintenance" + icon_state = "fmaint_2" + /area/maintenance/starboard name = "Starboard Maintenance" icon_state = "smaint" - -/area/maintenance/starboard/aft_starboard_maintenance - name = "Aft Starboard Maintenance" + +/area/maintenance/starboard/central + name = "Central Starboard Maintenance" icon_state = "smaint" - -/area/maintenance/starboard/fore_starboard_maintenance - name = "Fore Starboard Maintenance" - icon_state = "smaint" - + +/area/maintenance/starboard/aft +// /area/maintenance/starboard/aft_starboard_maintenance + name = "Starboard Quarter Maintenance" + icon_state = "asmaint" + +/area/maintenance/starboard/fore +// /area/maintenance/starboard/fore_starboard_maintenance + name = "Starboard Bow Maintenance" + icon_state = "fsmaint" + /area/maintenance/port - name = "Locker Room Maintenance" +// /area/maintenance/fpmaint2/port_maintenance + name = "Port Maintenance" icon_state = "pmaint" - -/area/maintenance/aft - name = "Engineering Maintenance" - icon_state = "amaint" - -/area/maintenance/aft/Aft_Maintenance - name = "Aft Maintenance" - icon_state = "amaint" - -/area/maintenance/storage - name = "Atmospherics" - icon_state = "green" - -/area/maintenance/incinerator - name = "Incinerator" - icon_state = "disposal" - + +/area/maintenance/port/central + name = "Central Port Maintenance" + icon_state = "maintcentral" + +/area/maintenance/port/aft +// /area/maintenance/fpmaint2/aft_port_maintenance + name = "Port Quarter Maintenance" + icon_state = "apmaint" + +/area/maintenance/port/fore + name = "Port Bow Maintenance" + icon_state = "fpmaint" + /area/maintenance/disposal name = "Waste Disposal" icon_state = "disposal" - -/area/maintenance/electrical - name = "Electrical Maintenance" - icon_state = "yellow" - - + +/area/maintenance/disposal/incinerator +// /area/maintenance/incinerator + name = "Incinerator" + icon_state = "disposal" + + +//Cere / Asteroid Specific + +/area/maintenance/asteroid/aft/science + name = "Aft Maintenance" + icon_state = "amaint" + +/area/maintenance/asteroid/aft/arrivals + name = "Aft Maintenance" + icon_state = "amaint" + +/area/maintenance/asteroid/central + name = "Central Asteroid Maintenance" + icon_state = "maintcentral" + +/area/maintenance/asteroid/disposal/east + name = "Eastern External Waste Belt" + icon_state = "disposal" + +/area/maintenance/asteroid/disposal/north + name = "Northern External Waste Belt" + icon_state = "disposal" + +/area/maintenance/asteroid/disposal/southeast + name = "South-Eastern Disposal" + icon_state = "disposal" + +/area/maintenance/asteroid/disposal/southwest + name = "South-Western Disposal" + icon_state = "disposal" + +/area/maintenance/asteroid/fore/cargo_west + name = "Fore Asteroid Maintenance" + icon_state = "fmaint" + +/area/maintenance/asteroid/fore/cargo_south + name = "Fore Asteroid Maintenance" + icon_state = "fmaint" + +/area/maintenance/asteroid/fore/com_west + name = "Fore Asteroid Maintenance" + icon_state = "fmaint" + +/area/maintenance/asteroid/fore/com_north + name = "Fore Asteroid Maintenance" + icon_state = "fmaint" + +/area/maintenance/asteroid/fore/com_east + name = "Fore Asteroid Maintenance" + icon_state = "fmaint" + +/area/maintenance/asteroid/fore/com_south + name = "Fore Asteroid Maintenance" + icon_state = "fmaint" + +/area/maintenance/asteroid/port/neast + name = "Port Asteroid Maintenance" + icon_state = "pmaint" + +/area/maintenance/asteroid/port/east + name = "Port Asteroid Maintenance" + icon_state = "pmaint" + +/area/maintenance/asteroid/port/west + name = "Port Asteroid Maintenance" + icon_state = "pmaint" + +/area/maintenance/asteroid/starboard + name = "Starboard Asteroid Maintenance" + icon_state = "smaint" + + //Hallway - + /area/hallway/primary/fore name = "Fore Primary Hallway" icon_state = "hallF" - + /area/hallway/primary/starboard name = "Starboard Primary Hallway" icon_state = "hallS" - + +/area/hallway/primary/starboard/aft + name = "Starboard Quarter Primary Hallway" + icon_state = "hallS" + +/area/hallway/primary/starboard/fore + name = "Starboard Bow Primary Hallway" + icon_state = "hallS" + /area/hallway/primary/aft name = "Aft Primary Hallway" icon_state = "hallA" - + /area/hallway/primary/port name = "Port Primary Hallway" icon_state = "hallP" - + /area/hallway/primary/central name = "Central Primary Hallway" icon_state = "hallC" - + /area/hallway/secondary/exit name = "Escape Shuttle Hallway" icon_state = "escape" - + +/area/hallway/secondary/exit/departure_lounge + name = "Departure Lounge" + icon_state = "escape" + +/area/hallway/secondary/bridges/cargo_ai + name = "Cargo-AI-Command Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/com_engi + name = "Command-Engineering Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/com_serv + name = "Command-Service Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/dock_med + name = "Docking-Medical Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/engi_med + name = "Engineering-Medical Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/med_cargo + name = "Medical-Cargo Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/sci_dock + name = "Science-Docking Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/serv_engi + name = "Service-Engineering Bridge" + icon_state = "yellow" + +/area/hallway/secondary/bridges/serv_sci + name = "Service-Science Bridge" + icon_state = "yellow" + +/area/hallway/secondary/command + name = "Command Hallway" + icon_state = "bridge_hallway" + /area/hallway/secondary/construction name = "Construction Area" icon_state = "construction" @@ -240,6 +426,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hallway/secondary/entry name = "Arrival Shuttle Hallway" icon_state = "entry" + +/area/hallway/secondary/service + name = "Service Hallway" + icon_state = "Sleep" //Command @@ -253,29 +443,76 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "meeting" music = null -/area/crew_quarters/captain +/area/bridge/meeting_room/council + name = "Council Chamber" + icon_state = "meeting" + music = null + +/area/bridge/showroom/corporate + name = "Corporate Showroom" + icon_state = "showroom" + music = null + +/area/crew_quarters/heads/captain +// /area/crew_quarters/captain name = "Captain's Office" icon_state = "captain" -/area/crew_quarters/captain/captains_quarters +/area/crew_quarters/heads/captain/private +// /area/crew_quarters/captain/captains_quarters name = "Captain's Quarters" icon_state = "captain" - -/area/crew_quarters/courtroom - name = "Courtroom" - icon_state = "courtroom" - -/area/crew_quarters/heads - name = "Head of Personnel's Office" - icon_state = "head_quarters" - -/area/crew_quarters/hor - name = "Research Director's Office" - icon_state = "head_quarters" - -/area/crew_quarters/chief + +/area/crew_quarters/heads/chief +// /area/crew_quarters/chief +// /area/engine/chiefs_office name = "Chief Engineer's Office" - icon_state = "head_quarters" + icon_state = "ce_office" + +/area/crew_quarters/heads/chief/private +// /area/crew_quarters/chief/private + name = "Chief Engineer's Private Quarters" + icon_state = "ce_private" + +/area/crew_quarters/heads/cmo +// /area/medical/cmo + name = "Chief Medical Officer's Office" + icon_state = "cmo_office" + +/area/crew_quarters/heads/cmo/private +// /area/medical/cmo/private + name = "Chief Medical Officer's Private Quarters" + icon_state = "cmo_private" + +/area/crew_quarters/heads/hop +// /area/crew_quarters/heads + name = "Head of Personnel's Office" + icon_state = "hop_office" + +/area/crew_quarters/heads/hop/private +// /area/crew_quarters/heads + name = "Head of Personnel's Private Quarters" + icon_state = "hop_private" + +/area/crew_quarters/heads/hos +// /area/security/hos + name = "Head of Security's Office" + icon_state = "hos_office" + +/area/crew_quarters/heads/hos/private +// /area/security/hos/private + name = "Head of Security's Private Quarters" + icon_state = "hos_private" + +/area/crew_quarters/heads/hor +// /area/crew_quarters/hor + name = "Research Director's Office" + icon_state = "rd_office" + +/area/crew_quarters/heads/hor/private +// /area/crew_quarters/hor/private + name = "Research Director's Private Quarters" + icon_state = "rd_private" /area/mint name = "Mint" @@ -291,54 +528,85 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Crew -/area/crew_quarters +/area/crew_quarters/dorms +// /area/crew_quarters +// /area/crew_quarters/sleep name = "Dormitories" icon_state = "Sleep" safe = 1 - + +/area/crew_quarters/dorms/male +// /area/crew_quarters/sleep_male + name = "Male Dorm" + icon_state = "Sleep" + +/area/crew_quarters/dorms/female +// /area/crew_quarters/sleep_female + name = "Female Dorm" + icon_state = "Sleep" + +/area/crew_quarters/rehab_dome + name = "Rehabilitation Dome" + icon_state = "Sleep" + /area/crew_quarters/toilet name = "Dormitory Toilets" icon_state = "toilet" - -/area/crew_quarters/sleep - name = "Dormitories" - icon_state = "Sleep" - -/area/crew_quarters/sleep_male - name = "Male Dorm" - icon_state = "Sleep" - -/area/crew_quarters/sleep_male/toilet_male + +/area/crew_quarters/toilet/auxiliary + name = "Auxiliary Restrooms" + icon_state = "toilet" + +/area/crew_quarters/toilet/locker +// /area/crew_quarters/locker/locker_toilet + name = "Locker Toilets" + icon_state = "toilet" + +/area/crew_quarters/toilet/female +// /area/crew_quarters/sleep_female/toilet_female + name = "Female Toilets" + icon_state = "toilet" + +/area/crew_quarters/toilet/male +// /area/crew_quarters/sleep_male/toilet_male name = "Male Toilets" icon_state = "toilet" - -/area/crew_quarters/sleep_female - name = "Female Dorm" - icon_state = "Sleep" - -/area/crew_quarters/sleep_female/toilet_female - name = "Female Toilets" + +/area/crew_quarters/toilet/restrooms + name = "Restrooms" icon_state = "toilet" /area/crew_quarters/locker name = "Locker Room" icon_state = "locker" - -/area/crew_quarters/locker/locker_toilet - name = "Locker Toilets" - icon_state = "toilet" - + +/area/crew_quarters/lounge + name = "Lounge" + icon_state = "yellow" + /area/crew_quarters/fitness name = "Fitness Room" icon_state = "fitness" + +/area/crew_quarters/fitness/recreation + name = "Recreation Area" + icon_state = "fitness" /area/crew_quarters/cafeteria name = "Cafeteria" icon_state = "cafeteria" + +/area/crew_quarters/cafeteria/lunchroom + name = "Lunchroom" + icon_state = "cafeteria" /area/crew_quarters/kitchen name = "Kitchen" icon_state = "kitchen" + +/area/crew_quarters/kitchen/backroom + name = "Kitchen Coldroom" + icon_state = "kitchen" /area/crew_quarters/bar name = "Bar" @@ -359,13 +627,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/theatre name = "Theatre" icon_state = "Theatre" + +/area/crew_quarters/theatre/abandoned + name = "Abandoned Theatre" + icon_state = "Theatre" /area/library name = "Library" icon_state = "library" flags = NONE + +/area/library/lounge + name = "Library Lounge" + icon_state = "library" -/area/library/abandoned_library +/area/library/abandoned +// /area/library/abandoned_library name = "Abandoned Library" icon_state = "library" flags = NONE @@ -377,20 +654,32 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel/main name = "Chapel" - + +/area/chapel/main/monastery + name = "Monastery" + /area/chapel/office name = "Chapel Office" icon_state = "chapeloffice" + +/area/chapel/asteroid + name = "Chapel Asteroid" + icon_state = "explored" +/area/chapel/dock + name = "Chapel Dock" + icon_state = "construction" + /area/lawoffice name = "Law Office" icon_state = "law" - + + //Engineering - + /area/engine ambientsounds = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') - + /area/engine/engine_smes name = "Engineering SMES" icon_state = "engine_smes" @@ -398,25 +687,44 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/engineering name = "Engineering" icon_state = "engine" - + +/area/engine/atmos +// /area/atmos + name = "Atmospherics" + icon_state = "atmos" + flags = NONE + +/area/engine/atmospherics_engine + name = "Atmospherics Engine" + icon_state = "atmos_engine" + +/area/engine/supermatter + name = "Supermatter Engine" + icon_state = "engine_sm" + /area/engine/break_room name = "Engineering Foyer" - icon_state = "engine" - -/area/engine/chiefs_office - name = "Chief Engineer's office" - icon_state = "engine_control" - + icon_state = "engine_foyer" + +/area/engine/gravity_generator + name = "Gravity Generator Room" + icon_state = "grav_gen" + /area/engine/secure_construction name = "Secure Construction Area" icon_state = "engine" - -/area/engine/gravity_generator - name = "Gravity Generator Room" - icon_state = "blue" - + +/area/engine/storage + name = "Engineering Storage" + icon_state = "engi_storage" + +/area/engine/transit_tube + name = "Transit Tube" + icon_state = "transit_tube" + + //Solars - + /area/solar requires_power = 0 dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT @@ -424,58 +732,133 @@ NOTE: there are two lists of areas in the end of this file: centcom and station blob_allowed = FALSE flags = NONE -/area/solar/auxport - name = "Fore Port Solar Array" - icon_state = "panelsA" - -/area/solar/auxstarboard - name = "Fore Starboard Solar Array" - icon_state = "panelsA" - +/area/solar/asteroid/aft + name = "Aft Asteroid Solar" + icon_state = "panelsA" + +/area/solar/asteroid/command + name = "Command Asteroid Solar" + icon_state = "panelsA" + +/area/solar/asteroid/fore + name = "Fore Asteroid Solar" + icon_state = "panelsA" + /area/solar/fore - name = "Fore Solar Array" - icon_state = "yellow" - + name = "Fore Solar Array" + icon_state = "yellow" + /area/solar/aft - name = "Aft Solar Array" - icon_state = "aft" - + name = "Aft Solar Array" + icon_state = "yellow" + +/area/solar/aux/port +// /area/solar/auxport + name = "Port Bow Auxiliary Solar Array" + icon_state = "panelsA" + +/area/solar/aux/starboard +// /area/solar/auxstarboard + name = "Starboard Bow Auxiliary Solar Array" + icon_state = "panelsA" + /area/solar/starboard - name = "Aft Starboard Solar Array" - icon_state = "panelsS" - + name = "Starboard Solar Array" + icon_state = "panelsS" + +/area/solar/starboard/aft +// /area/solar/starboard + name = "Starboard Quarter Solar Array" + icon_state = "panelsAS" + +/area/solar/starboard/fore + name = "Starboard Bow Solar Array" + icon_state = "panelsFS" + /area/solar/port - name = "Aft Port Solar Array" - icon_state = "panelsP" + name = "Port Solar Array" + icon_state = "panelsP" + +/area/solar/port/aft +// /area/solar/port + name = "Port Quarter Solar Array" + icon_state = "panelsAP" + +/area/solar/port/fore + name = "Port Bow Solar Array" + icon_state = "panelsFP" -/area/maintenance/auxsolarport - name = "Fore Port Solar Maintenance" + +//Solar Maint + +/area/maintenance/solars + name = "Solar Maintenance" + icon_state = "yellow" + +/area/maintenance/solars/asteroid/aft + name = "Aft Asteroid Solar Maintenance" icon_state = "SolarcontrolA" - -/area/maintenance/starboardsolar - name = "Aft Starboard Solar Maintenance" - icon_state = "SolarcontrolS" - -/area/maintenance/portsolar - name = "Aft Port Solar Maintenance" + +/area/maintenance/solars/asteroid/command + name = "Command Asteroid Solar Maintenance" icon_state = "SolarcontrolP" - -/area/maintenance/auxsolarstarboard - name = "Fore Starboard Solar Maintenance" + +/area/maintenance/solars/asteroid/fore + name = "Fore Asteroid Solar Maintenance" + icon_state = "SolarcontrolP" + +/area/maintenance/solars/port + name = "Port Solar Maintenance" + icon_state = "SolarcontrolP" + +/area/maintenance/solars/port/aft + name = "Port Quarter Solar Maintenance" + icon_state = "SolarcontrolAP" + +/area/maintenance/solars/port/fore + name = "Port Bow Solar Maintenance" + icon_state = "SolarcontrolFP" + +/area/maintenance/solars/starboard + name = "Starboard Solar Maintenance" + icon_state = "SolarcontrolS" + +/area/maintenance/solars/starboard/aft + name = "Starboard Quarter Solar Maintenance" + icon_state = "SolarcontrolAS" + +/area/maintenance/solars/starboard/fore + name = "Starboard Bow Solar Maintenance" + icon_state = "SolarcontrolFS" + +/area/maintenance/solars/aux/port + name = "Port Auxiliary Solar Maintenance" + icon_state = "SolarcontrolA" + +/area/maintenance/solars/aux/port/aft +// /area/maintenance/portsolar + name = "Port Quarter Auxiliary Solar Maintenance" + icon_state = "SolarcontrolAP" + +/area/maintenance/solars/aux/port/fore +// /area/maintenance/auxsolarport + name = "Port Bow Auxiliary Solar Maintenance" + icon_state = "SolarcontrolA" + +/area/maintenance/solars/aux/starboard + name = "Starboard Auxiliary Solar Maintenance" icon_state = "SolarcontrolA" +/area/maintenance/solars/aux/starboard/aft +// /area/maintenance/starboardsolar +// /area/maintenance/solars/aux/starboard/port/aft + name = "Starboard Quarter Auxiliary Solar Maintenance" + icon_state = "SolarcontrolA" -/area/assembly/chargebay - name = "Mech Bay" - icon_state = "mechbay" - -/area/assembly/showroom - name = "Robotics Showroom" - icon_state = "showroom" - -/area/assembly/robotics - name = "Robotics Lab" - icon_state = "ass_line" +/area/maintenance/solars/aux/starboard/fore +// /area/maintenance/auxsolarstarboard + name = "Starboard Bow Auxiliary Solar Maintenance" + icon_state = "SolarcontrolA" /area/assembly/assembly_line //Derelict Assembly Line name = "Assembly Line" @@ -490,6 +873,26 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Teleporter Room" icon_state = "teleporter" music = "signal" + +/area/teleporter/quantum/cargo + name = "Cargo Quantum Pad" + icon_state = "teleporter" + music = "signal" + +/area/teleporter/quantum/docking + name = "Docking Quantum Pad" + icon_state = "teleporter" + music = "signal" + +/area/teleporter/quantum/research + name = "Research Quantum Pad" + icon_state = "teleporter" + music = "signal" + +/area/teleporter/quantum/security + name = "Security Quantum Pad" + icon_state = "teleporter" + music = "signal" /area/gateway name = "Gateway" @@ -498,7 +901,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //MedBay -/area/medical/medbay +/area/medical + name = "Medical" + icon_state = "medbay3" + +/area/medical/abandoned +// /area/medical/abandoned_medbay + name = "Abandoned Medbay" + icon_state = "medbay3" + music = 'sound/ambience/signal.ogg' + +/area/medical/medbay/central +// /area/medical/medbay name = "Medbay Central" icon_state = "medbay" music = 'sound/ambience/signal.ogg' @@ -511,52 +925,44 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/medbay/lobby name = "Medbay Lobby" icon_state = "medbay" - music = 'sound/ambience/signal.ogg' + music = 'sound/ambience/signal.ogg' //Medbay is a large area, these additional areas help level out APC load. -/area/medical/medbay2 +/area/medical/medbay/zone2 +// /area/medical/medbay2 name = "Medbay" icon_state = "medbay2" music = 'sound/ambience/signal.ogg' + +/area/medical/medbay/zone3 +// /area/medical/medbay3 + name = "Medbay" + icon_state = "medbay3" + music = 'sound/ambience/signal.ogg' + +/area/medical/medbay/aft +// /area/medical/medbay3/aft + name = "Medbay Aft" + icon_state = "medbay3" + music = 'sound/ambience/signal.ogg' -/area/medical/medbay2/medbay_storage +/area/medical/storage +// /area/medical/medbay2/medbay_storage name = "Medbay Storage" icon_state = "medbay2" music = 'sound/ambience/signal.ogg' -/area/medical/medbay3 - name = "Medbay" - icon_state = "medbay3" - music = 'sound/ambience/signal.ogg' - -/area/medical/abandoned_medbay - name = "Abandoned Medbay" - icon_state = "medbay3" - music = 'sound/ambience/signal.ogg' - /area/medical/patients_rooms name = "Patients' Rooms" icon_state = "patients" - -/area/medical/cmo - name = "Chief Medical Officer's office" - icon_state = "CMO" - -/area/medical/robotics - name = "Robotics" - icon_state = "medresearch" - -/area/medical/research - name = "Research Division" - icon_state = "medresearch" - -/area/medical/research/research_lobby - name = "Research Division Lobby" - icon_state = "medresearch" - -/area/medical/research/abandoned_research_lab - name = "Abandoned Research Lab" - icon_state = "medresearch" + +/area/medical/patients_rooms/room_a + name = "Patient Room A" + icon_state = "patients" + +/area/medical/patients_rooms/room_b + name = "Patient Room B" + icon_state = "patients" /area/medical/virology name = "Virology" @@ -588,7 +994,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Genetics Lab" icon_state = "genetics" -/area/medical/genetics_cloning +/area/medical/genetics/cloning +// /area/medical/genetics_cloning name = "Cloning Lab" icon_state = "cloning" @@ -596,8 +1003,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Medbay Treatment Center" icon_state = "exam_room" + //Security +/area/security + name = "Security" + icon_state = "security" + /area/security/main name = "Security Office" icon_state = "security" @@ -605,6 +1017,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/brig name = "Brig" icon_state = "brig" + +/area/security/courtroom +// /area/crew_quarters/courtroom + name = "Courtroom" + icon_state = "courtroom" /area/security/prison name = "Prison Wing" @@ -613,6 +1030,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/processing name = "Labor Shuttle Dock" icon_state = "sec_prison" + +/area/security/processing/cremation + name = "Security Crematorium" + icon_state = "sec_prison" /area/security/warden name = "Brig Control" @@ -622,10 +1043,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Armory" icon_state = "armory" -/area/security/hos - name = "Head of Security's Office" - icon_state = "sec_hos" - /area/security/detectives_office name = "Detective's Office" icon_state = "detective" @@ -642,8 +1059,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/transfer name = "Transfer Centre" - icon_state = "armory" - + icon_state = "execution_room" /area/security/nuke_storage name = "Vault" @@ -657,7 +1073,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Security Checkpoint" icon_state = "checkpoint1" -/area/security/checkpoint2 +/area/security/checkpoint/checkpoint2 +// /area/security/checkpoint2 name = "Security Checkpoint" icon_state = "security" @@ -672,114 +1089,189 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/checkpoint/medical name = "Security Post - Medbay" icon_state = "checkpoint1" - + /area/security/checkpoint/science name = "Security Post - Science" icon_state = "checkpoint1" - + +/area/security/checkpoint/science/research + name = "Security Post - Research Division" + icon_state = "checkpoint1" + +/area/security/checkpoint/customs + name = "Customs" + icon_state = "bridge" + /area/security/vacantoffice name = "Vacant Office" icon_state = "security" - -/area/security/vacantoffice2 + +/area/security/vacantoffice/a + name = "Vacant Office A" + icon_state = "security" + +/area/security/vacantoffice/b +// /area/security/vacantoffice2 name = "Vacant Office B" icon_state = "security" - + /area/quartermaster name = "Quartermasters" icon_state = "quart" - + ///////////WORK IN PROGRESS////////// - + /area/quartermaster/sorting name = "Delivery Office" - icon_state = "quartstorage" - + icon_state = "cargo_delivery" + /area/quartermaster/warehouse name = "Warehouse" - icon_state = "quartstorage" - + icon_state = "cargo_warehouse" + ////////////WORK IN PROGRESS////////// - + /area/quartermaster/office name = "Cargo Office" icon_state = "quartoffice" - + /area/quartermaster/storage name = "Cargo Bay" - icon_state = "quartstorage" - + icon_state = "cargo_bay" + /area/quartermaster/qm name = "Quartermaster's Office" icon_state = "quart" - + +/area/quartermaster/qm/private + name = "Quartermaster's Private Quarters" + icon_state = "quart" + /area/quartermaster/miningdock name = "Mining Dock" icon_state = "mining" - + +/area/quartermaster/miningdock/abandoned + name = "Abandoned Mining Dock" + icon_state = "mining" + /area/quartermaster/miningoffice name = "Mining Office" icon_state = "mining" - + /area/quartermaster/miningstorage name = "Mining Storage" icon_state = "mining" - -/area/quartermaster/mechbay - name = "Mech Bay" - icon_state = "yellow" - + /area/janitor name = "Custodial Closet" icon_state = "janitor" flags = NONE - + /area/hydroponics name = "Hydroponics" icon_state = "hydro" - -/area/hydroponics/Abandoned_Garden + +/area/hydroponics/garden + name = "Garden" + icon_state = "garden" + +/area/hydroponics/garden/abandoned name = "Abandoned Garden" + icon_state = "abandoned_garden" + +/area/hydroponics/garden/monastery + name = "Monastery Garden" icon_state = "hydro" + + +//Science -//Toxins +/area/science + name = "Science Division" + icon_state = "toxlab" -/area/toxins/lab +/area/science/lab name = "Research and Development" icon_state = "toxlab" -/area/toxins/xenobiology +/area/science/xenobiology name = "Xenobiology Lab" icon_state = "toxlab" -/area/toxins/storage +/area/science/storage name = "Toxins Storage" icon_state = "toxstorage" -/area/toxins/mineral_storeroom +/area/science/mineral_storeroom name = "Mineral Storeroom" icon_state = "toxmisc" -/area/toxins/test_area +/area/science/test_area valid_territory = 0 name = "Toxins Test Area" icon_state = "toxtest" -/area/toxins/mixing +/area/science/mixing name = "Toxins Mixing Lab" icon_state = "toxmix" -/area/toxins/misc_lab +/area/science/misc_lab name = "Testing Lab" icon_state = "toxmisc" - -/area/toxins/server + +/area/science/misc_lab/range + name = "Research Testing Range" + icon_state = "toxmisc" + +/area/science/server name = "Research Division Server Room" icon_state = "server" -/area/toxins/explab +/area/science/explab name = "Experimentation Lab" icon_state = "toxmisc" + +/area/science/robotics +// /area/medical/robotics + name = "Robotics" + icon_state = "medresearch" + +/area/science/robotics/mechbay +// /area/assembly/chargebay + name = "Mech Bay" + icon_state = "mechbay" + +/area/science/robotics/mechbay_cargo +// /area/quartermaster/mechbay + name = "Mech Bay" + icon_state = "yellow" + +/area/science/robotics/showroom +// /area/assembly/showroom + name = "Robotics Showroom" + icon_state = "showroom" + +/area/science/robotics/lab +// /area/assembly/robotics + name = "Robotics Lab" + icon_state = "ass_line" + +/area/science/research +// /area/medical/research + name = "Research Division" + icon_state = "medresearch" + +/area/science/research/lobby +// /area/medical/research/research_lobby + name = "Research Division Lobby" + icon_state = "medresearch" + +/area/science/research/abandoned +// /area/medical/research/abandoned +// /area/medical/research/abandoned_research_lab + name = "Abandoned Research Lab" + icon_state = "medresearch" //Storage @@ -799,9 +1291,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Art Supply Storage" icon_state = "storage" -/area/storage/auxillary - name = "Auxillary Storage" +/area/storage/auxiliary +// /area/storage/auxillary + name = "Auxiliary Storage" icon_state = "auxstorage" + +/area/storage/atmos +// /area/maintenance/storage + name = "Atmospherics Storage" + icon_state = "atmos" + valid_territory = 0 + +/area/storage/tcom +// /area/maintenance/storage/tcom_storage + name = "Telecoms Storage" + icon_state = "green" + valid_territory = 0 /area/storage/eva name = "EVA Storage" @@ -811,11 +1316,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Secure Storage" icon_state = "storage" -/area/storage/emergency +/area/storage/emergency/starboard +// /area/storage/emergency name = "Starboard Emergency Storage" icon_state = "emergencystorage" -/area/storage/emergency2 +/area/storage/emergency/port +// /area/storage/emergency2 name = "Port Emergency Storage" icon_state = "emergencystorage" @@ -838,9 +1345,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/construction/minisat_exterior name = "Minisat Exterior" icon_state = "yellow" - -/area/mining_construction - name = "Auxillary Base Construction" + +/area/construction/mining/aux_base +// /area/mining_construction + name = "Auxiliary Base Construction" + icon_state = "yellow" + +/area/construction/mining/aux_base/closet +// /area/mining_construction/closet + name = "Auxiliary Closet Construction" icon_state = "yellow" /area/construction/supplyshuttle @@ -867,9 +1380,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Solar Panel Control" icon_state = "yellow" -/area/construction/Storage +/area/construction/storage name = "Construction Site Storage" icon_state = "yellow" + +/area/construction/storage/wing +// /area/construction/Storage + name = "Storage Wing" + icon_state = "storage_wing" + //AI /area/ai_monitored/security/armory @@ -911,6 +1430,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/turret_protected/aisat name = "AI Satellite" icon_state = "ai" + +/area/ai_monitored/turret_protected/aisat/atmos + name = "AI Satellite Atmos" + icon_state = "ai" + + /area/ai_monitored/turret_protected/aisat/atmos + name = "AI Satellite Atmos" + icon_state = "ai" + +/area/ai_monitored/turret_protected/aisat/service + name = "AI Satellite Service" + icon_state = "ai" + +/area/ai_monitored/turret_protected/aisat/hallway + name = "AI Satellite Hallway" + icon_state = "ai" /area/aisat name = "AI Satellite Exterior" @@ -987,14 +1522,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Telecommunications Satellite Lounge" icon_state = "tcomsatlounge" -/area/chapel/asteroid - name = "Chapel Asteroid" - icon_state = "explored" - -/area/chapel/dock - name = "Chapel Dock" - icon_state = "construction" - ///////////////////////////////////////////////////////////////////// /* Lists of areas to be used with is_type_in_list. @@ -1003,32 +1530,31 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //SPACE STATION 13 GLOBAL_LIST_INIT(the_station_areas, list ( - /area/atmos, - /area/maintenance, - /area/hallway, - /area/bridge, - /area/crew_quarters, - /area/holodeck, + /area/assembly, + /area/bridge, + /area/chapel, + /area/construction, + /area/crew_quarters, + /area/engine, + /area/hallway, + /area/holodeck, + /area/hydroponics, + /area/janitor, + /area/lawoffice, + /area/library, + /area/maintenance, + /area/medical, // /area/mint, //not present on map - /area/library, - /area/chapel, - /area/lawoffice, - /area/engine, - /area/solar, - /area/assembly, - /area/teleporter, - /area/medical, - /area/security, - /area/quartermaster, - /area/janitor, - /area/hydroponics, - /area/toxins, - /area/storage, - /area/construction, + /area/quartermaster, + /area/science, // /area/toxins/ + /area/security, + /area/solar, + /area/storage, + /area/teleporter, /area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0 // /area/ai_monitored/storage/secure, //not present on map // /area/ai_monitored/storage/emergency, //not present on map /area/ai_monitored/turret_protected/ai_upload, //do not try to simplify to "/area/ai_monitored/turret_protected" --rastaf0 /area/ai_monitored/turret_protected/ai_upload_foyer, /area/ai_monitored/turret_protected/ai, -)) \ No newline at end of file +))