From 2a206070cc723f6077dcf89dd9066f7247fb9ddc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Apr 2023 21:23:58 +0100 Subject: [PATCH] [MIRROR] Adds a prisoner transport space ruin [MDB IGNORE] (#20771) * Adds a prisoner transport space ruin (#74418) * Adds a prisoner transport space ruin --------- Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- .../RandomRuins/SpaceRuins/prison_shuttle.dmm | 418 ++++++++++++++++++ code/datums/ruins/space.dm | 6 + code/game/area/areas/ruins/space.dm | 5 + code/modules/mob_spawn/corpses/job_corpses.dm | 5 + config/spaceruinblacklist.txt | 1 + 5 files changed, 435 insertions(+) create mode 100644 _maps/RandomRuins/SpaceRuins/prison_shuttle.dmm diff --git a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm new file mode 100644 index 00000000000..b2aa28d68ba --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm @@ -0,0 +1,418 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/girder/reinforced, +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/structure/girder/reinforced, +/turf/open/misc/asteroid/airless, +/area/ruin/space/prison_shuttle) +"d" = ( +/obj/effect/spawner/structure/window/reinforced/shuttle, +/turf/closed/mineral/random/stationside/asteroid, +/area/ruin/space/prison_shuttle) +"e" = ( +/obj/structure/table/reinforced, +/turf/open/floor/carpet/red/airless, +/area/ruin/space/prison_shuttle) +"f" = ( +/obj/machinery/modular_computer/console, +/turf/closed/mineral/random/stationside/asteroid, +/area/ruin/space/prison_shuttle) +"g" = ( +/mob/living/simple_animal/hostile/asteroid/basilisk{ + environment_smash = 0 + }, +/turf/open/misc/asteroid/airless, +/area/ruin/space/prison_shuttle) +"h" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/space/prison_shuttle) +"i" = ( +/obj/structure/table/reinforced, +/turf/closed/mineral/random/stationside/asteroid, +/area/ruin/space/prison_shuttle) +"j" = ( +/turf/open/floor/carpet/red/airless, +/area/ruin/space/prison_shuttle) +"m" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/misc/asteroid/airless, +/area/ruin/space/prison_shuttle) +"p" = ( +/obj/structure/filingcabinet, +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"q" = ( +/mob/living/simple_animal/hostile/asteroid/hivelord, +/turf/open/misc/asteroid/airless, +/area/ruin/space/prison_shuttle) +"r" = ( +/obj/machinery/light/broken/directional/south, +/turf/open/misc/asteroid/airless, +/area/ruin/space/prison_shuttle) +"s" = ( +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/security/hos, +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"t" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"u" = ( +/obj/structure/closet/secure_closet/security, +/obj/machinery/light/broken/directional/north, +/turf/open/floor/mineral/titanium/tiled/airless, +/area/ruin/space/prison_shuttle) +"w" = ( +/mob/living/simple_animal/hostile/asteroid/hivelord, +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"x" = ( +/turf/open/floor/mineral/titanium/tiled/airless, +/area/ruin/space/prison_shuttle) +"y" = ( +/obj/machinery/light/broken/directional/north, +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"z" = ( +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/security, +/turf/open/floor/mineral/titanium/tiled/airless, +/area/ruin/space/prison_shuttle) +"B" = ( +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"E" = ( +/turf/open/misc/asteroid/airless, +/area/ruin/space/prison_shuttle) +"F" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/turf/template_noop, +/area/ruin/space/prison_shuttle) +"G" = ( +/obj/machinery/door/airlock/external/ruin, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/all/security, +/turf/open/floor/mineral/titanium/tiled/airless, +/area/ruin/space/prison_shuttle) +"H" = ( +/obj/structure/closet/secure_closet/contraband{ + name = "confiscation locker" + }, +/obj/effect/spawner/random/exotic/antag_gear, +/obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/effect/spawner/random/contraband/prison, +/obj/effect/spawner/random/contraband/prison, +/obj/machinery/light, +/turf/open/floor/mineral/titanium/tiled/airless, +/area/ruin/space/prison_shuttle) +"J" = ( +/obj/machinery/light, +/turf/open/floor/mineral/titanium/tiled/airless, +/area/ruin/space/prison_shuttle) +"L" = ( +/obj/machinery/power/shuttle_engine/propulsion/burst/left, +/turf/template_noop, +/area/ruin/space/prison_shuttle) +"M" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/orange{ + dir = 4 + }, +/obj/effect/mob_spawn/corpse/human/prisoner, +/obj/effect/decal/cleanable/blood, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"N" = ( +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"O" = ( +/mob/living/basic/cockroach, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"P" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/effect/spawner/random/contraband/narcotics, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"Q" = ( +/obj/effect/spawner/structure/window/reinforced/shuttle, +/turf/open/floor/plating/airless, +/area/ruin/space/prison_shuttle) +"R" = ( +/obj/machinery/power/shuttle_engine/propulsion/burst/right, +/turf/template_noop, +/area/ruin/space/prison_shuttle) +"S" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"T" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"U" = ( +/obj/effect/spawner/random/contraband/narcotics, +/obj/machinery/light/broken{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"V" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/orange{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"X" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/effect/mob_spawn/corpse/human/prisoner, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/airless, +/area/ruin/space/prison_shuttle) +"Y" = ( +/turf/closed/mineral/random/stationside/asteroid, +/area/ruin/space/prison_shuttle) +"Z" = ( +/obj/machinery/power/shuttle_engine/heater, +/turf/closed/wall/mineral/titanium, +/area/ruin/space/prison_shuttle) + +(1,1,1) = {" +a +a +a +a +a +a +a +h +h +h +h +h +L +a +a +Z +F +"} +(2,1,1) = {" +a +b +E +a +c +h +h +h +u +x +H +h +h +h +h +Z +F +"} +(3,1,1) = {" +a +E +Y +c +e +i +p +h +w +x +B +h +M +S +V +Z +F +"} +(4,1,1) = {" +E +Y +Y +d +E +j +q +s +x +x +x +z +N +N +O +Q +a +"} +(5,1,1) = {" +E +Y +Y +d +f +m +r +h +h +z +h +h +O +T +N +Q +a +"} +(6,1,1) = {" +E +Y +Y +Y +Y +Y +E +t +x +B +x +h +P +U +X +Z +F +"} +(7,1,1) = {" +E +Y +Y +Y +Y +c +c +h +y +x +J +h +h +h +h +Z +F +"} +(8,1,1) = {" +E +Y +Y +Y +Y +E +a +h +h +G +h +h +R +a +a +Z +F +"} +(9,1,1) = {" +a +E +Y +Y +g +E +E +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +E +E +E +E +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +E +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index aba3bdc03bb..e7459f8d2ec 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -414,6 +414,12 @@ suffix = "whiteshipruin_box.dmm"*/ name = "Traveler's Rest" description = "An abandoned capsule floating through space. It seems as if somebody was in here not too long ago." +/datum/map_template/ruin/space/prison_shuttle + id = "prison_shuttle" + suffix = "prison_shuttle.dmm" + name = "Crashed Prisoner Shuttle" + description = "A prisoner transport shuttle that had crashed into a stray asteroid long ago." + /datum/map_template/ruin/space/botanical_haven id = "botanical_haven" suffix = "botanical_haven.dmm" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 0e4e09d9acd..bfb507159f2 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -540,6 +540,11 @@ 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg') airlock_wires = /datum/wires/airlock/engineering +// CRASHED PRISON SHUTTLE +/area/ruin/space/prison_shuttle + name = "\improper Crashed Prisoner Shuttle" + + //ABANDONED BOX WHITESHIP /area/ruin/space/has_grav/whiteship/box diff --git a/code/modules/mob_spawn/corpses/job_corpses.dm b/code/modules/mob_spawn/corpses/job_corpses.dm index 28c7e8c1b88..c8dd458f42d 100644 --- a/code/modules/mob_spawn/corpses/job_corpses.dm +++ b/code/modules/mob_spawn/corpses/job_corpses.dm @@ -75,7 +75,12 @@ name = JOB_BARTENDER outfit = /datum/outfit/spacebartender +/obj/effect/mob_spawn/corpse/human/prisoner + name = JOB_PRISONER + outfit = /datum/outfit/job/prisoner + /obj/effect/mob_spawn/corpse/human/roboticist name = JOB_ROBOTICIST outfit = /datum/outfit/job/roboticist icon_state = "corpseroboticist" + diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index a369c2caa77..2a7cf70356c 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -79,6 +79,7 @@ #_maps/RandomRuins/SpaceRuins/atmosasteroidruin.dmm #_maps/RandomRuins/SpaceRuins/prey_pod.dmm #_maps/RandomRuins/SpaceRuins/travelers_rest.dmm +#_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm #_maps/RandomRuins/SpaceRuins/phonebooth.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm <<<<<<< HEAD