From 0e6a7b77c87e86d0cb15d1a453c50d2831c8d4a4 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 15 Feb 2016 04:06:40 -0600 Subject: [PATCH 1/6] Seed Vault --- .../templates/lavaland_surface_seed_vault.dmm | 41 +++++++++++++++++++ code/modules/ruins/lavaland_ruin_code.dm | 28 +++++++++++++ tgstation.dme | 1 + 3 files changed, 70 insertions(+) create mode 100644 _maps/templates/lavaland_surface_seed_vault.dmm create mode 100644 code/modules/ruins/lavaland_ruin_code.dm diff --git a/_maps/templates/lavaland_surface_seed_vault.dmm b/_maps/templates/lavaland_surface_seed_vault.dmm new file mode 100644 index 00000000000..b82c202b2b1 --- /dev/null +++ b/_maps/templates/lavaland_surface_seed_vault.dmm @@ -0,0 +1,41 @@ +"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/ruin/powered) +"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/powered) +"c" = (/turf/simulated/wall/r_wall,/area/ruin/powered) +"d" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"e" = (/obj/structure/closet/crate/hydroponics,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"f" = (/obj/machinery/hydroponics/constructable,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"g" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/seed_vault,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"h" = (/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"i" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"j" = (/obj/machinery/vending/hydroseeds,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"k" = (/obj/effect/landmark/corpse/seed_vault,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"l" = (/obj/machinery/door/airlock,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"m" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"n" = (/obj/structure/table/wood,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"o" = (/obj/structure/table/wood,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"p" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"q" = (/obj/machinery/seed_extractor,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"r" = (/obj/machinery/biogenerator,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) + +(1,1,1) = {" +aabbaaaaaaaaaaaaaaaa +aabbaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaabaaaa +aaaaaaaaaaaaaaaaabab +aaaaaaaaaaaaaaaaabbb +aaaaaaaaaaaaaaaabbbb +aacccccccccccccaabaa +ccccdefggfhfijcbbbbb +ckhchhhhhhhhhhcccbbb +ckhlhhmnnohhhhphpbbb +ckhlhhmnnohhhhphpbbb +ckhchhhhhhhhhhcccbbb +ccccdefhhfhfqrcabbbb +aacccccccccccccaaaaa +aaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaa +aabaaaaaaaaaaaaaaabb +bbaaaaaaaaaaaaaabbbb +bbbaaaaaaaaaaaaabbba +"} diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm new file mode 100644 index 00000000000..8a7b92147a5 --- /dev/null +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -0,0 +1,28 @@ + + + + + +//lavaland_surface_seed_vault.dmm +//Seed Vault +/obj/item/seeds/gatfruit + +/obj/effect/spawner/lootdrop/seed_vault + name = "seed vault seeds" + lootcount = 1 + + loot = list(/obj/item/seeds/gatfruit = 10, + /obj/item/seeds/cherryseed = 15, + /obj/item/seeds/glowberryseed = 10, + /obj/item/seeds/moonflowerseed = 8, + ) + +/obj/effect/landmark/corpse/seed_vault + name = "sleeper" + mobname = "Vault Creature" + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "sleeper" + roundstart = FALSE + death = FALSE + mob_species = /datum/species/pod + flavour_text = {"You are a strange, artificial creature. In the face of impending apocalyptic events, your creators tasked you with maintaining an emergency seed vault. You are to tend to the plants and await their return to aid in rebuilding civilization. You've been waiting quite a while though..."} diff --git a/tgstation.dme b/tgstation.dme index 2fb7c791662..3a36801346e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1530,6 +1530,7 @@ #include "code\modules\research\designs\weapon_designs.dm" #include "code\modules\research\xenobiology\xenobio_camera.dm" #include "code\modules\research\xenobiology\xenobiology.dm" +#include "code\modules\ruins\lavaland_ruin_code.dm" #include "code\modules\ruins\ruin_areas.dm" #include "code\modules\security levels\keycard authentication.dm" #include "code\modules\security levels\security levels.dm" From 4fbd30c5666d3aa86686a31c519b63325e60a428 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 15 Feb 2016 05:18:39 -0600 Subject: [PATCH 2/6] UFO Crash --- .../templates/lavaland_surface_seed_vault.dmm | 4 +- lavaland_surface_ufo_crash.dmm | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 lavaland_surface_ufo_crash.dmm diff --git a/_maps/templates/lavaland_surface_seed_vault.dmm b/_maps/templates/lavaland_surface_seed_vault.dmm index b82c202b2b1..e8b62525f35 100644 --- a/_maps/templates/lavaland_surface_seed_vault.dmm +++ b/_maps/templates/lavaland_surface_seed_vault.dmm @@ -1,5 +1,5 @@ -"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/ruin/powered) -"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/powered) +"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) +"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "c" = (/turf/simulated/wall/r_wall,/area/ruin/powered) "d" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) "e" = (/obj/structure/closet/crate/hydroponics,/turf/simulated/floor/plasteel/freezer{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) diff --git a/lavaland_surface_ufo_crash.dmm b/lavaland_surface_ufo_crash.dmm new file mode 100644 index 00000000000..c27ae7637fc --- /dev/null +++ b/lavaland_surface_ufo_crash.dmm @@ -0,0 +1,46 @@ +"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) +"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"c" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien20"},/area/lavaland/surface/outdoors) +"d" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien21"},/area/ruin/unpowered) +"e" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien22"},/area/ruin/unpowered) +"f" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien23"},/area/ruin/unpowered) +"g" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien24"},/area/lavaland/surface/outdoors) +"h" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien16"},/area/lavaland/surface/outdoors) +"i" = (/turf/indestructible/abductor{icon_state = "alien17"},/area/ruin/unpowered) +"j" = (/obj/machinery/abductor/experiment{team = 100},/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"k" = (/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"l" = (/obj/machinery/abductor/pad{team = 100},/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"m" = (/turf/indestructible/abductor{icon_state = "alien18"},/area/ruin/unpowered) +"n" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien19"},/area/lavaland/surface/outdoors) +"o" = (/obj/item/weapon/hemostat/alien,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"p" = (/obj/effect/landmark/corpse/abductor,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"q" = (/obj/structure/closet/abductor,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"r" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien14"},/area/ruin/unpowered) +"s" = (/obj/structure/table/optable/abductor,/obj/item/weapon/cautery/alien,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"t" = (/obj/structure/table/abductor,/obj/item/weapon/storage/box/alienhandcuffs,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"u" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien12"},/area/ruin/unpowered) +"v" = (/obj/item/weapon/scalpel/alien,/obj/item/weapon/surgical_drapes,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"w" = (/obj/item/weapon/retractor/alien,/obj/item/weapon/paper/abductor,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"x" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien10"},/area/ruin/unpowered) +"y" = (/obj/machinery/abductor/gland_dispenser,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"z" = (/obj/structure/table/abductor,/obj/item/weapon/surgicaldrill/alien,/obj/item/weapon/circular_saw/alien,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"A" = (/obj/structure/bed/abductor,/turf/simulated/floor/plating/abductor{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16; temperature = 300},/area/ruin/unpowered) +"B" = (/turf/indestructible/abductor{icon_state = "alien8"},/area/ruin/unpowered) +"C" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien9"},/area/lavaland/surface/outdoors) +"D" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien2"},/area/ruin/unpowered) +"E" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien3"},/area/ruin/unpowered) +"F" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien4"},/area/ruin/unpowered) +"G" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/turf/indestructible/abductor{icon_state = "alien5"},/area/lavaland/surface/outdoors) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaabaaabbaaaaabbb +aaacdefgbbbbbbbbbbbbbbbbbbbbbb +aahijklmnbbbbbbbbbbbbbbbbbbbbb +aaaakopqrbbbbbbbbbbbbbbbbbbbbb +aaaaksktubbbbbbbbbbbbbbbbbbbbb +aaaaavwqxbbbbbbbbbbbbbbbbbbbbb +aaaayzABCbbbbbbbbbbbbbbbbbbbbb +aaaaDEFGbaaaaaaaaabaaaaaaaaaab +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +"} From 044010e4d43989fdeb6a94963f5da7752b984fad Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 15 Feb 2016 13:06:18 -0600 Subject: [PATCH 3/6] Moves UFO crash to proper folder --- .../templates/lavaland_surface_ufo_crash.dmm | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lavaland_surface_ufo_crash.dmm => _maps/templates/lavaland_surface_ufo_crash.dmm (100%) diff --git a/lavaland_surface_ufo_crash.dmm b/_maps/templates/lavaland_surface_ufo_crash.dmm similarity index 100% rename from lavaland_surface_ufo_crash.dmm rename to _maps/templates/lavaland_surface_ufo_crash.dmm From d14a7f24701f9a1915e7ce6cff0bd6a872643bb8 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 15 Feb 2016 13:45:16 -0600 Subject: [PATCH 4/6] Another map --- _maps/templates/lavaland_surface_cube.dmm | 38 +++++++++++++++++++++++ code/modules/ruins/lavaland_ruin_code.dm | 1 - 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 _maps/templates/lavaland_surface_cube.dmm diff --git a/_maps/templates/lavaland_surface_cube.dmm b/_maps/templates/lavaland_surface_cube.dmm new file mode 100644 index 00000000000..f79eb33988c --- /dev/null +++ b/_maps/templates/lavaland_surface_cube.dmm @@ -0,0 +1,38 @@ +"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) +"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"c" = (/obj/effect/decal/remains/human,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"d" = (/turf/indestructible/riveted,/area/lavaland/surface/outdoors) +"e" = (/obj/machinery/wish_granter,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) + +(1,1,1) = {" +aaaaabbaaaaaaaaaaaaaaaaaabbbbb +aabaaaaaaaaaaaaaaaaaaaaaabbbaa +aaaabaaabaabbbbbbbbbbbaabbbbaa +aaaabaaaaababcbbbaabbbaabbaaaa +aaabbaaaaaaabbbbbaabbbaabbaaaa +aaabbaaaaaaabbbbbaabbbaabbaaaa +aabbbaaaaaabbbcbbbbbbabcbbaaaa +aaaaaaaaaaabbbbbcbbbbbbbbbaaaa +aaaaaaaaaaaabcbbbbbcbbbbbbaaaa +aaaaaaaaaaaabbbcbbbbbbbbbbaaaa +aaaaaabbbaacbcbbcbbbbabbbcaaaa +aaaaaabbbaabbdddddcbbbbbbbbbba +aaaaaabbbbabcdddddbcbbbbbbcbba +bbaaabbbbbbbcddeddcbcbbbbbbbba +aabbabbbcbbbbdddddcbbbbcbbbbba +bbababbbbbbbcdddddbbbbbbbbabba +bbbbbbbbbbbccbbbcbcbbbcbaabbba +bcbabbcbbcbbbbcbccbbbbbbaabbba +bbbabbbbbbbcbbbaabbabbbbaabbba +bbabbbbbbbbbbbbaaaaaabaaaabbba +bbabbbcbbbbbbbcbaaaaaaaaaabbaa +abbbbbbbbbbbbbbbaaaaaaaaabbbaa +aabbbbbbbbbbbcaaaaaaaaaaaaacaa +aaabbbbbbbcbbbbaaaaaaaaaaaabaa +aaabbbcbbbbbbbbbabbaaaaaaaabba +aabbbbbbbbbbbbbbbbaaaaaaaaabaa +aabbbbbbbcbbbbbbbbbaaaaaaaabba +aaaaabbbbbbbbbbbacbaaaaaaaabba +baabaabbbbbbcbbbbaaaaaaaaaabba +aaabbbaabbbbbbbbbaaaaaaaaaabba +"} diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 8a7b92147a5..a3b40d285bf 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -5,7 +5,6 @@ //lavaland_surface_seed_vault.dmm //Seed Vault -/obj/item/seeds/gatfruit /obj/effect/spawner/lootdrop/seed_vault name = "seed vault seeds" From f3fd49349c2ac55b24c9edb51f9065d41d123079 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 17 Feb 2016 06:32:32 -0600 Subject: [PATCH 5/6] Prisoner Transport --- .../lavaland_surface_prisoner_crash.dmm | 46 +++++++++++++++++++ code/modules/awaymissions/corpse.dm | 23 +++++++++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 _maps/templates/lavaland_surface_prisoner_crash.dmm diff --git a/_maps/templates/lavaland_surface_prisoner_crash.dmm b/_maps/templates/lavaland_surface_prisoner_crash.dmm new file mode 100644 index 00000000000..418f5bc5a6a --- /dev/null +++ b/_maps/templates/lavaland_surface_prisoner_crash.dmm @@ -0,0 +1,46 @@ +"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/space) +"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"c" = (/obj/item/weapon/shard,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"d" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"e" = (/turf/simulated/wall/shuttle/smooth/overplating{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"f" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"g" = (/turf/simulated/wall/shuttle/smooth/overred{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"h" = (/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) +"i" = (/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"j" = (/obj/effect/landmark/corpse/prisoner_transport,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"k" = (/obj/item/weapon/shard,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) +"l" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"m" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"n" = (/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"o" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"p" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) +"q" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) +"r" = (/obj/structure/closet/crate/internals,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"s" = (/obj/structure/lattice,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"t" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"u" = (/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"v" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"w" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) + +(1,1,1) = {" +abbbbbbabbaabbbbbbbb +aabbbbbbbbbbbabbbbbb +bbcbaabbbbbbbabbbbbb +bbbbaabbdbbbabaaabbb +bbbbaabbbbbbbbaaabbb +baabbbbbbbbbbaaaaaaa +baaabbbbbbbbbaaaaaaa +bbbbbebaaaabaaaaaaaa +bbbbbfeaaaabbaaaaaaa +bbbfggggggeehheeeaaa +bbbegijjjjghhhekaaaa +bbbfglmnnnohkhpqaaaa +bbbegrjjjjghhheaaeaa +bbbfggggggessheeeabb +bbbbbfebbbbbbbbbbabb +bbbbbebbbbbbbbbbbbbb +bbbbbbbttbbbbbbbbaab +bbbuvbtttbbbcbbbbaab +babbbwtbbaaaaaaaaaaa +bbabbbbbbaaaaaaaaaaa +"} diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index c7a1bb0ebc5..6a5e9ba33b7 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -45,6 +45,9 @@ ..() invisibility = 0 +/obj/effect/landmark/corpse/proc/special(mob/new_spawn) + return + /obj/effect/landmark/corpse/proc/createCorpse(death, ckey) //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) if(mobname != "default") @@ -114,6 +117,7 @@ if(ckey) M.ckey = ckey M << "[flavour_text]" + special(M) qdel(src) /obj/effect/landmark/corpse/AICorpse/createCorpse() //Creates a corrupted AI @@ -318,7 +322,6 @@ corpseidjob = "Private Security Force" corpseidaccess = "Security Officer" - /obj/effect/landmark/corpse/commander/alive death = FALSE roundstart = FALSE @@ -372,3 +375,21 @@ mob_species = /datum/species/abductor corpseuniform = /obj/item/clothing/under/color/grey corpseshoes = /obj/item/clothing/shoes/combat + +///Prisoner + +/obj/effect/landmark/corpse/prisoner_transport + name = "prisoner sleeper" + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "sleeper" + corpseuniform = /obj/item/clothing/under/rank/prisoner + corpsemask = /obj/item/clothing/mask/breath + corpseshoes = /obj/item/clothing/shoes/sneakers/orange + corpsepocket1 = /obj/item/weapon/tank/internals/emergency_oxygen + roundstart = FALSE + death = FALSE + flavour_text = {"You were a prisoner, sentenced to hard labour in one of Nanotrasen's harsh gulags, but judging by the explosive crash you just survived, fate may have other plans for. First thing is first though: Find a way to survive this mess."} + +/obj/effect/landmark/corpse/prisoner_transport/special(mob/living/new_spawn) + var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "syndicate collaboration", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting your manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence") + new_spawn << "You were convincted of: [crime]." From 5f0cbb3e408834683cbd77efd82c22910e09c6c8 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 17 Feb 2016 07:04:02 -0600 Subject: [PATCH 6/6] Automated Trading Post --- ...valand_surface_automated_trade_outpost.dmm | 33 +++++++++ .../lavaland_surface_prisoner_crash.dmm | 67 ++++++++++--------- 2 files changed, 69 insertions(+), 31 deletions(-) create mode 100644 _maps/templates/lavaland_surface_automated_trade_outpost.dmm diff --git a/_maps/templates/lavaland_surface_automated_trade_outpost.dmm b/_maps/templates/lavaland_surface_automated_trade_outpost.dmm new file mode 100644 index 00000000000..19e9004563f --- /dev/null +++ b/_maps/templates/lavaland_surface_automated_trade_outpost.dmm @@ -0,0 +1,33 @@ +"a" = (/turf/simulated/wall/shuttle/smooth/overred{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"b" = (/obj/machinery/vending/medical,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"c" = (/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"d" = (/obj/machinery/vending/autodrobe,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"e" = (/obj/machinery/vending/coffee,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"f" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"g" = (/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 4; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = -9; pixel_y = 2},/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"h" = (/obj/structure/showcase{density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; dir = 8; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_x = 9; pixel_y = 2},/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"i" = (/obj/structure/table/glass,/obj/item/weapon/paper{name = "payment table"},/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"j" = (/obj/machinery/vending/magivend,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"k" = (/obj/machinery/vending/sustenance,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"l" = (/obj/machinery/door/airlock/shuttle{name = "automated trading pod"},/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"m" = (/obj/structure/table/glass,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"n" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"o" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"p" = (/obj/item/weapon/paper{desc = "Please leave payment on the table - The Trader"; name = "welcome to the trading post"},/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"q" = (/obj/machinery/vending/snack,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"r" = (/obj/machinery/vending/tool,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"s" = (/obj/machinery/vending/cola,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) +"t" = (/obj/machinery/vending/clothing,/turf/simulated/floor/plasteel/shuttle/purple{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/powered) + +(1,1,1) = {" +aaaaaaaaaa +abcdccecfa +acccccccca +agccccccha +aiccjkcccl +amccnocpcl +agccccccha +acccccccca +aqcrccscta +aaaaaaaaaa +"} diff --git a/_maps/templates/lavaland_surface_prisoner_crash.dmm b/_maps/templates/lavaland_surface_prisoner_crash.dmm index 418f5bc5a6a..3273a4b706f 100644 --- a/_maps/templates/lavaland_surface_prisoner_crash.dmm +++ b/_maps/templates/lavaland_surface_prisoner_crash.dmm @@ -1,26 +1,31 @@ -"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/space) -"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"c" = (/obj/item/weapon/shard,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"d" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"e" = (/turf/simulated/wall/shuttle/smooth/overplating{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"f" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"g" = (/turf/simulated/wall/shuttle/smooth/overred{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"h" = (/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) -"i" = (/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"j" = (/obj/effect/landmark/corpse/prisoner_transport,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"k" = (/obj/item/weapon/shard,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) -"l" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"m" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"n" = (/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"o" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"p" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) -"q" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/space) -"r" = (/obj/structure/closet/crate/internals,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) -"s" = (/obj/structure/lattice,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"t" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"u" = (/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"v" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) -"w" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/space) +"a" = (/turf/simulated/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) +"b" = (/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"c" = (/obj/item/weapon/shard,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"d" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"e" = (/turf/simulated/wall/shuttle/smooth/overplating{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/lavaland/surface/outdoors) +"f" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"g" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered) +"h" = (/turf/simulated/wall/shuttle/smooth/overred{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"i" = (/turf/simulated/wall/shuttle/smooth/overplating{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"j" = (/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/lavaland/surface/outdoors) +"k" = (/turf/simulated/wall/shuttle/smooth/overplating{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/space) +"l" = (/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/device/flashlight/lantern,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"m" = (/obj/effect/landmark/corpse/prisoner_transport,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"n" = (/obj/item/weapon/shard,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/ruin/unpowered) +"o" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/effect/decal/cleanable/blood,/obj/item/device/flashlight/seclite,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"p" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"q" = (/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"r" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"s" = (/obj/item/weapon/shard,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/lavaland/surface/outdoors) +"t" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/ruin/unpowered) +"u" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth; nitrogen = 23; oxygen = 16},/area/ruin/unpowered) +"v" = (/obj/structure/closet/crate/internals,/obj/item/weapon/crowbar/large,/turf/simulated/floor/plasteel/shuttle/red{baseturf = /turf/simulated/floor/plating/lava/smooth},/area/ruin/unpowered) +"w" = (/obj/structure/lattice,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"x" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"y" = (/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"z" = (/obj/item/weapon/gun/projectile/automatic/pistol/m1911,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"A" = (/obj/effect/landmark/corpse/nanotrasensoldier,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"B" = (/obj/effect/decal/cleanable/blood,/obj/item/device/flashlight/seclite,/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) (1,1,1) = {" abbbbbbabbaabbbbbbbb @@ -32,15 +37,15 @@ baabbbbbbbbbbaaaaaaa baaabbbbbbbbbaaaaaaa bbbbbebaaaabaaaaaaaa bbbbbfeaaaabbaaaaaaa -bbbfggggggeehheeeaaa -bbbegijjjjghhhekaaaa -bbbfglmnnnohkhpqaaaa -bbbegrjjjjghhheaaeaa -bbbfggggggessheeeabb +bbbghhhhhhiejjiikaaa +bbbihlmmmmhjjjinaaaa +bbbghopqqqrjsjtuaaaa +bbbihvmmmmhjjjkaaeaa +bbbghhhhhhiwwjkkkabb bbbbbfebbbbbbbbbbabb bbbbbebbbbbbbbbbbbbb -bbbbbbbttbbbbbbbbaab -bbbuvbtttbbbcbbbbaab -babbbwtbbaaaaaaaaaaa +bbbbbbbxxbbbbbbbbaab +bbbyzbxxxbbbcbbbbaab +babbbABbbaaaaaaaaaaa bbabbbbbbaaaaaaaaaaa "}