cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch

Browse Source 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-03-15 20:37:35 +10:00
parent c7bd71244a e13498996b
commit 435ceda41f
31 changed files with 18859 additions and 18570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenoarchaeology/areas.dm
+2 -2
View File
@@ -12,11 +12,11 @@
icon_state = "anog"
/area/research_outpost/power
name = "Research Outpost Power Substation"
name = "Research Outpost Power"
icon_state = "engine"
/area/research_outpost/atmos
name = "Research Outpost Maintenance"
name = "Research Outpost Atmospherics"
icon_state = "atmos"
/area/research_outpost/maint