Fixes drop pods, fixes the Ninja TP consoles, fixes shuttles being unable to dock with the Horizon. (#14138)

This commit is contained in:
Matt Atlas
2022-05-29 20:26:06 +02:00
committed by GitHub
parent 73e16b02cf
commit f3bb184919
14 changed files with 689 additions and 642 deletions

View File

@@ -387,8 +387,6 @@ var/list/mob/living/forced_ambiance_list = new
continue continue
if (istype(A, /area/mine)) if (istype(A, /area/mine))
continue continue
if (istype(A, /area/horizon/exterior))
continue
//Although hostile mobs instadying to turrets is fun //Although hostile mobs instadying to turrets is fun
//If there's no AI they'll just be hit with stunbeams all day and spam the attack logs. //If there's no AI they'll just be hit with stunbeams all day and spam the attack logs.

View File

@@ -19,6 +19,7 @@
var/max_teleport_range = 4 //max overmap teleport distance var/max_teleport_range = 4 //max overmap teleport distance
var/calibration = 0 // a percentage chance for teleporting into space instead of your target. 0 is perfectly calibrated, 100 is totally uncalibrated var/calibration = 0 // a percentage chance for teleporting into space instead of your target. 0 is perfectly calibrated, 100 is totally uncalibrated
var/engaged = FALSE var/engaged = FALSE
var/ignore_distance = FALSE // For antag teleporters.
/obj/machinery/teleport/pad/Initialize() /obj/machinery/teleport/pad/Initialize()
. = ..() . = ..()
@@ -68,6 +69,8 @@
add_overlay(I) add_overlay(I)
/obj/machinery/teleport/pad/proc/within_range(var/target) /obj/machinery/teleport/pad/proc/within_range(var/target)
if(ignore_distance)
return TRUE
if (isweakref(target)) if (isweakref(target))
var/datum/weakref/target_ref = target var/datum/weakref/target_ref = target
target = target_ref.resolve() target = target_ref.resolve()
@@ -115,3 +118,6 @@
/obj/machinery/teleport/pad/proc/recalibrate() /obj/machinery/teleport/pad/proc/recalibrate()
calibration = 0 calibration = 0
audible_message(SPAN_NOTICE("Calibration complete.")) audible_message(SPAN_NOTICE("Calibration complete."))
/obj/machinery/teleport/pad/ninja
ignore_distance = TRUE

View File

@@ -110,6 +110,11 @@
desc = "A computer that has a special teleporter control program loaded." desc = "A computer that has a special teleporter control program loaded."
_app_preset_type = /datum/modular_computer_app_presets/command/teleporter _app_preset_type = /datum/modular_computer_app_presets/command/teleporter
/obj/item/modular_computer/console/preset/command/teleporter/ninja
name = "teleporter control console"
desc = "A computer that has a special teleporter control program loaded."
_app_preset_type = /datum/modular_computer_app_presets/command/teleporter/ninja
// Civilian // Civilian
/obj/item/modular_computer/console/preset/civilian /obj/item/modular_computer/console/preset/civilian
name = "civilian console" name = "civilian console"

View File

@@ -245,6 +245,26 @@
) )
return _prg_list return _prg_list
/datum/modular_computer_app_presets/command/teleporter/ninja
name = "ninja_teleporter"
display_name = "Offsite - Teleporter"
description = "Contains the most common command programs and has a special teleporter control program loaded."
available = FALSE
/datum/modular_computer_app_presets/command/teleporter/ninja/return_install_programs(obj/item/modular_computer/comp)
var/list/_prg_list = list(
new /datum/computer_file/program/ntnetdownload(comp),
new /datum/computer_file/program/filemanager(comp),
new /datum/computer_file/program/newsbrowser(comp),
new /datum/computer_file/program/manifest(comp),
new /datum/computer_file/program/chat_client(comp),
new /datum/computer_file/program/civilian/cargoorder(comp),
new /datum/computer_file/program/comm(comp, FALSE),
new /datum/computer_file/program/records/employment(comp),
new /datum/computer_file/program/teleporter/ninja(comp)
)
return _prg_list
/datum/modular_computer_app_presets/command/hop /datum/modular_computer_app_presets/command/hop
name = "command_hop" name = "command_hop"
display_name = "Command - HoP" display_name = "Command - HoP"

View File

@@ -162,3 +162,8 @@
linked_pad.visible_message(SPAN_NOTICE("Locked in."), range = 2) linked_pad.visible_message(SPAN_NOTICE("Locked in."), range = 2)
SSvueui.check_uis_for_change(src) SSvueui.check_uis_for_change(src)
/datum/computer_file/program/teleporter/ninja
required_access_run = list()
requires_ntnet = FALSE
requires_access_to_run = FALSE

View File

@@ -17,8 +17,6 @@
fire_dam_coeff = 0.6 fire_dam_coeff = 0.6
brute_dam_coeff = 0.5 brute_dam_coeff = 0.5
var/list/validfirelocations = list(1, 7, 9) // above the station, at the centcomm z-level and at derelicts.
var/status = READY var/status = READY
var/mob/humanload var/mob/humanload
@@ -180,32 +178,30 @@
var/area/A = null var/area/A = null
var/target = href_list["fire"] var/target = href_list["fire"]
switch(target) switch(target)
if("arrivals") if("recreational_areas")
var/arrivals_destination_list = list( var/list/recreational_areas_list = list(
/area/hallway/secondary/entry/fore = 35, /area/horizon/crew_quarters/fitness/hallway = 25,
/area/hallway/secondary/entry/port = 35, /area/horizon/crew_quarters/fitness/changing = 25,
/area/security/vacantoffice = 15, /area/horizon/crew_quarters/fitness/pool = 25,
/area/hallway/secondary/entry/departure_lounge = 15 /area/horizon/crew_quarters/fitness/gym = 25
) )
A = pickweight(arrivals_destination_list) A = pickweight(recreational_areas_list)
if("cargo") if("operations")
var/cargo_destination_list = list( var/list/ops_list = list(
/area/quartermaster/loading = 50, /area/operations/break_room = 15,
/area/quartermaster/qm = 20, /area/maintenance/wing/starboard = 20,
/area/maintenance/store = 10, /area/maintenance/wing/starboard/deck1 = 20,
/area/store = 5, /area/operations/office = 10,
/area/hallway/secondary/entry/aft = 10, /area/operations/storage = 15,
/area/sconference_room = 5 /area/outpost/mining_main/refinery = 20
) )
A = pickweight(cargo_destination_list) A = pickweight(ops_list)
if("commandescape") if("starboard_wing")
var/commandescape_destination_list = list( var/list/starboard_wing_list = list(
/area/bridge/levela = 35, /area/maintenance/wing/starboard = 50,
/area/bridge/levela/research_dock = 35, /area/maintenance/wing/starboard/far = 50
/area/security/bridge_surface_checkpoint = 15,
/area/maintenance/bridge_elevator/surface = 15
) )
A = pickweight(commandescape_destination_list) A = pickweight(starboard_wing_list)
if(A) if(A)
var/mob/user = usr var/mob/user = usr
if(!(user in src)) if(!(user in src))
@@ -238,15 +234,22 @@
else else
obstacle_found = FALSE obstacle_found = FALSE
if(!length(turf_selection)) //If the list of turfs is empty then the pick below would runtime and break the pod.
pod_error()
return
var/target_turf = pick(turf_selection) var/target_turf = pick(turf_selection)
if(!target_turf) if(!target_turf)
pod_error()
return
fire(target_turf)
/obj/vehicle/droppod/proc/pod_error()
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch."))
status = READY status = READY
if(connected_blastdoor) if(connected_blastdoor)
blastdoor_interact(TRUE) blastdoor_interact(TRUE)
return
fire(target_turf)
/obj/vehicle/droppod/proc/fire(var/turf/A) /obj/vehicle/droppod/proc/fire(var/turf/A)
if(!isturf(A)) if(!isturf(A))
@@ -257,14 +260,6 @@
blastdoor_interact(TRUE) blastdoor_interact(TRUE)
return return
if(!(src.z in validfirelocations))
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1)
visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Pod cannot be launched from this position."))
status = READY
if(connected_blastdoor)
blastdoor_interact(TRUE)
return
var/turf/aboveturf = GetAbove(A) var/turf/aboveturf = GetAbove(A)
if(aboveturf) if(aboveturf)
applyfalldamage(aboveturf) applyfalldamage(aboveturf)

View File

@@ -0,0 +1,44 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "The ninja teleporter console in their base works again."
- bugfix: "Drop pods now work correctly."
- bugfix: "Fixed shuttles that dock to the Horizon's exterior being unable to dock."
- bugfix: "TCFL ERT shuttle can now actually dock with the Horizon."

View File

@@ -309,17 +309,6 @@
icon_state = "unknown" icon_state = "unknown"
station_area = TRUE station_area = TRUE
// Exterior
/area/horizon/exterior
name = "Horizon - Exterior"
icon_state = "exterior"
base_turf = /turf/space
dynamic_lighting = TRUE
requires_power = FALSE
has_gravity = FALSE
no_light_control = TRUE
allow_nightmode = FALSE
/********** Maintenance Start **********/ /********** Maintenance Start **********/
// Maintenance // Maintenance
/area/horizon/maintenance /area/horizon/maintenance

View File

@@ -12,7 +12,6 @@
/area/supply/dock, /area/supply/dock,
/area/turbolift, /area/turbolift,
/area/mine, /area/mine,
/area/horizon/exterior,
/area/construction /area/construction
) )

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -208,7 +208,7 @@
/area/crew_quarters/lounge/secondary) /area/crew_quarters/lounge/secondary)
"at" = ( "at" = (
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"au" = ( "au" = (
/obj/random/junk, /obj/random/junk,
/obj/effect/floor_decal/industrial/warning{ /obj/effect/floor_decal/industrial/warning{
@@ -555,16 +555,9 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/bridge/controlroom) /area/bridge/controlroom)
"bb" = ( "bb" = (
/obj/machinery/door/airlock/external{ /obj/effect/shuttle_landmark/legion/green,
frequency = 1337; /turf/simulated/floor/reinforced/airless,
icon_state = "door_locked"; /area/template_noop)
id_tag = "green_dock_aft_exterior";
locked = 1;
name = "Emergency Services Dock";
req_access = list(13)
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry/emergency)
"bc" = ( "bc" = (
/obj/effect/floor_decal/spline/fancy/wood{ /obj/effect/floor_decal/spline/fancy/wood{
dir = 8 dir = 8
@@ -1052,7 +1045,7 @@
dir = 1 dir = 1
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"bV" = ( "bV" = (
/obj/effect/floor_decal/spline/plain{ /obj/effect/floor_decal/spline/plain{
dir = 6 dir = 6
@@ -1240,7 +1233,7 @@
"cq" = ( "cq" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"cr" = ( "cr" = (
/obj/structure/bookcase, /obj/structure/bookcase,
/obj/item/book/manual/robotics_cyborgs, /obj/item/book/manual/robotics_cyborgs,
@@ -2216,7 +2209,7 @@
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/mop, /obj/item/mop,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"dX" = ( "dX" = (
/obj/structure/table/reinforced/wood, /obj/structure/table/reinforced/wood,
/obj/machinery/computer/guestpass{ /obj/machinery/computer/guestpass{
@@ -2265,7 +2258,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"eb" = ( "eb" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/machinery/atmospherics/pipe/simple/visible/universal,
/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/lattice/catwalk/indoor/grate,
@@ -2691,7 +2684,7 @@
/obj/effect/floor_decal/corner/paleblue{ /obj/effect/floor_decal/corner/paleblue{
dir = 5 dir = 5
}, },
/obj/machinery/light{ /obj/effect/floor_decal/industrial/warning{
dir = 1 dir = 1
}, },
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
@@ -2799,7 +2792,7 @@
"fh" = ( "fh" = (
/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"fi" = ( "fi" = (
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/corner/paleblue{ /obj/effect/floor_decal/corner/paleblue{
@@ -2856,7 +2849,7 @@
}, },
/obj/structure/lattice, /obj/structure/lattice,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"fn" = ( "fn" = (
/obj/effect/floor_decal/corner/blue/full{ /obj/effect/floor_decal/corner/blue/full{
dir = 4 dir = 4
@@ -3002,6 +2995,18 @@
/obj/machinery/telecomms/server/presets/command, /obj/machinery/telecomms/server/presets/command,
/turf/simulated/floor/bluegrid, /turf/simulated/floor/bluegrid,
/area/tcommsat/chamber) /area/tcommsat/chamber)
"fE" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 10
},
/obj/structure/bed/stool/chair{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency)
"fF" = ( "fF" = (
/obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4208,11 +4213,16 @@
/obj/effect/floor_decal/corner/paleblue{ /obj/effect/floor_decal/corner/paleblue{
dir = 10 dir = 10
}, },
/obj/machinery/atmospherics/pipe/manifold/hidden,
/obj/machinery/camera/network/third_deck{ /obj/machinery/camera/network/third_deck{
c_tag = "Third Deck - Emergency Service Dock Port"; c_tag = "Third Deck - Emergency Service Dock Port";
dir = 1 dir = 1
}, },
/obj/structure/bed/stool/chair{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
"hX" = ( "hX" = (
@@ -5505,7 +5515,7 @@
"kh" = ( "kh" = (
/obj/effect/shuttle_landmark/merc_ship/dock, /obj/effect/shuttle_landmark/merc_ship/dock,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"ki" = ( "ki" = (
/obj/effect/floor_decal/corner/green{ /obj/effect/floor_decal/corner/green{
dir = 6 dir = 6
@@ -5792,9 +5802,13 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/bridge) /area/bridge)
"kI" = ( "kI" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/effect/floor_decal/corner/paleblue{ /obj/effect/floor_decal/corner/paleblue{
dir = 5 dir = 5
}, },
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
"kJ" = ( "kJ" = (
@@ -7054,12 +7068,7 @@
dir = 1; dir = 1;
pixel_y = -28 pixel_y = -28
}, },
/obj/machinery/atmospherics/pipe/simple/hidden{ /obj/machinery/atmospherics/pipe/manifold/hidden,
dir = 4
},
/obj/structure/bed/stool/chair{
dir = 1
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
"nc" = ( "nc" = (
@@ -7994,7 +8003,7 @@
}, },
/obj/structure/railing/mapped, /obj/structure/railing/mapped,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"oL" = ( "oL" = (
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
dir = 8 dir = 8
@@ -8379,7 +8388,7 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"px" = ( "px" = (
/obj/structure/cable/green{ /obj/structure/cable/green{
icon_state = "1-2" icon_state = "1-2"
@@ -8444,7 +8453,7 @@
"pE" = ( "pE" = (
/obj/structure/lattice/catwalk/indoor, /obj/structure/lattice/catwalk/indoor,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"pF" = ( "pF" = (
/obj/structure/filingcabinet{ /obj/structure/filingcabinet{
pixel_x = -8 pixel_x = -8
@@ -8560,7 +8569,7 @@
dir = 4 dir = 4
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"pQ" = ( "pQ" = (
/obj/effect/floor_decal/corner/green{ /obj/effect/floor_decal/corner/green{
dir = 6 dir = 6
@@ -8607,23 +8616,22 @@
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/crew_quarters/lounge/secondary) /area/crew_quarters/lounge/secondary)
"pU" = ( "pU" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/airlock/external{ /obj/machinery/door/airlock/external{
frequency = 1337; frequency = 1337;
icon_state = "door_locked"; icon_state = "door_locked";
id_tag = "green_dock_aft_interior"; id_tag = "green_dock_aft_exterior";
locked = 1; locked = 1;
name = "Emergency Services Dock"; name = "Emergency Services Dock";
req_access = list(13) req_access = list(13)
}, },
/obj/machinery/access_button{ /obj/machinery/access_button{
command = "cycle_interior"; command = "cycle_exterior";
frequency = 1337; frequency = 1337;
layer = 3.4; layer = 3.4;
master_tag = "green_dock_aft_airlock"; master_tag = "green_dock_aft_airlock";
name = "interior access button"; name = "exterior access button";
pixel_x = 26; pixel_x = -27;
pixel_y = -7; pixel_y = 7;
req_access = list(13) req_access = list(13)
}, },
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
@@ -9136,7 +9144,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"qY" = ( "qY" = (
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
@@ -10116,7 +10124,7 @@
"sP" = ( "sP" = (
/obj/structure/lattice, /obj/structure/lattice,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"sQ" = ( "sQ" = (
/obj/structure/filingcabinet/filingcabinet{ /obj/structure/filingcabinet/filingcabinet{
pixel_x = -9; pixel_x = -9;
@@ -10804,9 +10812,16 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/horizon/crew_quarters/fitness/showers) /area/horizon/crew_quarters/fitness/showers)
"tW" = ( "tW" = (
/obj/effect/shuttle_landmark/legion/green, /obj/machinery/door/airlock/external{
/turf/simulated/floor/reinforced/airless, frequency = 1337;
/area/horizon/exterior) icon_state = "door_locked";
id_tag = "green_dock_aft_exterior";
locked = 1;
name = "Emergency Services Dock";
req_access = list(13)
},
/turf/simulated/floor/plating,
/area/hallway/secondary/entry/emergency)
"tX" = ( "tX" = (
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 4 dir = 4
@@ -11204,7 +11219,7 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"uN" = ( "uN" = (
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/bridge) /area/maintenance/bridge)
@@ -12002,7 +12017,7 @@
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/obj/structure/railing/mapped, /obj/structure/railing/mapped,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"wl" = ( "wl" = (
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
dir = 1 dir = 1
@@ -12590,7 +12605,7 @@
"xo" = ( "xo" = (
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"xp" = ( "xp" = (
/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/horizon/crew_quarters/fitness/lounge) /area/horizon/crew_quarters/fitness/lounge)
@@ -13308,7 +13323,7 @@
pixel_y = 16 pixel_y = 16
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"yG" = ( "yG" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/machinery/chemical_dispenser/coffee, /obj/machinery/chemical_dispenser/coffee,
@@ -13332,7 +13347,7 @@
/obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/hatch/yellow,
/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"yJ" = ( "yJ" = (
/obj/machinery/light{ /obj/machinery/light{
dir = 8 dir = 8
@@ -13369,7 +13384,7 @@
"yM" = ( "yM" = (
/obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"yN" = ( "yN" = (
/obj/effect/floor_decal/corner/green{ /obj/effect/floor_decal/corner/green{
dir = 9 dir = 9
@@ -13768,7 +13783,7 @@
dir = 1 dir = 1
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"zz" = ( "zz" = (
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
dir = 8 dir = 8
@@ -14057,9 +14072,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden{ /obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4 dir = 4
}, },
/obj/structure/bed/stool/chair{
dir = 1
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
"Ab" = ( "Ab" = (
@@ -15169,7 +15181,7 @@
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/toy/figure/janitor, /obj/item/toy/figure/janitor,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Co" = ( "Co" = (
/obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -15904,7 +15916,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"DM" = ( "DM" = (
/obj/effect/floor_decal/corner/grey/diagonal{ /obj/effect/floor_decal/corner/grey/diagonal{
dir = 8 dir = 8
@@ -16101,15 +16113,6 @@
}, },
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/starboard/docks) /area/horizon/hallway/deck_three/primary/starboard/docks)
"Eg" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
},
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency)
"Eh" = ( "Eh" = (
/turf/simulated/wall/r_wall, /turf/simulated/wall/r_wall,
/area/medical/ward/isolation) /area/medical/ward/isolation)
@@ -16184,7 +16187,7 @@
/obj/effect/floor_decal/industrial/warning/full, /obj/effect/floor_decal/industrial/warning/full,
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Eo" = ( "Eo" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/effect/floor_decal/industrial/warning{ /obj/effect/floor_decal/industrial/warning{
@@ -18126,7 +18129,7 @@
dir = 1 dir = 1
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"HO" = ( "HO" = (
/obj/structure/cable/green{ /obj/structure/cable/green{
icon_state = "4-8" icon_state = "4-8"
@@ -18747,23 +18750,18 @@
/turf/simulated/floor/carpet, /turf/simulated/floor/carpet,
/area/bridge/meeting_room) /area/bridge/meeting_room)
"IR" = ( "IR" = (
/obj/machinery/door/airlock/external{ /obj/machinery/atmospherics/unary/vent_pump/high_volume{
frequency = 1337; frequency = 1337;
icon_state = "door_locked"; id_tag = "green_dock_aft_pump"
id_tag = "green_dock_aft_exterior";
locked = 1;
name = "Emergency Services Dock";
req_access = list(13)
}, },
/obj/machinery/access_button{ /obj/machinery/airlock_sensor{
command = "cycle_exterior";
frequency = 1337; frequency = 1337;
id_tag = "green_dock_aft_sensor";
layer = 3.4; layer = 3.4;
master_tag = "green_dock_aft_airlock"; pixel_x = -28
name = "exterior access button"; },
pixel_x = -27; /obj/machinery/light/small/emergency{
pixel_y = 7; dir = 8
req_access = list(13)
}, },
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
@@ -19090,7 +19088,7 @@
/obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk,
/obj/structure/railing/mapped, /obj/structure/railing/mapped,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"Jw" = ( "Jw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -19426,11 +19424,11 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"JZ" = ( "JZ" = (
/obj/structure/railing/mapped, /obj/structure/railing/mapped,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Ka" = ( "Ka" = (
/obj/effect/floor_decal/spline/fancy/wood/corner{ /obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 4 dir = 4
@@ -19811,7 +19809,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"KO" = ( "KO" = (
/obj/structure/railing/mapped, /obj/structure/railing/mapped,
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
@@ -20049,7 +20047,7 @@
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Ll" = ( "Ll" = (
/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
/turf/simulated/floor, /turf/simulated/floor,
@@ -20646,14 +20644,14 @@
dir = 10 dir = 10
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Mp" = ( "Mp" = (
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
dir = 8 dir = 8
}, },
/obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"Mq" = ( "Mq" = (
/obj/machinery/alarm{ /obj/machinery/alarm{
pixel_y = 28 pixel_y = 28
@@ -20972,7 +20970,7 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"MR" = ( "MR" = (
/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
id = "Recovery1" id = "Recovery1"
@@ -21108,12 +21106,12 @@
"Ne" = ( "Ne" = (
/obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/sign/securearea{ /obj/structure/sign/securearea{
name = "\improper BRIG COMMUNAL AREA sign"; desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'.";
desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'." name = "\improper BRIG COMMUNAL AREA sign"
}, },
/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Nf" = ( "Nf" = (
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
dir = 4 dir = 4
@@ -21223,7 +21221,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Nq" = ( "Nq" = (
/turf/simulated/wall, /turf/simulated/wall,
/area/crew_quarters/lounge/secondary) /area/crew_quarters/lounge/secondary)
@@ -21652,7 +21650,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"Oc" = ( "Oc" = (
/obj/structure/cable/green{ /obj/structure/cable/green{
icon_state = "4-8" icon_state = "4-8"
@@ -22542,7 +22540,7 @@
dir = 6 dir = 6
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"PG" = ( "PG" = (
/obj/structure/railing/mapped{ /obj/structure/railing/mapped{
dir = 1 dir = 1
@@ -22658,7 +22656,7 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"PQ" = ( "PQ" = (
/obj/structure/window/shuttle/scc_space_ship, /obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille, /obj/structure/grille,
@@ -23435,7 +23433,7 @@
"Rh" = ( "Rh" = (
/obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Ri" = ( "Ri" = (
/obj/effect/floor_decal/corner/green{ /obj/effect/floor_decal/corner/green{
dir = 6 dir = 6
@@ -23896,13 +23894,13 @@
dir = 4 dir = 4
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Sb" = ( "Sb" = (
/obj/effect/floor_decal/industrial/warning{ /obj/effect/floor_decal/industrial/warning{
dir = 5 dir = 5
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Sc" = ( "Sc" = (
/obj/effect/floor_decal/spline/plain{ /obj/effect/floor_decal/spline/plain{
dir = 8 dir = 8
@@ -24245,7 +24243,7 @@
dir = 4 dir = 4
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"SM" = ( "SM" = (
/obj/effect/floor_decal/corner/green{ /obj/effect/floor_decal/corner/green{
dir = 10 dir = 10
@@ -24541,7 +24539,7 @@
dir = 4 dir = 4
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Ts" = ( "Ts" = (
/obj/structure/cable/green{ /obj/structure/cable/green{
icon_state = "1-2" icon_state = "1-2"
@@ -24663,7 +24661,7 @@
dir = 4 dir = 4
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"TD" = ( "TD" = (
/obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/corner/green/diagonal,
/obj/item/bedsheet/medical{ /obj/item/bedsheet/medical{
@@ -24678,7 +24676,7 @@
dir = 1 dir = 1
}, },
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"TF" = ( "TF" = (
/obj/structure/bed/stool/chair{ /obj/structure/bed/stool/chair{
dir = 1 dir = 1
@@ -24911,6 +24909,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden{ /obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4 dir = 4
}, },
/obj/structure/bed/stool/chair{
dir = 1
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
"Ug" = ( "Ug" = (
@@ -24957,7 +24958,7 @@
dir = 9 dir = 9
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Uk" = ( "Uk" = (
/obj/effect/floor_decal/spline/fancy{ /obj/effect/floor_decal/spline/fancy{
dir = 1 dir = 1
@@ -25398,7 +25399,7 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/open/airless, /turf/simulated/open/airless,
/area/horizon/exterior) /area/template_noop)
"UZ" = ( "UZ" = (
/obj/effect/floor_decal/corner/green{ /obj/effect/floor_decal/corner/green{
dir = 6 dir = 6
@@ -25830,7 +25831,7 @@
dir = 8 dir = 8
}, },
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"VN" = ( "VN" = (
/obj/effect/floor_decal/corner/blue/diagonal, /obj/effect/floor_decal/corner/blue/diagonal,
/obj/structure/closet/emcloset, /obj/structure/closet/emcloset,
@@ -25977,7 +25978,7 @@
"Wb" = ( "Wb" = (
/obj/effect/shuttle_landmark/ert/dock, /obj/effect/shuttle_landmark/ert/dock,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Wc" = ( "Wc" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/material/ashtray/bronze, /obj/item/material/ashtray/bronze,
@@ -26137,7 +26138,7 @@
}, },
/obj/item/hullbeacon/red, /obj/item/hullbeacon/red,
/turf/simulated/floor/reinforced/airless, /turf/simulated/floor/reinforced/airless,
/area/horizon/exterior) /area/template_noop)
"Wv" = ( "Wv" = (
/obj/machinery/shieldwallgen, /obj/machinery/shieldwallgen,
/obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/yellow/diagonal,
@@ -26157,13 +26158,9 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/starboard) /area/horizon/hallway/deck_three/primary/starboard)
"Wx" = ( "Wx" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/effect/floor_decal/corner/paleblue{ /obj/effect/floor_decal/corner/paleblue{
dir = 5 dir = 5
}, },
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
"Wy" = ( "Wy" = (
@@ -27093,18 +27090,24 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/horizon/hallway/deck_three/primary/starboard) /area/horizon/hallway/deck_three/primary/starboard)
"Yc" = ( "Yc" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{ /obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/airlock/external{
frequency = 1337; frequency = 1337;
id_tag = "green_dock_aft_pump" icon_state = "door_locked";
id_tag = "green_dock_aft_interior";
locked = 1;
name = "Emergency Services Dock";
req_access = list(13)
}, },
/obj/machinery/airlock_sensor{ /obj/machinery/access_button{
command = "cycle_interior";
frequency = 1337; frequency = 1337;
id_tag = "green_dock_aft_sensor";
layer = 3.4; layer = 3.4;
pixel_x = -28 master_tag = "green_dock_aft_airlock";
}, name = "interior access button";
/obj/machinery/light/small/emergency{ pixel_x = 26;
dir = 8 pixel_y = -7;
req_access = list(13)
}, },
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/hallway/secondary/entry/emergency) /area/hallway/secondary/entry/emergency)
@@ -54549,10 +54552,10 @@ at
at at
at at
at at
yP at
yP at
yP Cu
Eg Wx
sa sa
Gr Gr
if if
@@ -54747,15 +54750,15 @@ at
at at
at at
at at
tW
at at
at at
at at
IR at
Yc at
KE at
Cu
Wx Wx
IY fE
Gr Gr
Lo Lo
Fo Fo
@@ -54953,9 +54956,9 @@ at
at at
at at
at at
bb at
Kv at
pU Cu
Wx Wx
hW hW
Gr Gr
@@ -55155,10 +55158,10 @@ at
at at
at at
at at
yP at
yP at
yP Cu
Eg Wx
Uf Uf
Gr Gr
Lo Lo
@@ -55357,9 +55360,9 @@ at
at at
at at
at at
at yP
at yP
Cu yP
eS eS
iJ iJ
Gr Gr
@@ -55555,15 +55558,15 @@ at
at at
at at
at at
bb
at at
at at
at at
at pU
at IR
at KE
Cu
kI kI
Aa IY
Gr Gr
Lo Lo
Fj Fj
@@ -55761,9 +55764,9 @@ at
at at
at at
at at
at tW
at Kv
yP Yc
kI kI
nb nb
Gr Gr
@@ -55963,10 +55966,10 @@ at
at at
at at
at at
at
at
yP yP
kI yP
yP
eS
Aa Aa
Gr Gr
Lo Lo
@@ -56167,7 +56170,7 @@ at
at at
at at
at at
yP Cu
LI LI
IY IY
Gr Gr

View File

@@ -34108,13 +34108,13 @@
/turf/simulated/floor/shuttle/black, /turf/simulated/floor/shuttle/black,
/area/shuttle/distress) /area/shuttle/distress)
"bCB" = ( "bCB" = (
/obj/item/modular_computer/console/preset/command/teleporter, /obj/item/modular_computer/console/preset/command/teleporter/ninja,
/turf/unsimulated/floor{ /turf/unsimulated/floor{
icon_state = "new_reinforced" icon_state = "new_reinforced"
}, },
/area/antag/ninja) /area/antag/ninja)
"bCC" = ( "bCC" = (
/obj/machinery/teleport/pad, /obj/machinery/teleport/pad/ninja,
/turf/unsimulated/floor{ /turf/unsimulated/floor{
icon_state = "new_reinforced" icon_state = "new_reinforced"
}, },

View File

@@ -6,9 +6,9 @@
<div v-if="status == 0"> <div v-if="status == 0">
<div>Pod status: <span class="good">Operational.</span></div> <div>Pod status: <span class="good">Operational.</span></div>
<div><vui-button icon="cog" :params="{ fire: 'arrivals'}">Departures</vui-button></div> <div><vui-button icon="cog" :params="{ fire: 'recreational_areas'}">Recreational Areas</vui-button></div>
<div><vui-button icon="cog" :params="{ fire: 'cargo'}">Cargo Surface</vui-button></div> <div><vui-button icon="cog" :params="{ fire: 'operations'}">Operations</vui-button></div>
<div><vui-button icon="cog" :params="{ fire: 'commandescape'}">Command Surface</vui-button></div> <div><vui-button icon="cog" :params="{ fire: 'starboard_wing'}">Starboard Wing Frame Interior</vui-button></div>
</div> </div>
<div v-else> <div v-else>
Pod status: <span class="bad">Non-operational.</span> Pod status: <span class="bad">Non-operational.</span>