From bc5b828ca0d7ccbe134a4caaf2399986050cd5b3 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 13 Mar 2023 18:43:20 -0300 Subject: [PATCH] Adds a new Adhomai random ruin: the Rredouane Shrine (#15999) * Adds a new Adhomai random ruin: the Rredouane Shrine * changelog * Update code/game/objects/structures/statue.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --------- Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- aurorastation.dme | 2 + code/game/objects/structures/statue.dm | 8 + .../maps/planet_types/lore/srandmarr.dm | 4 +- html/changelogs/alberyk-shrine.yml | 6 + icons/obj/statue.dmi | Bin 3156 -> 3736 bytes .../adhomai/adhomai_rredouane_shrine.dm | 9 ++ .../adhomai/adhomai_rredouane_shrine.dmm | 147 ++++++++++++++++++ 7 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 code/game/objects/structures/statue.dm create mode 100644 html/changelogs/alberyk-shrine.yml create mode 100644 maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dm create mode 100644 maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm 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 befe3982a163ba8e1bd12b0a625b0d67e7afa8a3..40a3f3ab7c6d9e65f8683809419d8c656b94cb4b 100644 GIT binary patch literal 3736 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 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 +"}