mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 14:47:50 +01:00
Merge pull request #2166 from CHOMPStationBot/upstream-merge-10601
[MIRROR] Add distress beacons to overmap ships/visitables
This commit is contained in:
Nadyr
@@ -138,7 +138,7 @@ They're also cool, and Rykka/Nyria wrote this uwu
|
||||
var/obj/item/clothing/head/newhat = H.get_active_hand()
|
||||
H.drop_from_inventory(newhat, get_turf(src))
|
||||
if(!stat)
|
||||
intent = I_HELP
|
||||
a_intent = I_HELP
|
||||
newhat.attack_hand(src)
|
||||
else if(src.get_active_hand())
|
||||
to_chat(user, "<span class='notice'>\The [src] seems busy with \the [get_active_hand()] already!</span>")
|
||||
@@ -179,4 +179,4 @@ They're also cool, and Rykka/Nyria wrote this uwu
|
||||
maxHealth = 225 // tuff yeen. <3
|
||||
health = 225 // tuff yeen. <3
|
||||
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee/pack_mob/nyria // Define here what type of enemy hyena is. Nyria is non-hostile.
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/melee/pack_mob/nyria // Define here what type of enemy hyena is. Nyria is non-hostile.
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
var/feeding_delay = 30 SECONDS // How long do we have to wait to bite our host's organs?
|
||||
var/last_feeding = 0
|
||||
|
||||
intent = I_HELP
|
||||
a_intent = I_HELP
|
||||
|
||||
holder_type = /obj/item/weapon/holder/leech
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
var/obj/item/clothing/head/newhat = H.get_active_hand()
|
||||
H.drop_from_inventory(newhat, get_turf(src))
|
||||
if(!stat)
|
||||
intent = I_HELP
|
||||
a_intent = I_HELP
|
||||
newhat.attack_hand(src)
|
||||
else if(src.get_active_hand())
|
||||
to_chat(user, "<span class='notice'>\The [src] seems busy with \the [get_active_hand()] already!</span>")
|
||||
|
||||
@@ -110,7 +110,6 @@
|
||||
var/stunned = 0.0
|
||||
var/weakened = 0.0
|
||||
var/losebreath = 0.0//Carbon
|
||||
var/intent = null//Living
|
||||
var/shakecamera = 0
|
||||
var/a_intent = I_HELP//Living
|
||||
var/m_int = null//Living
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
var/hide_from_reports = FALSE
|
||||
|
||||
var/has_distress_beacon
|
||||
var/list/levels_for_distress
|
||||
|
||||
/obj/effect/overmap/visitable/Initialize()
|
||||
. = ..()
|
||||
@@ -164,6 +165,40 @@
|
||||
// prior to being moved to the overmap. This blocks that. Use set_invisibility to adjust invisibility as needed instead.
|
||||
/obj/effect/overmap/visitable/sector/hide()
|
||||
|
||||
/obj/effect/overmap/visitable/proc/distress(mob/user)
|
||||
if(has_distress_beacon)
|
||||
return FALSE
|
||||
has_distress_beacon = TRUE
|
||||
|
||||
admin_chat_message(message = "Overmap panic button hit on z[z] ([scanner_name || name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") //VOREStation Add
|
||||
var/message = "This is an automated distress signal from a MIL-DTL-93352-compliant beacon transmitting on [PUB_FREQ*0.1]kHz. \
|
||||
This beacon was launched from '[scanner_name || name]'. I can provide this additional information to rescuers: [get_distress_info()]. \
|
||||
Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \
|
||||
or relay the message to those who can. This message will repeat one time in 5 minutes. Thank you for your urgent assistance."
|
||||
|
||||
if(!levels_for_distress)
|
||||
levels_for_distress = list(1)
|
||||
for(var/zlevel in levels_for_distress)
|
||||
priority_announcement.Announce(message, new_title = "Automated Distress Signal", new_sound = 'sound/AI/sos.ogg', zlevel = zlevel)
|
||||
|
||||
var/image/I = image(icon, icon_state = "distress")
|
||||
I.plane = PLANE_LIGHTING_ABOVE
|
||||
I.appearance_flags = KEEP_APART|RESET_TRANSFORM|RESET_COLOR
|
||||
add_overlay(I)
|
||||
|
||||
addtimer(CALLBACK(src, .proc/distress_update), 5 MINUTES)
|
||||
return TRUE
|
||||
|
||||
/obj/effect/overmap/visitable/proc/get_distress_info()
|
||||
return "\[X:[x], Y:[y]\]"
|
||||
|
||||
/obj/effect/overmap/visitable/proc/distress_update()
|
||||
var/message = "This is the final message from the distress beacon launched from '[scanner_name || name]'. I can provide this additional information to rescuers: [get_distress_info()]. \
|
||||
Please render assistance under your obligations per the Interplanetary Convention on Space SAR, or relay this message to a party who can. Thank you for your urgent assistance."
|
||||
|
||||
for(var/zlevel in levels_for_distress)
|
||||
priority_announcement.Announce(message, new_title = "Automated Distress Signal", new_sound = 'sound/AI/sos.ogg', zlevel = zlevel)
|
||||
|
||||
/proc/build_overmap()
|
||||
if(!global.using_map.use_overmap)
|
||||
return 1
|
||||
@@ -186,3 +221,4 @@
|
||||
|
||||
testing("Overmap build complete.")
|
||||
return 1
|
||||
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
/obj/structure/panic_button
|
||||
name = "distress beacon trigger"
|
||||
desc = "WARNING: Will deploy ship's distress beacon and request help. Misuse may result in fines and jail time."
|
||||
description_info = "Using this device (smashing the glas on harm intent, and then pressing the button) will send a message to people on other z-levels requesting their aid. It may take them a while to come get you, as they'll need to prepare. You should only use this if you really need it."
|
||||
icon = 'icons/obj/objects_vr.dmi'
|
||||
icon_state = "panicbutton"
|
||||
anchored = TRUE
|
||||
|
||||
var/glass = TRUE
|
||||
var/launched = FALSE
|
||||
|
||||
// In case we're annihilated by a meteor
|
||||
/obj/structure/panic_button/Destroy()
|
||||
if(!launched)
|
||||
launch()
|
||||
return ..()
|
||||
|
||||
/obj/structure/panic_button/update_icon()
|
||||
if(launched)
|
||||
icon_state = "[initial(icon_state)]_launched"
|
||||
else if(!glass)
|
||||
icon_state = "[initial(icon_state)]_open"
|
||||
else
|
||||
icon_state = "[initial(icon_state)]"
|
||||
|
||||
/obj/structure/panic_button/attack_hand(mob/living/user)
|
||||
if(!istype(user))
|
||||
return ..()
|
||||
|
||||
if(user.incapacitated())
|
||||
return
|
||||
|
||||
// Already launched
|
||||
if(launched)
|
||||
to_chat(user, "<span class='warning'>The button is already depressed; the beacon has been launched already.</span>")
|
||||
// Glass present
|
||||
else if(glass)
|
||||
if(user.a_intent == I_HURT)
|
||||
user.custom_emote(VISIBLE_MESSAGE, "smashes the glass on [src]!")
|
||||
glass = FALSE
|
||||
playsound(src, 'sound/effects/hit_on_shattered_glass.ogg')
|
||||
update_icon()
|
||||
else
|
||||
user.custom_emote(VISIBLE_MESSAGE, "pats [src] in a friendly manner.")
|
||||
to_chat(user, "<span class='warning'>If you're trying to break the glass, you'll have to hit it harder than that...</span>")
|
||||
// Must be !glass and !launched
|
||||
else
|
||||
user.custom_emote(VISIBLE_MESSAGE, "pushes the button on [src]!")
|
||||
launch(user)
|
||||
playsound(src, get_sfx("button"))
|
||||
update_icon()
|
||||
|
||||
/obj/structure/panic_button/proc/launch(mob/living/user)
|
||||
if(launched)
|
||||
return
|
||||
launched = TRUE
|
||||
var/obj/effect/overmap/visitable/S = get_overmap_sector(z)
|
||||
if(!S)
|
||||
error("Distress button hit on z[z] but that's not an overmap sector...")
|
||||
return
|
||||
S.distress(user)
|
||||
//Kind of pricey, but this is a one-time thing that can't be reused, so I'm not too worried.
|
||||
var/list/hear_z = GetConnectedZlevels(z) // multiz 'physical' connections only, not crazy overmap connections
|
||||
|
||||
var/mapsize = (world.maxx+world.maxy)*0.5
|
||||
var/turf/us = get_turf(src)
|
||||
|
||||
for(var/hz in hear_z)
|
||||
for(var/m in GLOB.players_by_zlevel[hz])
|
||||
var/mob/M = m
|
||||
var/sound/SND = sound('sound/misc/emergency_beacon_launched.ogg') // Inside the loop because playsound_local modifies it for each person, so, need separate instances
|
||||
var/turf/them = get_turf(M)
|
||||
var/volume = max(0.20, 1-(get_dist(us,them) / mapsize*0.8))*100
|
||||
M.playsound_local(get_turf(M), SND, vol = volume)
|
||||
@@ -260,6 +260,12 @@
|
||||
/obj/effect/overmap/visitable/ship/proc/get_landed_info()
|
||||
return "This ship cannot land."
|
||||
|
||||
/obj/effect/overmap/visitable/ship/get_distress_info()
|
||||
var/turf/T = get_turf(src) // Usually we're on the turf, but sometimes we might be landed or something.
|
||||
var/x_to_use = T?.x || "UNK"
|
||||
var/y_to_use = T?.y || "UNK"
|
||||
return "\[X:[x_to_use], Y:[y_to_use], VEL:[get_speed() * 1000], HDG:[get_heading_degrees()]\]"
|
||||
|
||||
#undef MOVING
|
||||
#undef SANITIZE_SPEED
|
||||
#undef CHANGE_SPEED_BY
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 11 KiB |
@@ -27765,7 +27765,17 @@ Ua
|
||||
dir = 8;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/obj/item/mecha_parts/mecha_equipment/repair_droid,
|
||||
/obj/item/clothing/under/explorer{
|
||||
name = "survivalist's jumpsuit"
|
||||
},
|
||||
/obj/item/clothing/suit/storage/hooded/explorer{
|
||||
name = "survivalist suit"
|
||||
},
|
||||
/obj/item/clothing/shoes/boots/jackboots/toeless{
|
||||
name = "toe-less boots"
|
||||
},
|
||||
/obj/item/clothing/shoes/black/cuffs,
|
||||
/obj/item/clothing/gloves/fingerless,
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"oW" = (
|
||||
@@ -28348,15 +28358,6 @@ Ua
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/turf/simulated/floor/carpet/oracarpet,
|
||||
/area/aro3/bunkrooms)
|
||||
"ul" = (
|
||||
/obj/structure/closet/crate/bin{
|
||||
anchored = 1;
|
||||
density = 0;
|
||||
name = "trash bin";
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"uE" = (
|
||||
/turf/simulated/floor/tiled/eris/white/golden,
|
||||
/area/aro3/medical)
|
||||
@@ -28453,6 +28454,7 @@ Ua
|
||||
"vD" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,
|
||||
/obj/item/mecha_parts/mecha_equipment/cloak,
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"vH" = (
|
||||
@@ -28951,6 +28953,10 @@ Ua
|
||||
/obj/structure/bed/chair/bay/comfy/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/violetcorener,
|
||||
/area/aro3/cockpit)
|
||||
"yU" = (
|
||||
@@ -29857,11 +29863,11 @@ Ua
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/weapon/inducer/hybrid,
|
||||
/obj/machinery/light_switch{
|
||||
dir = 1;
|
||||
pixel_y = -24
|
||||
},
|
||||
/obj/item/device/uav/loaded,
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"Gy" = (
|
||||
@@ -29946,7 +29952,6 @@ Ua
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/device/uav/loaded,
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"Hq" = (
|
||||
@@ -31037,6 +31042,7 @@ Ua
|
||||
"Rv" = (
|
||||
/obj/structure/table/rack/shelf/steel,
|
||||
/obj/item/mecha_parts/mecha_equipment/omni_shield,
|
||||
/obj/item/mecha_parts/mecha_equipment/repair_droid,
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"Rw" = (
|
||||
@@ -31143,7 +31149,9 @@ Ua
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/mecha_parts/mecha_equipment/cloak,
|
||||
/obj/item/weapon/inducer/hybrid,
|
||||
/obj/item/device/perfect_tele/alien/bluefo,
|
||||
/obj/item/device/mapping_unit,
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"Ta" = (
|
||||
@@ -31677,8 +31685,12 @@ Ua
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/aro3/medical)
|
||||
"Yt" = (
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/device/perfect_tele/alien/bluefo,
|
||||
/obj/structure/closet/crate/bin{
|
||||
anchored = 1;
|
||||
density = 0;
|
||||
name = "trash bin";
|
||||
pixel_y = 3
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
|
||||
/area/aro3/repair_bay)
|
||||
"Yu" = (
|
||||
@@ -41376,7 +41388,7 @@ RJ
|
||||
iN
|
||||
Fr
|
||||
NC
|
||||
ul
|
||||
hl
|
||||
hl
|
||||
IS
|
||||
yu
|
||||
|
||||
@@ -384,6 +384,9 @@
|
||||
dir = 4;
|
||||
icon_state = "apc0"
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/shuttle/bearcat/command_captain)
|
||||
"aP" = (
|
||||
|
||||
+147
-144
@@ -209,8 +209,8 @@
|
||||
/area/mothership/breakroom)
|
||||
"ay" = (
|
||||
/obj/structure/bed/chair/wood{
|
||||
icon_state = "wooden_chair";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "wooden_chair"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 10
|
||||
@@ -223,8 +223,8 @@
|
||||
/area/mothership/breakroom)
|
||||
"aA" = (
|
||||
/obj/structure/bed/chair/wood{
|
||||
icon_state = "wooden_chair";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "wooden_chair"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -276,8 +276,8 @@
|
||||
/area/mothership/breakroom)
|
||||
"aF" = (
|
||||
/obj/structure/bed/chair/wood{
|
||||
icon_state = "wooden_chair";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "wooden_chair"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden{
|
||||
@@ -299,8 +299,8 @@
|
||||
/area/mothership/breakroom)
|
||||
"aI" = (
|
||||
/obj/structure/bed/chair/wood{
|
||||
icon_state = "wooden_chair";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "wooden_chair"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10
|
||||
@@ -311,8 +311,8 @@
|
||||
/area/mothership/breakroom)
|
||||
"aJ" = (
|
||||
/obj/structure/bed/chair/wood{
|
||||
icon_state = "wooden_chair";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "wooden_chair"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
@@ -984,8 +984,8 @@
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
icon_state = "intact-scrubbers";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-scrubbers"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/hydroponics)
|
||||
@@ -1995,8 +1995,8 @@
|
||||
/area/mothership/teleporter)
|
||||
"eh" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor/grid,
|
||||
/area/mothership/teleporter)
|
||||
@@ -2424,8 +2424,8 @@
|
||||
/area/mothership/teleporter)
|
||||
"eR" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/obj/machinery/alarm{
|
||||
alarm_id = "pen_nine";
|
||||
@@ -2652,8 +2652,8 @@
|
||||
/area/mothership/chemistry)
|
||||
"fv" = (
|
||||
/obj/machinery/light/small{
|
||||
icon_state = "bulb1";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bulb1"
|
||||
},
|
||||
/obj/structure/closet/radiation,
|
||||
/obj/fiftyspawner/uranium,
|
||||
@@ -2709,8 +2709,8 @@
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
icon_state = "bulb1";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bulb1"
|
||||
},
|
||||
/obj/structure/closet/radiation,
|
||||
/obj/fiftyspawner/uranium,
|
||||
@@ -2873,13 +2873,13 @@
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4";
|
||||
d2 = 4
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/terminal,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -2898,8 +2898,8 @@
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
@@ -4248,16 +4248,16 @@
|
||||
},
|
||||
/obj/structure/table/steel_reinforced,
|
||||
/obj/effect/floor_decal/corner/lightorange{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
icon_state = "borderfloor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "borderfloor_shifted"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange/border/shifted{
|
||||
icon_state = "bordercolor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bordercolor_shifted"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/sechallway)
|
||||
@@ -4265,20 +4265,20 @@
|
||||
/obj/structure/bed/padded,
|
||||
/obj/item/weapon/bedsheet,
|
||||
/obj/effect/floor_decal/corner/lightorange{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
icon_state = "borderfloor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "borderfloor_shifted"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange/border/shifted{
|
||||
icon_state = "bordercolor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bordercolor_shifted"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
icon_state = "bulb1";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bulb1"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/sechallway)
|
||||
@@ -4287,16 +4287,16 @@
|
||||
id = "Cell M1"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
icon_state = "borderfloor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "borderfloor_shifted"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange/border/shifted{
|
||||
icon_state = "bordercolor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bordercolor_shifted"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/sechallway)
|
||||
@@ -4787,16 +4787,16 @@
|
||||
},
|
||||
/obj/structure/table/steel_reinforced,
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
icon_state = "borderfloor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "borderfloor_shifted"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange/border/shifted{
|
||||
icon_state = "bordercolor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bordercolor_shifted"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/sechallway)
|
||||
@@ -4804,20 +4804,20 @@
|
||||
/obj/structure/bed/padded,
|
||||
/obj/item/weapon/bedsheet,
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
icon_state = "borderfloor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "borderfloor_shifted"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange/border/shifted{
|
||||
icon_state = "bordercolor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bordercolor_shifted"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
icon_state = "bulb1";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bulb1"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/sechallway)
|
||||
@@ -4826,16 +4826,16 @@
|
||||
id = "Cell M2"
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
icon_state = "borderfloor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "borderfloor_shifted"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange{
|
||||
icon_state = "corner_white";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "corner_white"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lightorange/border/shifted{
|
||||
icon_state = "bordercolor_shifted";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bordercolor_shifted"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/sechallway)
|
||||
@@ -7240,6 +7240,9 @@
|
||||
pixel_x = 32;
|
||||
req_access = list(101)
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/bridge)
|
||||
"ol" = (
|
||||
@@ -7258,8 +7261,8 @@
|
||||
/area/mothership/robotics)
|
||||
"op" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 1
|
||||
@@ -7270,15 +7273,15 @@
|
||||
"oq" = (
|
||||
/obj/machinery/mech_recharger,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/area/mothership/robotics)
|
||||
"or" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/bluegrid,
|
||||
/area/mothership/robotics)
|
||||
@@ -7290,8 +7293,8 @@
|
||||
"ot" = (
|
||||
/obj/structure/ghost_pod/manual/lost_drone/dogborg,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/mothership/robotics)
|
||||
@@ -7311,8 +7314,8 @@
|
||||
/area/mothership/robotics)
|
||||
"ov" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/hallway)
|
||||
@@ -7383,8 +7386,8 @@
|
||||
/area/mothership/robotics)
|
||||
"oF" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/mothership/robotics)
|
||||
@@ -7533,8 +7536,8 @@
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/mothership/robotics)
|
||||
@@ -7558,8 +7561,8 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/mothership/hallway)
|
||||
@@ -7719,8 +7722,8 @@
|
||||
id_tag = "ws_dock_6_pump"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
icon_state = "bulb1";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bulb1"
|
||||
},
|
||||
/obj/machinery/airlock_sensor{
|
||||
frequency = 1380;
|
||||
@@ -8054,8 +8057,8 @@
|
||||
id_tag = "ws_dock_3_pump"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
icon_state = "bulb1";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bulb1"
|
||||
},
|
||||
/obj/machinery/airlock_sensor{
|
||||
frequency = 1380;
|
||||
@@ -8287,8 +8290,8 @@
|
||||
/area/mothership/telecomms1)
|
||||
"qw" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 10
|
||||
dir = 10;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
dir = 4
|
||||
@@ -8505,8 +8508,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
icon_state = "corner_techfloor_grid";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "corner_techfloor_grid"
|
||||
},
|
||||
/obj/machinery/mech_recharger{
|
||||
icon = 'icons/turf/shuttle_alien_blue.dmi'
|
||||
@@ -8529,8 +8532,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
icon_state = "corner_techfloor_grid";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "corner_techfloor_grid"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/mothership/telecomms1)
|
||||
@@ -8592,8 +8595,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
icon_state = "corner_techfloor_grid";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "corner_techfloor_grid"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
|
||||
dir = 4
|
||||
@@ -8620,56 +8623,56 @@
|
||||
/area/mothership/engineering)
|
||||
"rx" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-supply"
|
||||
},
|
||||
/obj/machinery/portable_atmospherics/powered/pump/filled,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
"ry" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-supply"
|
||||
},
|
||||
/obj/machinery/space_heater,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
"rz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-supply"
|
||||
},
|
||||
/obj/machinery/pipedispenser/disposal/orderable,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
"rA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-supply"
|
||||
},
|
||||
/obj/machinery/pipedispenser/orderable,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
"rB" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-supply"
|
||||
},
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
"rC" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/supply{
|
||||
icon_state = "intact-supply";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact-supply"
|
||||
},
|
||||
/obj/structure/closet/secure_closet/engineering_personal,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
"rD" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
|
||||
icon_state = "map-supply";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "map-supply"
|
||||
},
|
||||
/obj/structure/closet/secure_closet/engineering_personal,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
@@ -8710,8 +8713,8 @@
|
||||
/area/mothership/engineering)
|
||||
"rL" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/obj/machinery/atmospherics/binary/pump/high_power/on{
|
||||
dir = 1
|
||||
@@ -8778,8 +8781,8 @@
|
||||
/area/mothership/engineering)
|
||||
"rU" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/red{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "map"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/mothership/engineering)
|
||||
@@ -8823,8 +8826,8 @@
|
||||
/area/mothership/engineering)
|
||||
"rZ" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 10
|
||||
dir = 10;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
dir = 4
|
||||
@@ -8903,8 +8906,8 @@
|
||||
/area/mothership/engineering)
|
||||
"sj" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/black{
|
||||
icon_state = "map";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "map"
|
||||
},
|
||||
/obj/machinery/meter,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
@@ -9302,8 +9305,8 @@
|
||||
/area/space)
|
||||
"tb" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
dir = 8
|
||||
@@ -9413,8 +9416,8 @@
|
||||
/area/mothership/telecomms1)
|
||||
"wm" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
dir = 1
|
||||
@@ -9639,8 +9642,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
icon_state = "corner_techfloor_grid";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "corner_techfloor_grid"
|
||||
},
|
||||
/obj/machinery/mech_recharger{
|
||||
icon = 'icons/turf/shuttle_alien_blue.dmi'
|
||||
@@ -9650,8 +9653,8 @@
|
||||
/area/mothership/telecomms1)
|
||||
"Ch" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
dir = 1
|
||||
@@ -9702,8 +9705,8 @@
|
||||
/area/mothership/breakroom)
|
||||
"DG" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 4
|
||||
@@ -9712,8 +9715,8 @@
|
||||
/area/mothership/hallway)
|
||||
"DX" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
dir = 8
|
||||
@@ -9742,8 +9745,8 @@
|
||||
/area/mothership/hallway)
|
||||
"Ex" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless{
|
||||
name = "outer hull"
|
||||
@@ -9799,8 +9802,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
icon_state = "corner_techfloor_grid";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "corner_techfloor_grid"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/mothership/telecomms2)
|
||||
@@ -9847,8 +9850,8 @@
|
||||
req_one_access = list(101)
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/mothership/breakroom)
|
||||
@@ -9857,8 +9860,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid{
|
||||
icon_state = "corner_techfloor_grid";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "corner_techfloor_grid"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
|
||||
dir = 4
|
||||
@@ -9870,8 +9873,8 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
@@ -9993,8 +9996,8 @@
|
||||
/area/mothership/hallway)
|
||||
"Ox" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 9
|
||||
dir = 9;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
@@ -10025,8 +10028,8 @@
|
||||
req_one_access = list(101)
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "warning"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/mothership/breakroom)
|
||||
@@ -10276,8 +10279,8 @@
|
||||
/area/mothership/processing)
|
||||
"TK" = (
|
||||
/obj/effect/floor_decal/techfloor/orange{
|
||||
icon_state = "techfloororange_edges";
|
||||
dir = 9
|
||||
dir = 9;
|
||||
icon_state = "techfloororange_edges"
|
||||
},
|
||||
/obj/effect/floor_decal/corner_techfloor_grid,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2144,6 +2144,13 @@
|
||||
},
|
||||
/turf/simulated/wall/rshull,
|
||||
/area/shuttle/gecko_cr)
|
||||
"Nl" = (
|
||||
/obj/structure/table/steel,
|
||||
/obj/structure/panic_button{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/gecko_cr_cockpit)
|
||||
"Np" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 6
|
||||
@@ -3720,7 +3727,7 @@ WP
|
||||
WP
|
||||
NC
|
||||
qL
|
||||
wG
|
||||
Nl
|
||||
ic
|
||||
Id
|
||||
qL
|
||||
|
||||
@@ -286,6 +286,9 @@
|
||||
/obj/structure/handrail{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/monofloor,
|
||||
/area/itglight/cockpit)
|
||||
"bi" = (
|
||||
|
||||
@@ -621,6 +621,10 @@
|
||||
dir = 8;
|
||||
pixel_x = 30
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/mackerel_hc)
|
||||
"LU" = (
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -742,6 +742,10 @@
|
||||
dir = 4;
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32;
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"kU" = (
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"ae" = (
|
||||
/obj/structure/disposaloutlet{
|
||||
icon_state = "outlet";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "outlet"
|
||||
},
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -24,8 +24,8 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "rwindow";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "rwindow"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/fore)
|
||||
@@ -33,19 +33,19 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "rwindow";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "rwindow"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "pipe-s";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "pipe-s"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/fore)
|
||||
"ah" = (
|
||||
/obj/machinery/power/emitter{
|
||||
icon_state = "emitter";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "emitter"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "0-2"
|
||||
@@ -58,8 +58,8 @@
|
||||
"ai" = (
|
||||
/obj/machinery/computer/ship/helm,
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "pipe-s";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "pipe-s"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
@@ -73,8 +73,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"al" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "pipe-s";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "pipe-s"
|
||||
},
|
||||
/obj/machinery/computer/shuttle_control/explore/screebarge,
|
||||
/turf/simulated/floor/reinforced,
|
||||
@@ -83,8 +83,8 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "rwindow";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "rwindow"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/fore)
|
||||
@@ -99,12 +99,12 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"ao" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "pipe-s";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "pipe-s"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "4-8"
|
||||
@@ -113,8 +113,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"ap" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "4-8"
|
||||
@@ -143,8 +143,8 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "rwindow";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/fore)
|
||||
@@ -156,8 +156,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"au" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "pipe-s";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "pipe-s"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
@@ -176,24 +176,24 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"ax" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "pipe-c";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
"ay" = (
|
||||
/obj/machinery/disposal,
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
icon_state = "pipe-t";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "pipe-t"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
"az" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/power/terminal{
|
||||
icon_state = "term";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "term"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
@@ -203,22 +203,22 @@
|
||||
"aA" = (
|
||||
/obj/machinery/disposal,
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
icon_state = "pipe-t";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "pipe-t"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
"aB" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
icon_state = "conpipe-c";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "conpipe-c"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
"aC" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "1-2"
|
||||
@@ -227,8 +227,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"aD" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/machinery/embedded_controller/radio/simple_docking_controller{
|
||||
frequency = 1380;
|
||||
@@ -245,8 +245,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"aF" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
@@ -274,8 +274,8 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"aJ" = (
|
||||
/obj/machinery/power/emitter{
|
||||
icon_state = "emitter";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "emitter"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "0-2"
|
||||
@@ -308,15 +308,15 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "rwindow";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "rwindow"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/mid)
|
||||
"aP" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty,
|
||||
/area/shuttle/screebarge/mid)
|
||||
@@ -325,15 +325,15 @@
|
||||
/area/shuttle/screebarge/mid)
|
||||
"aR" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty,
|
||||
/area/shuttle/screebarge/mid)
|
||||
"aS" = (
|
||||
/obj/machinery/sleeper{
|
||||
icon_state = "sleeper_0";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "sleeper_0"
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_dirty,
|
||||
/area/shuttle/screebarge/mid)
|
||||
@@ -351,8 +351,8 @@
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced{
|
||||
icon_state = "rwindow";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "rwindow"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/mid)
|
||||
@@ -455,8 +455,8 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bk" = (
|
||||
/obj/machinery/atmospherics/portables_connector{
|
||||
icon_state = "map_connector";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "map_connector"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/red,
|
||||
/obj/machinery/portable_atmospherics/canister/phoron,
|
||||
@@ -464,8 +464,8 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bl" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "map"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "1-4"
|
||||
@@ -474,8 +474,8 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bm" = (
|
||||
/obj/machinery/atmospherics/binary/pump{
|
||||
icon_state = "map_off";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "map_off"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "4-8"
|
||||
@@ -484,8 +484,8 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bn" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "map"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "0-8"
|
||||
@@ -498,22 +498,22 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bo" = (
|
||||
/obj/machinery/atmospherics/binary/pump{
|
||||
icon_state = "map_off";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "map_off"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bp" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "map"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bq" = (
|
||||
/obj/machinery/atmospherics/portables_connector{
|
||||
icon_state = "map_connector";
|
||||
dir = 8
|
||||
dir = 8;
|
||||
icon_state = "map_connector"
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/red,
|
||||
/obj/machinery/portable_atmospherics/canister/phoron,
|
||||
@@ -521,8 +521,8 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"br" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 9
|
||||
dir = 9;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/aft)
|
||||
@@ -535,36 +535,36 @@
|
||||
/area/shuttle/screebarge/fore)
|
||||
"bt" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bu" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 5
|
||||
dir = 5;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bv" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 6
|
||||
dir = 6;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bw" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
|
||||
icon_state = "map";
|
||||
dir = 1
|
||||
dir = 1;
|
||||
icon_state = "map"
|
||||
},
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bx" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/screebarge/aft)
|
||||
@@ -574,8 +574,8 @@
|
||||
/area/shuttle/screebarge/aft)
|
||||
"bz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
icon_state = "intact";
|
||||
dir = 10
|
||||
dir = 10;
|
||||
icon_state = "intact"
|
||||
},
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/screebarge/aft)
|
||||
@@ -609,18 +609,18 @@
|
||||
/area/shuttle/screebarge/mid)
|
||||
"bD" = (
|
||||
/obj/machinery/button/remote/airlock{
|
||||
desiredstate = 1;
|
||||
id = "battlebarge_frontdoor";
|
||||
pixel_x = 26;
|
||||
pixel_y = 5;
|
||||
id = "battlebarge_frontdoor";
|
||||
desiredstate = 1;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
"bE" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
icon_state = "bay_chair_preview";
|
||||
dir = 4
|
||||
dir = 4;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
@@ -637,6 +637,20 @@
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/screebarge/aft)
|
||||
"YC" = (
|
||||
/obj/structure/bed/chair/bay/chair{
|
||||
dir = 8;
|
||||
icon_state = "bay_chair_preview"
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/screebarge/fore)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -973,7 +987,7 @@ aJ
|
||||
ar
|
||||
at
|
||||
aC
|
||||
aC
|
||||
YC
|
||||
at
|
||||
aN
|
||||
aU
|
||||
|
||||
+2333
-2329
File diff suppressed because it is too large
Load Diff
@@ -54,6 +54,8 @@ var/global/list/latejoin_talon = list()
|
||||
skybox_pixel_x = 270
|
||||
skybox_pixel_y = 60
|
||||
|
||||
levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT)
|
||||
|
||||
// The shuttle's 'shuttle' computer
|
||||
/obj/machinery/computer/shuttle_control/explore/talonboat
|
||||
name = "shuttle control console"
|
||||
|
||||
+70667
-1
File diff suppressed because it is too large
Load Diff
@@ -29779,6 +29779,9 @@
|
||||
"aYi" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/weapon/storage/box/donut,
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/bridge)
|
||||
"aYj" = (
|
||||
|
||||
@@ -4549,6 +4549,10 @@
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = -32;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/excursion/cockpit)
|
||||
"alH" = (
|
||||
@@ -29029,7 +29033,9 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/quartermaster/foyer)
|
||||
"pjb" = (
|
||||
/obj/machinery/door/airlock/multi_tile/metal/mait,
|
||||
/obj/machinery/door/airlock/multi_tile/metal/mait{
|
||||
req_one_access = list(1,67)
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
@@ -30041,6 +30047,10 @@
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/tank/phoron,
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32;
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/dark/techfloor_grid,
|
||||
/area/shuttle/securiship/engines)
|
||||
"qxn" = (
|
||||
@@ -33288,6 +33298,10 @@
|
||||
req_access = list(67)
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden,
|
||||
/obj/structure/panic_button{
|
||||
pixel_x = 32;
|
||||
pixel_y = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/steel/cyancorner,
|
||||
/area/shuttle/medivac/cockpit)
|
||||
"uqi" = (
|
||||
|
||||
@@ -253,6 +253,8 @@
|
||||
Z_LEVEL_UNDERDARK
|
||||
)
|
||||
|
||||
levels_for_distress = list(Z_LEVEL_OFFMAP1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT)
|
||||
|
||||
/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM)
|
||||
. = ..()
|
||||
announce_atc(AM,going = FALSE)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -3514,6 +3514,7 @@
|
||||
#include "code\modules\overmap\events\generation.dm"
|
||||
#include "code\modules\overmap\events\overmap_event.dm"
|
||||
#include "code\modules\overmap\ships\landable.dm"
|
||||
#include "code\modules\overmap\ships\panicbutton.dm"
|
||||
#include "code\modules\overmap\ships\ship.dm"
|
||||
#include "code\modules\overmap\ships\computers\computer_shims.dm"
|
||||
#include "code\modules\overmap\ships\computers\engine_control.dm"
|
||||
|
||||
Reference in New Issue
Block a user