Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

code/modules/ruins/icemoonruin_code/hotsprings.dm

@@ -0,0 +1,37 @@
+GLOBAL_LIST_EMPTY(cursed_minds)
+
+/**
+  * Turns whoever enters into a mob
+  *
+  * If mob is chosen, turns the person into a random animal type
+  * Once the spring is used, it cannot be used by the same mind ever again
+  * After usage, teleports the user back to a random safe turf (so mobs are not killed by ice moon atmosphere)
+  *
+  */
+
+/turf/open/water/cursed_spring
+	baseturfs = /turf/open/water/cursed_spring
+	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+
+/turf/open/water/cursed_spring/Entered(atom/movable/thing, atom/oldLoc)
+	. = ..()
+	if(!isliving(thing))
+		return
+	var/mob/living/L = thing
+	if(!L.client)
+		return
+	if(GLOB.cursed_minds[L.mind])
+		return
+	GLOB.cursed_minds[L.mind] = TRUE
+	RegisterSignal(L.mind, COMSIG_PARENT_QDELETING, .proc/remove_from_cursed)
+	L = wabbajack(L, "animal") // Appearance randomization removed so citadel players don't get randomized into some ungodly ugly creature and complain
+	var/turf/T = find_safe_turf()
+	L.forceMove(T)
+	to_chat(L, "<span class='notice'>You blink and find yourself in [get_area_name(T)].</span>")
+
+/**
+  * Deletes minds from the cursed minds list after their deletion
+  *
+  */
+/turf/open/water/cursed_spring/proc/remove_from_cursed(datum/mind/M)
+	GLOB.cursed_minds -= M

code/modules/ruins/icemoonruin_code/library.dm

@@ -0,0 +1,33 @@
+/obj/machinery/door/keycard/library
+	name = "wooden door"
+	desc = "A dusty, scratched door with a thick lock attached."
+	icon = 'icons/obj/doors/puzzledoor/wood.dmi'
+	puzzle_id = "library"
+	open_message = "The door opens with a loud creak."
+
+/obj/item/keycard/library
+	name = "golden key"
+	desc = "A dull, golden key."
+	icon_state = "golden_key"
+	puzzle_id = "library"
+
+/obj/item/paper/crumpled/bloody/fluff/stations/lavaland/library/warning
+	name = "ancient note"
+	info = "<b>Here lies the vast collection of He Who Knows Ten Thousand Things. May all who pursue this knowledge for power be cursed a thousand times.</b>"
+
+/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary
+	name = "diary entry 13"
+	info = "It has been a week since the library was buried. I am so hungry that I can barely muster the energy to think, let alone write. The owl is gone."
+
+/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary2
+	name = "diary entry 18"
+	info = "I've lost track of time. I lack the strength to even pick up books off the shelves. To think, after all this time spent searching for the library, I will die before I can so much as graze the depth of its knowledge."
+
+/obj/item/feather
+	name = "feather"
+	desc = "A dark, wilting feather. It seems as old as time."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "feather"
+	force = 0
+	throwforce = 0
+	w_class = WEIGHT_CLASS_TINY

code/modules/ruins/lavaland_ruin_code.dm

@@ -133,7 +133,7 @@
 	assignedrole = "Lavaland Syndicate"
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/special(mob/living/new_spawn)
-	new_spawn.grant_language(/datum/language/codespeak)
+	new_spawn.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)
 
 /datum/outfit/lavaland_syndicate
 	name = "Lavaland Syndicate Agent"