diff --git a/_maps/RandomRuins/LavaRuins/caloriteshrine.dmm b/_maps/RandomRuins/LavaRuins/caloriteshrine.dmm
new file mode 100644
index 00000000..6d159f44
--- /dev/null
+++ b/_maps/RandomRuins/LavaRuins/caloriteshrine.dmm
@@ -0,0 +1,59 @@
+"a" = (/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors)
+"b" = (/mob/living/simple_animal/butterfly,/turf/open/floor/wood,/area/ruin/unpowered/caloriteshrine)
+"c" = (/turf/open/floor/plasteel/stairs/right,/area/ruin/unpowered/caloriteshrine)
+"f" = (/turf/open/floor/plasteel/stairs/medium,/area/ruin/unpowered/caloriteshrine)
+"h" = (/obj/structure/flora/tree/jungle,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"j" = (/turf/open/floor/plasteel/stairs/left,/area/ruin/unpowered/caloriteshrine)
+"l" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"p" = (/obj/structure/flora/ausbushes/genericbush,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"r" = (/turf/open/indestructible/cobble/side{dir = 4},/area/ruin/unpowered/caloriteshrine)
+"s" = (/turf/open/floor/wood,/area/ruin/unpowered/caloriteshrine)
+"t" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"u" = (/turf/closed/wall/mineral/calorite,/area/lavaland/surface/outdoors)
+"y" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/water,/area/ruin/unpowered/caloriteshrine)
+"z" = (/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine)
+"E" = (/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"G" = (/turf/closed/wall/mineral/calorite,/area/ruin/unpowered/caloriteshrine)
+"H" = (/turf/open/indestructible/cobble,/area/ruin/unpowered/caloriteshrine)
+"M" = (/obj/structure/flora/ausbushes/brflowers,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"N" = (/turf/open/water,/area/ruin/unpowered/caloriteshrine)
+"O" = (/turf/open/indestructible/cobble/side{dir = 8},/area/ruin/unpowered/caloriteshrine)
+"Q" = (/obj/structure/flora/tree/jungle/small,/obj/structure/flora/ausbushes/sparsegrass,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"R" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/water,/area/ruin/unpowered/caloriteshrine)
+"S" = (/mob/living/simple_animal/butterfly,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"T" = (/obj/structure/statue/calorite/fatty{anchored = 1},/obj/item/flashlight/lantern{anchored = 1; icon_state = null; icon = null},/turf/open/floor/mineral/calorite/strong,/area/ruin/unpowered/caloriteshrine)
+"U" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/closed/wall/mineral/calorite,/area/ruin/unpowered/caloriteshrine)
+"V" = (/obj/structure/flora/tree/jungle/small,/turf/open/floor/grass,/area/ruin/unpowered/caloriteshrine)
+"X" = (/turf/template_noop,/area/template_noop)
+
+(1,1,1) = {"
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXaaaaaaaaaaaaaaaXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXaaaGGGGGGGGGGGGGaaXXXXXXXXXXXXXX
+XXXXXXXXXXXXXaaGGESlEEEEEEEEGGaaXXXXXaaaaXXXX
+XXXXXXXXXXXXXaGGEEEEzzzzzEEEEGGaaaXXaaaaaaXXX
+XXXXXXXXXXXXaaGEEEEzzzzzzzEEEEGaaaXaaaaaaaXXX
+XXXXXXXXXXXXaaGEEEEzzzzzzzEEESGaaaaaaaaaaaXXX
+XXXXXXXXXXXXaaGEEhEzzzzzzzlhEEGaaaaaaaaaaaXXX
+XXXXXXXXXXXXaaGESlEzzzzzzzEElEGaaaaaaaaaaaXXX
+XXXXXXXXXXXXaaGEEEEzzzzzzzEEEEGaaaaaaaaaaaXXX
+XXXXXXXXXXXXaaGGlEEEzzzzzEEEEGGaaaaaaaaaaXXXX
+XXXXXXXXXXXaaaGGGGGEEzzzlEGGGGGaaaaaaaaaXXXXX
+XXXXXXXXXXXaaGGEEtUUUjfcUUUEMEGGaaaaaaXXXXXXX
+XXXXXXXXXXXaaGEtEENNNOHrNNNEEStGaaaaXXXXXXXXX
+XXXXXXXXXXaaGGEEQENTNOHrNTNlEEEGGaaaXXXXXXXXX
+XXXXXXXXXXaaGMESEMNNNOHrNNNEEEEEGaaaXXXXXXXXX
+XXXXXXXXXXaaGEEEEEsssOHrsssEEEQEGaaaXXXXXXXXX
+XXXXXXXXXXaaGEEEEEsssOHrssbEEEEEGaaaXXXXXXXXX
+XXXXXXXXXaaaGEMEEEsssOHrsssEEEMEGaaaXXXXXXXXX
+XXXXXXXXXaaaGGEEtENNROHrNNNEVEEGGaaaXXXXXXXXX
+XXXXXXXXXaaaaGtEESNTNOHrNTNEtSEGaaaXXXXXXXXXX
+XXXXXXXXXXaaaGGEEEyyyOHryyyEEEGGaaXXXXXXXXXXX
+XXXXXXXXXXXaaaGGEpGGGGHGGGGEMGGaaXXXXXXXXXXXX
+XXXXXXXXXXXXaaaGGGGaaaaaaaGGGGaaaXXXXXXXXXXXX
+XXXXXXXXXXXXXaaaaaaauaaauaaaaaaaXXXXXXXXXXXXX
+XXXXXXXXXXXXXXaaaaaaaaaaaaaaaaaaXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXaaaaaaaaaaaaaaaaaXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXaaauaaauaaaaaaXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXaaaaaaaaaaXXXXXXXXXXXXXXXX
+"}
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index 99245f71..5d327f3d 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -93,3 +93,12 @@
 //ash walker nest
 /area/ruin/unpowered/ash_walkers
 	icon_state = "red"
+
+
+
+
+// GS13 CONTENT STARTS HERE!!!
+
+/area/ruin/unpowered/caloriteshrine
+	name = "Calorite Shrine"
+	icon_state = "away"
\ No newline at end of file
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index ca1204cf..f775ebcc 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index f4ce85c7..d3e36a12 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,253 +6,6 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
-#define FILE_DIR "code"
-#define FILE_DIR "code/modules"
-#define FILE_DIR "code/modules/research"
-#define FILE_DIR "code/modules/research/xenoarch"
-#define FILE_DIR "code/modules/research/xenoarch/xenobotany"
-#define FILE_DIR "code/modules/research/xenoarch/xenobotany/icons"
-#define FILE_DIR "config"
-#define FILE_DIR "config/jukebox_music"
-#define FILE_DIR "config/jukebox_music/sounds"
-#define FILE_DIR "config/title_screens"
-#define FILE_DIR "GainStation13"
-#define FILE_DIR "GainStation13/icons"
-#define FILE_DIR "GainStation13/icons/mob"
-#define FILE_DIR "GainStation13/icons/mob/uniforms"
-#define FILE_DIR "GainStation13/icons/obj"
-#define FILE_DIR "GainStation13/icons/obj/clothing"
-#define FILE_DIR "GainStation13/icons/obj/lavaland_demone"
-#define FILE_DIR "GainStation13/icons/obj/spells"
-#define FILE_DIR "GainStation13/icons/obj/sugarland"
-#define FILE_DIR "GainStation13/icons/turf"
-#define FILE_DIR "GainStation13/sound"
-#define FILE_DIR "GainStation13/sound/voice"
-#define FILE_DIR "goon"
-#define FILE_DIR "goon/icons"
-#define FILE_DIR "goon/icons/obj"
-#define FILE_DIR "goon/sound"
-#define FILE_DIR "goon/sound/effects"
-#define FILE_DIR "goon/sound/machinery"
-#define FILE_DIR "html"
-#define FILE_DIR "hyperstation"
-#define FILE_DIR "hyperstation/icons"
-#define FILE_DIR "hyperstation/icons/chat"
-#define FILE_DIR "hyperstation/icons/decals"
-#define FILE_DIR "hyperstation/icons/effects"
-#define FILE_DIR "hyperstation/icons/mob"
-#define FILE_DIR "hyperstation/icons/mob/clothes"
-#define FILE_DIR "hyperstation/icons/mobs"
-#define FILE_DIR "hyperstation/icons/mobs/dancer"
-#define FILE_DIR "hyperstation/icons/obj"
-#define FILE_DIR "hyperstation/icons/obj/cargo"
-#define FILE_DIR "hyperstation/icons/obj/cargo/sweatshop"
-#define FILE_DIR "hyperstation/icons/obj/clothing"
-#define FILE_DIR "hyperstation/icons/obj/genitals"
-#define FILE_DIR "hyperstation/icons/obj/machinery"
-#define FILE_DIR "hyperstation/icons/obj/structures"
-#define FILE_DIR "hyperstation/sound"
-#define FILE_DIR "hyperstation/sound/ambience"
-#define FILE_DIR "hyperstation/sound/creatures"
-#define FILE_DIR "hyperstation/sound/creatures/mimic"
-#define FILE_DIR "hyperstation/sound/effects"
-#define FILE_DIR "hyperstation/sound/effects/rbmk"
-#define FILE_DIR "hyperstation/sound/effects/ship"
-#define FILE_DIR "hyperstation/sound/effects/ship/freespace2"
-#define FILE_DIR "hyperstation/sound/effects/ship/reactor"
-#define FILE_DIR "hyperstation/sound/halflife"
-#define FILE_DIR "hyperstation/sound/machines"
-#define FILE_DIR "hyperstation/sound/machines/sm"
-#define FILE_DIR "hyperstation/sound/machines/sm/accent"
-#define FILE_DIR "hyperstation/sound/machines/sm/accent/normal"
-#define FILE_DIR "hyperstation/sound/misc"
-#define FILE_DIR "icons"
-#define FILE_DIR "icons/ass"
-#define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/mecha"
-#define FILE_DIR "icons/minimaps"
-#define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/mob/actions"
-#define FILE_DIR "icons/mob/augmentation"
-#define FILE_DIR "icons/mob/inhands"
-#define FILE_DIR "icons/mob/inhands/antag"
-#define FILE_DIR "icons/mob/inhands/equipment"
-#define FILE_DIR "icons/mob/inhands/misc"
-#define FILE_DIR "icons/mob/inhands/weapons"
-#define FILE_DIR "icons/mob/jungle"
-#define FILE_DIR "icons/mob/large-worn-icons"
-#define FILE_DIR "icons/mob/large-worn-icons/64x64"
-#define FILE_DIR "icons/mob/lavaland"
-#define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/assemblies"
-#define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/atmospherics/components"
-#define FILE_DIR "icons/obj/atmospherics/pipes"
-#define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/doors/airlocks"
-#define FILE_DIR "icons/obj/doors/airlocks/abductor"
-#define FILE_DIR "icons/obj/doors/airlocks/centcom"
-#define FILE_DIR "icons/obj/doors/airlocks/clockwork"
-#define FILE_DIR "icons/obj/doors/airlocks/cult"
-#define FILE_DIR "icons/obj/doors/airlocks/cult/runed"
-#define FILE_DIR "icons/obj/doors/airlocks/cult/unruned"
-#define FILE_DIR "icons/obj/doors/airlocks/external"
-#define FILE_DIR "icons/obj/doors/airlocks/glass_large"
-#define FILE_DIR "icons/obj/doors/airlocks/hatch"
-#define FILE_DIR "icons/obj/doors/airlocks/highsec"
-#define FILE_DIR "icons/obj/doors/airlocks/shuttle"
-#define FILE_DIR "icons/obj/doors/airlocks/station"
-#define FILE_DIR "icons/obj/doors/airlocks/station2"
-#define FILE_DIR "icons/obj/doors/airlocks/survival"
-#define FILE_DIR "icons/obj/doors/airlocks/vault"
-#define FILE_DIR "icons/obj/flora"
-#define FILE_DIR "icons/obj/food"
-#define FILE_DIR "icons/obj/guns"
-#define FILE_DIR "icons/obj/hydroponics"
-#define FILE_DIR "icons/obj/lavaland"
-#define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/power_cond"
-#define FILE_DIR "icons/obj/smooth_structures"
-#define FILE_DIR "icons/obj/smooth_structures/alien"
-#define FILE_DIR "icons/obj/tesla_engine"
-#define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/program_icons"
-#define FILE_DIR "icons/rooms"
-#define FILE_DIR "icons/rooms/box"
-#define FILE_DIR "icons/stamp_icons"
-#define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/turf/floors"
-#define FILE_DIR "icons/turf/walls"
-#define FILE_DIR "icons/UI_Icons"
-#define FILE_DIR "icons/UI_Icons/chat"
-#define FILE_DIR "icons/UI_Icons/minesweeper_tiles"
-#define FILE_DIR "icons/UI_Icons/Pills"
-#define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "modular_citadel"
-#define FILE_DIR "modular_citadel/code"
-#define FILE_DIR "modular_citadel/code/game"
-#define FILE_DIR "modular_citadel/code/game/area"
-#define FILE_DIR "modular_citadel/icons"
-#define FILE_DIR "modular_citadel/icons/effects"
-#define FILE_DIR "modular_citadel/icons/eutactic"
-#define FILE_DIR "modular_citadel/icons/eutactic/item"
-#define FILE_DIR "modular_citadel/icons/eutactic/mob"
-#define FILE_DIR "modular_citadel/icons/lavaknight"
-#define FILE_DIR "modular_citadel/icons/lavaknight/item"
-#define FILE_DIR "modular_citadel/icons/lavaknight/mob"
-#define FILE_DIR "modular_citadel/icons/misc"
-#define FILE_DIR "modular_citadel/icons/mob"
-#define FILE_DIR "modular_citadel/icons/mob/actions"
-#define FILE_DIR "modular_citadel/icons/mob/citadel"
-#define FILE_DIR "modular_citadel/icons/mob/citadel_refs"
-#define FILE_DIR "modular_citadel/icons/mob/clothing"
-#define FILE_DIR "modular_citadel/icons/mob/inhands"
-#define FILE_DIR "modular_citadel/icons/obj"
-#define FILE_DIR "modular_citadel/icons/obj/clothing"
-#define FILE_DIR "modular_citadel/icons/obj/food"
-#define FILE_DIR "modular_citadel/icons/obj/genitals"
-#define FILE_DIR "modular_citadel/icons/obj/guns"
-#define FILE_DIR "modular_citadel/icons/polyclothes"
-#define FILE_DIR "modular_citadel/icons/polyclothes/item"
-#define FILE_DIR "modular_citadel/icons/polyclothes/mob"
-#define FILE_DIR "modular_citadel/icons/ui"
-#define FILE_DIR "modular_citadel/sound"
-#define FILE_DIR "modular_citadel/sound/misc"
-#define FILE_DIR "modular_citadel/sound/voice"
-#define FILE_DIR "modular_citadel/sound/weapons"
-#define FILE_DIR "nsv13"
-#define FILE_DIR "nsv13/icons"
-#define FILE_DIR "nsv13/icons/obj"
-#define FILE_DIR "nsv13/sound"
-#define FILE_DIR "nsv13/sound/effects"
-#define FILE_DIR "nsv13/sound/effects/computer"
-#define FILE_DIR "sound"
-#define FILE_DIR "sound/AI"
-#define FILE_DIR "sound/alien"
-#define FILE_DIR "sound/alien/Effects"
-#define FILE_DIR "sound/alien/Voice"
-#define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/ambience/antag"
-#define FILE_DIR "sound/arcade"
-#define FILE_DIR "sound/bloodsucker"
-#define FILE_DIR "sound/chatter"
-#define FILE_DIR "sound/creatures"
-#define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/effects/footstep"
-#define FILE_DIR "sound/FermiChem"
-#define FILE_DIR "sound/hallucinations"
-#define FILE_DIR "sound/health"
-#define FILE_DIR "sound/instruments"
-#define FILE_DIR "sound/instruments/accordion"
-#define FILE_DIR "sound/instruments/bikehorn"
-#define FILE_DIR "sound/instruments/eguitar"
-#define FILE_DIR "sound/instruments/glockenspiel"
-#define FILE_DIR "sound/instruments/guitar"
-#define FILE_DIR "sound/instruments/harmonica"
-#define FILE_DIR "sound/instruments/piano"
-#define FILE_DIR "sound/instruments/recorder"
-#define FILE_DIR "sound/instruments/saxophone"
-#define FILE_DIR "sound/instruments/trombone"
-#define FILE_DIR "sound/instruments/violin"
-#define FILE_DIR "sound/instruments/xylophone"
-#define FILE_DIR "sound/items"
-#define FILE_DIR "sound/items/equip"
-#define FILE_DIR "sound/items/geiger"
-#define FILE_DIR "sound/items/handling"
-#define FILE_DIR "sound/lavaland"
-#define FILE_DIR "sound/lewd"
-#define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/machines/clockcult"
-#define FILE_DIR "sound/machines/fryer"
-#define FILE_DIR "sound/machines/generator"
-#define FILE_DIR "sound/machines/microwave"
-#define FILE_DIR "sound/machines/nuke"
-#define FILE_DIR "sound/machines/shower"
-#define FILE_DIR "sound/machines/sm"
-#define FILE_DIR "sound/magic"
-#define FILE_DIR "sound/magic/clockwork"
-#define FILE_DIR "sound/mecha"
-#define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/music"
-#define FILE_DIR "sound/roundend"
-#define FILE_DIR "sound/spookoween"
-#define FILE_DIR "sound/vehicles"
-#define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/voice/beepsky"
-#define FILE_DIR "sound/voice/catpeople"
-#define FILE_DIR "sound/voice/complionator"
-#define FILE_DIR "sound/voice/firebot"
-#define FILE_DIR "sound/voice/human"
-#define FILE_DIR "sound/voice/medbot"
-#define FILE_DIR "sound/voice/scream"
-#define FILE_DIR "sound/vore"
-#define FILE_DIR "sound/vore/pred"
-#define FILE_DIR "sound/vore/prey"
-#define FILE_DIR "sound/vox_fem"
-#define FILE_DIR "sound/weapons"
-#define FILE_DIR "sound/weapons/effects"
-#define FILE_DIR "sound/weather"
-#define FILE_DIR "sound/weather/ashstorm"
-#define FILE_DIR "sound/weather/ashstorm/inside"
-#define FILE_DIR "sound/weather/ashstorm/outside"
-#define FILE_DIR "sound/weather/oxygenrain"
-#define FILE_DIR "sound/weather/oxygenrain/inside"
-#define FILE_DIR "sound/weather/oxygenrain/outside"
-#define FILE_DIR "tools"
-#define FILE_DIR "tools/HumanScissors"
-#define FILE_DIR "tools/SS13SmoothingCutter"
-#define FILE_DIR "yogstation"
-#define FILE_DIR "yogstation/icons"
-#define FILE_DIR "yogstation/icons/obj"
-#define FILE_DIR "yogstation/icons/obj/clothing"
-#define FILE_DIR "yogstation/icons/turf"
-#define FILE_DIR "yogstation/sound"
-#define FILE_DIR "yogstation/sound/effects"
-#define FILE_DIR "yogstation/sound/misc"
-#define FILE_DIR "yogstation/sound/voice"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES
@@ -3329,6 +3082,7 @@
 #include "GainStation13\code\mobs\cakegolem.dm"
 #include "GainStation13\code\modules\client\preferences\preferences.dm"
 #include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm"
+#include "GainStation13\code\modules\mob\living\brap.dm"
 #include "GainStation13\code\modules\mob\living\emote.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm"