diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 5ee57ec38cf..bb23d7a2261 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -5859,6 +5859,308 @@ dir = 8 }, /area/holodeck/rec_center/medical) +"ts" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/drinkingglasses, +/turf/open/floor/carpet, +/area/hades) +"tr" = ( +/obj/structure/chair/wood/normal{ + icon_state = "wooden_chair"; + dir = 1 + }, +/turf/open/floor/carpet, +/area/hades) +"tq" = ( +/obj/structure/table/wood, +/obj/item/weapon/kitchen/fork, +/turf/open/floor/carpet, +/area/hades) +"tp" = ( +/obj/structure/chair/wood/normal, +/mob/living/simple_animal/hostile/hadesacolyte, +/turf/open/floor/carpet, +/area/hades) +"to" = ( +/obj/machinery/chem_dispenser/drinks, +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/hades) +"tn" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/donkpockets, +/turf/open/floor/carpet, +/area/hades) +"tm" = ( +/obj/structure/table/wood, +/obj/machinery/microwave, +/turf/open/floor/carpet, +/area/hades) +"tl" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer, +/turf/open/floor/carpet, +/area/hades) +"tk" = ( +/obj/machinery/vending/snack, +/turf/open/floor/carpet, +/area/hades) +"tj" = ( +/obj/machinery/vending/cola, +/turf/open/floor/carpet, +/area/hades) +"ti" = ( +/obj/structure/chair/hades, +/turf/open/floor/mineral/diamond, +/area/hades) +"th" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/carpet, +/area/hades) +"tg" = ( +/obj/structure/table/wood, +/obj/item/weapon/razor, +/turf/open/floor/carpet, +/area/hades) +"tf" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/crayons, +/turf/open/floor/carpet, +/area/hades) +"te" = ( +/obj/structure/chair/wood/normal{ + icon_state = "wooden_chair"; + dir = 8 + }, +/turf/open/floor/carpet, +/area/hades) +"td" = ( +/obj/structure/chair/wood/normal{ + icon_state = "wooden_chair"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/hades) +"tc" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/fancy/candle_box, +/turf/open/floor/carpet, +/area/hades) +"tb" = ( +/obj/structure/table/wood, +/obj/item/weapon/lipstick, +/turf/open/floor/carpet, +/area/hades) +"ta" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/plasteel/hades, +/area/hades) +"sZ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plasteel, +/area/hades) +"sY" = ( +/obj/structure/table/wood, +/obj/item/weapon/storage/box/matches, +/turf/open/floor/carpet, +/area/hades) +"sX" = ( +/mob/living/simple_animal/hostile/hadesacolyte, +/turf/open/floor/carpet, +/area/hades) +"sW" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet/black, +/turf/open/floor/carpet, +/area/hades) +"sV" = ( +/obj/structure/flora/ausbushes/fernybush, +/turf/open/floor/grass, +/area/hades) +"sU" = ( +/obj/structure/table/wood, +/obj/item/weapon/paper/hades_instructions, +/turf/open/floor/carpet, +/area/hades) +"sT" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/carpet, +/area/hades) +"sS" = ( +/obj/structure/bookcase/random/reference, +/turf/open/floor/carpet, +/area/hades) +"sR" = ( +/obj/structure/flora/ausbushes/genericbush, +/turf/open/floor/grass, +/area/hades) +"sQ" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/grass, +/area/hades) +"sP" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/grass, +/area/hades) +"sO" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet, +/area/hades) +"sN" = ( +/turf/open/floor/mineral/gold, +/area/hades) +"sM" = ( +/mob/living/simple_animal/hostile/hadesacolyte, +/turf/open/floor/mineral/gold, +/area/hades) +"sL" = ( +/obj/structure/kitchenspike, +/turf/open/floor/mineral/diamond, +/area/hades) +"sK" = ( +/obj/structure/bookcase/random/religion, +/turf/open/floor/carpet, +/area/hades) +"sJ" = ( +/obj/structure/bookcase/random/adult, +/turf/open/floor/carpet, +/area/hades) +"sI" = ( +/obj/structure/bookcase/random/fiction, +/turf/open/floor/carpet, +/area/hades) +"sH" = ( +/obj/structure/bookcase/random/nonfiction, +/turf/open/floor/carpet, +/area/hades) +"sG" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass, +/area/hades) +"sF" = ( +/obj/structure/flora/ausbushes/palebush, +/turf/open/floor/grass, +/area/hades) +"sE" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/hades) +"sD" = ( +/obj/structure/flora/grass/green, +/turf/open/floor/grass, +/area/hades) +"sC" = ( +/obj/structure/table/wood, +/obj/item/trash/candle, +/turf/open/floor/carpet, +/area/hades) +"sB" = ( +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/hades) +"sA" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet, +/area/hades) +"sz" = ( +/obj/effect/gibspawner/human, +/turf/open/floor/carpet, +/area/hades) +"sy" = ( +/obj/structure/chair/wood/normal{ + icon_state = "wooden_chair"; + dir = 1 + }, +/turf/open/floor/plasteel/hades, +/area/hades) +"sx" = ( +/obj/structure/chair/wood/normal{ + icon_state = "wooden_chair"; + dir = 1 + }, +/mob/living/simple_animal/hostile/hadesacolyte, +/turf/open/floor/plasteel/hades, +/area/hades) +"sw" = ( +/turf/open/floor/carpet, +/area/hades) +"sv" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/fulltile, +/turf/open/floor/plasteel/hades, +/area/hades) +"su" = ( +/obj/structure/table/reinforced/brass, +/obj/item/candle/infinite, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plasteel/hades, +/area/hades) +"st" = ( +/obj/structure/table/reinforced/brass, +/turf/open/floor/plasteel/hades, +/area/hades) +"ss" = ( +/obj/structure/table/reinforced/brass, +/obj/item/candle/infinite, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel/hades, +/area/hades) +"sr" = ( +/obj/structure/table/reinforced/brass, +/obj/item/candle/infinite, +/turf/open/floor/plasteel/hades, +/area/hades) +"sq" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/fulltile, +/turf/open/floor/plasteel/hades, +/area/hades) +"sp" = ( +/mob/living/simple_animal/hostile/hadesacolyte, +/turf/open/floor/plasteel/hades, +/area/hades) +"so" = ( +/obj/effect/gibspawner/human, +/mob/living/simple_animal/hostile/hadesacolyte, +/turf/open/floor/plasteel/hades, +/area/hades) +"sn" = ( +/obj/structure/window/reinforced, +/turf/open/floor/plasteel/hades, +/area/hades) +"sm" = ( +/obj/structure/window/fulltile, +/turf/open/floor/plasteel/hades, +/area/hades) +"sl" = ( +/turf/open/floor/plasteel/hades, +/area/hades) +"sk" = ( +/obj/effect/gibspawner/human, +/turf/open/floor/plasteel/hades, +/area/hades) +"sj" = ( +/obj/structure/piano, +/turf/open/floor/plasteel/hades, +/area/hades) +"si" = ( +/obj/structure/bookcase/random/religion, +/turf/open/floor/plasteel/hades, +/area/hades) +"sh" = ( +/turf/closed/indestructible/riveted, +/area/hades) (1,1,1) = {" aa @@ -6345,33 +6647,33 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh ab "} (3,1,1) = {" @@ -6602,33 +6904,33 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sk +sl +sl +sl +sl +sl +sl +sl +sl +sk +sh +sB +sw +sT +sW +tb +sW +sO +sW +sh +sw +sw +td +sw +sh ab "} (4,1,1) = {" @@ -6859,33 +7161,33 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sl +sx +sl +sy +sl +sy +sl +sx +sl +sh +sB +sw +sw +sX +sw +sw +sw +sX +sh +sw +tp +tq +tr +sh ab "} (5,1,1) = {" @@ -7113,36 +7415,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sh +sh +sh +si +sl +sl +sy +sl +sy +sk +sy +sl +sy +sl +sh +sB +sw +sw +sw +sw +sw +sw +sw +th +sw +tp +sO +tr +sh ab "} (6,1,1) = {" @@ -7370,36 +7672,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sj +sm +sq +sl +sk +sy +sl +sx +sl +sy +sk +sy +sl +sh +sB +sw +sw +sw +sw +sw +sX +sw +sh +sw +sw +te +sw +sh ab "} (7,1,1) = {" @@ -7627,36 +7929,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sk +sn +sr +sl +sl +sy +sl +sy +sl +sx +sl +sy +sl +sh +sB +sw +sT +sW +sU +sW +tg +sW +sh +tj +sw +sw +sw +sh ab "} (8,1,1) = {" @@ -7884,36 +8186,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sn +ss +sp +sl +sl +sl +sl +sl +sl +sl +sl +sl +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +tk +sw +sw +sw +sh ab "} (9,1,1) = {" @@ -8141,36 +8443,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +so +st +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sC +sO +sU +sY +tc +tf +sO +sw +sh +tl +sw +sw +ts +sh ab "} (10,1,1) = {" @@ -8398,36 +8700,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sl +st +sw +sw +sz +sw +sw +sz +sw +sA +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sh +tm +sw +sw +sO +sh ab "} (11,1,1) = {" @@ -8655,36 +8957,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sl +st +sw +sw +sw +sw +sw +sw +sw +sw +sz +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sh +tn +sw +sw +sO +sh ab "} (12,1,1) = {" @@ -8912,36 +9214,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sk +sp +st +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sh +to +sw +sw +sU +sh ab "} (13,1,1) = {" @@ -9169,36 +9471,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sn +su +sp +sl +sl +sl +sl +sl +sl +sl +sl +sl +sh +sh +sh +sh +sh +sh +sh +th +sh +sh +sh +sh +th +sh +sh ab "} (14,1,1) = {" @@ -9426,36 +9728,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sn +sr +sl +sl +sx +sl +sy +sl +sy +sl +sy +sl +sh +sD +sP +sV +sZ +td +td +sw +sw +sw +td +td +sw +sw +sh ab "} (15,1,1) = {" @@ -9683,36 +9985,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sm +sv +sl +sk +sy +sl +sx +sk +sy +sl +sx +sl +sh +sE +sQ +sE +sZ +sw +sw +sw +sw +sw +sw +sw +sw +sw +sh ab "} (16,1,1) = {" @@ -9940,36 +10242,36 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sh +sh +sh +si +sl +sl +sy +sl +sy +sl +sx +sl +sy +sl +sh +sF +sR +sP +sZ +sw +sw +sw +sw +sw +sw +sw +sw +sw +sh ab "} (17,1,1) = {" @@ -10200,33 +10502,33 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sl +sl +sx +sl +sy +sl +sy +sk +sy +sl +sh +sG +sG +sD +sZ +sw +sw +sw +sw +sw +sX +sw +sw +sw +sh ab "} (18,1,1) = {" @@ -10457,33 +10759,33 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +si +sk +sl +sl +sl +sl +sl +sl +sl +sl +sk +sh +sD +sE +sF +sZ +te +te +sw +sw +sw +te +te +sw +sw +sh ab "} (19,1,1) = {" @@ -10714,33 +11016,33 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +th +sh +sh ab "} (20,1,1) = {" @@ -10983,21 +11285,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sH +sS +sS +sK +sK +sK +sh +sK +sK +sH +sI +sw +sS +sh ab "} (21,1,1) = {" @@ -11240,21 +11542,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sH +sw +sw +sw +sw +sw +sh +sH +sw +sw +sw +sw +sS +sh ab "} (22,1,1) = {" @@ -11497,21 +11799,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sI +sw +sw +sX +sX +sw +th +sw +sw +sw +sw +sX +sH +sh ab "} (23,1,1) = {" @@ -11754,21 +12056,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sI +sw +sw +sX +sX +sw +sh +sI +sw +sw +sw +sw +sJ +sh ab "} (24,1,1) = {" @@ -12011,21 +12313,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sJ +sw +sw +sw +sw +sw +sh +sH +sX +sw +sw +sw +sI +sh ab "} (25,1,1) = {" @@ -12268,21 +12570,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sK +sS +sI +sH +sH +sI +sh +sK +sH +sK +sS +sK +sS +sh ab "} (26,1,1) = {" @@ -12525,21 +12827,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sh +sh +sh +ta +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh ab "} (27,1,1) = {" @@ -12782,21 +13084,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sL +sl +sl +sl +sl +sl +sL +sl +sl +sl +sl +sl +sL +sh ab "} (28,1,1) = {" @@ -13039,21 +13341,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sM +sl +sl +sl +sl +sl +sM +sl +sl +sl +sl +sl +sM +sh ab "} (29,1,1) = {" @@ -13296,21 +13598,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sN +sl +sl +sl +sl +sl +sN +sl +sl +sl +sl +sl +sN +sh ab "} (30,1,1) = {" @@ -13553,21 +13855,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sN +sN +sN +sN +sN +sN +ti +sN +sN +sN +sN +sN +sN +sh ab "} (31,1,1) = {" @@ -13810,21 +14112,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sN +sl +sl +sl +sl +sl +sN +sl +sl +sl +sl +sl +sN +sh ab "} (32,1,1) = {" @@ -14067,21 +14369,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sM +sl +sl +sl +sl +sl +sM +sl +sl +sl +sl +sl +sM +sh ab "} (33,1,1) = {" @@ -14324,21 +14626,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sL +sl +sl +sl +sl +sl +sL +sl +sl +sl +sl +sl +sL +sh ab "} (34,1,1) = {" @@ -14581,21 +14883,21 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh +sh ab "} (35,1,1) = {" diff --git a/code/game/gamemodes/miniantags/hades/hades.dm b/code/game/gamemodes/miniantags/hades/hades.dm index d9882cf21b4..667f0347c4b 100644 --- a/code/game/gamemodes/miniantags/hades/hades.dm +++ b/code/game/gamemodes/miniantags/hades/hades.dm @@ -82,14 +82,6 @@ /mob/living/simple_animal/hostile/hades/New() ..() - //helper_datums/map_template.dmm make this a generic function - - var/list/bounds = maploader.load_map('_maps/map_files/generic/chapel.dmm') - initTemplateBounds(bounds) - log_game("Chapel of Sin loaded by [src] spawning.") - - // - sinLightning = new/obj/effect/proc_holder/spell/targeted/lightning(src) sinLightning.charge_max = 1 @@ -613,4 +605,4 @@ #undef STATE_JUDGE #undef STATE_WRATH -#undef STATE_FLEE \ No newline at end of file +#undef STATE_FLEE