diff --git a/GainStation13/code/obj/structure/fountain.dm b/GainStation13/code/obj/structure/fountain.dm index b7090bb3..db8f64dc 100644 --- a/GainStation13/code/obj/structure/fountain.dm +++ b/GainStation13/code/obj/structure/fountain.dm @@ -17,12 +17,12 @@ if(.) return if(curse_given == 1) - to_chat(user, "The fountain seems to deject your hand.") + to_chat(user, "The fountain has dried up.") icon_state = "empty" return if (ishuman(user) && user.has_dna()) user.cursed_fat = 1 - user.fattening_steps_left = 40 + user.fattening_steps_left = 100 icon_state = "empty" to_chat(user, "The glittering orange liquid disappears instantly as you touch it. You feel a strange, warm sensation inside, growing stronger the more you move...") curse_given = 1 @@ -37,7 +37,7 @@ . = ..() if(cursed_fat == 1) fattening_steps_left -= 1 - adjust_fatness(50, FATTENING_TYPE_MAGIC) + adjust_fatness(20, FATTENING_TYPE_MAGIC) if(fattening_steps_left <= 0) cursed_fat = 0 diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm new file mode 100644 index 00000000..9da95ae0 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm @@ -0,0 +1,61 @@ +"a" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"c" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"d" = (/obj/structure/cursedfatfountain,/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) +"i" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"j" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/machinery/light{dir = 4; color = "#ffa500"},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"k" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"l" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/railing{color = FFA500; dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"o" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/structure/railing{color = FFA500},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"r" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"s" = (/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"v" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/ruin/powered/gluttony) +"w" = (/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"y" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) +"z" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"B" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"D" = (/obj/machinery/light/small{dir = 1; pixel_x = 16},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"F" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"G" = (/obj/structure/statue/calorite/fatty,/obj/machinery/light{dir = 4; color = "#ffa500"},/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) +"H" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/mineral_door/calorite,/obj/structure/fans/tiny/invisible,/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) +"I" = (/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) +"J" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"K" = (/turf/closed/wall/mineral/calorite,/area/ruin/powered/gluttony) +"M" = (/obj/structure/statue/calorite/fatty,/obj/machinery/light{dir = 8; color = "#ffa500"},/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) +"N" = (/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"O" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) +"P" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/powered/gluttony) +"R" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/railing{color = FFA500; dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"T" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"U" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/railing{color = FFA500; dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"V" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/mineral_door/calorite,/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) +"W" = (/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"X" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/light{dir = 8; color = "#ffa500"},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"Y" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) + +(1,1,1) = {" +yyyyyyyyyyyyy +yyyyyyyyyyyyy +yyyyyyyyyyyyy +yyyPPPPPPPyyy +yyyPKKKKKPyyy +yyyPKrYJKPyyy +yyyPKXdjKPyyy +yyyPKTciKPyyy +yyyPKKVKKPyyy +yyyPPKOKPPyyy +yyyyKKOKKyyyy +yyyKKIOIKKyyy +yyyKoJvWoKyyy +yyyKMlvRGKyyy +yyyKUNvsUKyyy +yyyKKNvsKKyyy +ayyyKkvzKyyyy +ayyyKFOBKyyyy +ayayKIOIKyyyy +aaayKKHKKyyya +aaaaDwwDwyyya +aaaaKwwwKyyaa +ayyaaaaayyyaa +ayyyaaaaaaaaa +aaaaaaaaaaaay +"} diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index c913304b..a0a27b11 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -257,3 +257,11 @@ suffix = "lavaland_surface_snack_store.dmm" allow_duplicates = FALSE cost = 0 + +/datum/map_template/ruin/lavaland/calorite_altar //GS13 + name = "Calorite Altar" + id = "caloritealtar" + description = "A mysterious fountain stands dormant amidst a small calorite shrine... What could it possibly offer?" + suffix = "lavaland_surface_caloritealtar.dmm" + allow_duplicates = TRUE + cost = 0 diff --git a/config/lavaRuinBlacklist.txt b/config/lavaRuinBlacklist.txt index 5622700c..5f0d0335 100644 --- a/config/lavaRuinBlacklist.txt +++ b/config/lavaRuinBlacklist.txt @@ -44,5 +44,7 @@ _maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_oasis.dmm + ## GS13 #_maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm