Merge remote-tracking branch 'upstream/master' into funnylore

hyperstation/code/game/machinery/lore_terminal.dm

@@ -40,7 +40,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new)
 /obj/machinery/computer/lore_terminal/proc/get_entries()
 	for(var/X in GLOB.lore_terminal_controller.entries)
 		var/datum/lore_entry/instance = X
-		if(instance.access_tag == access_tag)
+		if(instance.access_tag == access_tag || instance.access_tag == "all")
 			entries += instance
 
 /obj/machinery/computer/lore_terminal/attack_hand(mob/user)
@@ -198,7 +198,7 @@ SPECIAL KEYS RESPOND AS FOLLOWS:
 
 ` = newline (br) (AKA when you press enter)
 ~ = horizontal line (hr)
-� = bullet point
+� = bullet point //Bullet points are not working? - archie
 
 */
 
@@ -208,7 +208,13 @@ SPECIAL KEYS RESPOND AS FOLLOWS:
 	path = "lore_entries/welcome.txt"
 	access_tag = "kncommon"
 
-/datum/lore_entry/station/meltdown_proceedures
+/datum/lore_entry/all
+	name = "nuclear_authdisk_instructions.mail"
+	title = "Handling the Nuclear Authentication Disk and You!"
+	content = "SYSADMIN -> allcrew@seegnet.kin. RE: The Nuclear Authentication Disk. ` Greetings staff members! We're aware of the questions you have in regards to the Nuclear Authentication disk. The disk itself contains the codes needed to unlock nuclear devices used in a Nuclear Emergency and trigger a station self-destruction sequence. ` It is the duty of every member of this crew to take responsibility for the disk in the off chance that station command is currently absent. ` Even though Layenia itself is a mobile facility and prevents Disk Triangulation in most circumstances, it is still important to hold onto the disk even when not needed- it is a good formality and keeps things secure! ` If the disk location is unknown, look for a red pinpointer, the Head of Security and the Captain should always have one in their offices or lockers. These will help you locate the disk. ` If the disk is in enemy hands, call all hands on deck immediately and order a red alert. ` ` Protect the disk with your life, for the lives of the station's crew depend on it. Stay safe through vigilance."
+	access_tag = "all"
+
+/datum/lore_entry/all/meltdown_proceedures
 	name = "meltdown_proceedures.mail"
 	title = "Emergency proceedures regarding nuclear meltdowns:"
 	path = "lore_entries/meltdowns.txt"

hyperstation/code/game/objects/railings.dm

@@ -39,7 +39,8 @@
 		/obj/effect/collapse,
 		/obj/effect/particle_effect/ion_trails,
 		/obj/effect/dummy/phased_mob,
-		/obj/effect/immovablerod
+		/obj/effect/immovablerod,
+		/obj/effect/crystalline_reentry
 		)) //Gotta make sure certain things can phase through it otherwise the railings also block them.
 
 /obj/structure/railing/CanPass(atom/movable/mover, turf/target)
@@ -158,4 +159,4 @@
 	else
 		usr.forceMove(get_turf(src))
 
-	usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")
+	usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")

hyperstation/code/game/objects/structures/ghost_role_spawners.dm

@@ -111,3 +111,59 @@
 
 /obj/effect/mob_spawn/human/exiled/special(mob/living/carbon/human/new_spawn)
 	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
+
+//Villagers: Once a group of servants that worshiped their 'Gods-Kings', but now finally free after their overlords have abandoned the planet.
+
+/obj/effect/mob_spawn/human/villager
+	name = "used bed"
+	desc = "Still warm."
+	mob_name = "villager"
+	job_description = "Villagers"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "bed"
+	roundstart = FALSE
+	death = FALSE
+	mob_species = /datum/species/human
+	short_desc = "You're finally free."
+	flavour_text = "After the God-Kings have abandoned the land, your people are finally free from their oppression. \
+	Still, the reasons for their departure are a mystery, and now your people need to work together to survive in this world."
+	assignedrole = "Free villager"
+	mirrorcanloadappearance = TRUE
+
+/obj/effect/mob_spawn/human/villager/Initialize(mapload)
+	. = ..()
+	var/arrpee = rand(1,3)
+	switch(arrpee)
+		if(1)
+			flavour_text += "You were a guard, serving your gods to keep control of you own people. \
+			Now that they left, you work to defend the village."
+			outfit.head = /obj/item/clothing/head/pharaoh
+			outfit.uniform = /obj/item/clothing/under/mummy
+			outfit.suit = /obj/item/clothing/suit/nemes
+			outfit.shoes = /obj/item/clothing/shoes/sandal
+			outfit.back = /obj/item/storage/backpack/satchel/leather
+			outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
+		if(2)
+			flavour_text += "You were a farmer, working extensively for years in the field to feed your people. \
+			The work hasn't changed much since the departure of the gods..."
+			outfit.head = /obj/item/clothing/head/rice_hat
+			outfit.uniform = /obj/item/clothing/under/mummy
+			outfit.suit = /obj/item/clothing/suit/nemes
+			outfit.shoes = /obj/item/clothing/shoes/sandal
+			outfit.back = /obj/item/storage/backpack/satchel/leather
+			outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
+		if(3)
+			flavour_text += "You were a servant, doing any necessary work that was thrown at you. \
+			At least it gave you experience in a bit of everything, which can be useful in these new times."
+			outfit.uniform = /obj/item/clothing/under/mummy
+			outfit.suit = /obj/item/clothing/suit/nemes
+			outfit.shoes = /obj/item/clothing/shoes/sandal
+			outfit.back = /obj/item/storage/backpack/satchel/leather
+			outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
+
+/obj/effect/mob_spawn/human/villager/Destroy()
+	new/obj/structure/bed(get_turf(src))
+	return ..()
+
+/obj/effect/mob_spawn/human/villager/special(mob/living/carbon/human/new_spawn)
+	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)