[MAP] Several major remaps, and additions #3 (#3465)

- Remap: Atmopsherics.
- Remap: Captain's Office.
- Remap: Head of Staff Conference Room.
- Remap: Chief Medical Officer's Office.
- Remap: Medical Briefing Room.
- Remap: Security Processing and Holding Cell.
- Modification: Robotics Laboratory.
- Addition: Desk Ringers in several locations.
- Fix: #3391, #3374, #3345, #3341, #3308, #3306, #3277, #3244, #3173,
#3094.
- Several other minor changes.
- A new subtype of folder has been sprited for the Security folders.
- More colours of flooring decals were added.
- New colours for pipes were added (Lohikar).
This commit is contained in:
Juani2400
2017-09-20 15:42:02 +01:00
committed by Werner
parent 9e04f32316
commit d4a6ea6949
14 changed files with 32780 additions and 30097 deletions
+82 -82
View File
@@ -580,7 +580,7 @@ area/space/atmosalert()
icon_state = "maintcentral"
/area/maintenance/arrivals
name = "Arrivals Maintenance"
name = "Surface Maintenance"
icon_state = "maint_arrivals"
/area/maintenance/bar
@@ -608,7 +608,7 @@ area/space/atmosalert()
icon_state = "maint_eva"
/area/maintenance/solarmaint
name = "\improper Roof Solar Array Maintenance"
name = "\improper Surface - Solar Maintenance"
icon_state = "maint_eva"
base_turf = /turf/space
@@ -671,16 +671,16 @@ area/space/atmosalert()
name = "Medical Research Substation"
/area/maintenance/substation/medical // Medbay
name = "Medical Substation"
name = "Main Lvl. Medical Substation"
/area/maintenance/substation/research // Research
name = "Research Substation"
name = "Main Lvl. Research Substation"
/area/maintenance/substation/civilian_east // Bar, kitchen, dorms, ...
name = "Civilian East Substation"
name = "Surface Lvl. Civilian Substation"
/area/maintenance/substation/civilian_west // Cargo, PTS, locker room, probably arrivals, ...)
name = "Civilian West Substation"
name = "Main Lvl. Civilian Substation"
/area/maintenance/substation/command // AI and central cluster. This one will be between HoP office and meeting room (probably).
name = "Command Substation"
@@ -728,7 +728,7 @@ area/space/atmosalert()
icon_state = "hallC3"
/area/hallway/secondary/exit
name = "\improper Escape Shuttle Hallway"
name = "\improper Surface - Red Dock"
icon_state = "escape"
no_light_control = 1
holomap_color = HOLOMAP_AREACOLOR_ESCAPE
@@ -739,11 +739,11 @@ area/space/atmosalert()
allow_nightmode = 0
/area/hallway/secondary/entry/fore
name = "\improper Arrival Shuttle Hallway - Fore"
name = "\improper Surface Lvl. Hallway Fore"
icon_state = "entry_1"
/area/hallway/secondary/entry/port
name = "\improper Arrival Shuttle Hallway - Port"
name = "\improper Surface - Yellow Dock"
icon_state = "entry_2"
/area/hallway/secondary/entry/starboard
@@ -751,11 +751,11 @@ area/space/atmosalert()
icon_state = "entry_3"
/area/hallway/secondary/entry/aft
name = "\improper Arrival Shuttle Hallway - Aft"
name = "\improper Surface Lvl. Hallway Aft"
icon_state = "entry_4"
/area/hallway/secondary/entry/dock
name = "\improper Arrival Shuttle Dock"
name = "\improper Surface - Blue Dock"
icon_state = "arrivals_dock"
holomap_color = HOLOMAP_AREACOLOR_ARRIVALS
@@ -777,7 +777,7 @@ area/space/atmosalert()
icon_state = "ai_foyer"
/area/bridge/aibunker
name = "\improper AI Maintainence Bunker"
name = "\improper Command - Bunker"
icon_state = "ai_foyer"
/area/bridge/centcom_meetingroom
@@ -785,15 +785,15 @@ area/space/atmosalert()
icon_state = "bridge"
/area/bridge/levela
name = "\improper Level A Bridge"
name = "\improper Surface - Bridge"
icon_state = "bridge"
/area/crew_quarters/heads/cryo
name = "\improper Command Dormitory"
name = "\improper Command - Dormitory"
icon_state = "head_quarters"
/area/bridge/meeting_room
name = "\improper Heads of Staff Meeting Room"
name = "\improper Command - Conference Room"
icon_state = "bridge"
ambience = list()
sound_env = MEDIUM_SOFTFLOOR
@@ -863,7 +863,7 @@ area/space/atmosalert()
holomap_color = HOLOMAP_AREACOLOR_DORMS
/area/crew_quarters/sleep/engi_wash
name = "\improper Engineering Washroom"
name = "\improper Engineering - Washroom"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
@@ -1073,87 +1073,87 @@ area/space/atmosalert()
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
/area/engineering/atmos
name = "\improper Atmospherics"
name = "\improper Engineering - Atmospherics"
icon_state = "atmos"
sound_env = LARGE_ENCLOSED
no_light_control = 1
ambience = list('sound/ambience/ambiatm1.ogg')
/area/engineering/atmos/monitoring
name = "\improper Atmospherics Monitoring Room"
name = "\improper Engineering - Atmospherics Monitoring Room"
icon_state = "atmos_monitoring"
sound_env = STANDARD_STATION
/area/engineering/atmos/storage
name = "\improper Atmospherics Storage"
name = "\improper Engineering - Atmospherics Storage"
icon_state = "atmos_storage"
sound_env = SMALL_ENCLOSED
/area/engineering/drone_fabrication
name = "\improper Engineering Drone Fabrication"
name = "\improper Engineering - Drone Fabrication"
icon_state = "drone_fab"
sound_env = SMALL_ENCLOSED
/area/engineering/engine_smes
name = "\improper Engineering SMES"
name = "\improper Engineering - Main Lvl. SMES Room"
icon_state = "engine_smes"
sound_env = SMALL_ENCLOSED
/area/engineering/engine_room
name = "\improper Engine Room"
name = "\improper Engineering - Engine Room"
icon_state = "engine"
sound_env = LARGE_ENCLOSED
no_light_control = 1
/area/engineering/engine_airlock
name = "\improper Engine Room Airlock"
name = "\improper Engineering - Engine Room Airlock"
icon_state = "engine"
/area/engineering/engine_monitoring
name = "\improper Engine Monitoring Room"
name = "\improper Engineering - Monitoring Room"
icon_state = "engine_monitoring"
/area/engineering/engine_waste
name = "\improper Engine Waste Handling"
name = "\improper Engineering - Engine Waste Handling"
icon_state = "engine_waste"
no_light_control = 1
/area/engineering/engineering_monitoring
name = "\improper Engineering Monitoring Room"
name = "\improper Engineering - Monitoring Room"
icon_state = "engine_monitoring"
/area/engineering/foyer
name = "\improper Engineering Foyer"
name = "\improper Engineering - Foyer"
icon_state = "engineering_foyer"
allow_nightmode = 1
/area/engineering/storage
name = "\improper Engineering Storage"
name = "\improper Engineering - Storage"
icon_state = "engineering_storage"
/area/engineering/break_room
name = "\improper Engineering Break Room"
name = "\improper Engineering - Break Room"
icon_state = "engineering_break"
sound_env = MEDIUM_SOFTFLOOR
/area/engineering/engine_eva
name = "\improper Engine EVA"
name = "\improper Engineering - Engine EVA"
icon_state = "engine_eva"
/area/engineering/locker_room
name = "\improper Engineering Locker Room"
name = "\improper Engineering - Locker Room"
icon_state = "engineering_locker"
/area/engineering/workshop
name = "\improper Engineering Workshop"
name = "\improper Engineering - Workshop"
icon_state = "engineering_workshop"
/area/engineering/cooling
name = "\improper Engineering Cooling Radiator"
name = "\improper Engineering - Engine Cooling Radiator"
icon_state = "engineering_monitoring"
/area/engineering/gravity_gen
name = "\improper Gravity Generator"
name = "\improper Engineering - Gravity Generator"
icon_state = "engine"
@@ -1175,7 +1175,7 @@ area/space/atmosalert()
icon_state = "panelsA"
fore
name = "\improper Fore Solar Array"
name = "\improper Surface - Fore TComms Solar Array"
icon_state = "yellow"
aft
@@ -1183,11 +1183,11 @@ area/space/atmosalert()
icon_state = "aft"
starboard
name = "\improper Aft Starboard Solar Array"
name = "\improper Surface - Aft TComms Solar Array"
icon_state = "panelsS"
port
name = "\improper Aft Port Solar Array"
name = "\improper Surface - Port TComms Solar Array"
icon_state = "panelsP"
/area/maintenance/auxsolarport
@@ -1196,12 +1196,12 @@ area/space/atmosalert()
sound_env = SMALL_ENCLOSED
/area/maintenance/starboardsolar
name = "Solar Maintenance - Aft Starboard"
name = "Solar Maintenance - Aft"
icon_state = "SolarcontrolS"
sound_env = SMALL_ENCLOSED
/area/maintenance/portsolar
name = "Solar Maintenance - Aft Port"
name = "Solar Maintenance - Port"
icon_state = "SolarcontrolP"
sound_env = SMALL_ENCLOSED
@@ -1236,7 +1236,7 @@ area/space/atmosalert()
//Teleporter
/area/teleporter
name = "\improper Teleporter"
name = "\improper Command - Teleporter"
icon_state = "teleporter"
station_area = 1
@@ -1254,11 +1254,11 @@ area/space/atmosalert()
//Medbay is a large area, these additional areas help level out APC load.
/area/medical/emt
name = "\improper Emergency Technician Storage"
name = "\improper Medical - Emergency Technician Storage"
icon_state = "medbay"
/area/medical/temp_morgue
name = "\improper Temporary Morgue"
name = "\improper Medical - Temporary Morgue"
icon_state = "morgue"
/area/medical/medbay2
@@ -1272,52 +1272,52 @@ area/space/atmosalert()
ambience = list('sound/ambience/signal.ogg')
/area/medical/medbay4
name = "\improper Medbay Hallway - Aft"
name = "\improper Medbay Hallway - Staff Wing"
icon_state = "medbay4"
ambience = list('sound/ambience/signal.ogg')
/area/medical/biostorage
name = "\improper Secondary Storage"
name = "\improper Medical - Secondary Storage"
icon_state = "medbay2"
ambience = list('sound/ambience/signal.ogg')
/area/medical/reception
name = "\improper Medbay Reception"
name = "\improper Medical - Reception"
icon_state = "medbay"
ambience = list('sound/ambience/signal.ogg')
/area/medical/psych
name = "\improper Psych Room"
name = "\improper Medical - Psych Room"
icon_state = "medbay3"
ambience = list('sound/ambience/signal.ogg')
/area/crew_quarters/medbreak
name = "\improper Break Room"
name = "\improper Medical - Break Room"
icon_state = "medbay3"
ambience = list('sound/ambience/signal.ogg')
/area/medical/patients_rooms
name = "\improper Patient's Rooms"
name = "\improper Medical - Patient's Rooms"
icon_state = "patients"
/area/medical/ward
name = "\improper Recovery Ward"
name = "\improper Medical - Recovery Ward"
icon_state = "patients"
/area/medical/patient_a
name = "\improper Isolation A"
name = "\improper Medical - Isolation A"
icon_state = "patients"
/area/medical/patient_b
name = "\improper Isolation B"
name = "\improper Medical - Isolation B"
icon_state = "patients"
/area/medical/patient_c
name = "\improper Isolation C"
name = "\improper Medical - Isolation C"
icon_state = "patients"
/area/medical/patient_wing
name = "\improper Patient Wing"
name = "\improper Medical - Patient Wing"
icon_state = "patients"
/area/medical/cmostore
@@ -1329,37 +1329,37 @@ area/space/atmosalert()
icon_state = "medresearch"
/area/medical/virology
name = "\improper Virology"
name = "\improper Medical - Virology"
icon_state = "virology"
/area/medical/virologyaccess
name = "\improper Virology Access"
name = "\improper Medical - Virology Access"
icon_state = "virology"
/area/medical/morgue
name = "\improper Morgue"
name = "\improper Medical - Long-term Morgue"
icon_state = "morgue"
ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg')
/area/medical/chemistry
name = "\improper Chemistry"
name = "\improper Medical - Chemistry"
icon_state = "chem"
/area/medical/surgery
name = "\improper Operating Theatre"
name = "\improper Medical - Operating Theatre"
icon_state = "surgery"
no_light_control = 1
/area/medical/surgeryobs
name = "\improper Operation Observation Room"
name = "\improper Medical - Operation Observation Room"
icon_state = "surgery"
/area/medical/surgeryprep
name = "\improper Pre-Op Prep Room"
name = "\improper Medical - Pre-Op Prep Room"
icon_state = "surgery"
/area/medical/surgerywing
name = "\improper Surgery Wing"
name = "\improper Medical - Surgery Wing"
icon_state = "surgery"
/area/medical/cryo
@@ -1367,11 +1367,11 @@ area/space/atmosalert()
icon_state = "cryo"
/area/medical/gen_treatment
name = "\improper General Treatment"
name = "\improper Medical - General Treatment"
icon_state = "cryo"
/area/medical/exam_room
name = "\improper Exam Room"
name = "\improper Medical - Exam Room"
icon_state = "exam_room"
/area/medical/genetics
@@ -1380,16 +1380,16 @@ area/space/atmosalert()
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
/area/medical/genetics_cloning
name = "\improper Cloning Lab"
name = "\improper Medical - Cloning Lab"
icon_state = "cloning"
/area/medical/sleeper
name = "\improper Emergency Treatment Centre"
name = "\improper Medical - Emergency Treatment Centre"
icon_state = "exam_room"
no_light_control = 1
/area/medical/icu
name = "\improper Intensive Care Unit"
name = "\improper Medical - Intensive Care Unit"
icon_state = "cryo"
@@ -1401,11 +1401,11 @@ area/space/atmosalert()
holomap_color = HOLOMAP_AREACOLOR_SECURITY
/area/security/main
name = "\improper Security Office"
name = "\improper Security - Equipment Room"
icon_state = "security"
/area/security/lobby
name = "\improper Security Lobby"
name = "\improper Security - Lobby"
icon_state = "security"
allow_nightmode = 1
no_light_control = 0
@@ -1488,7 +1488,7 @@ area/space/atmosalert()
icon_state = "checkpoint1"
/area/security/checkpoint2
name = "\improper Security - Arrival Checkpoint"
name = "\improper Security - Arrivals Checkpoint"
icon_state = "security"
/area/security/checkpoint/supply
@@ -1512,7 +1512,7 @@ area/space/atmosalert()
icon_state = "security"
/area/security/vacantoffice2
name = "\improper Security Meeting Room"
name = "\improper Security - Meeting Room"
icon_state = "security"
/area/quartermaster
@@ -1567,7 +1567,7 @@ area/space/atmosalert()
icon_state = "research"
/area/rnd/telesci
name = "\improper Telescience Lab"
name = "\improper Research - Telescience Laboratory"
icon_state = "research"
/area/rnd/docking
@@ -1575,7 +1575,7 @@ area/space/atmosalert()
icon_state = "research_dock"
/area/rnd/lab
name = "\improper Research Lab"
name = "\improper Research - R&D Laboratory"
icon_state = "toxlab"
/area/rnd/rdoffice
@@ -1583,44 +1583,44 @@ area/space/atmosalert()
icon_state = "head_quarters"
/area/rnd/supermatter
name = "\improper Supermatter Lab"
name = "\improper Research - Supermatter Lab"
icon_state = "toxlab"
/area/rnd/xenobiology
name = "\improper Xenobiology Lab"
name = "\improper Research - Xenobiology Lab"
icon_state = "xeno_lab"
/area/rnd/xenobiology/xenoflora_storage
name = "\improper Xenoflora Storage"
name = "\improper Research - Xenoflora Storage"
icon_state = "xeno_f_store"
no_light_control = TRUE
/area/rnd/xenobiology/xenoflora
name = "\improper Xenoflora Lab"
name = "\improper Research - Xenoflora Lab"
icon_state = "xeno_f_lab"
no_light_control = TRUE
/area/rnd/storage
name = "\improper Toxins Storage"
name = "\improper Research - Toxins Storage"
icon_state = "toxstorage"
/area/rnd/test_area
name = "\improper Toxins Test Area"
name = "\improper Research - Toxins Test Area"
icon_state = "toxtest"
/area/rnd/mixing
name = "\improper Toxins Mixing Room"
name = "\improper Research - Toxins Mixing Room"
icon_state = "toxmix"
/area/rnd/misc_lab
name = "\improper Miscellaneous Research"
name = "\improper Research - Miscellaneous Research"
icon_state = "toxmisc"
/area/toxins
station_area = 1
/area/toxins/server
name = "\improper Server Room"
name = "\improper Research - Server Room"
icon_state = "server"
station_area = 1
@@ -2045,7 +2045,7 @@ area/space/atmosalert()
icon_state = "tcomsatwest"
/area/tcommsat/mainlvl_tcomms__relay
name = "\improper Telecommucations Main Level Relay"
name = "\improper Sublevel - Telecommunications Relay"
icon_state = "tcomsatcham"
/area/beach
+20 -20
View File
@@ -65,22 +65,22 @@
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
/area/outpost/engineering/hallway
name = "Engineering Sublevel Hallway"
name = "Engineering - Sublevel Hallway"
/area/outpost/engineering/atmospherics
name = "Engineering Sublevel Atmospherics"
name = "Engineering - Sublevel Atmospherics"
/area/outpost/engineering/power
name = "Engineering Sublevel Power Distribution"
name = "Engineering - Tesla Bay"
/area/outpost/engineering/telecomms
name = "Engineering Sublevel Telecommunications"
name = "Engineering - Sublevel Telecommunications"
/area/outpost/engineering/storage
name = "Engineering Sublevel Storage"
name = "Engineering - Sublevel Storage"
/area/outpost/engineering/meeting
name = "Engineering Sublevel Meeting Room"
name = "Engineering - Break Room"
@@ -91,19 +91,19 @@
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
/area/outpost/research/hallway
name = "Research Sublevel Hallway"
name = "Research - Sublevel Hallway"
/area/outpost/research/dock
name = "Research Shuttle Dock"
/area/outpost/research/eva
name = "Research Sublevel EVA"
name = "Research - Xenoarcheology"
/area/outpost/research/analysis
name = "Research Sample Analysis"
name = "Research - Sample Analysis"
/area/outpost/research/chemistry
name = "Research Chemistry"
name = "Research - Chemistry"
/area/outpost/research/medical
name = "Research Medical"
@@ -112,31 +112,31 @@
name = "Research Maintenance"
/area/outpost/research/isolation_a
name = "Research Isolation A"
name = "Research - Isolation A"
/area/outpost/research/isolation_b
name = "Research Isolation B"
name = "Research - Isolation B"
/area/outpost/research/isolation_c
name = "Research Isolation C"
name = "Research - Isolation C"
/area/outpost/research/isolation_monitoring
name = "Research Isolation Monitoring"
name = "Research - Isolation Monitoring"
/area/outpost/research/lab
name = "Research Sublevel Laboratory"
name = "Research - Sublevel Laboratory"
/area/outpost/research/emergency_storage
name = "Research Emergency Storage"
name = "Research - Sublevel Emergency Storage"
/area/outpost/research/anomaly_storage
name = "Research Anomalous Storage"
name = "Research - Anomalous Storage"
/area/outpost/research/anomaly_analysis
name = "Research Anomaly Analysis"
name = "Research - Anomaly Analysis"
/area/outpost/research/kitchen
name = "Research Kitchen"
name = "Research - Kitchen"
/area/outpost/research/disposal
name = "Research Waste Disposal"
name = "Research - Waste Disposal"
+9 -2
View File
@@ -253,13 +253,16 @@
/obj/effect/floor_decal/industrial/hatch/yellow
color = "#CFCF55"
/obj/effect/floor_decal/industrial/hatch/red
color = "#990C0C"
/obj/effect/floor_decal/industrial/outline
name = "white outline"
icon_state = "outline"
/obj/effect/floor_decal/industrial/outline/blue
name = "blue outline"
color = "#00B8B2"
name = "cyan outline"
color = "#b6efe1"
/obj/effect/floor_decal/industrial/outline/yellow
name = "yellow outline"
@@ -269,6 +272,10 @@
name = "grey outline"
color = "#808080"
/obj/effect/floor_decal/industrial/outline/red
name = "red outline"
color = "#990C0C"
/obj/effect/floor_decal/industrial/loading
name = "loading area"
icon_state = "loadingarea"
+12 -1
View File
@@ -2,6 +2,7 @@
// parent class for pipes //
////////////////////////////
/obj/machinery/atmospherics/pipe/zpipe
icon = 'icons/atmos/pipes.dmi'
icon_state = "up"
var/ptype // What direction of pipe this is. Used for icons.
@@ -61,7 +62,7 @@
invisibility = i ? 101 : 0
update_icon()
/obj/machinery/atmospherics/pipe/up/machinery_process()
/obj/machinery/atmospherics/pipe/zpipe/machinery_process()
if(!parent) //This should cut back on the overhead calling build_network thousands of times per cycle
..()
else
@@ -276,3 +277,13 @@
color = PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/zpipe/down/red
color = PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/zpipe/up/yellow
color = PIPE_COLOR_YELLOW
/obj/machinery/atmospherics/pipe/zpipe/down/yellow
color = PIPE_COLOR_YELLOW
/obj/machinery/atmospherics/pipe/zpipe/up/blue
color = PIPE_COLOR_BLUE
/obj/machinery/atmospherics/pipe/zpipe/down/blue
color = PIPE_COLOR_BLUE
+8 -4
View File
@@ -9,6 +9,10 @@
desc = "A blue folder."
icon_state = "folder_blue"
/obj/item/weapon/folder/sec
desc = "A gold and blue folder, specifically designed for the Internal Security Department."
icon_state = "folder_blue_gold"
/obj/item/weapon/folder/red
desc = "A red folder."
icon_state = "folder_red"
@@ -86,20 +90,20 @@
onclose(usr, "[P.name]")
else if(href_list["rename"])
var/obj/item/weapon/O = locate(href_list["rename"])
if(O && (O.loc == src))
if(istype(O, /obj/item/weapon/paper))
var/obj/item/weapon/paper/to_rename = O
to_rename.rename()
else if(istype(O, /obj/item/weapon/photo))
var/obj/item/weapon/photo/to_rename = O
to_rename.rename()
else if(istype(O, /obj/item/weapon/paper_bundle))
var/obj/item/weapon/paper_bundle/to_rename = O
to_rename.rename()
//Update everything
attack_self(usr)
update_icon()
+42
View File
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Juani2400
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Remapped: Atmospherics, Captain's Office, Heads of Staff Conference Room, CMO's office, Medical Briefing Room, Security Processing and Holding Cell."
- maptweak: "Modified: Robotics Laboratory."
- maptweak: "Mapped in the desk ringers."
- rscadd: "Added a new subtype of folder: Security."
- rscadd: "Added new flooring decals for Medical."
- wip: "Started the re-work of map areas. Most areas have been renamed as a result. More changes to be done eventually."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

File diff suppressed because it is too large Load Diff
+16 -3
View File
@@ -78,7 +78,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
/area/space)
/area/engineering/cooling)
"n" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -112,6 +112,7 @@
frequency = 1379;
id_tag = "cooling_sensor";
layer = 3.3;
master_tag = "cooling airlock";
pixel_x = 12;
pixel_y = -25
},
@@ -296,6 +297,18 @@
/obj/random/loot,
/turf/space,
/area/space)
"J" = (
/obj/structure/lattice/catwalk,
/obj/machinery/light/small/emergency{
icon_state = "bulb1";
dir = 4
},
/turf/space,
/area/engineering/cooling)
"K" = (
/obj/structure/lattice/catwalk,
/turf/space,
/area/engineering/cooling)
(1,1,1) = {"
a
@@ -10696,9 +10709,9 @@ a
e
a
a
h
J
m
h
K
h
h
A
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+88 -57
View File
@@ -2760,10 +2760,11 @@
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"fC" = (
/obj/effect/floor_decal/industrial/warning/corner,
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 1
},
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"fD" = (
@@ -3668,6 +3669,36 @@
},
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"im" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"in" = (
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"io" = (
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 1
},
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
(1,1,1) = {"
aa
@@ -28180,7 +28211,7 @@ aa
aa
aa
aa
ae
io
ah
ah
ah
@@ -28691,9 +28722,9 @@ ag
ag
ag
ag
ag
ag
ag
im
ii
in
fD
aa
aa
@@ -33137,9 +33168,9 @@ ai
ai
ai
ai
fl
ah
fo
ai
ai
ai
ai
am
ab
@@ -33394,9 +33425,9 @@ aa
aa
aa
aa
ae
ah
al
aa
aa
aa
aa
ab
ab
@@ -33651,9 +33682,9 @@ aa
aa
aa
aa
ae
ah
al
aa
aa
aa
aa
aa
aa
@@ -33908,9 +33939,9 @@ aa
aa
aa
aa
af
ai
am
aa
aa
aa
aa
aa
aa
@@ -34673,7 +34704,7 @@ ab
ab
ab
ab
aa
ab
aa
aa
aa
@@ -34930,9 +34961,9 @@ ab
ab
ac
ac
aa
aa
aa
ab
ab
ab
aa
aa
aa
@@ -35187,10 +35218,10 @@ ab
ac
ac
ac
aa
aa
aa
aa
ac
ac
ab
ab
aa
aa
aa
@@ -35444,11 +35475,11 @@ ac
ac
ac
ac
aa
aa
aa
aa
aa
ab
ab
ab
ac
ac
aa
aa
aa
@@ -35701,11 +35732,11 @@ ac
ac
ac
ab
aa
aa
aa
aa
aa
ab
ac
ac
ac
ac
aa
aa
aa
@@ -35958,11 +35989,11 @@ ab
ac
ac
ab
aa
aa
aa
aa
aa
ac
ac
ac
ac
ac
aa
aa
aa
@@ -36215,11 +36246,11 @@ ab
ac
ab
ab
aa
aa
aa
aa
aa
ac
ac
ac
ac
ac
aa
aa
aa
@@ -36472,10 +36503,10 @@ ab
ab
ab
ab
aa
aa
aa
aa
ac
ac
ac
ac
aa
aa
aa
@@ -36729,10 +36760,10 @@ ab
ab
ac
ab
aa
aa
aa
aa
ac
ac
ac
ac
aa
aa
aa
@@ -36986,9 +37017,9 @@ ab
ab
ab
ab
aa
aa
aa
ac
ac
ac
aa
aa
aa
@@ -37756,7 +37787,7 @@ aa
aa
aa
aa
ab
aa
aa
aa
aa
+19 -19
View File
@@ -1757,7 +1757,7 @@
"fG" = (
/obj/machinery/power/smes/buildable{
charge = 0;
RCon_tag = "Solar - Fore Port"
RCon_tag = "NO_TAG"
},
/turf/simulated/floor/airless,
/area/derelict/hallway/northwest)
@@ -5934,7 +5934,7 @@
"rS" = (
/obj/machinery/power/smes/buildable{
charge = 0;
RCon_tag = "Solar - Aft Starboard"
RCon_tag = "NO_TAG"
},
/turf/simulated/floor/airless,
/area/derelict/hallway/southeast)
@@ -7129,7 +7129,7 @@
"uO" = (
/obj/machinery/power/smes/buildable{
charge = 0;
RCon_tag = "Solar - Aft Starboard"
RCon_tag = "NO_TAG"
},
/turf/simulated/floor/airless,
/area/derelict/hallway/southwest)
@@ -23769,7 +23769,7 @@ tN
tN
tN
ac
xG
xF
ac
tN
tN
@@ -26291,7 +26291,7 @@ ac
aa
aa
aa
xs
xj
ac
aa
aa
@@ -28653,7 +28653,7 @@ aa
kZ
uO
ix
xH
xF
kZ
aa
ac
@@ -29668,7 +29668,7 @@ aa
aa
aa
ad
xC
xj
aa
aa
aa
@@ -32010,7 +32010,7 @@ ix
ix
wu
ix
xL
xF
kZ
aa
ac
@@ -32201,7 +32201,7 @@ aa
aa
aa
ar
xr
xn
az
aa
aa
@@ -32533,7 +32533,7 @@ aa
ar
ac
ar
xO
xj
aa
ac
ac
@@ -32742,7 +32742,7 @@ aa
aa
aa
aa
xA
xj
it
qJ
ix
@@ -38181,7 +38181,7 @@ wE
wE
iq
wO
xM
xI
iu
wU
wU
@@ -45623,7 +45623,7 @@ iq
jt
jt
jt
xK
xt
vR
vZ
wd
@@ -47162,7 +47162,7 @@ aa
iu
jv
jv
xJ
xt
kq
kq
vP
@@ -48151,7 +48151,7 @@ mX
kq
jt
nV
xy
xt
ir
ac
ac
@@ -50222,7 +50222,7 @@ qw
kf
iu
aa
qQ
xB
rf
aa
aa
@@ -51505,7 +51505,7 @@ aa
aa
ac
iu
qQ
xB
aa
iq
aa
@@ -53573,7 +53573,7 @@ iu
iu
iu
iu
xD
xz
jt
kq
kq
@@ -57931,7 +57931,7 @@ iq
iq
iq
iq
qQ
xB
aa
rw
rI