diff --git a/aurorastation.dme b/aurorastation.dme index 6372716fb37..f9698ecbadb 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1146,6 +1146,7 @@ #include "code\game\objects\structures\sarcophagus.dm" #include "code\game\objects\structures\signs.dm" #include "code\game\objects\structures\simple_doors.dm" +#include "code\game\objects\structures\statue.dm" #include "code\game\objects\structures\tank_dispenser.dm" #include "code\game\objects\structures\target_stake.dm" #include "code\game\objects\structures\therapy.dm" @@ -3341,6 +3342,7 @@ #include "maps\random_ruins\exoplanets\adhomai\adhomai_rafama_herd.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_raskara_ritual.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_raskariim_hideout.dm" +#include "maps\random_ruins\exoplanets\adhomai\adhomai_rredouane_shrine.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_schlorrgo_cage.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_silo.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_tunneler_nest.dm" diff --git a/code/game/objects/structures/statue.dm b/code/game/objects/structures/statue.dm new file mode 100644 index 00000000000..48bfdeffb28 --- /dev/null +++ b/code/game/objects/structures/statue.dm @@ -0,0 +1,8 @@ +/obj/structure/rredouane_statue + name = "\improper Rredouane statue" + desc = "A statue of Rredouane, the Ma'ta'ke deity of valor, triumph, and victory." + icon = 'icons/obj/statue.dmi' + icon_state = "rredouane" + density = TRUE + anchored = TRUE + layer = ABOVE_ALL_MOB_LAYER \ No newline at end of file diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index 2986bb11db7..e5372993b25 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -156,14 +156,14 @@ /datum/map_template/ruin/exoplanet/adhomai_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout, /datum/map_template/ruin/exoplanet/adhomai_cavern_geist, /datum/map_template/ruin/exoplanet/adhomai_tunneler_nest, /datum/map_template/ruin/exoplanet/adhomai_rafama_herd, /datum/map_template/ruin/exoplanet/adhomai_amohdan, /datum/map_template/ruin/exoplanet/ala_cell, /datum/map_template/ruin/exoplanet/adhomai_chemical_testing, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue_toppled, /datum/map_template/ruin/exoplanet/ala_base, - /datum/map_template/ruin/exoplanet/adhomai_deserter, /datum/map_template/ruin/exoplanet/adhomai_nuclear_waste_makeshift) + /datum/map_template/ruin/exoplanet/adhomai_deserter, /datum/map_template/ruin/exoplanet/adhomai_nuclear_waste_makeshift, /datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine) if("New Kingdom of Adhomai") possible_random_ruins = list (/datum/map_template/ruin/exoplanet/adhomai_hunting, /datum/map_template/ruin/exoplanet/adhomai_minefield, /datum/map_template/ruin/exoplanet/adhomai_village, /datum/map_template/ruin/exoplanet/adhomai_abandoned_village, /datum/map_template/ruin/exoplanet/adhomai_battlefield, /datum/map_template/ruin/exoplanet/adhomai_cavern, /datum/map_template/ruin/exoplanet/adhomai_raskara_ritual, /datum/map_template/ruin/exoplanet/adhomai_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout,/datum/map_template/ruin/exoplanet/adhomai_cavern_geist, /datum/map_template/ruin/exoplanet/adhomai_tunneler_nest, /datum/map_template/ruin/exoplanet/adhomai_rafama_herd, /datum/map_template/ruin/exoplanet/adhomai_amohdan, /datum/map_template/ruin/exoplanet/adhomai_archeology, - /datum/map_template/ruin/exoplanet/nka_base, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue_toppled) + /datum/map_template/ruin/exoplanet/nka_base, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue_toppled, /datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine) if("North Pole") features_budget = 1 diff --git a/html/changelogs/alberyk-shrine.yml b/html/changelogs/alberyk-shrine.yml new file mode 100644 index 00000000000..dee7d658426 --- /dev/null +++ b/html/changelogs/alberyk-shrine.yml @@ -0,0 +1,6 @@ +author: Alberyk, Atteria + +delete-after: True + +changes: + - rscadd: "Added a new Adhomai random ruin: the Rredouane Shrine." diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index befe3982a16..40a3f3ab7c6 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm new file mode 100644 index 00000000000..976a3dceeec --- /dev/null +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm @@ -0,0 +1,9 @@ +/datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine + name = "Rredouane Shrine" + id = "adhomai_rredouane_shrine" + description = "A shrine dedicated to the Ma'ta'ke deity, Rredouane." + + spawn_weight = 1 + spawn_cost = 1 + sectors = list(SECTOR_SRANDMARR) + suffixes = list("adhomai/adhomai_rredouane_shrine.dmm") \ No newline at end of file diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm new file mode 100644 index 00000000000..56ff1b6ef38 --- /dev/null +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm @@ -0,0 +1,147 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"o" = ( +/obj/structure/flora/bush/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"s" = ( +/obj/item/flame/candle{ + start_lit = 1; + pixel_y = 12; + pixel_x = -9 + }, +/obj/item/flame/candle{ + start_lit = 1; + pixel_y = 12; + pixel_x = 9 + }, +/obj/item/reagent_containers/food/drinks/bottle/messa_mead{ + pixel_x = -12 + }, +/obj/item/reagent_containers/food/snacks/meat/adhomai{ + pixel_y = -3; + pixel_x = 13 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug{ + pixel_y = -5 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"u" = ( +/obj/structure/rredouane_statue, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"x" = ( +/obj/structure/flora/tree/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"J" = ( +/obj/item/storage/pill_bottle/dice/tajara{ + pixel_x = 10; + pixel_y = -5 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"K" = ( +/obj/structure/flora/grass/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"N" = ( +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"P" = ( +/obj/structure/flora/rock/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"T" = ( +/obj/item/deck/cards{ + pixel_y = 10; + pixel_x = -10 + }, +/obj/item/deck/tarot/adhomai{ + pixel_y = 10; + pixel_x = -3 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) + +(1,1,1) = {" +N +N +N +N +N +N +x +"} +(2,1,1) = {" +N +P +N +N +N +K +N +"} +(3,1,1) = {" +N +N +N +J +N +N +N +"} +(4,1,1) = {" +N +o +N +u +s +N +N +"} +(5,1,1) = {" +N +N +N +N +T +N +N +"} +(6,1,1) = {" +N +N +x +N +N +N +P +"} +(7,1,1) = {" +N +K +N +N +K +N +N +"}