Skip to content

Commit

Permalink
Merge pull request VoiceInYourHead#2 from SWIFTWAVE0/main
Browse files Browse the repository at this point in the history
вфы
  • Loading branch information
800maximum123 authored Apr 6, 2024
2 parents 91ec0ca + 3586987 commit 98dbe7a
Show file tree
Hide file tree
Showing 8 changed files with 761 additions and 67 deletions.
143 changes: 76 additions & 67 deletions maps/away/facility/facility.dmm

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions maps/away/utility_shuttle_1/shuttles.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/obj/effect/overmap/visitable/ship/landable/utility_shuttle_1
name = "Utility Shuttle"
shuttle = "US1"
desc = "Small capsule-like spacecraft with minimum capacity."
max_speed = 1/(2 SECONDS)
burn_delay = 1 SECONDS
vessel_mass = 1500
integrity_failure_cap = 30
skill_needed = SKILL_BASIC
vessel_size = SHIP_SIZE_TINY
fore_dir = NORTH
color = "#6e0000"
hide_from_reports = TRUE
known = 0
initial_restricted_waypoints = list(
"Bluespace Residue" = list("us1")
)


/obj/machinery/computer/shuttle_control/explore/us1
name = "shuttle control console"
shuttle_tag = "US1"

/datum/shuttle/autodock/overmap/us1
name = "US1"
range = 0 //range = 1
shuttle_area = /area/ship/utility_shuttle_1
defer_initialisation = TRUE
flags = SHUTTLE_FLAGS_PROCESS
skill_needed = SKILL_BASIC
ceiling_type = /turf/simulated/floor/shuttle_ceiling
current_location = "us1"
31 changes: 31 additions & 0 deletions maps/away/utility_shuttle_1/us1.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#include "shuttles.dm"


/obj/effect/overmap/visitable/sector/utility_shuttle_1
name = "Bluespace Residue"
desc = "/ERROR/."
icon_state = "event"
hide_from_reports = TRUE
sector_flags = OVERMAP_SECTOR_IN_SPACE | OVERMAP_SECTOR_UNTARGETABLE

/obj/effect/shuttle_landmark/us1
name = "Bluespace Residue"
landmark_tag = "us1"
docking_controller = "us1_shuttle_dock_airlock"
base_turf = /turf/space
movable_flags = MOVABLE_FLAG_EFFECTMOVE

/datum/map_template/ruin/away_site/us1
name = "Utility Shuttle 1"
id = "utility_shuttle_1"
description = "Small capsule-like spacecraft with minimum capacity."
suffixes = list("utility_shuttle_1/us1.dmm")
spawn_cost = 1000
area_usage_test_exempted_root_areas = list(/area/ship/utility_shuttle_1)
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/us1)

/area/ship/utility_shuttle_1
name = "Shuttle's interior"
icon_state = "bridge"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
req_access = list()
279 changes: 279 additions & 0 deletions maps/away/utility_shuttle_1/us1.dmm

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions maps/away/utility_shuttle_2/shuttles.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/obj/effect/overmap/visitable/ship/landable/utility_shuttle_2
name = "Utility Shuttle"
shuttle = "US2"
desc = "Small capsule-like spacecraft with minimum capacity."
max_speed = 1/(2 SECONDS)
burn_delay = 1 SECONDS
vessel_mass = 1500
integrity_failure_cap = 30
skill_needed = SKILL_BASIC
vessel_size = SHIP_SIZE_TINY
fore_dir = NORTH
color = "#6e0000"
hide_from_reports = TRUE
known = 0
initial_restricted_waypoints = list(
"Bluespace Residue" = list("us2")
)


/obj/machinery/computer/shuttle_control/explore/us2
name = "shuttle control console"
shuttle_tag = "US2"

/datum/shuttle/autodock/overmap/us2
name = "US2"
range = 0 //range = 1
shuttle_area = /area/ship/utility_shuttle_2
defer_initialisation = TRUE
flags = SHUTTLE_FLAGS_PROCESS
skill_needed = SKILL_BASIC
ceiling_type = /turf/simulated/floor/shuttle_ceiling
current_location = "us2"
31 changes: 31 additions & 0 deletions maps/away/utility_shuttle_2/us2.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#include "shuttles.dm"


/obj/effect/overmap/visitable/sector/utility_shuttle_2
name = "Bluespace Residue"
desc = "/ERROR/."
icon_state = "event"
hide_from_reports = TRUE
sector_flags = OVERMAP_SECTOR_IN_SPACE | OVERMAP_SECTOR_UNTARGETABLE

/obj/effect/shuttle_landmark/us2
name = "Bluespace Residue"
landmark_tag = "us2"
docking_controller = "us2_shuttle_dock_airlock"
base_turf = /turf/space
movable_flags = MOVABLE_FLAG_EFFECTMOVE

/datum/map_template/ruin/away_site/us2
name = "Utility Shuttle 2"
id = "utility_shuttle_2"
description = "Small capsule-like spacecraft with minimum capacity."
suffixes = list("utility_shuttle_2/us2.dmm")
spawn_cost = 1000
area_usage_test_exempted_root_areas = list(/area/ship/utility_shuttle_2)
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/us2)

/area/ship/utility_shuttle_2
name = "Shuttle's interior 2"
icon_state = "bridge"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
req_access = list()
278 changes: 278 additions & 0 deletions maps/away/utility_shuttle_2/us2.dmm

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions maps/torch/torch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@
#include "../away/constructed_station/main.dm"
#include "../away/snow_cage/snow_cage.dm"
#include "../away/rancho/farm.dm"
#include "../away/utility_shuttle_1/us1.dm"
#include "../away/utility_shuttle_2/us2.dm"

//alternative future stuff
#include "../away/airfield/airfield.dm"
Expand Down

0 comments on commit 98dbe7a

Please sign in to comment.