cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes omega detective office + prepare_maps change (#6110)

Browse Source 
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
This commit is contained in:
CitadelStationBot
2018-03-26 04:31:41 -05:00
committed by Poojawa
parent 9892fabe4e
commit bcc360d0d9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_maps/map_files/OmegaStation/OmegaStation.dmm
View File

@@ -3284,11 +3284,12 @@
/area/security/detectives_office)
"agK" = (
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/hand_labeler,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
/obj/machinery/computer/security/wooden_tv{
pixel_x = 2
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"agL" = (
@@ -3820,7 +3821,6 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"ahE" = (
/obj/machinery/computer/security/wooden_tv,
/obj/structure/table/wood,
/obj/machinery/button/door{
id = "detectivewindows";
@@ -3836,6 +3836,8 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/obj/item/folder/red,
/obj/item/hand_labeler,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"ahF" = (

2
tools/mapmerge2/Prepare Maps.bat
View File

@@ -7,6 +7,6 @@ cls
echo All dmm files in _maps directories have been backed up
echo Now you can make your changes...
echo ---
echo Remember to run Run_Map_Merge.bat just before you commit your changes!
echo Remember to run mapmerge.bat just before you commit your changes!
echo ---
pause