Removes the Chapel, Reverts God. (#2739)

Removes the chapel and replaces it with a holodeck.
Replaces the old holodeck with a pool/gymnasium.
Properly sets up the holodeck, mapwise. All holorooms have been adjusted to be the appropriate size for the now slightly smaller holodeck (7x10).
The Chaplain now has an office above hydroponics, which has all of his necessary things - crematorium, morgue tray, tools of office, and even a slight semi-confessional for private council.
Adds a chapel to the holodeck, for when the chaplain wishes to conduct a service. Additional holodecks for specific lore-religions are pending.
Adds a gymnasium holoroom.
This commit is contained in:
LordFowl
2017-07-01 10:54:56 -04:00
committed by skull132
parent c876437f91
commit 077196f0d1
11 changed files with 4927 additions and 4830 deletions

View File

@@ -401,7 +401,7 @@ area/space/atmosalert()
/area/syndicate_mothership/elite_squad
name = "\improper Elite Mercenary Squad"
icon_state = "syndie-elite"
/area/syndicate_mothership/raider_base
name = "\improper Pirate Hideout"
icon_state = "syndie-control"
@@ -1065,6 +1065,17 @@ area/space/atmosalert()
/area/holodeck/source_plating
name = "\improper Holodeck - Off"
/area/holodeck/source_chapel
name = "\improper Holodeck - Chapel"
/area/holodeck/source_gym
name = "\improper Holodeck - Gym"
sound_env = ARENA
/area/holodeck/source_range
name = "\improper Holodeck - Range"
sound_env = ARENA
/area/holodeck/source_emptycourt
name = "\improper Holodeck - Empty Court"
sound_env = ARENA

View File

@@ -1,8 +1,8 @@
/obj/machinery/computer/sentencing
name = "criminal sentencing console"
desc = "Used to generate a criminal sentence."
icon_state = "securityw"
icon_screen = null
icon_state = "computerw"
icon_screen = "securityw"
light_color = LIGHT_COLOR_ORANGE
req_one_access = list( access_brig, access_heads )
circuit = "/obj/item/weapon/circuitboard/sentencing"

View File

@@ -229,6 +229,7 @@
name = "water"
icon_state = "water"
footstep_sound = "waterstep"
var/watertype = "water5"
/turf/simulated/floor/beach/water/update_dirt()
return // Water doesn't become dirty
@@ -236,6 +237,11 @@
/turf/simulated/floor/beach/water/ocean
icon_state = "seadeep"
/turf/simulated/floor/beach/water/pool
icon_state = "pool"
watertype = "poolwater"
/turf/simulated/floor/beach/water/Initialize()
. = ..()
add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1))
if(add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="[watertype]","layer"=MOB_LAYER+0.1)))
icon_state = "pool1"

View File

@@ -2,7 +2,8 @@
name = "holodeck control console"
desc = "A computer used to control a nearby holodeck."
icon_screen = "holocontrol"
icon_state = "computerw"
icon_screen = "holocontrolw"
light_color = LIGHT_COLOR_CYAN
use_power = 1
@@ -335,6 +336,7 @@
use_power = 1
/obj/machinery/computer/HolodeckControl/Exodus
density = 0
linkedholodeck_area = /area/holodeck/alphadeck
/obj/machinery/computer/HolodeckControl/Exodus/New()
@@ -351,7 +353,9 @@
"Snow Field" = "snowfield",
"Theatre" = "theatre",
"Meeting Hall" = "meetinghall",
"Courtroom" = "courtroom"
"Courtroom" = "courtroom",
"Chapel" = "chapel",
"Xavier Trasen Memorial Gymnasium" = "gym"
)
restricted_programs = list(

View File

@@ -26,6 +26,18 @@
icon_state = "steel"
initial_flooring = /decl/flooring/tiling
/turf/simulated/floor/holofloor/tiled/ramp
name = "foot ramp"
icon = 'icons/turf/flooring/tiles.dmi'
icon_state = "ramptop"
initial_flooring = /decl/flooring/reinforced/ramp
/turf/simulated/floor/holofloor/tiled/ramp/bottom
name = "foot ramp"
icon = 'icons/turf/flooring/tiles.dmi'
icon_state = "rampbot"
initial_flooring = /decl/flooring/reinforced/ramp/bottom
/turf/simulated/floor/holofloor/tiled/dark
name = "dark floor"
icon_state = "dark"

View File

@@ -38,6 +38,16 @@ var/global/list/holodeck_programs = list(
"courtroom" = new/datum/holodeck_program(/area/holodeck/source_courtroom, list('sound/music/traitor.ogg')),
"burntest" = new/datum/holodeck_program(/area/holodeck/source_burntest, list()),
"wildlifecarp" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()),
"chapel" = new/datum/holodeck_program(/area/holodeck/source_chapel,
list(
'sound/ambience/ambicha1.ogg',
'sound/ambience/ambicha2.ogg',
'sound/ambience/ambicha3.ogg',
'sound/ambience/ambicha4.ogg',
'sound/music/traitor.ogg'
)
),
"gym" = new/datum/holodeck_program(/area/holodeck/source_gym),
"turnoff" = new/datum/holodeck_program(/area/holodeck/source_plating, list())
)