Skip to content

Commit

Permalink
Progress
Browse files Browse the repository at this point in the history
so far
  • Loading branch information
Domic2 committed Sep 5, 2020
1 parent 834898e commit b643a23
Show file tree
Hide file tree
Showing 17 changed files with 4,613 additions and 2,015 deletions.
1,818 changes: 1,189 additions & 629 deletions maps/perseverance/Perseverance_1.dmm

Large diffs are not rendered by default.

1,470 changes: 1,033 additions & 437 deletions maps/perseverance/Perseverance_2.dmm

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion maps/perseverance/XIV.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Made by Domic(mapping, bad coding, spriting), additional credits to: Sibg (mapping) and DoctorDerp (spriting). If you have any questions or feedback, ping me on discord (Domic#7513)
//Made by Domic(mapping, bad coding, spriting), additional credits to: Sibg (mapping), S m i l e (spriting) and DoctorDerp (spriting).

#if !defined(using_map_DATUM)
#include "XIV_unit_testing.dm"
Expand All @@ -21,6 +21,7 @@
#include "code/XIV_blackbox.dm"
#include "code/XIV_radiomodified.dm"
#include "code/XIV_bsdrive.dm"
#include "code/XIV_loadouts.dm"

#include "Perseverance_1.dmm"
#include "Perseverance_2.dmm"
Expand Down
183 changes: 161 additions & 22 deletions maps/perseverance/XIV_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,45 @@
/area/ship/perseverance/lift
name = "\improper Perseverance Central Elevator"
icon_state = "shuttlered"
sound_env = SMALL_ENCLOSED

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

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

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

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

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

//midship

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

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

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

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

/area/ship/perseverance/midship/chemistry
name = "\improper Perseverance Chemistry"
Expand All @@ -70,12 +60,10 @@
/area/ship/perseverance/midship/bathroom
name = "\improper Perseverance Bathroom"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

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

/area/ship/perseverance/midship/cpod
name = "\improper Perseverance Cargo Pod"
Expand All @@ -85,13 +73,12 @@
/area/ship/perseverance/midship/hydroponics
name = "\improper Perseverance Hydroponics"
icon_state = "hydro"
req_access = list(access_XIV, access_research)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/midship/xenoflora
name = "\improper Perseverance Xenoflora Lab"
icon_state = "xeno_lab"
sound_env = SMALL_ENCLOSED
req_access = list(access_XIV, access_research)

//cargo bay

Expand Down Expand Up @@ -121,26 +108,70 @@
/area/ship/perseverance/eng/atmos_out
name = "\improper Perseverance Atmospherics Distribution"
icon_state = "atmos"
req_access = list(access_XIV, access_engine)
req_access = list(access_XIV, access_atmospherics)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/eng/atmos_injection
name = "\improper Perseverance Atmospherics Air Injection"
icon_state = "atmos"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED
req_access = list(access_XIV, access_atmospherics)

/area/ship/perseverance/eng/atmos_in
name = "\improper Perseverance Atmospherics Filtering"
icon_state = "atmos"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED
req_access = list(access_XIV, access_atmospherics)
sound_env = LARGE_ENCLOSED

/area/ship/perseverance/eng/atmos_mixing
name = "\improper Perseverance Atmospherics Mixing"
icon_state = "atmos"
req_access = list(access_XIV, access_atmospherics)

/area/ship/perseverance/eng/workshop
name = "\improper Perseverance Engineering Workshop"
icon_state = "engine"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/eng/atmos_workshop
name = "\improper Perseverance Atmospherics Workshop"
icon_state = "atmos"
req_access = list(access_XIV, access_atmospherics)

/area/ship/perseverance/eng/fuelbay
name = "\improper Perseverance Central Fuel Bay"
icon_state = "engine"
req_access = list(access_XIV, access_atmospherics, access_engine)
has_gravity = FALSE

/area/ship/perseverance/eng/fuelbay/port
name = "\improper Perseverance Port Fuel Bay"
icon_state = "engineering"

/area/ship/perseverance/eng/fuelbay/starboard
name = "\improper Perseverance Starboard Fuel Bay"
icon_state = "engineering"

/area/ship/perseverance/eng/fuelbay_monitoring
name = "\improper Perseverance Fuel Bay Monitoring"
icon_state = "atmos"
req_access = list(access_XIV, access_atmospherics)

/area/ship/perseverance/eng/fuelbay_monitoring_upper
name = "\improper Perseverance Upper fuel Bay Monitoring"
icon_state = "atmos"
req_access = list(access_XIV, access_atmospherics)

/area/ship/perseverance/eng/fuelbay/upper
name = "\improper Perseverance Upper Central Fuel Bay"
icon_state = "engine"

/area/ship/perseverance/eng/fuelbay/port_upper
name = "\improper Perseverance Upper Port Fuel Bay"
icon_state = "engineering"

/area/ship/perseverance/eng/fuelbay/starboard_upper
name = "\improper Perseverance Upper Starboard Fuel Bay"
icon_state = "engineering"

//hallways

Expand All @@ -153,11 +184,13 @@
name = "\improper Perseverance Port Hallway"
icon_state = "hallF"
sound_env = LARGE_ENCLOSED
color = COLOR_BOTTLE_GREEN

/area/ship/perseverance/hall/shall
name = "\improper Perseverance Starboard Hallway"
icon_state = "hallA"
sound_env = LARGE_ENCLOSED
color = COLOR_BOTTLE_GREEN

/area/ship/perseverance/hall/ehall
name = "\improper Perseverance Aft Hallway"
Expand Down Expand Up @@ -189,7 +222,7 @@
/area/ship/perseverance/bridge/ahallway
name = "\improper Perseverance Bridge Aft Hallway"
icon_state = "hallA"
req_access = list(access_XIV, access_bridge)
req_access = list(access_XIV)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/storage
Expand All @@ -204,6 +237,12 @@
req_access = list(access_XIV, access_network)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/study
name = "\improper Perseverance Expedition Leader's Study"
icon_state = "tcomsatcham"
req_access = list(access_XIV, access_network)
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/bridge/aisat
name = "\improper Perseverance AI Chamber"
icon_state = "ai_foyer"
Expand All @@ -226,4 +265,104 @@ area/ship/perseverance/bridge/bluespacedrive
name = "\improper Perseverance Bluespace Drive"
icon_state = "engineering"
color = COLOR_BLUE_LIGHT
req_access = list(access_XIV, access_engine, access_bridge)
req_access = list(access_XIV, access_engine, access_bridge)

//S.E.C.

area/ship/perseverance/sec
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
sound_env = SMALL_ENCLOSED

//bottom
area/ship/perseverance/sec/bot/paft
name = "Perseverance Port Aft Sub-Exterior Causeway"
icon_state = "apmaint"

area/ship/perseverance/sec/bot/saft
name = "Perseverance Starboard Aft Sub-Exterior Causeway"
icon_state = "asmaint"

area/ship/perseverance/sec/bot/pstore
name = "Perseverance Port Engineering Storage Room"
icon_state = "pmaint"

area/ship/perseverance/sec/bot/sstore
name = "Perseverance Starboard Engineering Storage Room"
icon_state = "smaint"

area/ship/perseverance/sec/bot/pmid
name = "Perseverance Port Mid Sub-Exterior Causeway"
icon_state = "pmaint"

area/ship/perseverance/sec/bot/smid
name = "Perseverance Starboard Mid Sub-Exterior Causeway"
icon_state = "smaint"

area/ship/perseverance/sec/bot/pfore
name = "Perseverance Port Fore Sub-Exterior Causeway"
icon_state = "fpmaint"

area/ship/perseverance/sec/bot/sfore
name = "Perseverance Starboard Fore Sub-Exterior Causeway"
icon_state = "fsmaint"

//top
area/ship/perseverance/sec/top/paft
name = "Perseverance Port Upper Aft Sub-Exterior Causeway"
icon_state = "apmaint"

area/ship/perseverance/sec/top/saft
name = "Perseverance Starboard Upper Aft Sub-Exterior Causeway"
icon_state = "asmaint"

area/ship/perseverance/sec/top/pmid
name = "Perseverance Port Upper Mid Sub-Exterior Causeway"
icon_state = "pmaint"

area/ship/perseverance/sec/top/smid
name = "Perseverance Starboard Upper Mid Sub-Exterior Causeway"
icon_state = "smaint"

area/ship/perseverance/sec/top/pfore
name = "Perseverance Port Upper Fore Sub-Exterior Causeway"
icon_state = "fpmaint"

area/ship/perseverance/sec/top/sfore
name = "Perseverance Starboard Upper Fore Sub-Exterior Causeway"
icon_state = "fsmaint"

//Ventilation

area/ship/perseverance/ventilation
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
sound_env = SMALL_ENCLOSED

area/ship/perseverance/ventilation/blue
color = COLOR_BLUE_LIGHT

area/ship/perseverance/ventilation/blue/aft
name = "Perseverance Aft Supply Ventilation Duct"
icon_state = "amaint"

area/ship/perseverance/ventilation/blue/mid
name = "Perseverance Mid Supply Ventilation Duct"
icon_state = "maintcentral"

area/ship/perseverance/ventilation/blue/fore
name = "Perseverance Fore Supply Ventilation Duct"
icon_state = "fmaint"

area/ship/perseverance/ventilation/red
color = COLOR_RED

area/ship/perseverance/ventilation/red/aft
name = "Perseverance Aft Filtering Ventilation Duct"
icon_state = "amaint"

area/ship/perseverance/ventilation/red/mid
name = "Perseverance Mid Filtering Ventilation Duct"
icon_state = "maintcentral"

area/ship/perseverance/ventilation/red/fore
name = "Perseverance Fore Filtering Ventilation Duct"
icon_state = "fmaint"
2 changes: 1 addition & 1 deletion maps/perseverance/XIV_overmap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name = "XIV Perseverance"
desc = "A very old bluespace capable Pravda-class exploration ship with Xion markings. It seems it underwent several major refits."
fore_dir = NORTH
vessel_mass = 20000
vessel_mass = 100000
burn_delay = 5 SECONDS
base = TRUE
Loading

0 comments on commit b643a23

Please sign in to comment.