Skip to content

Commit

Permalink
bridg
Browse files Browse the repository at this point in the history
  • Loading branch information
Domic2 committed Jul 18, 2020
1 parent 22f6c45 commit 02134f5
Show file tree
Hide file tree
Showing 7 changed files with 496 additions and 351 deletions.
430 changes: 216 additions & 214 deletions maps/perseverance/Perseverance_1.dmm

Large diffs are not rendered by default.

292 changes: 188 additions & 104 deletions maps/perseverance/Perseverance_2.dmm

Large diffs are not rendered by default.

80 changes: 62 additions & 18 deletions maps/perseverance/XIV_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/lifttop
name = "\improper Perseverance Central Elevator shaft"
name = "\improper Perseverance Central Elevator Shaft"
icon_state = "shuttlered"
sound_env = SMALL_ENCLOSED

Expand All @@ -18,7 +18,7 @@
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/whouselifttop
name = "\improper Perseverance Cargo Elevator shaft"
name = "\improper Perseverance Cargo Elevator Shaft"
icon_state = "shuttlered"
sound_env = SMALL_ENCLOSED

Expand All @@ -28,50 +28,44 @@
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/englifttop
name = "\improper Perseverance Engineering Elevator shaft"
name = "\improper Perseverance Engineering Elevator Shaft"
icon_state = "shuttlered"
sound_env = SMALL_ENCLOSED

//rooms
//midship

/area/ship/perseverance/cryos
/area/ship/perseverance/midship/cryos
name = "\improper Perseverance Starboard Cryogenics"
icon_state = "crew_quarters"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/cryop
/area/ship/perseverance/midship/cryop
name = "\improper Perseverance Port Cryogenics"
icon_state = "Sleep"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/navigation
name = "\improper Perseverance Navigation Center"
icon_state = "shuttle"
req_access = list(access_XIV, access_bridge)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/canteen
/area/ship/perseverance/midship/canteen
name = "\improper Perseverance canteen"
icon_state = "cafeteria"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/infirmary
/area/ship/perseverance/midship/infirmary
name = "\improper Perseverance Infirmary"
icon_state = "medbay"
req_access = list(access_XIV)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bathroom
/area/ship/perseverance/midship/bathroom
name = "\improper Perseverance Bathroom"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/storage
/area/ship/perseverance/midship/storage
name = "\improper Perseverance General Storage"
icon_state = "storage"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/cpod
/area/ship/perseverance/midship/cpod
name = "\improper Perseverance Cargo Pod"
icon_state = "shuttle"
sound_env = SMALL_ENCLOSED
Expand Down Expand Up @@ -141,4 +135,54 @@

/area/ship/perseverance/hall/ehall/starboard
name = "\improper Perseverance Starboard Aft Hallway"
icon_state = "hallA"
icon_state = "hallA"

//bridge

/area/ship/perseverance/bridge/navigation
name = "\improper Perseverance Navigation Center"
icon_state = "shuttle"
req_access = list(access_XIV, access_bridge)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/fhallway
name = "\improper Perseverance Bridge Fore Hallway"
icon_state = "hallF"
req_access = list(access_XIV, access_bridge)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/ahallway
name = "\improper Perseverance Bridge Aft Hallway"
icon_state = "hallA"
req_access = list(access_XIV, access_bridge)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/storage
name = "\improper Perseverance Bridge Storage"
icon_state = "quartstorage"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/comms
name = "\improper Perseverance Communications"
icon_state = "tcomsatcham"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/aisat
name = "\improper Perseverance AI Chamber"
icon_state = "ai_foyer"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/aicore
name = "\improper Perseverance AI Core"
icon_state = "ai_chamber"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/selfdestruct
name = "\improper Perseverance Ship Destruct System"
icon_state = "nuke_storage"
req_access = list(access_XIV, access_bridge)
area_flags = AREA_FLAG_IS_NOT_PERSISTENT
4 changes: 2 additions & 2 deletions maps/perseverance/code/XIV_atmos.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// I hate the map editor when it comes to linking airlocks, pumps and atmos, this should be an easy way of tracking and setting everything up without losing my sanity, copy n paste for the win, hope this works!
// I hate the map editor when it comes to linking airlocks, pumps and such, this should be an easy way of tracking and setting everything up without losing my sanity, copy n paste for the win, hope this works!

/obj/machinery/atmospherics/unary/vent_pump/XIV/ventilation/output
use_power = 1
icon_state = "map_vent_out"
external_pressure_bound = 1.2 * ONE_ATMOSPHERE

/obj/machinery/atmospherics/unary/vent_pump/XIV/ventilation/syphon
/obj/machinery/atmospherics/unary/vent_pump/XIV/ventilation/siphon
pump_direction = 0
use_power = 1
icon_state = "map_vent_in"
Expand Down
4 changes: 2 additions & 2 deletions maps/perseverance/code/XIV_blackbox.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define STATION_Z 2
#define STATION_Z 1
#define TELECOMM_Z 1

/obj/machinery/telecomms/server/blackbox
Expand Down Expand Up @@ -108,7 +108,7 @@
log.name = "data packet ([md5(identifier)])"


//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
//-----------------------------------------------------------------------------------------------------------//

obj/machinery/computer/telecomms/server/blackbox
req_access = list()
Expand Down
35 changes: 25 additions & 10 deletions maps/perseverance/code/XIV_minor.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
//all the minor overrides and some new stuff

/decl/flooring/reinforced/redgrid//blackgrid is black instead of red and I have no idea why, but I'm not really willing to go diggin through this damned code to find out becauseIcouldntfinditafterafewhours
name = "processing strata"
icon = 'icons/turf/flooring/circuit.dmi'
icon_base = "rcircuit"
build_type = null
flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK | TURF_REMOVE_WRENCH
can_paint = 1
can_engrave = FALSE

/turf/simulated/floor/redgrid
name = "mainframe floor"
icon = 'icons/turf/flooring/circuit.dmi'
icon_state = "rcircuit"
light_outer_range = 2
light_max_bright = 2
light_color = COLOR_RED
initial_flooring = /decl/flooring/reinforced/redgrid

/obj/machinery/door/airlock/hatch/autoname/command
stripe_color = COLOR_COMMAND_BLUE

Expand Down Expand Up @@ -192,29 +210,26 @@

//SMES

// Main Engine output SMES, plus empty version
/obj/machinery/power/smes/buildable/preset/XIV/engine_main
uncreated_component_parts = list(
/obj/item/weapon/stock_parts/smes_coil/super_io = 2,
/obj/item/weapon/stock_parts/smes_coil/super_capacity = 1)
/obj/machinery/power/smes/buildable/preset/XIV
_input_maxed = TRUE
_output_maxed = TRUE
_input_on = TRUE
_output_on = TRUE
_fully_charged = TRUE

// Main Engine output SMES, plus empty version
/obj/machinery/power/smes/buildable/preset/XIV/engine_main
uncreated_component_parts = list(
/obj/item/weapon/stock_parts/smes_coil/super_io = 2,
/obj/item/weapon/stock_parts/smes_coil/super_capacity = 1)

/obj/machinery/power/smes/buildable/preset/XIV/engine_main/empty
_fully_charged = FALSE

// Main Engine internal SMES, for powering the gyrotron and the actual room, doesn't need super high capacity, but it does need I/O
/obj/machinery/power/smes/buildable/preset/XIV/engine_central
uncreated_component_parts = list(
/obj/item/weapon/stock_parts/smes_coil/super_io = 1)
_input_maxed = TRUE
_output_maxed = TRUE
_input_on = TRUE
_output_on = TRUE
_fully_charged = TRUE

//Crates

Expand Down
2 changes: 1 addition & 1 deletion maps/perseverance/jobs/XIV_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/datum/species/human/mule = list()
)

allowed_jobs = list(/datum/job/manager, /datum/job/amanager, /datum/job/engineer, /datum/job/doctor, /datum/job/science
allowed_jobs = list(/datum/job/manager, /datum/job/amanager, /datum/job/engineer, /datum/job/doctor, /datum/job/science, /datum/job/ai
) //this actually also sets in what order the jobs show on the occupation screen, neat

access_modify_region = list(
Expand Down

0 comments on commit 02134f5

Please sign in to comment.