cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5736 from Rykka-Stormheart/shep-dev-xenobiology

Browse Source 
Xenobiology Lab Rework - No longer WIP!
This commit is contained in:
Novacat
2019-09-20 16:38:53 -04:00
committed by GitHub
parent 5d67a5aa21 bc50468461
commit cfe94c7378
5 changed files with 53364 additions and 49187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-01-surface1.dmm
+23524 -25081
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-02-surface2.dmm
+19458 -17518
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-03-surface3.dmm
+10335 -6585
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas2.dm
+45 -2
View File
@@ -258,7 +258,7 @@
/area/maintenance/lower/trash_pit
name = "\improper Trash Pit"
/area/maintenance/lower/solars
name = "\improper Solars maintenanceance"
name = "\improper Solars Maintenance"
/area/maintenance/lower/mining_eva
name = "\improper Mining EVA Maintenance"
/area/maintenance/lower/public_garden_maintenence
@@ -290,6 +290,9 @@
/area/rnd/chemistry_lab
name = "\improper Research Chemistry Lab"
icon_state = "research"
/area/rnd/miscellaneous_lab
name = "\improper Research Miscellaneous Lab"
icon_state = "research"
/area/rnd/staircase/secondfloor
name = "\improper Research Staircase Second Floor"
icon_state = "research"
@@ -367,6 +370,46 @@
name = "\improper Research Outpost Xenoarch Storage"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_north_airlock
name = "\improper Xenbiology Northern Airlock"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_south_airlock
name = "\improper Xenbiology Southern Airlock"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_hallway
name = "\improper Xenbiology Access Corridor"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_breakroom
name = "\improper Xenbiology Breakroom"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_office
name = "\improper Xenbiology Main Office"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_autopsy
name = "\improper Xenbiology Alien Autopsy Room"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_decon
name = "\improper Xenbiology Decontamination and Showers"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_first_aid
name = "\improper Xenbiology First Aid"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_slimepens
name = "\improper Xenbiology Slime and Xenos Containment"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_main
name = "\improper Xenbiology Main Outpost"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_storage
name = "\improper Xenbiology Equipment Storage"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_atmos
name = "\improper Xenbiology Atmos"
icon_state = "research"
/area/rnd/outpost/xenobiology/outpost_substation
name = "\improper Xenbiology SMES Substation"
icon_state = "research"
// Misc
/area/hallway/lower/third_south
name = "\improper Hallway Third Floor South"
@@ -914,4 +957,4 @@
excluded |= /area/tether/surfacebase/atrium_three
excluded |= /area/teleporter/departing
excluded |= /area/hallway/station/upper
..()
..()
maps/tether/tether_defines.dm
+2 -1
View File
@@ -133,7 +133,8 @@
/area/crew_quarters/sleep/Dorm_1/holo,
/area/crew_quarters/sleep/Dorm_3/holo,
/area/crew_quarters/sleep/Dorm_5/holo,
/area/crew_quarters/sleep/Dorm_7/holo)
/area/crew_quarters/sleep/Dorm_7/holo,
/area/rnd/miscellaneous_lab) //TFF 31/8/19 - exempt new construction site from unit tests
unit_test_exempt_from_atmos = list(
/area/engineering/atmos/intake, // Outside,
/area/rnd/external, // Outside,