Skip to content

Commit

Permalink
Fuel bay, areas, and much more
Browse files Browse the repository at this point in the history
Lots o' good stuff, tested adding to code atmos stuff meant to be individually edited within the editor and it works perfectly! Should save time and sanity. Added a massive fuel bay, areas for most of the op deck are up and did some other edits.
  • Loading branch information
Domic2 committed Apr 24, 2020
1 parent c9e0656 commit 917ae94
Show file tree
Hide file tree
Showing 16 changed files with 619 additions and 329 deletions.
510 changes: 351 additions & 159 deletions maps/perseverance/Perseverance_1.dmm

Large diffs are not rendered by default.

152 changes: 64 additions & 88 deletions maps/perseverance/Perseverance_2.dmm

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions maps/perseverance/XIV.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "code/XIV_minor.dm"
#include "code/XIV_clothes.dm"
#include "code/XIV_atmos.dm"

#include "Perseverance_1.dmm"
#include "Perseverance_2.dmm"
Expand Down
68 changes: 60 additions & 8 deletions maps/perseverance/XIV_areas.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
//XIV Perseverance rooms
//XIV Perseverance

//lift stuff

/area/ship/perseverance/lift
name = "\improper Perseverance Elevator"
Expand All @@ -11,23 +13,73 @@
icon_state = "sleep"
sound_env = SMALL_ENCLOSED

//rooms

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

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

/area/ship/perseverance/chall
name = "\improper Perseverance Central Hallway"
icon_state = "hallC3"
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
name = "\improper Perseverance canteen"
icon_state = "cafeteria"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/medbay
name = "\improper Perseverance Medical Bay"
icon_state = "medbay"
req_access = list(access_XIV, access_medical)
sound_env = SMALL_ENCLOSED

//engineering

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

/area/ship/perseverance/eng/atmos_out
name = "\improper Perseverance Atmospherics Distribution"
icon_state = "atmos"
req_access = list(access_XIV, access_engine)
sound_env = SMALL_ENCLOSED

/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

//hallways

/area/ship/perseverance/hall/chall
name = "\improper Perseverance Central Hallway"
icon_state = "hallC3"
sound_env = SMALL_ENCLOSED

/area/ship/perseverance/hall/phall
name = "\improper Perseverance Port Hallway"
icon_state = "hallF"
sound_env = SMALL_ENCLOSED

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

/area/ship/perseverance/hall/ehall
name = "\improper Perseverance Aft Hallway"
icon_state = "hallC3"
sound_env = SMALL_ENCLOSED
3 changes: 3 additions & 0 deletions maps/perseverance/XIV_define.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
company_name = "Xion Industries"
company_short = "Xion"

admin_levels = list()
empty_levels = list()
accessible_z_levels = list("1"=1,"2"=1)
overmap_size = 40
overmap_event_areas = 30
usable_email_tlds = list("freemail.net")
Expand Down
2 changes: 1 addition & 1 deletion maps/perseverance/XIV_elevators.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
name = "Operations Deck"
landmark_tag = "nav_cargo_lift_bottom"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/ship/perseverance/chall
base_area = /area/ship/perseverance/hall/chall
base_turf = /turf/simulated/floor/plating
6 changes: 3 additions & 3 deletions maps/perseverance/XIV_overmap.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/obj/effect/overmap/visitable/ship/Perseverance
name = "XIV Perseverance"
desc = "A bluespace-capable ateroid cracker owned by Xion Industries. This seems to be a converted Apog-class exploration ship."
desc = "A very old bluespace capable Apog-class exploration ship with Xion markings. It seems it underwent several major refits."
fore_dir = NORTH
start_x = 20
start_y = 20
start_x = 10
start_y = 10
vessel_mass = 20000
burn_delay = 5 SECONDS
base = TRUE
45 changes: 38 additions & 7 deletions maps/perseverance/XIV_setup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,49 @@
minor_announcement = new(new_sound = sound('sound/AI/torch/commandreport.ogg', volume = 45))

/datum/map/isolation/get_map_info()
return "You're aboard the <b>[station_name],</b> a repurposed frontier exploration frigate owned by Xion Industries on its way to a newly discovered mining hotspot \
somwhere in the Theia galaxy. This area is well within SCG borders, and you are expected to obey the law."
return "You're aboard the <b>[station_name],</b> an old but reliable frontier exploration frigate owned by Xion Industries sent out to locate new mining hotspots."
. += "This area of space is uncharted, away from SCG territory. You might encounter remote outposts or drifting hulks, but no recognized government holds claim on this sector."

/datum/map/isolation/send_welcome()
var/welcome_text = "<center><img src = sollogo.png /><br /><font size = 3><b>XIV Perseverance</b> Sensor Readings:</font><br>"
var/welcome_text = "<font size = 3><b>XIV Perseverance</b> Sensor Readings:</font><br>"
welcome_text += "Report generated on [stationdate2text()] at [stationtime2text()]</center><br /><br />"
welcome_text += "<hr>Current system:<br /><b>[system_name()]</b><br /><br>"

welcome_text += "Target system:<br /><b>[generate_system_name()]</b><br /><br>"
welcome_text += "Travel time to Sol:<br /><b>[rand(5,9)] days</b><br /><br>"
welcome_text += "Time since last port visit:<br /><b>[rand(8,9)] days</b><br /><hr>"
welcome_text += "<br>WARN: Critical system failures detected.<br />"
var/list/space_things = list()
var/obj/effect/overmap/visitable/torch = map_sectors["1"]

welcome_text += "Current Coordinates:<br /><b>10:10</b><br /><br>"
welcome_text += "Next system targeted for jump:<br /><b>[generate_system_name()]</b><br /><br>"
welcome_text += "Travel time to Sol:<br /><b>[rand(15,45)] days</b><br /><br>"
welcome_text += "Time since last port visit:<br /><b>[rand(40,200)] days</b><br /><hr>"
welcome_text += "Scan results show the following points of interest:<br />"

for(var/zlevel in map_sectors)
var/obj/effect/overmap/visitable/O = map_sectors[zlevel]
if(O.name == torch.name)
continue
if(istype(O, /obj/effect/overmap/visitable/ship/landable)) //Don't show shuttles
continue
if (O.hide_from_reports)
continue
space_things |= O

var/list/distress_calls
for(var/obj/effect/overmap/visitable/O in space_things)
var/location_desc = " at present co-ordinates."
if(O.loc != torch.loc)
var/bearing = round(90 - Atan2(O.x - torch.x, O.y - torch.y),5) //fucking triangles how do they work
if(bearing < 0)
bearing += 360
location_desc = ", bearing [bearing]."
if(O.has_distress_beacon)
LAZYADD(distress_calls, "[O.has_distress_beacon][location_desc]")
welcome_text += "<li>\A <b>[O.name]</b>[location_desc]</li>"

if(LAZYLEN(distress_calls))
welcome_text += "<br><b>Distress calls logged:</b><br>[jointext(distress_calls, "<br>")]<br>"
else
welcome_text += "<br>No distress calls logged.<br />"
welcome_text += "<hr>"

post_comm_message("XIV Perseverance Status Report", welcome_text)
Expand Down
4 changes: 4 additions & 0 deletions maps/perseverance/code/XIV_atmos.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// 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!

/obj/machinery/atmospherics/omni/mixer/XIV/fuelbay
tag_south = 2
5 changes: 2 additions & 3 deletions maps/perseverance/code/XIV_clothes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
worn_state = "xionsuit_s"
siemens_coefficient = 0.8
armor = list(
energy = ARMOR_ENERGY_SMALL,
rad = ARMOR_RAD_MINOR
)

/obj/item/clothing/under/XIV/xionplus
name = "manager's jumpsuit"
desc = "A special jumpsuit given to higher-ranking xion employees."
name = "xion padded suit"
desc = "A special suit given to higher-ranking xion employees."
icon = 'maps/perseverance/icons/clothes/XIVunder.dmi'
icon_state = "manage"
item_state = "manage"
Expand Down
78 changes: 54 additions & 24 deletions maps/perseverance/code/XIV_minor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
/obj/machinery/door/airlock/autoname/weapons
stripe_color = COLOR_RED

/obj/machinery/computer
icon = 'maps/perseverance/icons/obj/computer.dmi'
///obj/machinery/computer
// icon = 'maps/perseverance/icons/obj/computer.dmi'
// uncomment once derp does the sprites

/obj/item/device/radio/headset/contractor/alt
name = "contractor headset"
Expand Down Expand Up @@ -56,7 +57,7 @@
icon = 'maps/perseverance/icons/obj/multitool.dmi'
icon_state = "multitool"

// The ship's been out of power for a bit, these are fairly good at showcasing that
// The ship has (furure code) been out of power for a bit, these are fairly good at showcasing that

/obj/item/weapon/cell/apc/empty
charge = 0
Expand All @@ -70,23 +71,8 @@
/obj/machinery/power/apc/XIV/low
cell_type = /obj/item/weapon/cell/apc/low

/obj/structure/closet/secure_closet/engineering_personal/XIV
name = "mechanic's locker"
req_access = list(access_engine_equip)
closet_appearance = /decl/closet_appearance/secure_closet/engineering

/obj/structure/closet/secure_closet/engineering_personal/XIV/WillContain()
return list(
new/datum/atom_creator/weighted(list(/obj/item/clothing/accessory/storage/brown_vest = 70, /obj/item/clothing/accessory/storage/webbing = 30)),
new/datum/atom_creator/weighted(list(/obj/item/weapon/storage/backpack/industrial, /obj/item/weapon/storage/backpack/satchel/eng)),
new/datum/atom_creator/simple(/obj/item/weapon/storage/backpack/dufflebag/eng, 50),
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/device/radio/headset/contractor/alt,
/obj/item/clothing/under/XIV/xion,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/head/welding,
/obj/item/taperoll/engineering
)
/obj/machinery/power/apc/high/empty
cell_type = /obj/item/weapon/cell/high/empty

/obj/structure/wall_frame/hull/white
paint_color = COLOR_WHITE
Expand All @@ -106,8 +92,52 @@
/turf/simulated/wall/r_wall/white
paint_color = COLOR_WHITE

/turf/simulated/wall/ocp_wall/white
paint_color = COLOR_WHITE
/turf/simulated/wall/r_wall/orange //for fuel tanks
paint_color = COLOR_DARK_ORANGE

/turf/simulated/wall/ocp_wall/orange
paint_color = COLOR_DARK_ORANGE

/obj/structure/closet/secure_closet/freezer/kitchen/XIV //really? REALLY? COME ON REALLY???
req_access = list()

// This is for the multi-z gas tanks

/turf/simulated/open/XIV/airmix
initial_gas = list(GAS_OXYGEN = MOLES_O2ATMOS, GAS_NITROGEN = MOLES_N2ATMOS)

/turf/simulated/open/XIV/hydrogen
initial_gas = list(GAS_HYDROGEN = ATMOSTANK_HYDROGEN)

/turf/simulated/open/XIV/oxygen
initial_gas = list(GAS_OXYGEN = ATMOSTANK_OXYGEN)

/turf/simulated/open/XIV/carbon_dioxide
initial_gas = list(GAS_CO2 = ATMOSTANK_CO2)

/turf/simulated/open/XIV/airless //for the aft fuel bay
initial_gas = null

//SMES

// Main Engine output SMES, it's empty
/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)
_input_maxed = TRUE
_output_maxed = TRUE
_input_on = TRUE
_output_on = TRUE
_fully_charged = TRUE

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

/obj/structure/closet/secure_closet/freezer/kitchen/XIV
req_access = list()
// Main Engine internal SMES, for powering the gyrotron and the actual room, doesn't need super high capacity or I/O
/obj/machinery/power/smes/buildable/preset/XIV/engine_main
_input_maxed = TRUE
_output_maxed = TRUE
_input_on = TRUE
_output_on = TRUE
_fully_charged = TRUE
Binary file modified maps/perseverance/icons/clothes/XIVunder.dmi
Binary file not shown.
10 changes: 5 additions & 5 deletions maps/perseverance/jobs/XIV_IDs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
extra_details = list("goldstripe")
color = "#ccecff"

/obj/item/weapon/card/id/XIV/navigation
/obj/item/weapon/card/id/XIV/amanager
name = "identification card"
desc = "An identification card issued to contracted navigation officers."
job_access_type = /datum/job/navigation
desc = "An identification card issued to contracted Assistant Managers."
job_access_type = /datum/job/amanager
detail_color = COLOR_COMMAND_BLUE

/obj/item/weapon/card/id/XIV/mechanic
/obj/item/weapon/card/id/XIV/engineer
name = "identification card"
desc = "An identification card issued to contracted mechanics."
job_access_type = /datum/job/techie
job_access_type = /datum/job/engineer
detail_color = COLOR_SUN

/obj/item/weapon/card/id/XIV/doctor
Expand Down
Loading

0 comments on commit 917ae94

Please sign in to comment.