Skip to content

Commit

Permalink
Map Stuff
Browse files Browse the repository at this point in the history
Map stuff, airlocks, fuel bay, minor elevator changes, and much much more
  • Loading branch information
Domic2 committed May 7, 2020
1 parent 917ae94 commit cbcaa14
Show file tree
Hide file tree
Showing 8 changed files with 271 additions and 217 deletions.
289 changes: 155 additions & 134 deletions maps/perseverance/Perseverance_1.dmm

Large diffs are not rendered by default.

150 changes: 77 additions & 73 deletions maps/perseverance/Perseverance_2.dmm

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions maps/perseverance/XIV_elevators.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
name = "Cargo Lift"
shuttle_area = /area/ship/perseverance/lift
warmup_time = 3
waypoint_station = "nav_cargo_lift_top"
waypoint_offsite = "nav_cargo_lift_bottom"
waypoint_station = "nav_cargo_lift_bottom"
waypoint_offsite = "nav_cargo_lift_top"
sound_takeoff = 'sound/effects/lift_heavy_start.ogg'
sound_landing = 'sound/effects/lift_heavy_stop.ogg'
ceiling_type = null
Expand All @@ -21,12 +21,12 @@
/obj/effect/shuttle_landmark/lift/cargo_top
name = "Ventilation Deck"
landmark_tag = "nav_cargo_lift_top"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/ship/perseverance/lifttop
base_turf = /turf/simulated/open

/obj/effect/shuttle_landmark/lift/cargo_bottom
name = "Operations Deck"
landmark_tag = "nav_cargo_lift_bottom"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/ship/perseverance/hall/chall
base_turf = /turf/simulated/floor/plating
2 changes: 1 addition & 1 deletion maps/perseverance/XIV_overmap.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/effect/overmap/visitable/ship/Perseverance
name = "XIV Perseverance"
desc = "A very old bluespace capable Apog-class exploration ship with Xion markings. It seems it underwent several major refits."
desc = "A very old bluespace capable Pravda-class exploration ship with Xion markings. It seems it underwent several major refits."
fore_dir = NORTH
start_x = 10
start_y = 10
Expand Down
35 changes: 32 additions & 3 deletions maps/perseverance/code/XIV_minor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
/obj/machinery/door/airlock/autoname/engineering
stripe_color = COLOR_AMBER

/obj/machinery/door/airlock/autoname/atmos
stripe_color = COLOR_CYAN

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

Expand All @@ -22,7 +25,7 @@
// icon = 'maps/perseverance/icons/obj/computer.dmi'
// uncomment once derp does the sprites

/obj/item/device/radio/headset/contractor/alt
/obj/item/device/radio/headset/contractor
name = "contractor headset"
desc = "A headset often used by contractors on ships where having a full communications system is simply too expensive."
item_state = "cargo_headset" //not alt headset sprite because they look bad on other species
Expand Down Expand Up @@ -74,11 +77,22 @@
/obj/machinery/power/apc/high/empty
cell_type = /obj/item/weapon/cell/high/empty

// Need these for wallframe spawners

/obj/structure/wall_frame/hull/white
paint_color = COLOR_WHITE

// Setting these two up as hull should make them do the special space-facing decay effet. Addendum: it does! It actually does! Seems to work on area check, which makes sense
/obj/structure/wall_frame/orange
paint_color = COLOR_DARK_ORANGE

// For the fuel bay

/obj/effect/wallframe_spawn/reinforced/orange
name = "white reinforced wall frame window spawner"
icon_state = "r-wingrille"
frame_path = /obj/structure/wall_frame/orange

// Setting these two up as hull should make them do the special space-facing decay effet. Addendum: it does! It actually does! Seems to work on area check
/obj/effect/wallframe_spawn/reinforced/hull/white
name = "white reinforced wall frame window spawner"
icon_state = "r-wingrille"
Expand Down Expand Up @@ -140,4 +154,19 @@
_output_maxed = TRUE
_input_on = TRUE
_output_on = TRUE
_fully_charged = TRUE
_fully_charged = TRUE

// Autoname multitile glass airlocks
/obj/machinery/door/airlock/multi_tile/glass/autoname

/obj/machinery/door/airlock/multi_tile/glass/autoname/New()
var/area/A = get_area(src)
name = A.name
..()

/obj/machinery/door/airlock/multi_tile/glass/autoname/engineering
door_color = COLOR_AMBER
stripe_color = COLOR_RED

/obj/machinery/door/airlock/multi_tile/glass/autoname/atmos
stripe_color = COLOR_CYAN
2 changes: 1 addition & 1 deletion maps/perseverance/jobs/XIV_jobjobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
supervisors = "the Operations Manager"
selection_color = COLOR_DARK_BROWN
economic_power = 2
alt_titles = list()
alt_titles = list("Senior Engineer")
minimal_player_age = 0
ideal_character_age = 24
outfit_type = /decl/hierarchy/outfit/job/isolation/techie
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/techie, /datum/job/doctor, /datum/job/fabtec
allowed_jobs = list(/datum/job/manager, /datum/job/amanager, /datum/job/engineer, /datum/job/doctor, /datum/job/fabtec
) //this actually also sets in what order the jobs show on the occupation screen, neat, assistant is an exception though

access_modify_region = list(
Expand Down
2 changes: 1 addition & 1 deletion maps/perseverance/jobs/XIV_outfits.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/isolation
l_ear = /obj/item/device/radio/headset/contractor/alt
l_ear = /obj/item/device/radio/headset/contractor
flags = OUTFIT_HAS_BACKPACK
pda_slot = slot_l_store
pda_type = /obj/item/device/radio //WE ARE POOR OKAY?
Expand Down

0 comments on commit cbcaa14

Please sign in to comment.