diff --git a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm b/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm new file mode 100644 index 00000000000..17e9d92a2f4 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm @@ -0,0 +1,2596 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bM" = ( +/obj/structure/flora/ash/stem_shroom, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"cW" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"db" = ( +/obj/item/clothing/under/plasmaman/clown, +/obj/item/clothing/shoes/clown_shoes, +/obj/item/clothing/mask/gas/clown_hat, +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"dJ" = ( +/obj/structure/flora/rock, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"dK" = ( +/obj/item/reagent_containers/hypospray/medipen/survival, +/obj/effect/decal/remains/human, +/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/clothing/mask/gas/explorer, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/gloves/color/black, +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/obj/item/borg/sight/meson, +/obj/item/pickaxe/improvised, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"dQ" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"dZ" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"em" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/item/relic/lavaland, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"en" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 0 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"fc" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"fJ" = ( +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/obj/item/clothing/under/color/grey, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/mask/gas, +/obj/item/spear, +/obj/item/gps/spaceruin, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"fK" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 0 + }, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/statue/dragonman, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"fP" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/statue/dragonman, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"fY" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"gc" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/stone_tile/block, +/obj/item/flashlight/flare/torch/everburning, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"gz" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"gF" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"hk" = ( +/obj/item/storage/bag/ore, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"hm" = ( +/obj/structure/stone_tile/block/cracked, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"hu" = ( +/obj/structure/stone_tile, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"hL" = ( +/obj/structure/statue/bone/rib, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"iB" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/obj/item/knife/hunting, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"iE" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"jx" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"mM" = ( +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/flora/ash/fireblossom, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"nd" = ( +/obj/structure/stone_tile/cracked, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"nk" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"nm" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"nw" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile, +/obj/effect/decal/cleanable/blood/old, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"ov" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"oP" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"pg" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 6 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"py" = ( +/mob/living/basic/mining/ice_whelp/ash, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"pR" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 6 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = -12; + pixel_y = 6 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"sS" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"te" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"tm" = ( +/obj/effect/decal/remains/human, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"tv" = ( +/obj/structure/flora/rock/pile/style_3, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"tH" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"tW" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"ul" = ( +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"uA" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"uJ" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"we" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 5 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"wh" = ( +/obj/structure/stone_tile/block, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"wD" = ( +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"xl" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 6 + }, +/obj/item/flashlight/flare/torch/everburning, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"xq" = ( +/obj/item/clothing/head/helmet/space/eva, +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"xG" = ( +/obj/item/stack/ore/glass/basalt, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"yy" = ( +/obj/structure/altar, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"zZ" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center/cracked, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Bi" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/item/shovel/serrated/dull, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"BJ" = ( +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"BP" = ( +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/statue/dragonman, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"BU" = ( +/turf/open/space, +/area/space) +"BX" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Cm" = ( +/obj/structure/stone_tile/slab, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Cq" = ( +/obj/structure/stone_tile/center/cracked, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"CB" = ( +/obj/structure/stone_tile/slab, +/obj/structure/closet/crate/coffin, +/obj/effect/mob_spawn/corpse/human/charredskeleton/dragoon, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Ds" = ( +/obj/structure/stone_tile/slab/cracked, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"DR" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Ef" = ( +/obj/structure/ore_box, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Ew" = ( +/obj/structure/stone_tile/slab, +/obj/item/relic/lavaland, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Fh" = ( +/obj/structure/stone_tile, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Fo" = ( +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Gi" = ( +/obj/effect/mapping_helpers/bombable_wall, +/turf/closed/wall/tomb, +/area/ruin/unpowered/no_grav) +"Hj" = ( +/obj/structure/flora/ash/leaf_shroom, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Hv" = ( +/obj/structure/fluff/drake_statue/falling, +/obj/structure/stone_tile/slab, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Id" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/effect/decal/remains/human/smokey, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Is" = ( +/obj/structure/flora/ash/fireblossom, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Iz" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"IW" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/stone_tile/block/cracked, +/obj/item/flashlight/flare/torch/everburning, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Jj" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 1 + }, +/mob/living/basic/mining/ice_whelp/ash, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"JE" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"JY" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Kt" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Ky" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 6 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"KA" = ( +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/structure/statue/drake, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"KI" = ( +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/statue/dragonman, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"La" = ( +/obj/structure/statue/bone/rib{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Lj" = ( +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Lv" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Lx" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"LC" = ( +/obj/structure/flora/rock/style_3, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"LG" = ( +/obj/structure/flora/rock/style_4, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"LQ" = ( +/obj/structure/flora/rock/style_2, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"LU" = ( +/obj/item/bikehorn, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Mu" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/statue/drake, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"MI" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"NI" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/item/spear, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"NJ" = ( +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/obj/item/spear/bonespear, +/obj/item/clothing/under/costume/gladiator/ash_walker, +/obj/item/clothing/head/helmet/gladiator, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"NW" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"OE" = ( +/obj/structure/statue/drake, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"OM" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"PS" = ( +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/item/relic/lavaland, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"PW" = ( +/obj/structure/flora/rock/pile, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"PX" = ( +/obj/structure/necropolis_gate, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Qa" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Qg" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 9 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"QQ" = ( +/obj/effect/decal/cleanable/blood/trails, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"QY" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Rh" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Rl" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/item/toy/eldritch_book, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Rp" = ( +/turf/closed/mineral/volcanic/airless, +/area/ruin/unpowered/no_grav) +"SG" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/statue/drake, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"SP" = ( +/obj/effect/mapping_helpers/bombable_wall, +/turf/closed/mineral/volcanic/airless, +/area/ruin/unpowered/no_grav) +"Tg" = ( +/obj/structure/stone_tile/burnt, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Tt" = ( +/obj/item/pickaxe, +/obj/structure/flora/rock/pile/style_2, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Tu" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"TO" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/crayon/rune4, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"TP" = ( +/turf/open/space/basic, +/area/space) +"Ue" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"UK" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Va" = ( +/obj/effect/decal/cleanable/blood/trails{ + dir = 10 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Vd" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Vn" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 5 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"VX" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/item/spear, +/obj/effect/decal/remains/human, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"VZ" = ( +/obj/item/clothing/suit/space/eva, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Wm" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"WL" = ( +/turf/closed/wall/tomb, +/area/ruin/unpowered/no_grav) +"WP" = ( +/obj/item/relic/lavaland, +/obj/structure/stone_tile/slab, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Xg" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/center/burnt, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = 12; + pixel_y = -6 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = 12; + pixel_y = 6 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"Yf" = ( +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/obj/item/organ/legion_tumour, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"YC" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"YG" = ( +/turf/closed/mineral/gibtonite/volcanic/airless, +/area/ruin/unpowered/no_grav) +"Zm" = ( +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) +"ZW" = ( +/obj/structure/closet/crate/grave/filled, +/turf/open/misc/asteroid/basalt/airless, +/area/ruin/unpowered/no_grav) + +(1,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} +(2,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} +(3,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +wD +wD +Rp +Rp +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} +(4,1,1) = {" +BU +BU +BU +BU +BU +BU +wD +wD +wD +Rp +Rp +Rp +Rp +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} +(5,1,1) = {" +BU +BU +BU +BU +BU +BU +wD +wD +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +"} +(6,1,1) = {" +BU +BU +BU +BU +BU +wD +wD +wD +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +wD +PW +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +wD +PW +Rp +Rp +Rp +Rp +BU +BU +BU +"} +(7,1,1) = {" +BU +BU +BU +BU +wD +wD +wD +wD +wD +wD +wD +Rp +wD +Rp +Rp +Rp +Rp +wD +wD +wD +Qg +QQ +QQ +Va +Rp +Rp +Rp +Rp +Rp +fJ +Va +py +wD +VZ +Rp +Rp +Rp +BU +BU +BU +"} +(8,1,1) = {" +BU +BU +BU +wD +wD +wD +Rp +Rp +wD +wD +wD +wD +wD +wD +Rp +Rp +Rp +wD +dJ +wD +JY +Rp +Rp +we +Va +Rp +Rp +YG +Rp +Rp +we +Va +wD +wD +Rp +Rp +Rp +BU +BU +BU +"} +(9,1,1) = {" +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Lv +wD +wD +Rp +Rp +Rp +wD +wD +py +JY +wD +Rp +Rp +JY +JE +Rp +Rp +Rp +Rp +Rp +JY +xq +Rp +Rp +Rp +Rp +Rp +BU +BU +"} +(10,1,1) = {" +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +wD +wD +Rp +Rp +Rp +dK +Qa +Qa +Ky +wD +Rp +Rp +we +Qa +wD +Rp +Rp +Rp +Rp +JY +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +"} +(11,1,1) = {" +BU +BU +BU +BU +Rp +Rp +Rp +Rp +wD +wD +wD +Rp +Rp +wD +wD +Rp +Rp +Rp +wD +wD +wD +Rp +Rp +Rp +Rp +tv +wD +wD +Rp +JE +QQ +Ky +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +"} +(12,1,1) = {" +BU +BU +BU +wD +Rp +Rp +Rp +LC +wD +py +wD +Rp +Rp +wD +wD +Lv +Rp +Rp +WL +WL +WL +WL +WL +WL +WL +Rp +wD +wD +wD +wD +Is +Rp +Rp +Rp +Rp +Rp +Rp +wD +BU +BU +"} +(13,1,1) = {" +BU +BU +BU +wD +Rp +Rp +Rp +wD +Qg +QQ +Va +Is +Rp +Rp +JE +wD +Rp +WL +WL +fP +OM +Rh +PS +NW +WL +WL +Rp +wD +Lv +wD +wD +Rp +Rp +Rp +Rp +Rp +Rp +wD +BU +BU +"} +(14,1,1) = {" +BU +BU +wD +wD +Rp +Rp +Rp +wD +JY +Rp +we +Va +wD +Rp +JY +wD +Rp +WL +oP +Wm +Tu +sS +tW +Id +gc +WL +mM +La +Zm +La +wD +Rp +Rp +Rp +Rp +wD +wD +BU +BU +BU +"} +(15,1,1) = {" +BU +BU +wD +Rp +Rp +Rp +Rp +Rp +db +Rp +Rp +fc +LU +Rp +JY +wD +Rp +WL +BP +iB +dQ +NI +zZ +BX +WL +WL +dZ +Zm +wD +wD +wD +wD +Rp +Rp +Rp +wD +wD +BU +BU +TP +"} +(16,1,1) = {" +BU +BU +wD +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +we +Qa +Qa +Ky +Rp +Rp +WL +NW +Ue +hm +gF +iE +Ds +uA +PX +wD +YC +te +Iz +QY +wD +Rp +Rp +wD +wD +wD +BU +BU +BU +"} +(17,1,1) = {" +BU +BU +wD +wD +Rp +Rp +Rp +Rp +Rp +Rp +wD +wD +wD +wD +Rp +Rp +Rp +WL +fK +jx +MI +VX +ov +en +WL +WL +gz +hu +Vd +Is +wD +wD +Rp +Rp +wD +wD +wD +BU +BU +BU +"} +(18,1,1) = {" +BU +BU +BU +wD +Rp +Rp +Rp +Rp +Rp +JE +wD +Rp +Rp +Rp +Rp +Rp +Rp +WL +ul +em +nw +uJ +nk +Lx +IW +WL +hu +hL +wD +hL +wD +Is +Rp +Rp +wD +wD +wD +BU +BU +BU +"} +(19,1,1) = {" +BU +BU +BU +wD +Rp +Rp +Rp +Rp +Rp +we +Va +Lv +Rp +Rp +Rp +YG +Rp +WL +WL +KI +Lj +UK +nk +YC +WL +WL +Rp +wD +wD +wD +wD +Rp +Rp +Rp +Rp +wD +wD +BU +BU +BU +"} +(20,1,1) = {" +BU +BU +BU +wD +Rp +Rp +wD +Rp +Rp +Rp +we +Va +Qg +Va +Rp +Rp +Rp +Rp +WL +WL +WL +Cm +WL +WL +WL +Rp +wD +Is +wD +wD +Rp +Rp +Rp +Rp +Rp +Rp +wD +BU +BU +BU +"} +(21,1,1) = {" +BU +BU +BU +BU +Rp +Rp +wD +bM +LQ +Rp +Rp +we +Ky +we +Va +Rp +Rp +Rp +Rp +WL +Mu +DR +SG +WL +Rp +Rp +Ef +wD +wD +wD +wD +Rp +Rp +Rp +Rp +Rp +wD +wD +BU +BU +"} +(22,1,1) = {" +BU +BU +BU +BU +BU +Rp +Rp +Rl +TO +wD +SP +wD +Qg +Qa +Ky +Rp +Rp +Rp +Rp +WL +WL +hu +WL +WL +Rp +Rp +xG +wD +Rp +wD +wD +PW +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +"} +(23,1,1) = {" +BU +BU +BU +BU +BU +Rp +Rp +Ew +Fh +wD +Rp +wD +fc +Lv +WL +WL +WL +WL +WL +WL +OE +wD +BJ +WL +Rp +Rp +wD +wD +Rp +Rp +wD +wD +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +"} +(24,1,1) = {" +BU +BU +BU +BU +BU +wD +Rp +nm +Hj +Rp +Rp +wD +fc +WL +WL +Vn +ZW +wD +yy +WL +WL +Fo +WL +WL +Rp +Rp +hk +xG +Rp +Rp +wD +wD +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +"} +(25,1,1) = {" +BU +BU +BU +BU +BU +wD +Rp +Rp +Rp +Rp +wD +wD +fc +WL +pg +Cm +cW +Cq +ZW +WL +hu +nd +KA +WL +Rp +Rp +xG +Rp +Rp +Lv +wD +wD +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +"} +(26,1,1) = {" +BU +BU +BU +BU +BU +wD +wD +Rp +Rp +wD +LG +Qg +Ky +Gi +Cm +Ds +Xg +wD +wD +WL +WL +Vd +WL +WL +Rp +Rp +Tt +Rp +Rp +wD +wD +Rp +Rp +Lv +Rp +Rp +Rp +Rp +BU +BU +"} +(27,1,1) = {" +BU +BU +BU +BU +BU +wD +wD +Rp +Lv +Qg +Jj +Ky +Rp +WL +xl +Hv +CB +hm +Kt +Ds +wh +tH +WL +Rp +Rp +Rp +Rp +Rp +wD +wD +wD +Rp +Rp +wD +wD +wD +wD +wD +BU +BU +"} +(28,1,1) = {" +BU +BU +BU +BU +BU +BU +wD +Rp +wD +fc +wD +Lv +Rp +WL +Cm +Cm +pR +wD +wD +WL +WL +WL +WL +Rp +Rp +tm +Lv +Rp +wD +wD +Rp +Rp +Rp +wD +wD +wD +wD +wD +BU +BU +"} +(29,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +we +Va +Rp +Rp +WL +nm +Cm +hu +wD +ZW +WL +Rp +Rp +Rp +Rp +Hj +Bi +Rp +Rp +wD +wD +wD +Rp +wD +wD +wD +Rp +Rp +BU +BU +BU +"} +(30,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Yf +Rp +Rp +WL +WL +fY +ZW +Tg +yy +WL +Rp +Rp +Rp +YG +tv +WP +Rp +Rp +tv +wD +wD +wD +wD +wD +Rp +Rp +wD +wD +BU +BU +"} +(31,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +WL +WL +WL +WL +WL +WL +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +wD +LG +wD +wD +wD +Rp +Rp +wD +BU +BU +BU +"} +(32,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Qg +Qa +Qa +Qa +Va +Rp +Rp +Rp +wD +Qg +JE +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +"} +(33,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Qg +Qa +Qa +Ky +wD +Lv +wD +fc +wD +Rp +wD +wD +fc +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +"} +(34,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +wD +fc +wD +wD +wD +Rp +Rp +wD +we +Va +wD +Qg +QQ +Ky +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +"} +(35,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +TP +Rp +Rp +Rp +Rp +py +fc +wD +Rp +Rp +Rp +Rp +Rp +Rp +we +QQ +Ky +Rp +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +"} +(36,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +TP +TP +TP +Rp +Rp +Rp +NJ +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +wD +Rp +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +BU +"} +(37,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +BU +BU +"} +(38,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +Rp +Rp +Rp +Rp +BU +BU +BU +BU +Rp +Rp +Rp +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} +(39,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +Rp +Rp +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} +(40,1,1) = {" +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +BU +"} diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 4ced4938047..bb612f1c84b 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -58163,7 +58163,7 @@ /turf/open/floor/grass, /area/station/service/chapel) "tts" = ( -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /obj/item/book/bible, /obj/effect/landmark/start/hangover, /obj/item/flashlight/lantern/on, diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 0d98ec8ae5e..f83d88f8bdb 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -11245,7 +11245,7 @@ }, /area/station/hallway/secondary/service) "drE" = ( -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /obj/structure/noticeboard/directional/north, /turf/open/floor/iron/chapel{ dir = 4 diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 89cb228e282..fa4d824418f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -94565,7 +94565,7 @@ /area/station/science/xenobiology) "xDd" = ( /obj/item/book/bible, -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /turf/open/floor/iron/grimy, /area/station/service/chapel) "xDf" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index fd83c1c2b38..305b12ac07b 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2636,7 +2636,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/book/bible, -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /turf/open/floor/iron/dark, /area/station/service/chapel) "aLz" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5bfd9a76a38..6a8dc34839d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -34758,7 +34758,7 @@ /area/station/maintenance/fore) "msl" = ( /obj/item/book/bible, -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /turf/open/floor/iron/dark, /area/station/service/chapel) "msu" = ( diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 3462917cf75..71e47c437fb 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -98938,7 +98938,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/aft/greater) "oJn" = ( -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/item/book/bible, /obj/effect/turf_decal/siding/thinplating_new/dark{ diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b261804651b..950d173846c 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -39617,7 +39617,7 @@ /area/station/commons/vacant_room) "mVo" = ( /obj/item/book/bible, -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /turf/open/floor/iron/dark, /area/station/service/chapel) "mVp" = ( diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 51a51c65385..541ad5d0958 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -21516,7 +21516,7 @@ /turf/open/floor/iron/dark, /area/station/security/execution/education) "hzC" = ( -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /obj/effect/turf_decal/siding/dark{ dir = 8 }, diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 63df00c0048..8b0c5c2768b 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -1195,7 +1195,7 @@ "sv" = ( /obj/item/book/bible, /obj/structure/cable, -/obj/structure/altar_of_gods, +/obj/structure/altar/of_gods, /turf/open/floor/carpet, /area/shuttle/escape) "sz" = ( diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 87a65232532..8faaeffb291 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -38,6 +38,9 @@ #define COOLDOWN_MECHA_MISSILE_STRIKE "mecha_missile_strike" #define COOLDOWN_MECHA_CABIN_SEAL "mecha_cabin_seal" +//skybulge cooldown +#define COOLDOWN_SKYBULGE_JUMP "skybulge_jump" + //car cooldowns #define COOLDOWN_CAR_HONK "car_honk" diff --git a/code/__DEFINES/megafauna.dm b/code/__DEFINES/megafauna.dm index 981b8d49f52..446f9a4a551 100644 --- a/code/__DEFINES/megafauna.dm +++ b/code/__DEFINES/megafauna.dm @@ -1,4 +1,6 @@ /// Temperature of drake fire hotspots #define DRAKE_FIRE_TEMP 500 +/// Temperature of ash whelp fire hostpos +#define ICE_WHELP_FIRE_TEMP TCMB /// Volume of drake fire hotspots #define DRAKE_FIRE_EXPOSURE 50 diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm index e407dafd7cf..b38687a72ab 100644 --- a/code/datums/actions/mobs/fire_breath.dm +++ b/code/datums/actions/mobs/fire_breath.dm @@ -53,7 +53,7 @@ /// Finally spawn the actual fire, spawns the fire hotspot in case you want to recolour it or something /datum/action/cooldown/mob_cooldown/fire_breath/proc/burn_turf(turf/fire_turf, list/hit_list, mob/living/source) - var/obj/effect/hotspot/fire_hotspot = new /obj/effect/hotspot(fire_turf) + var/obj/effect/hotspot/fire_hotspot = new /obj/effect/hotspot(fire_turf, fire_volume, fire_temperature) fire_turf.hotspot_expose(fire_temperature, fire_volume, TRUE) for(var/mob/living/barbecued in fire_turf.contents) @@ -72,7 +72,11 @@ /// Do something unpleasant to someone we set on fire /datum/action/cooldown/mob_cooldown/fire_breath/proc/on_burn_mob(mob/living/barbecued, mob/living/source) - to_chat(barbecued, span_userdanger("You are burned by [source]'s fire breath!")) + if(fire_temperature <= TCMB) + barbecued.apply_status_effect(/datum/status_effect/ice_block_talisman, 2 SECONDS) + to_chat(barbecued, span_userdanger("You're frozen solid by [source]'s icy breath!")) + else + to_chat(barbecued, span_userdanger("You are burned by [source]'s fire breath!")) barbecued.adjustFireLoss(fire_damage) /// Shoot three lines of fire in a sort of fork pattern approximating a cone diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 828efa4c250..4414b466170 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -166,16 +166,16 @@ /datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot) SIGNAL_HANDLER - if(require_twohands && (slot & ITEM_SLOT_HANDS)) // force equip the item + if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS) && (slot & ITEM_SLOT_HANDS)) // force equip the item wield(user) - if(!user.is_holding(parent) && wielded && !require_twohands) + if(!user.is_holding(parent) && wielded && !HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) unwield(user) /// Triggered on drop of item containing the component /datum/component/two_handed/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER - if(require_twohands) //Don't let the item fall to the ground and cause bugs if it's actually being equipped on another slot. + if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) //Don't let the item fall to the ground and cause bugs if it's actually being equipped on another slot. unwield(user, FALSE, FALSE) if(wielded) unwield(user) @@ -192,7 +192,7 @@ /datum/component/two_handed/proc/on_attack_self(datum/source, mob/user) SIGNAL_HANDLER - if(!require_twohands) + if(!HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) if(wielded) unwield(user) else if(user.is_holding(parent)) @@ -210,21 +210,21 @@ var/atom/atom_parent = parent if(HAS_TRAIT(user, TRAIT_NO_TWOHANDING)) - if(require_twohands) + if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) atom_parent.balloon_alert(user, "can't wield!") user.dropItemToGround(parent, force = TRUE) else atom_parent.balloon_alert(user, "can't wield with both hands!") return COMPONENT_EQUIPPED_FAILED if(user.get_inactive_held_item()) - if(require_twohands) + if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) atom_parent.balloon_alert(user, "can't carry in one hand!") user.dropItemToGround(parent, force = TRUE) else atom_parent.balloon_alert(user, "holding something in other hand!") return COMPONENT_EQUIPPED_FAILED if(user.usable_hands < 2) - if(require_twohands) + if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) user.dropItemToGround(parent, force = TRUE) atom_parent.balloon_alert(user, "not enough hands!") return COMPONENT_EQUIPPED_FAILED @@ -313,14 +313,14 @@ user.update_held_items() // if the item requires two handed drop the item on unwield - if(require_twohands && can_drop) + if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS) && can_drop) user.dropItemToGround(parent, force=TRUE) // Show message if requested if(show_message) if(iscyborg(user)) to_chat(user, span_notice("You free up your module.")) - else if(require_twohands) + else if(HAS_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS)) to_chat(user, span_notice("You drop [parent].")) else to_chat(user, span_notice("You are now carrying [parent] with one hand.")) diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index 8be3c39651a..817529ce9d7 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -90,6 +90,10 @@ name = "Captain %REAL_NAME%" desc = "Probably better than the last captain." +/datum/dog_fashion/head/dragoon + name = "Dragoon %REAL_NAME%" + desc = "The last living Dragon Knight." + /datum/dog_fashion/head/kitty name = "Runtime" desc = "They're a cute little kitty-cat! ... wait ... what the hell?" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index d2b81b413d0..55b63cba3e7 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -553,6 +553,14 @@ BUBBERSTATION REMOVAL END */ name = "Space-Ruin Space Sector 13 Local Channel" description = "A local TV station serving areas surrounding Space Sector 13, shows including but not limited to: talk shows, operas, stage plays and more!" +/datum/map_template/ruin/space/dragoon + id = "dragoon" + suffix = "dragoontomb.dmm" + name = "Sky Bulge Tomb" + description = "A tomb of a dice-loving dragoon in space. \ + Turns out he got too good and jumped too high. \ + Contains the Sky Bulge, which allows the user to jump onto targets." + /datum/map_template/ruin/space/experimental_cloning id = "cloning_facility" suffix = "cloning_facility.dmm" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d4dca8b3377..38845ba737c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -692,6 +692,14 @@ trash_type = /obj/effect/decal/cleanable/ash can_be_extinguished = TRUE +/obj/item/flashlight/flare/torch/everburning + name = "everburning torch" + desc = "A torch which burns continuously, even in the vacuum of space" + can_be_extinguished = FALSE + fuel = INFINITY + randomize_fuel = FALSE + start_on = TRUE + /obj/item/flashlight/lantern name = "lantern" icon_state = "lantern" diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 1b394b2cca6..0bd8cae7d3f 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -284,3 +284,141 @@ /datum/element/slapcrafting,\ slapcraft_recipes = slapcraft_recipe_list,\ ) + +/** + * Skybulge + * + * Gives a special ability that allows you to enter the skies an drop down upon a target. + * Other than that ability, is a default spear with extra throw force, but no embedding. + */ +/obj/item/spear/skybulge + name = "\improper Sky Bulge" + desc = "A legendary stick with a very pointy tip. Takes you to the skies!" + icon_state = "dragoonpole0" + icon_prefix = "dragoonpole" + attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "gores", "lances") + attack_verb_simple = list("attack", "poke", "jab", "tear", "gore", "lance") + throwforce = 24 + embed_type = null //no embedding + + custom_materials = list( + /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT, + ) + action_slots = ITEM_SLOT_HANDS + actions_types = list(/datum/action/item_action/skybulge) + +///The action button the spear gives, usable once a minute. +/datum/action/item_action/skybulge + name = "Dragoon Strike" + desc = "Jump up into the skies and fall down upon your opponents to deal double damage." + check_flags = parent_type::check_flags | AB_CHECK_IMMOBILE | AB_CHECK_PHASED + ///Ref to the addtimer we have between jumping up and falling down, used to cancel early if you're incapacitated mid-jump. + var/jump_timer + ///Cooldown time between jumps. + var/jump_cooldown_time = 1 MINUTES + /** + * boolean we set every time we jump, to know if we should take away the passflags we give, + * so we don't give/take when they have it from other sources (since we don't have traits, we have + * no way to tell which pass flags they get from what source.) + */ + var/gave_pass_flags = FALSE + +/datum/action/item_action/skybulge/do_effect(trigger_flags) + if(!HAS_TRAIT(target, TRAIT_WIELDED)) + owner.balloon_alert(owner, "not dual-wielded!") + return + var/time_left = S_TIMER_COOLDOWN_TIMELEFT(target, COOLDOWN_SKYBULGE_JUMP) + if(time_left) + owner.balloon_alert(owner, "[FLOOR(time_left * 0.1, 0.1)]s cooldown!") + return + //do after shows the progress bar as feedback, so nothing here. + if(LAZYACCESS(owner.do_afters, target)) + return + + owner.balloon_alert(owner, "charging up...") + ADD_TRAIT(target, TRAIT_NEEDS_TWO_HANDS, ACTION_TRAIT) + INVOKE_ASYNC(src, PROC_REF(jump_up)) + +///Sends the owner up in the air and calls them back down, calling land() for aftereffects. +/datum/action/item_action/skybulge/proc/jump_up() + if(!do_after(owner, 2 SECONDS, target = owner, timed_action_flags = IGNORE_USER_LOC_CHANGE)) + REMOVE_TRAIT(target, TRAIT_NEEDS_TWO_HANDS, ACTION_TRAIT) + return + playsound(owner, 'sound/effects/footstep/heavy1.ogg', 50, 1) + S_TIMER_COOLDOWN_START(target, COOLDOWN_SKYBULGE_JUMP, jump_cooldown_time) + new /obj/effect/temp_visual/telegraphing/exclamation/following(get_turf(owner), 2.5 SECONDS, owner) + + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_attack_during_jump)) + ADD_TRAIT(target, TRAIT_NODROP, ACTION_TRAIT) + owner.add_traits(list(TRAIT_SILENT_FOOTSTEPS, TRAIT_MOVE_FLYING), ACTION_TRAIT) + + if(owner.pass_flags & PASSTABLE) + gave_pass_flags = FALSE + else + gave_pass_flags = TRUE + owner.pass_flags |= PASSTABLE + + owner.set_density(FALSE) + owner.layer = ABOVE_ALL_MOB_LAYER + + animate(owner, pixel_y = owner.pixel_y + 60, time = (2 SECONDS), easing = CIRCULAR_EASING|EASE_OUT) + animate(pixel_y = initial(owner.pixel_y), time = (1 SECONDS), easing = CIRCULAR_EASING|EASE_IN) + + jump_timer = addtimer(CALLBACK(src, PROC_REF(land), /*do_effects = */TRUE, /*mob_override = */owner), 3 SECONDS, TIMER_STOPPABLE) + +/datum/action/item_action/skybulge/update_status_on_signal(datum/source, new_stat, old_stat) + if(!isnull(jump_timer) && !IsAvailable()) + INVOKE_ASYNC(src, PROC_REF(land), /*do_effects = */FALSE, /*mob_override = */source) + deltimer(jump_timer) + return ..() + +/** + * ## land() + * + * Called by jump_up, this is the post-jump effects, damaging objects and mobs it lands on. + * Args: + * do_effects - Whether we'll do the attacking effects of the land (damaging mobs & sound), + * we set this to false if we were forced out of the jump, they lost their ability to do the hit. + * mob_doing_effects - This is who we use for aftereffects, passing the mob using the ability, with owner as fallback. + * ourselves. + */ +/datum/action/item_action/skybulge/proc/land(do_effects = TRUE, mob/living/mob_doing_effects) + if(!mob_doing_effects) + mob_doing_effects = owner + var/turf/landed_on = get_turf(mob_doing_effects) + + UnregisterSignal(target, COMSIG_ITEM_ATTACK) + target.remove_traits(list(TRAIT_NEEDS_TWO_HANDS, TRAIT_NODROP), ACTION_TRAIT) + mob_doing_effects.remove_traits(list(TRAIT_SILENT_FOOTSTEPS, TRAIT_MOVE_FLYING), ACTION_TRAIT) + if(gave_pass_flags) + mob_doing_effects.pass_flags &= ~PASSTABLE + mob_doing_effects.set_density(TRUE) + mob_doing_effects.layer = initial(mob_doing_effects.layer) + SET_PLANE(mob_doing_effects, initial(mob_doing_effects.plane), landed_on) + + if(!do_effects) + return + + playsound(mob_doing_effects, 'sound/effects/explosion/explosion1.ogg', 40, 1) + var/obj/item/skybulge_item = target + + for(var/atom/thing as anything in landed_on) + if(thing == mob_doing_effects) + continue + + if(isobj(thing)) + thing.take_damage(150) + continue + + if(isliving(thing)) + skybulge_item.melee_attack_chain(owner, thing, list("[FORCE_MULTIPLIER]" = 2)) + skybulge_item.attack(thing, owner) + var/mob/living/living_target = thing + living_target.SetKnockdown(1 SECONDS) + +///Called when the person holding us is trying to attack something mid-jump. +///You're technically in mid-air, so block any attempts at getting extra hits in. +/datum/action/item_action/skybulge/proc/on_attack_during_jump(atom/source, mob/living/target_mob, mob/living/user, params) + SIGNAL_HANDLER + return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 5d5185df38d..1865479d607 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -677,6 +677,11 @@ baseturfs = /turf/open/misc/asteroid/basalt initial_gas_mix = LAVALAND_DEFAULT_ATMOS +/turf/closed/mineral/volcanic/airless + turf_type = /turf/open/misc/asteroid/basalt/airless + baseturfs = /turf/open/misc/asteroid/basalt/airless + initial_gas_mix = AIRLESS_ATMOS + /turf/closed/mineral/volcanic/lava_land_surface turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface @@ -872,6 +877,11 @@ initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE +/turf/closed/mineral/gibtonite/volcanic/airless + turf_type = /turf/open/misc/asteroid/basalt + baseturfs = /turf/open/misc/asteroid/basalt + initial_gas_mix = AIRLESS_ATMOS + /turf/closed/mineral/gibtonite/ice MAP_SWITCH(, icon_state = "icerock_Gibtonite_inactive") icon = MAP_SWITCH('icons/turf/walls/icerock_wall.dmi', 'icons/turf/mining.dmi') diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm index b09a0355b9f..6bb8520189e 100644 --- a/code/game/turfs/closed/wall/misc_walls.dm +++ b/code/game/turfs/closed/wall/misc_walls.dm @@ -126,3 +126,16 @@ /turf/closed/wall/material/meat/airless baseturfs = /turf/open/floor/material/meat/airless + +/turf/closed/wall/tomb + name = "tomb wall" + desc = "The carved surface of a dusty tomb. It's not clear who built this." + icon = 'icons/turf/walls/boss_wall.dmi' + icon_state = "boss_wall-0" + base_icon_state = "boss_wall" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_BOSS_WALLS + canSmoothWith = SMOOTH_GROUP_BOSS_WALLS + turf_flags = NO_RUST + explosive_resistance = 50 + baseturfs = /turf/open/misc/asteroid/basalt/airless diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index 2a0c1ce4507..83b40083a3e 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -54,6 +54,39 @@ new custom_material.sheet_type(drop_location(), amount) //////////////////////////////////////STATUES///////////////////////////////////////////////////////////// + +/obj/structure/statue/drake + name = "drake statue" + desc = "Statue of a lesser drake. Its carved eye sockets glow slightly." + icon_state = "drake" + anchored = TRUE + +/obj/structure/statue/drake/Initialize(mapload) + . = ..() + if (prob(25)) + icon_state = "drake_headless" + desc = "Statue of a lesser drake. Time has not been kind." + update_appearance(UPDATE_OVERLAYS) + +/obj/structure/statue/drake/update_overlays() + . = ..() + if (icon_state == "drake") + . += emissive_appearance(icon, "drake_emissive", src) + +/obj/structure/statue/dragonman + name = "dragonman statue" + desc = "Statue of a draconic humanoid warrior. Its glittering eyes seem to follow you around the room." + icon_state = "dragonman" + anchored = TRUE + +/obj/structure/statue/dragonman/Initialize(mapload) + . = ..() + update_appearance(UPDATE_OVERLAYS) + +/obj/structure/statue/dragonman/update_overlays() + . = ..() + . += emissive_appearance(icon, "dragonman_emissive", src) + ////////////////////////uranium/////////////////////////////////// /obj/structure/statue/uranium diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 2a807dda1fd..e8a6f946d3d 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -108,6 +108,8 @@ volume = starting_volume if(!isnull(starting_temperature)) temperature = starting_temperature + if(temperature <= FREON_MAXIMUM_BURN_TEMPERATURE) + cold_fire = TRUE var/turf/open/our_turf = loc //on creation we check adjacent turfs for hot spot to start grouping, if surrounding do not have hot spots we create our own @@ -147,6 +149,7 @@ // Remove just_spawned protection if no longer processing the parent cell just_spawned = (our_turf.current_cycle < SSair.times_fired) + update_color() /obj/effect/hotspot/set_smoothed_icon_state(new_junction) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c9c1aa8197d..18510f48a4b 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -751,3 +751,17 @@ fire = 20 acid = 40 wound = 10 + +/obj/item/clothing/head/helmet/dragoon + name = "drachen helmet" + desc = "A chainmail helmet with dragon scales attached to the skeleton, with ash-covered mythril plate reinforcement covering it." + icon_state = "dragoonhelm" + base_icon_state = "dragoonhelm" + inhand_icon_state = "dragoonhelm" + clothing_flags = SNUG_FIT + resistance_flags = FIRE_PROOF | ACID_PROOF + dog_fashion = /datum/dog_fashion/head/dragoon + sound_vary = TRUE + equip_sound = 'sound/items/handling/helmet/helmet_equip1.ogg' + pickup_sound = 'sound/items/handling/helmet/helmet_pickup1.ogg' + drop_sound = 'sound/items/handling/helmet/helmet_drop1.ogg' diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 177cbd75046..a8ebd708522 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -884,3 +884,13 @@ fire = 20 acid = 40 wound = 10 + +/obj/item/clothing/suit/armor/dragoon + name = "drachen suit" + desc = "A chainmail suit with dragon scales attached to the skeleton, with ash-covered mythril plate reinforcement covering it." + icon_state = "dragoon" + inhand_icon_state = "dragoon" + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + resistance_flags = FIRE_PROOF | ACID_PROOF + allowed = list(/obj/item/spear/skybulge) diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm index d3420794ee8..dda66b653b8 100644 --- a/code/modules/library/bibles.dm +++ b/code/modules/library/bibles.dm @@ -199,7 +199,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( balloon_alert(user, "unpacking bible...") if(!do_after(user, 15 SECONDS, new_altar_area)) return - new /obj/structure/altar_of_gods(new_altar_area) + new /obj/structure/altar/of_gods(new_altar_area) qdel(src) /obj/item/book/bible/proc/bless(mob/living/blessed, mob/living/user) diff --git a/code/modules/mob/living/basic/boss/thing/thing_objects.dm b/code/modules/mob/living/basic/boss/thing/thing_objects.dm index a733a6b6b24..d85e4535441 100644 --- a/code/modules/mob/living/basic/boss/thing/thing_objects.dm +++ b/code/modules/mob/living/basic/boss/thing/thing_objects.dm @@ -58,6 +58,18 @@ src.duration = duration return ..() +/obj/effect/temp_visual/telegraphing/exclamation/following/Initialize(mapload, duration, obj/following) + . = ..() + if(isnull(following)) + return INITIALIZE_HINT_QDEL + glide_size = following.glide_size + RegisterSignal(following, COMSIG_MOVABLE_MOVED, PROC_REF(follow)) + +///called when the thing we're following moves +/obj/effect/temp_visual/telegraphing/exclamation/following/proc/follow(datum/source) + SIGNAL_HANDLER + forceMove(get_turf(source)) + /obj/effect/temp_visual/telegraphing/exclamation/animated alpha = 0 diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm index 3cc922ccc71..42aedc1106d 100644 --- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm +++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm @@ -36,18 +36,16 @@ ai_controller = /datum/ai_controller/basic_controller/ice_whelp ///how much we will heal when cannibalizing a target var/heal_on_cannibalize = 5 + var/list/innate_actions = list( + /datum/action/cooldown/mob_cooldown/fire_breath/ice = BB_WHELP_STRAIGHTLINE_FIRE, + /datum/action/cooldown/mob_cooldown/fire_breath/ice/eruption = BB_WHELP_WIDESPREAD_FIRE, + ) /mob/living/basic/mining/ice_whelp/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NO_GLIDE, INNATE_TRAIT) AddElement(/datum/element/footstep, FOOTSTEP_MOB_HEAVY) - - var/static/list/innate_actions = list( - /datum/action/cooldown/mob_cooldown/fire_breath/ice = BB_WHELP_STRAIGHTLINE_FIRE, - /datum/action/cooldown/mob_cooldown/fire_breath/ice/eruption = BB_WHELP_WIDESPREAD_FIRE, - ) - grant_actions_by_list(innate_actions) ai_controller.set_blackboard_key(BB_TARGETED_ACTION, ai_controller.blackboard[BB_WHELP_STRAIGHTLINE_FIRE]) @@ -90,3 +88,16 @@ return target.gib(DROP_ALL_REMAINS) adjustBruteLoss(-1 * heal_on_cannibalize) + +///Ash whelp, the "lava" variant of ice whelps. +/mob/living/basic/mining/ice_whelp/ash + name = "ash whelp" + desc = "The offspring of an ash drake, weak in comparison but still terrifying." + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + icon_state = "ash_whelp" + icon_living = "ash_whelp" + icon_dead = "ash_whelp_dead" + innate_actions = list( + /datum/action/cooldown/mob_cooldown/fire_breath = BB_WHELP_STRAIGHTLINE_FIRE, + /datum/action/cooldown/mob_cooldown/fire_breath/ice/eruption/fire = BB_WHELP_WIDESPREAD_FIRE, + ) diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm index e975997071b..f406dda9088 100644 --- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm +++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm @@ -8,6 +8,7 @@ fire_range = 7 fire_damage = 10 fire_delay = 0.85 DECISECONDS + fire_temperature = ICE_WHELP_FIRE_TEMP /// Time to warn people about what we are doing var/forecast_delay = 0.6 SECONDS /// What turf are we aiming at? @@ -44,16 +45,6 @@ fire_line(target_turf) target_turf = null -/datum/action/cooldown/mob_cooldown/fire_breath/ice/burn_turf(turf/fire_turf, list/hit_list, atom/source) - var/obj/effect/hotspot/fire_hotspot = ..() - fire_hotspot.add_atom_colour(COLOR_BLUE_LIGHT, FIXED_COLOUR_PRIORITY) // You're blue now, that's my attack - return fire_hotspot - -/datum/action/cooldown/mob_cooldown/fire_breath/ice/on_burn_mob(mob/living/barbecued, mob/living/source) - barbecued.apply_status_effect(/datum/status_effect/ice_block_talisman, 2 SECONDS) - to_chat(barbecued, span_userdanger("You're frozen solid by [source]'s icy breath!")) - barbecued.adjustFireLoss(fire_damage) - /// Breathe really cold fire in a plus shape, like bomberman /datum/action/cooldown/mob_cooldown/fire_breath/ice/eruption name = "Ice Eruption" @@ -84,3 +75,8 @@ for (var/turf/open/kindling as anything in nearby_turfs["[i]"]) burn_turf(kindling, hit_list, owner) sleep(fire_delay) + +///Fire subtype for ash whelps +/datum/action/cooldown/mob_cooldown/fire_breath/ice/eruption/fire + name = "Eruption" + fire_temperature = /datum/action/cooldown/mob_cooldown/fire_breath::fire_temperature diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index cdadb223c69..53cb6edcd9e 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -413,7 +413,7 @@ if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated return - if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) + if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] inv.update_appearance() diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index b5bafd0e4e8..9b419028bcf 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -481,7 +481,7 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_head(update_obscured = TRUE) remove_overlay(HEAD_LAYER) - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) + if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] inv.update_icon() diff --git a/code/modules/mob_spawn/corpses/mining_corpses.dm b/code/modules/mob_spawn/corpses/mining_corpses.dm index 2fb841fab84..a791296c6e4 100644 --- a/code/modules/mob_spawn/corpses/mining_corpses.dm +++ b/code/modules/mob_spawn/corpses/mining_corpses.dm @@ -14,6 +14,16 @@ spawned_human.gender = NEUTER //don't need to set the human's body type (neuter) +/obj/effect/mob_spawn/corpse/human/charredskeleton/dragoon + outfit = /datum/outfit/dragoon_gear + +/datum/outfit/dragoon_gear + name = "Dragoon" + + suit = /obj/item/clothing/suit/armor/dragoon + head = /obj/item/clothing/head/helmet/dragoon + suit_store = /obj/item/spear/skybulge + //Legion infested mobs /// Mob spawner used by Legion to spawn costumed bodies diff --git a/code/modules/religion/festival/instrument_rites.dm b/code/modules/religion/festival/instrument_rites.dm index 271abf9b251..9ac32dd24de 100644 --- a/code/modules/religion/festival/instrument_rites.dm +++ b/code/modules/religion/festival/instrument_rites.dm @@ -70,7 +70,7 @@ ///what the instrument will glow when playing var/glow_color = COLOR_BLACK -/datum/religion_rites/song_tuner/invoke_effect(mob/living/user, obj/structure/altar_of_gods/altar) +/datum/religion_rites/song_tuner/invoke_effect(mob/living/user, obj/structure/altar/of_gods/altar) . = ..() to_chat(user, span_notice(song_invocation_message)) user.AddComponent(/datum/component/smooth_tunes, src, repeats_okay, particles_path, glow_color) diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 8c8783f16eb..c57269fa061 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -1,6 +1,6 @@ -/obj/structure/altar_of_gods - name = "\improper Altar of the Gods" - desc = "An altar which allows the head of the church to choose a sect of religious teachings as well as provide sacrifices to earn favor." +/obj/structure/altar + name = "\improper Altar" + desc = "A religious structure. You could lie on it if you wanted to." icon = 'icons/obj/service/hand_of_god_structures.dmi' icon_state = "convertaltar" density = TRUE @@ -9,29 +9,21 @@ pass_flags_self = PASSSTRUCTURE | PASSTABLE | LETPASSTHROW can_buckle = TRUE buckle_lying = 90 //we turn to you! - ///Avoids having to check global everytime by referencing it locally. - var/datum/religion_sect/sect_to_altar + /// Do we have lit candles? + var/lit_candles = TRUE -/obj/structure/altar_of_gods/Initialize(mapload) +/obj/structure/altar/Initialize(mapload) . = ..() - AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, PROC_REF(reflect_sect_in_icons))) - reflect_sect_in_icons() - GLOB.chaplain_altars += src AddElement(/datum/element/climbable) AddElement(/datum/element/elevation, pixel_shift = 12) + update_appearance(UPDATE_OVERLAYS) -/obj/structure/altar_of_gods/Destroy() - GLOB.chaplain_altars -= src - return ..() +/obj/structure/altar/update_overlays() + . = ..() + if (lit_candles) + . += "convertaltarcandle" -/obj/structure/altar_of_gods/update_overlays() - var/list/new_overlays = ..() - if(GLOB.religious_sect) - return new_overlays - new_overlays += "convertaltarcandle" - return new_overlays - -/obj/structure/altar_of_gods/attack_hand(mob/living/user, list/modifiers) +/obj/structure/altar/attack_hand(mob/living/user, list/modifiers) if(!Adjacent(user) || !user.pulling) return ..() if(!isliving(user.pulling)) @@ -46,7 +38,24 @@ pushed_mob.forceMove(loc) return ..() -/obj/structure/altar_of_gods/examine_more(mob/user) +/// This one actually has relevance to chaplains +/obj/structure/altar/of_gods + name = "\improper Altar of the Gods" + desc = "An altar which allows the head of the church to choose a sect of religious teachings as well as provide sacrifices to earn favor." + ///Avoids having to check global everytime by referencing it locally. + var/datum/religion_sect/sect_to_altar + +/obj/structure/altar/of_gods/Initialize(mapload) + . = ..() + AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, PROC_REF(reflect_sect_in_icons))) + reflect_sect_in_icons() + GLOB.chaplain_altars += src + +/obj/structure/altar/of_gods/Destroy() + GLOB.chaplain_altars -= src + return ..() + +/obj/structure/altar/of_gods/examine_more(mob/user) if(!isobserver(user)) return ..() . = list(span_notice("You examine [src] closer, and note the following...")) @@ -61,19 +70,21 @@ if(isAdminObserver(user) && chaplains) . += list(span_notice("Chaplains: [chaplains].")) -/obj/structure/altar_of_gods/proc/reflect_sect_in_icons() +/obj/structure/altar/of_gods/proc/reflect_sect_in_icons() if(isnull(GLOB.religious_sect)) + lit_candles = FALSE icon = initial(icon) icon_state = initial(icon_state) else + lit_candles = TRUE sect_to_altar = GLOB.religious_sect if(sect_to_altar.altar_icon) icon = sect_to_altar.altar_icon if(sect_to_altar.altar_icon_state) icon_state = sect_to_altar.altar_icon_state - update_appearance() //Light the candles! + update_appearance(UPDATE_OVERLAYS) //Light the candles! -/obj/structure/altar_of_gods/proc/get_chaplains() +/obj/structure/altar/of_gods/proc/get_chaplains() var/chaplain_string = "" for(var/mob/living/carbon/human/potential_chap in GLOB.player_list) if(potential_chap.key && is_chaplain_job(potential_chap.mind?.assigned_role)) diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index c12e1c62a85..a928f042d8f 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -87,6 +87,7 @@ #_maps/RandomRuins/SpaceRuins/waystation.dmm #_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +#_maps/RandomRuins/SpaceRuins/dragoontomb.dmm #_maps/RandomRuins/SpaceRuins/skyrat/drones_derelict.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/forgottenship_skyrat.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/shuttle8532.dmm diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 1410d5be71c..afc61abf26b 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi index 90fdc538c7d..36d626c97f3 100644 Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index 426a760e770..01706411594 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi index 3ea3bd8ae5b..1566b0e8f23 100644 Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi index f0d5f3fa3e2..35719a09a7f 100644 Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi index 9c15bb18c7b..661d98d87e2 100644 Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi index 87187225fdc..6e9b9ab23cf 100644 Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/polearms_lefthand.dmi b/icons/mob/inhands/weapons/polearms_lefthand.dmi index a1355ed9c40..749de0cfca6 100644 Binary files a/icons/mob/inhands/weapons/polearms_lefthand.dmi and b/icons/mob/inhands/weapons/polearms_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/polearms_righthand.dmi b/icons/mob/inhands/weapons/polearms_righthand.dmi index 05665fbaf95..df595538cc3 100644 Binary files a/icons/mob/inhands/weapons/polearms_righthand.dmi and b/icons/mob/inhands/weapons/polearms_righthand.dmi differ diff --git a/icons/mob/simple/corgi_head.dmi b/icons/mob/simple/corgi_head.dmi index c07f1227a3d..f79560392da 100644 Binary files a/icons/mob/simple/corgi_head.dmi and b/icons/mob/simple/corgi_head.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_monsters.dmi b/icons/mob/simple/lavaland/lavaland_monsters.dmi index 3c1d6e9ff6f..5ef7df49ea6 100644 Binary files a/icons/mob/simple/lavaland/lavaland_monsters.dmi and b/icons/mob/simple/lavaland/lavaland_monsters.dmi differ diff --git a/icons/obj/art/statue.dmi b/icons/obj/art/statue.dmi index c4f7e24192a..811cd5d2bed 100644 Binary files a/icons/obj/art/statue.dmi and b/icons/obj/art/statue.dmi differ diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi index e2137737175..9dac3d1be84 100644 Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index b2c9a1aa8b4..6f55ddc1a93 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/weapons/spear.dmi b/icons/obj/weapons/spear.dmi index 7c044d362a7..e654cbde28d 100644 Binary files a/icons/obj/weapons/spear.dmi and b/icons/obj/weapons/spear.dmi differ diff --git a/tools/UpdatePaths/Scripts/90781_altars.txt b/tools/UpdatePaths/Scripts/90781_altars.txt new file mode 100644 index 00000000000..4323b3f83ed --- /dev/null +++ b/tools/UpdatePaths/Scripts/90781_altars.txt @@ -0,0 +1 @@ +/obj/structure/altar_of_gods : /obj/structure/altar/of_gods{@OLD}