From 62e13975d6cadf888e0d29d8544518e6953712a0 Mon Sep 17 00:00:00 2001 From: Ros_Sample Date: Tue, 20 Aug 2024 20:22:06 +0300 Subject: [PATCH] mapping + etc --- .../automapper/automapper_config.toml | 44 +- .../templates/birdshot/birdshot_cryo.dmm | 216 +++++++++ .../deltastation/deltastation_cryo.dmm | 107 +++++ .../templates/iceboxstation/icebox_cryo.dmm | 226 +++++++++ .../metastation/metastation_cryo.dmm | 33 ++ .../tramstation/tramstation_cryo.dmm | 444 ++++++++++++++++++ code/game/gamemodes/objective.dm | 3 + .../mob/living/carbon/human/examine.dm | 2 +- modular_bandastation/cryosleep/code/admin.dm | 4 +- modular_bandastation/cryosleep/code/ai.dm | 6 +- .../cryosleep/code/cryopod.dm | 16 +- modular_bandastation/modular_bandastation.dme | 1 + 12 files changed, 1080 insertions(+), 22 deletions(-) create mode 100644 _maps/bandastation/automapper/templates/birdshot/birdshot_cryo.dmm create mode 100644 _maps/bandastation/automapper/templates/deltastation/deltastation_cryo.dmm create mode 100644 _maps/bandastation/automapper/templates/iceboxstation/icebox_cryo.dmm create mode 100644 _maps/bandastation/automapper/templates/tramstation/tramstation_cryo.dmm diff --git a/_maps/bandastation/automapper/automapper_config.toml b/_maps/bandastation/automapper/automapper_config.toml index 4bf2809b4d828..e575b4df3901e 100644 --- a/_maps/bandastation/automapper/automapper_config.toml +++ b/_maps/bandastation/automapper/automapper_config.toml @@ -10,9 +10,41 @@ # More can be found in code\__DEFINES\maps.dm # Metastation Cryo -# [templates.metastation_cryo] -# map_files = ["metastation_cryo.dmm"] -# directory = "_maps/bandastation/automapper/templates/metastation/" -# required_map = "MetaStation.dmm" -# coordinates = [133, 182, 1] -# trait_name = "Station" +[templates.metastation_cryo] +map_files = ["metastation_cryo.dmm"] +directory = "_maps/bandastation/automapper/templates/metastation/" +required_map = "MetaStation.dmm" +coordinates = [133, 182, 1] +trait_name = "Station" + +# Deltastation Cryo +[templates.deltastation_cryo] +map_files = ["deltastation_cryo.dmm"] +directory = "_maps/bandastation/automapper/templates/deltastation/" +required_map = "DeltaStation2.dmm" +coordinates = [216, 93, 1] +trait_name = "Station" + +# Icebox Cryo +[templates.icebox_cryo] +map_files = ["icebox_cryo.dmm"] +directory = "_maps/bandastation/automapper/templates/iceboxstation/" +required_map = "IceBoxStation.dmm" +coordinates = [117, 142, 3] +trait_name = "Station" + +# Tramstation Cryo +[templates.tramstation_cryo] +map_files = ["tramstation_cryo.dmm"] +directory = "_maps/bandastation/automapper/templates/tramstation/" +required_map = "tramstation.dmm" +coordinates = [68, 102, 2] +trait_name = "Station" + +# Birdshot Cryo +[templates.birdshot_cryo] +map_files = ["birdshot_cryo.dmm"] +directory = "_maps/bandastation/automapper/templates/birdshot/" +required_map = "birdshot.dmm" +coordinates = [142, 84, 1] +trait_name = "Station" diff --git a/_maps/bandastation/automapper/templates/birdshot/birdshot_cryo.dmm b/_maps/bandastation/automapper/templates/birdshot/birdshot_cryo.dmm new file mode 100644 index 0000000000000..bbe62f54c4ca4 --- /dev/null +++ b/_maps/bandastation/automapper/templates/birdshot/birdshot_cryo.dmm @@ -0,0 +1,216 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/common/cryopods) +"c" = ( +/turf/closed/wall, +/area/station/common/cryopods) +"g" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"m" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light/floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"n" = ( +/obj/structure/sign/poster/official/random/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"p" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"s" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"v" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"x" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"A" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"G" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination{ + location = "Cryopods" + }, +/obj/machinery/door/airlock/public/glass{ + name = "Cryopods" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/textured_half, +/area/station/common/cryopods) +"J" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) +"K" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"M" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new/light/end, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"Q" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/clothing, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"R" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"S" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/broken_flooring/corner/directional/south, +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"U" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/common/cryopods) +"V" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/common/cryopods) +"Y" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/hallway/secondary/entry) + +(1,1,1) = {" +a +a +c +g +"} +(2,1,1) = {" +U +S +a +A +"} +(3,1,1) = {" +n +x +a +A +"} +(4,1,1) = {" +M +K +G +Y +"} +(5,1,1) = {" +s +R +a +J +"} +(6,1,1) = {" +p +Q +a +m +"} +(7,1,1) = {" +V +V +c +v +"} diff --git a/_maps/bandastation/automapper/templates/deltastation/deltastation_cryo.dmm b/_maps/bandastation/automapper/templates/deltastation/deltastation_cryo.dmm new file mode 100644 index 0000000000000..a851dc8cbca13 --- /dev/null +++ b/_maps/bandastation/automapper/templates/deltastation/deltastation_cryo.dmm @@ -0,0 +1,107 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall, +/area/station/commons/fitness/recreation) +"d" = ( +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"e" = ( +/obj/machinery/computer/cryopod/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/commons/fitness/recreation) +"k" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"v" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/commons/fitness/recreation) +"F" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"G" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Cryopods" + }, +/obj/effect/landmark/navigate_destination{ + location = "Cryopods" + }, +/turf/open/floor/iron/white, +/area/station/commons/fitness/recreation) +"I" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/commons/fitness/recreation) +"P" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/commons/fitness/recreation) +"Z" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) + +(1,1,1) = {" +a +I +G +I +a +"} +(2,1,1) = {" +I +Z +P +F +I +"} +(3,1,1) = {" +I +Z +v +F +I +"} +(4,1,1) = {" +I +d +e +k +I +"} +(5,1,1) = {" +a +a +a +a +a +"} diff --git a/_maps/bandastation/automapper/templates/iceboxstation/icebox_cryo.dmm b/_maps/bandastation/automapper/templates/iceboxstation/icebox_cryo.dmm new file mode 100644 index 0000000000000..c74ca531336bf --- /dev/null +++ b/_maps/bandastation/automapper/templates/iceboxstation/icebox_cryo.dmm @@ -0,0 +1,226 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/common/cryopods) +"b" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"e" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/commons/dorms) +"f" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Cryopods" + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/common/cryopods) +"j" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"k" = ( +/obj/machinery/computer/cryopod/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/common/cryopods) +"v" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/common/cryopods) +"y" = ( +/turf/template_noop, +/area/template_noop) +"z" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"B" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"C" = ( +/turf/closed/wall, +/area/station/common/cryopods) +"E" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"J" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"K" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/common/cryopods) +"M" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/dorms) +"P" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"Q" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) +"T" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"W" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/dorms) +"Z" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) + +(1,1,1) = {" +C +C +C +v +v +y +"} +(2,1,1) = {" +C +E +J +b +v +y +"} +(3,1,1) = {" +C +k +a +a +v +y +"} +(4,1,1) = {" +C +K +j +z +v +T +"} +(5,1,1) = {" +C +f +C +v +v +y +"} +(6,1,1) = {" +y +M +y +y +y +y +"} +(7,1,1) = {" +Q +W +e +Z +P +B +"} diff --git a/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm b/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm index 473c0b647fc60..89f81fddf935e 100644 --- a/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm +++ b/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm @@ -3,13 +3,24 @@ /turf/template_noop, /area/template_noop) "e" = ( +/obj/machinery/computer/cryopod/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/common/cryopods) "i" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/station/common/cryopods) @@ -18,15 +29,27 @@ /turf/open/floor/plating, /area/station/common/cryopods) "p" = ( +/obj/effect/turf_decal/siding/white, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/common/cryopods) "q" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/common/cryopods) "v" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/siding/white, +/obj/machinery/camera/directional/north{ + c_tag = "Cryogenics Pods" + }, /turf/open/floor/iron/dark, /area/station/common/cryopods) "x" = ( @@ -37,6 +60,12 @@ name = "Cryopods" }, /obj/effect/landmark/navigate_destination, +/obj/effect/turf_decal/trimline/dark_green/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/corner{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/common/cryopods) "C" = ( @@ -47,6 +76,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/common/cryopods) "L" = ( diff --git a/_maps/bandastation/automapper/templates/tramstation/tramstation_cryo.dmm b/_maps/bandastation/automapper/templates/tramstation/tramstation_cryo.dmm new file mode 100644 index 0000000000000..c7ac6ea3d396c --- /dev/null +++ b/_maps/bandastation/automapper/templates/tramstation/tramstation_cryo.dmm @@ -0,0 +1,444 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall, +/area/station/commons/dorms/laundry) +"b" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/commons/dorms/laundry) +"c" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"d" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/common/cryopods) +"e" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"f" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/turf/open/floor/grass, +/area/station/common/cryopods) +"g" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"j" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/turf/open/floor/grass, +/area/station/common/cryopods) +"k" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"l" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/common/cryopods) +"m" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"n" = ( +/turf/closed/wall, +/area/station/security/checkpoint/arrivals) +"o" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"q" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/vending/clothing, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"r" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"s" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"t" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/closet/wardrobe/grey, +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"u" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/vending/autodrobe/all_access, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"v" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"w" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"x" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"y" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/station/common/cryopods) +"A" = ( +/obj/structure/chair/stool/bar/directional/west, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"B" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/common/cryopods) +"D" = ( +/turf/closed/wall, +/area/station/common/cryopods) +"E" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/closet/wardrobe/white, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"F" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"H" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"I" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/common/cryopods) +"J" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/washing_machine, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"L" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"M" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/public/glass{ + name = "Cryopods" + }, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron, +/area/station/common/cryopods) +"N" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/machinery/computer/cryopod/directional/west, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"O" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/flora/bush/flowers_yw/style_random, +/turf/open/floor/grass, +/area/station/common/cryopods) +"P" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"Q" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"S" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/item/toy/plush/lizard_plushie{ + desc = "A cute little lizard plushie. It has some soot on it."; + name = "Tends-The-Garden" + }, +/turf/open/floor/grass, +/area/station/common/cryopods) +"U" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/common/cryopods) +"V" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Civilian - Laundry Room" + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"X" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) +"Y" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/grassy/style_random, +/turf/open/floor/grass, +/area/station/common/cryopods) +"Z" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/washing_machine, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) + +(1,1,1) = {" +n +D +D +D +D +D +D +P +"} +(2,1,1) = {" +n +y +O +s +N +L +I +A +"} +(3,1,1) = {" +n +f +Y +l +d +B +M +w +"} +(4,1,1) = {" +n +S +j +U +U +c +I +F +"} +(5,1,1) = {" +n +a +a +b +b +a +a +x +"} +(6,1,1) = {" +n +e +J +Z +Z +Z +Q +F +"} +(7,1,1) = {" +n +V +k +v +g +o +X +H +"} +(8,1,1) = {" +n +a +q +t +E +u +a +m +"} +(9,1,1) = {" +n +a +a +a +a +a +a +r +"} diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index bce9ed3bb9375..9952ce2a25d27 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,4 +1,5 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list +GLOBAL_LIST_EMPTY(objectives) // BANDASTATION EDIT ADDITION /datum/objective var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code. @@ -18,11 +19,13 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list var/admin_grantable = FALSE /datum/objective/New(text) + GLOB.objectives += src // BANDASTATION EDIT ADDITION if(text) explanation_text = text //Apparently objectives can be qdel'd. Learn a new thing every day /datum/objective/Destroy() + GLOB.objectives -= src // BANDASTATION EDIT ADDITION return ..() /datum/objective/proc/get_owners() // Combine owner and team into a single list. diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 0c50e881635f6..6e82166f1d0f2 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -325,7 +325,7 @@ if(!key) msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n" else if(!client) - msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.")]\n" + msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and [t_has] been completely unresponsive to anything for [round(((world.time - lastclienttime) / (1 MINUTES)),1)] minutes. [t_He] may snap out of it soon.")]\n" // BANDASTATION EDIT CHANGE - ORIGINAL: msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.")]\n" var/scar_severity = 0 for(var/i in all_scars) diff --git a/modular_bandastation/cryosleep/code/admin.dm b/modular_bandastation/cryosleep/code/admin.dm index 4b6ce389eee24..43f391362909d 100644 --- a/modular_bandastation/cryosleep/code/admin.dm +++ b/modular_bandastation/cryosleep/code/admin.dm @@ -10,8 +10,8 @@ //make a paper if need if(with_paper) var/obj/item/paper/cryo_paper = new /obj/item/paper(loc) - cryo_paper.name = "Notification - [name]" - cryo_paper.add_raw_text("Our sincerest apologies, [name][job ? ", [job]," : ""] had to be sent back in Cryogenic Storage for reasons that cannot be elaborated on at the moment.

Sincerely,
Nanotrasen Anti-Sudden Sleep Disorder Agency") + cryo_paper.name = "Уведомление - [name]" + cryo_paper.add_raw_text("Приносим искренние извинения, персону \"[name][job ? ", [job]," : ""]\" пришлось отправить в криогенное хранилище по причинам, которые на данный момент не могут быть уточнены.

С уважением,
Агентство Нанотрейзен по борьбе с SSD") cryo_paper.update_appearance() //find cryopod for(var/obj/machinery/cryopod/cryo in GLOB.valid_cryopods) diff --git a/modular_bandastation/cryosleep/code/ai.dm b/modular_bandastation/cryosleep/code/ai.dm index e41628c4bdaa9..354f8147ef0b7 100644 --- a/modular_bandastation/cryosleep/code/ai.dm +++ b/modular_bandastation/cryosleep/code/ai.dm @@ -1,13 +1,13 @@ /mob/living/silicon/ai/verb/ai_cryo() set name = "AI Cryogenic Stasis" - set desc = "Puts the current AI personality into cryogenic stasis, freeing the space for another." + set desc = "Перемещает текущий ИИ в криогенное хранилище, освобождая место для другого." set category = "AI Commands" if(incapacitated()) return - if(tgui_alert(usr, "Войти в криосон? Вы станете призраком. Не забывайте Ахелпать при вхождении в криосон на важных ролях.", "Войти в криогенный стазис", list("Да", "Нет")) == "Да") + if(tgui_alert(usr, "Войти в криогенный стазис? Вы станете призраком.", "Войти в криогенный стазис", list("Да", "Нет")) == "Да") src.ghostize(FALSE) - minor_announce("Станционный ИИ был отключён от внутренних систем и был перемещён на хранение. Подготовка к загрузке нового ИИ.", "Станционный ИИ") + minor_announce("Станционный ИИ был отключён от внутренних систем и был перемещён на хранение. Производится подготовка для загрузки нового ИИ.", "Станционный ИИ") new /obj/structure/ai_core/latejoin_inactive(loc) if(src.mind) //Handle job slot/tater cleanup. diff --git a/modular_bandastation/cryosleep/code/cryopod.dm b/modular_bandastation/cryosleep/code/cryopod.dm index 2e4ccca621192..f4692222d8b6a 100644 --- a/modular_bandastation/cryosleep/code/cryopod.dm +++ b/modular_bandastation/cryosleep/code/cryopod.dm @@ -3,8 +3,6 @@ /// modifying the actual name during the game will cause issues with the GLOB.mob_spawners associative list var/use_outfit_name -#define AHELP_FIRST_MESSAGE "Please adminhelp before leaving the round, even if there are no administrators online!" - /* * Cryogenic refrigeration unit. Basically a despawner. * Stealing a lot of concepts/code from sleepers due to massive laziness. @@ -136,11 +134,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) if (occupant_job_radio) if (occupant_departments_bitflags & DEPARTMENT_BITFLAG_COMMAND) if (occupant_job_radio != RADIO_CHANNEL_COMMAND) - radio.talk_into(src, "[user][rank ? ", [rank]" : ""] has been moved to cryo storage.", RADIO_CHANNEL_COMMAND) + radio.talk_into(src, "[user][rank ? ", [rank]" : ""] был перемещён в криогенное хранилище.", RADIO_CHANNEL_COMMAND) radio.use_command = TRUE - radio.talk_into(src, "[user][rank ? ", [rank]" : ""] has been moved to cryo storage.", occupant_job_radio) + radio.talk_into(src, "[user][rank ? ", [rank]" : ""] был перемещён в криогенное хранилище.", occupant_job_radio) radio.use_command = FALSE - radio.talk_into(src, "[user][rank ? ", [rank]" : ""] has been moved to cryo storage.", announcement_channel) + radio.talk_into(src, "[user][rank ? ", [rank]" : ""] был перемещён в криогенное хранилище.", announcement_channel) // Cryopods themselves. /obj/machinery/cryopod @@ -391,7 +389,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) return else if(tgui_alert(user, "Would you like to place [target] into [src]?", "Place into Cryopod?", list("Yes", "No")) == "Yes") if(target.mind.assigned_role.req_admin_notify) - tgui_alert(user, "They are an important role! [AHELP_FIRST_MESSAGE]") + tgui_alert(user, "Они играют на важной роли! Вы уверены что хотите переместить их в криохранилище?") to_chat(user, span_danger("You put [target] into [src]. [target.p_Theyre()] in the cryopod.")) log_admin("[key_name(user)] has put [key_name(target)] into a stasis pod.") message_admins("[key_name(user)] has put [key_name(target)] into a stasis pod. [ADMIN_JMP(src)]") @@ -412,10 +410,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) if(target == user) if(target.mind.assigned_role.req_admin_notify) - tgui_alert(target, "You're an important role! [AHELP_FIRST_MESSAGE]") + tgui_alert(target, "Вы играете на важной роли! Вы уверены что хотите покинуть раунд?") var/datum/antagonist/antag = target.mind.has_antag_datum(/datum/antagonist) if(antag) - tgui_alert(target, "You're \a [antag.name]! [AHELP_FIRST_MESSAGE]") + tgui_alert(target, "Вы \a [antag.name]! Вы уверены что хотите покинуть раунд?") if(LAZYLEN(target.buckled_mobs) > 0) if(target == user) @@ -517,5 +515,3 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/cryopod/prison, 18) ..() set_ssd_state(FALSE) */ - -#undef AHELP_FIRST_MESSAGE diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 93ec3dd1bd1fc..c46ab534209bf 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -35,3 +35,4 @@ #include "jukebox/_jukebox.dme" #include "objects/_objects.dme" #include "hair/_hair.dme" +#include "cryosleep/_cryosleep.dme"