Merge pull request #3175 from CHOMPStationBot/upstream-merge-11746

[MIRROR] Holodeck update and map tweaks
This commit is contained in:
Nadyr
2021-11-01 20:22:11 -04:00
committed by GitHub
4 changed files with 1405 additions and 957 deletions
+8 -1
View File
@@ -180,4 +180,11 @@
/area/holodeck/source_smoleworld
name = "\improper Holodeck - Smolworld"
/area/holodeck/source_gym
name = "\improper Holodeck - Gym"
/area/holodeck/source_game_room
name = "\improper Holodeck - Game Room"
/area/holodeck/source_patient_ward
name = "\improper Holodeck - Patient Ward"
+3
View File
@@ -64,6 +64,9 @@
"Courtroom" = new/datum/holodeck_program(/area/holodeck/source_courtroom, list('sound/music/traitor.ogg')),
"Chessboard" = new/datum/holodeck_program(/area/holodeck/source_chess),
"Micro Building Area" = new/datum/holodeck_program(/area/holodeck/source_smoleworld), //VOREStation add
"Gym" = new/datum/holodeck_program(/area/holodeck/source_gym), //VOREStation add
"Game Room" = new/datum/holodeck_program(/area/holodeck/source_game_room), //VOREStation add
"Patient Ward" = new/datum/holodeck_program(/area/holodeck/source_patient_ward), //VOREStation add
"Turn Off" = new/datum/holodeck_program(/area/holodeck/source_plating, list())
)
File diff suppressed because it is too large Load Diff
+6
View File
@@ -183,6 +183,9 @@
/obj/machinery/shower{
dir = 1
},
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/stellardelight/deck1/shower)
"ay" = (
@@ -13762,6 +13765,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 5
},
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/stellardelight/deck1/shower)
"Dz" = (