Browse Source

Merge pull request #2 from Paxilmaniac/very-cool-map

Very cool map
master
‮ittaG ordnasselA 7 months ago
committed by GitHub
parent
commit
dbf697f31d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 78551 additions and 6 deletions
  1. +1
    -0
      _maps/_basemap.dm
  2. +73140
    -0
      _maps/map_files/ShipStation/ShipStation.dmm
  3. +5
    -0
      _maps/shipstation.json
  4. +5364
    -0
      _maps/shuttles/station_ship.dmm
  5. +3
    -4
      code/datums/components/stationloving.dm
  6. +6
    -0
      code/datums/shuttles.dm
  7. +4
    -0
      code/game/area/areas/shuttles.dm
  8. +2
    -2
      code/game/machinery/computer/communications.dm
  9. +20
    -0
      code/modules/shuttle/shipstation.dm
  10. +5
    -0
      config/maps.txt
  11. +1
    -0
      tgstation.dme

+ 1
- 0
_maps/_basemap.dm View File

@ -11,6 +11,7 @@
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\IceBoxStation\IceBoxStation.dmm"
#include "map_files\ShipStation\ShipStation.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"


+ 73140
- 0
_maps/map_files/ShipStation/ShipStation.dmm
File diff suppressed because it is too large
View File


+ 5
- 0
_maps/shipstation.json View File

@ -0,0 +1,5 @@
{
"map_name": "ShipStation",
"map_path": "map_files/ShipStation",
"map_file": "ShipStation.dmm"
}

+ 5364
- 0
_maps/shuttles/station_ship.dmm
File diff suppressed because it is too large
View File


+ 3
- 4
code/datums/components/stationloving.dm View File

@ -63,7 +63,7 @@
return COMPONENT_BLOCK_MARK_RETRIEVAL
/datum/component/stationloving/proc/in_bounds()
var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4))
var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4, /area/shuttle/shipstation))
var/static/list/disallowed_centcom_areas = typecacheof(list(/area/abductor_ship, /area/awaymission/errorroom))
var/turf/T = get_turf(parent)
if (!T)
@ -75,9 +75,8 @@
if (is_type_in_typecache(A, disallowed_centcom_areas))
return FALSE
return TRUE
if (is_reserved_level(T.z))
if (is_type_in_typecache(A, allowed_shuttles))
return TRUE
if (is_type_in_typecache(A, allowed_shuttles))
return TRUE
return FALSE


+ 6
- 0
code/datums/shuttles.dm View File

@ -635,3 +635,9 @@
/datum/map_template/shuttle/snowdin/excavation
suffix = "excavation"
name = "Snowdin Excavation Elevator"
/datum/map_template/shuttle/shipstation
port_id = "station"
can_be_bought = FALSE
suffix = "ship"
name = "NTSS 'Companionship'"

+ 4
- 0
code/game/area/areas/shuttles.dm View File

@ -193,3 +193,7 @@
/area/shuttle/caravan/freighter3
name = "Tiny Freighter"
/area/shuttle/shipstation
name = "NTSS 'Companionship'"
requires_power = TRUE

+ 2
- 2
code/game/machinery/computer/communications.dm View File

@ -48,7 +48,7 @@
return
if(!usr.canUseTopic(src, !issilicon(usr)))
return
if(!is_station_level(z) && !is_reserved_level(z)) //Can only use in transit and on SS13
if(!is_station_level(z) && !is_reserved_level(z) && !is_centcom_level(z) && !istype(get_area(src), /area/shuttle/shipstation)) //Can only use in transit, centcom and on SS13
to_chat(usr, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
return
usr.set_machine(src)
@ -436,7 +436,7 @@
/obj/machinery/computer/communications/ui_interact(mob/user)
. = ..()
if (z > 6)
if (z > 6 && !istype(get_area(src), /area/shuttle/shipstation))
to_chat(user, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
return


+ 20
- 0
code/modules/shuttle/shipstation.dm View File

@ -0,0 +1,20 @@
/obj/machinery/computer/shuttle/shipstation
name = "NTSS 'Companionship' Shuttle Console"
desc = "Used to control the NTSS 'Companionship'."
shuttleId = "station"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;station_custom"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/machinery/computer/camera_advanced/shuttle_docker/shipstation
name = "NTSS 'Companionship' Navigation Computer"
desc = "Used to designate a precise transit location for the NTSS 'Companionship'."
shuttleId = "station"
lock_override = NONE
shuttlePortId = "station_custom"
jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "whiteship_lavaland" = 1)
whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/closed/mineral)
view_range = 12
designate_time = 50
x_offset = 9
y_offset = 9
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF

+ 5
- 0
config/maps.txt View File

@ -34,6 +34,11 @@ map icebox
votable
endmap
map shipstation
maxplayers 30
votable
endmap
map runtimestation
endmap


+ 1
- 0
tgstation.dme View File

@ -3016,6 +3016,7 @@
#include "code\modules\shuttle\navigation_computer.dm"
#include "code\modules\shuttle\on_move.dm"
#include "code\modules\shuttle\ripple.dm"
#include "code\modules\shuttle\shipstation.dm"
#include "code\modules\shuttle\shuttle.dm"
#include "code\modules\shuttle\shuttle_rotate.dm"
#include "code\modules\shuttle\spaceship_navigation_beacon.dm"


Loading…
Cancel
Save