Merge pull request NebulaSS13#4126 from MistakeNot4892/feature/shrine

Added shrine and clerics to Shaded Hills.

code/datums/uplink/stealth_and_camouflage_items.dm

@@ -56,7 +56,7 @@
 /datum/uplink_item/item/stealth_items/sneakies
 	name = "Sneakies"
 	desc = "A fashionable pair of polished dress shoes. The soles are made in a way so that any \
-	tracks you leave look like they are traveling in the opposite direction."
+	tracks you leave look like they are travelling in the opposite direction."
 	item_cost = 4
 	path = /obj/item/clothing/shoes/dress/sneakies
 

code/game/turfs/unsimulated/floor.dm

@@ -18,6 +18,12 @@
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "rockvault"
 
+/turf/unsimulated/mask_alt // just a second mask type for maps needing two random map runs
+	name = "mask"
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "rockvault"
+	color = COLOR_SILVER
+
 /turf/unsimulated/mask/flooded
 	flooded = /decl/material/liquid/water
 	color = COLOR_LIQUID_WATER

code/modules/clothing/neck/jewelry.dm

@@ -3,10 +3,23 @@
 	desc = "A simple necklace."
 	icon = 'icons/clothing/accessories/jewelry/necklace.dmi'
 	material = /decl/material/solid/metal/silver
+	material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC
+
+/obj/item/clothing/neck/necklace/prayer_beads
+	name = "prayer beads"
+	desc = "A string of smooth, polished beads."
+	icon = 'icons/clothing/accessories/jewelry/prayer_beads.dmi'
+	material = /decl/material/solid/organic/wood/ebony
+
+/obj/item/clothing/neck/necklace/prayer_beads/gold
+	material = /decl/material/solid/metal/gold
+
+/obj/item/clothing/neck/necklace/prayer_beads/basalt
+	material = /decl/material/solid/stone/basalt
 
 /obj/item/clothing/neck/necklace/locket
-	name = "silver locket"
-	desc = "A silver locket that seems to have space for a photo within."
+	name = "locket"
+	desc = "A locket that seems to have space for a photo within."
 	icon = 'icons/clothing/accessories/jewelry/locket.dmi'
 	var/open
 	var/obj/item/held

code/modules/clothing/spacesuits/rig/rig.dm

@@ -82,7 +82,7 @@
 	var/malfunction_delay = 0
 	var/electrified = 0
 	var/locked_down = 0
-	var/aimove_power_usage = 200							  // Power usage per tile traveled when suit is moved by AI in IIS. In joules.
+	var/aimove_power_usage = 200							  // Power usage per tile travelled when suit is moved by AI in IIS. In joules.
 
 	var/seal_delay = SEAL_DELAY
 	var/sealing                                               // Keeps track of seal status independantly of canremove.

code/modules/clothing/suits/mantle.dm

@@ -0,0 +1,8 @@
+/obj/item/clothing/suit/mantle
+	name = "mantle"
+	desc = "A light garment worn draped over and around the shoulders."
+	icon = 'icons/clothing/suits/mantle.dmi'
+
+/obj/item/clothing/suit/mantle/fated
+	desc = "A heavy, gold-chained mantle."
+	icon = 'icons/clothing/suits/fated_mantle.dmi'

code/modules/fabrication/designs/textile/gimmick.dm

@@ -10,7 +10,7 @@
 	path = /obj/item/clothing/suit/redtag
 
 /datum/fabricator_recipe/textiles/gimmick/mantle
-	path = /obj/item/clothing/suit/fated
+	path = /obj/item/clothing/suit/mantle/fated
 
 /datum/fabricator_recipe/textiles/gimmick/syndicatefake
 	path = /obj/item/clothing/suit/syndicatefake
@@ -111,9 +111,6 @@
 /datum/fabricator_recipe/textiles/gimmick/capjacket
 	path = /obj/item/clothing/suit/jacket/captain
 
-/datum/fabricator_recipe/textiles/gimmick/robe
-	path = /obj/item/clothing/suit/robe
-
 /datum/fabricator_recipe/textiles/gimmick/xeno
 	path = /obj/item/clothing/head/xeno/scarf
 

code/modules/fabrication/designs/textile/overwear.dm

@@ -76,4 +76,7 @@
 	path = /obj/item/clothing/suit/poncho/engineering
 
 /datum/fabricator_recipe/textiles/overwear/poncho9
-	path = /obj/item/clothing/suit/poncho/cargo
+	path = /obj/item/clothing/suit/poncho/cargo
+
+/datum/fabricator_recipe/textiles/overwear/mantle
+	path = /obj/item/clothing/suit/mantle

code/modules/hydroponics/seed_packets.dm

@@ -367,3 +367,18 @@
 
 /obj/item/seeds/extracted/foxglove
 	seed = "foxglove"
+
+/obj/item/seeds/extracted/cabbage
+	seed = "cabbage"
+
+/obj/item/seeds/extracted/carrot
+	seed = "carrot"
+
+/obj/item/seeds/extracted/potato
+	seed = "potato"
+
+/obj/item/seeds/extracted/wheat
+	seed = "wheat"
+
+/obj/item/seeds/extracted/rice
+	seed = "rice"

maps/shaded_hills/_shaded_hills_defines.dm

@@ -3,4 +3,4 @@
 #define SKILL_TEXTILES      /decl/hierarchy/skill/crafting/textiles
 #define SKILL_STONEMASONRY  /decl/hierarchy/skill/crafting/stonemasonry
 #define SKILL_SCULPTING     /decl/hierarchy/skill/crafting/sculpting
-#define SKILL_ARTIFICE      /decl/hierarchy/skill/crafting/artifice
+#define SKILL_ARTIFICE      /decl/hierarchy/skill/crafting/artifice

maps/shaded_hills/areas/downlands.dm

@@ -39,3 +39,12 @@
 	name = "\improper General Store"
 	fishing_failure_prob = "100"
 	fishing_results = list()
+
+
+/area/shaded_hills/shrine
+	name = "\improper Shrine"
+	fishing_failure_prob = "100"
+	fishing_results = list()
+
+/area/shaded_hills/outside/shrine
+	name = "\improper Shrine Grounds"

maps/shaded_hills/jobs/_jobs.dm

@@ -12,8 +12,11 @@
 		/datum/job/shaded_hills/inn/bartender,
 		/datum/job/shaded_hills/inn/farmer,
 		/datum/job/shaded_hills/caves/dweller,
+		/datum/job/shaded_hills/shrine/keeper,
+		/datum/job/shaded_hills/shrine/attendant,
+		/datum/job/shaded_hills/visitor/traveller/cleric
 	)
-	default_job_type        = /datum/job/shaded_hills/visitor/traveller
+	default_job_type = /datum/job/shaded_hills/visitor/traveller
 	default_department_type = /decl/department/shaded_hills/visitors
 	species_to_job_whitelist = list(
 		/decl/species/grafadreka = list(
@@ -30,7 +33,9 @@
 	species_to_job_blacklist = list(
 		/decl/species/kobaloi = list(
 			/datum/job/shaded_hills/visitor/beggar_knight,
-			/datum/job/shaded_hills/inn/innkeeper
+			/datum/job/shaded_hills/inn/innkeeper,
+			/datum/job/shaded_hills/shrine/keeper,
+			/datum/job/shaded_hills/visitor/traveller/cleric
 		)
 	)
 

maps/shaded_hills/jobs/shrine.dm

@@ -0,0 +1,57 @@
+/decl/department/shaded_hills/shrine
+	name                    = "Shrine Attendants"
+	colour                  = "#404e68"
+	display_color           = "#8c96c4"
+
+/datum/job/shaded_hills/shrine
+	abstract_type = /datum/job/shaded_hills/shrine
+	department_types        = list(/decl/department/shaded_hills/shrine)
+	skill_points            = 20
+
+/datum/job/shaded_hills/shrine/keeper
+	title                   = "Shrine Keeper"
+	supervisors             = "your vows, and your faith"
+	description             = "You are the leader of the local religious order, living and working within the shrine. You are expected to see to both the spiritual and physical health of the populace, as well as travellers, if they can offer appropriate tithe."
+	spawn_positions         = 1
+	total_positions         = 1
+	outfit_type             = /decl/hierarchy/outfit/job/shaded_hills/shrine/keeper
+	min_skill               = list(
+		SKILL_LITERACY      = SKILL_ADEPT,
+		SKILL_MEDICAL       = SKILL_ADEPT,
+		SKILL_ANATOMY       = SKILL_ADEPT,
+	)
+	max_skill               = list(
+		SKILL_MEDICAL       = SKILL_MAX,
+		SKILL_ANATOMY       = SKILL_MAX,
+	)
+	skill_points            = 24
+
+/obj/abstract/landmark/start/shaded_hills/shrine_keeper
+	name                    = "Shrine Keeper"
+
+/datum/job/shaded_hills/shrine/attendant
+	title                   = "Shrine Attendant"
+	supervisors             = "the Shrine Keeper, your vows, and your faith"
+	description             = "You are an acolyte of the local religious order, living and working within the shrine. Under the direction of the shrine keeper, you are expected to tend to the shrine and the grounds, and to produce food or other goods for use or trade to support the clergy."
+	spawn_positions         = 2
+	total_positions         = 2
+	outfit_type             = /decl/hierarchy/outfit/job/shaded_hills/shrine
+	min_skill               = list(
+		SKILL_STONEMASONRY  = SKILL_BASIC,
+		SKILL_CARPENTRY     = SKILL_BASIC,
+		SKILL_TEXTILES      = SKILL_BASIC,
+		SKILL_COOKING       = SKILL_BASIC,
+		SKILL_BOTANY        = SKILL_BASIC,
+		SKILL_ATHLETICS     = SKILL_ADEPT,
+		SKILL_MEDICAL       = SKILL_ADEPT,
+		SKILL_ANATOMY       = SKILL_ADEPT,
+	)
+	max_skill               = list(
+		SKILL_COOKING       = SKILL_EXPERT,
+		SKILL_BOTANY        = SKILL_EXPERT,
+		SKILL_MEDICAL       = SKILL_EXPERT,
+		SKILL_ANATOMY       = SKILL_EXPERT,
+	)
+
+/obj/abstract/landmark/start/shaded_hills/shrine_attendant
+	name                    = "Shrine Attendant"

maps/shaded_hills/jobs/visitors.dm

@@ -22,12 +22,12 @@
 /datum/job/shaded_hills/visitor/traveller/learned
 	title                   = "Itinerant Scholar"
 	// todo: outfits for alt-titles?
-	alt_titles              = list("Itinerant Monk", "Traveling Doctor", "Dilettante")
+	alt_titles              = list("Itinerant Monk", "Travelling Doctor", "Dilettante")
 	supervisors             = "your conscience"
-	description             = "You are a skilled professional who has traveled to this area from elsewhere. You may be a doctor, a scholar, a monk, or some other highly-educated individual with rare skills. Whatever your reason for coming here, you are likely one of the only individuals in the area to possess your unique skillset."
+	description             = "You are a skilled professional who has travelled to this area from elsewhere. You may be a doctor, a scholar, a monk, or some other highly-educated individual with rare skills. Whatever your reason for coming here, you are likely one of the only individuals in the area to possess your unique skillset."
 	spawn_positions         = 2
 	total_positions         = 2
-	outfit_type             = /decl/hierarchy/outfit/job/shaded_hills/traveller
+	outfit_type             = /decl/hierarchy/outfit/job/shaded_hills/traveller/scholar
 	skill_points            = 24
 	min_skill               = list(
 		SKILL_LITERACY      = SKILL_ADEPT
@@ -64,3 +64,28 @@
 
 /obj/abstract/landmark/start/shaded_hills/beggar_knight
 	name                    = "Beggar Knight"
+
+
+/datum/job/shaded_hills/visitor/traveller/cleric
+	title                   = "Travelling Cleric"
+	supervisors             = "your vows, and your faith"
+	description             = "You are an ordained person of faith, travelling the lands on the business of your order, to preach, or simply to experience new people and cultures. You are battle-trained, but are also a healer."
+	spawn_positions         = 2
+	total_positions         = 2
+	outfit_type             = /decl/hierarchy/outfit/job/shaded_hills/traveller/cleric
+	min_skill               = list(
+		SKILL_WEAPONS       = SKILL_ADEPT,
+		SKILL_ATHLETICS     = SKILL_ADEPT,
+		SKILL_MEDICAL       = SKILL_ADEPT,
+		SKILL_ANATOMY       = SKILL_ADEPT,
+	)
+	max_skill               = list(
+		SKILL_WEAPONS       = SKILL_MAX,
+		SKILL_MEDICAL       = SKILL_MAX,
+		SKILL_ANATOMY       = SKILL_MAX,
+	)
+	skill_points            = 22
+
+/obj/abstract/landmark/start/shaded_hills/cleric
+	name                    = "Travelling Cleric"
+

maps/shaded_hills/outfits/shrine.dm

@@ -0,0 +1,9 @@
+/decl/hierarchy/outfit/job/shaded_hills/shrine
+	name    = "Shaded Hills - Shrine Attendant"
+	uniform = /obj/item/clothing/suit/robe
+	shoes   = /obj/item/clothing/shoes/sandal
+
+/decl/hierarchy/outfit/job/shaded_hills/shrine/keeper
+	name    = "Shaded Hills - Shrine Keeper"
+	suit    = /obj/item/clothing/suit/mantle
+	mask    = /obj/item/clothing/neck/necklace/prayer_beads/basalt

maps/shaded_hills/outfits/visitors.dm

@@ -10,3 +10,10 @@
 		/obj/item/stack/medical/ointment/poultice/five   = 1,
 		/obj/item/chems/waterskin/crafted/wine           = 1
 	)
+
+/decl/hierarchy/outfit/job/shaded_hills/traveller/scholar
+	name    = "Shaded Hills - Itinerant Scholar"
+
+/decl/hierarchy/outfit/job/shaded_hills/traveller/cleric
+	name    = "Shaded Hills - Travelling Cleric"
+