cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6502 from PsiOmegaDelta/MapFixes

Browse Source 
Post-dev/master merge map fixes
This commit is contained in:
Zuhayr
2014-09-25 05:53:46 +09:30
parent 69ed2317bf 93ef5dbe2f
commit 25515e9afc
4 changed files with 301 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -28,6 +28,9 @@
var/radio_filter_out var/radio_filter_out
var/radio_filter_in var/radio_filter_in
/obj/machinery/atmospherics/unary/vent_scrubber/on
on = 1
/obj/machinery/atmospherics/unary/vent_scrubber/New() /obj/machinery/atmospherics/unary/vent_scrubber/New()
..() ..()
air_contents.volume = ATMOS_DEFAULT_VOLUME_FILTER air_contents.volume = ATMOS_DEFAULT_VOLUME_FILTER

2
code/game/area/Space Station 13 areas.dm
View File

@@ -1463,7 +1463,7 @@ var/list/ghostteleportlocs = list()
/area/rnd/docking /area/rnd/docking
name = "\improper Research Dock" name = "\improper Research Dock"
icon_state = "research" icon_state = "research_dock"
/area/rnd/lab /area/rnd/lab
name = "\improper Research Lab" name = "\improper Research Lab"

BIN
icons/turf/areas.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

596
maps/tgstation2.dmm
View File

File diff suppressed because it is too large Load Diff