Merge branch 'master' into New-MG

code/modules/clothing/suits/armor.dm

@@ -173,7 +173,7 @@
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	armor = list("melee" = 70, "bullet" = 20, "laser" = 10,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10)
+	armor = list("melee" = 60, "bullet" = 30, "laser" = 10,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 30)
 	blocks_shove_knockdown = TRUE
 	strip_delay = 80
 	equip_delay_other = 60

code/modules/fallout/obj/food_and_drinks/food.dm

@@ -129,7 +129,7 @@
 	name = "cazador meat"
 	desc = "Meat extracted from the lean hide of cazador wasp."
 	icon_state = "mothmeat"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/toxin/carpotoxin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/toxin/cazador_venom = 3)
 	filling_color = "#e5b73b"
 	bitesize = 2
 	tastes = list("insect guts" = 3, "sweet tangy liquid" = 1) //google says toxin is sweet anyway.
@@ -142,7 +142,7 @@
 	desc = "Meat from a radscorpion, still inside its chitin.  Going to need pliers for this."
 	icon = 'icons/fallout/objects/food&drinks/food.dmi'
 	icon_state = "radscorpion_meat"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3,  /datum/reagent/toxin  = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/radscorp = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#e5b73b"
 	bitesize = 4
 	tastes = list("insect guts" = 3, "sweet tangy liquid" = 2) //google says toxin is sweet anyway.

code/modules/jobs/job_types/church.dm

@@ -24,6 +24,11 @@
 	access = list(ACCESS_COTC, ACCESS_COTC_ARMORY, ACCESS_COTC_SECRET)
 	minimal_access = list(ACCESS_COTC, ACCESS_COTC_ARMORY, ACCESS_COTC_SECRET)
 
+	loadout_options = list(
+		/datum/outfit/loadout/beckoner,		//
+		/datum/outfit/loadout/minister,	//
+		)
+
 	matchmaking_allowed = list(
 		/datum/matchmaking_pref/friend = list(
 			/datum/job/church,
@@ -71,6 +76,23 @@
 	ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src)
 	ADD_TRAIT(H, TRAIT_MACHINE_SPIRITS, src)
 
+/datum/outfit/loadout/beckoner
+	name = "Beckoner of His Truth"
+	suit_store = /obj/item/gun/energy/gammagun
+	backpack_contents = list(
+		/obj/item/clothing/suit/armor/f13/harbingermantle = 1,
+		/obj/item/stock_parts/cell/ammo/mfc = 3,
+		/obj/item/reagent_containers/glass/bottle/FEV_solution/two = 2,
+		/obj/item/reagent_containers/hypospray/medipen/stimpak = 4
+		)
+
+/datum/outfit/loadout/minister
+	name = "Minister of His Mercy"
+	suit_store = /obj/item/gun/energy/ionrifle
+	backpack_contents = list(
+		/obj/item/stock_parts/cell/ammo/mfc = 3,
+		/obj/item/storage/box/medicine/stimpaks/stimpaks5 = 4
+		)
 
 /*--------------------------------------------------------------*/
 
@@ -92,6 +114,11 @@
 	access = list(ACCESS_COTC, ACCESS_COTC_ARMORY, ACCESS_COTC_SECRET)
 	minimal_access = list(ACCESS_COTC, ACCESS_COTC_ARMORY, ACCESS_COTC_SECRET)
 
+	loadout_options = list(
+		/datum/outfit/loadout/bulwark,		//
+		/datum/outfit/loadout/sovereign,	//
+		)
+
 	matchmaking_allowed = list(
 		/datum/matchmaking_pref/friend = list(
 			/datum/job/church,
@@ -108,7 +135,6 @@
 	id = /obj/item/card/id/yuma/cotc/brand
 	uniform = /obj/item/clothing/under/f13/chaplain
 	suit = /obj/item/clothing/suit/hooded/robes/cotc/servitor
-	suit_store = /obj/item/gun/energy/laser/wattz2k
 	ears = /obj/item/radio/headset/headset_church
 	backpack = /obj/item/storage/backpack/satchel/leather
 	satchel = /obj/item/storage/backpack/satchel/leather
@@ -120,11 +146,8 @@
 	backpack_contents = list(
 		/obj/item/book/manual/thebook = 1,
 		/obj/item/book/manual/ritualbook = 1,
-		/obj/item/melee/classic_baton = 1,
-		/obj/item/stock_parts/cell/ammo/mfc = 2,
 		/obj/item/stack/medical/bruise_pack = 1,
 		/obj/item/restraints/handcuffs/cable = 1,
-		/obj/item/reagent_containers/hypospray/medipen/stimpak = 2
 		)
 
 /datum/outfit/job/church/f13servitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -142,6 +165,27 @@
 	ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src)
 	ADD_TRAIT(H, TRAIT_MACHINE_SPIRITS, src)
 
+/datum/outfit/loadout/bulwark
+	name = "Bulwark of His Faith"
+	suit_store = /obj/item/twohanded/sledgehammer/atomsjudgement
+	backpack_contents = list(
+		/obj/item/melee/classic_baton = 1,
+		/obj/item/restraints/legcuffs/bola = 3,
+		/obj/item/clothing/suit/armored/heavy/recycled_power = 1,
+		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1
+		)
+
+/datum/outfit/loadout/sovereign
+	name = "Sovereign of His Grace"
+	suit_store = /obj/item/gun/energy/laser/wattz2k
+	backpack_contents = list(
+		/obj/item/book/granter/trait/midsurgery = 1,
+		/obj/item/stock_parts/cell/ammo/mfc = 2,
+		/obj/item/clothing/suit/chaplain/witchhunter = 1,
+		/obj/item/clothing/head/helmet/chaplain/witchunter_hat = 1,
+		/obj/item/reagent_containers/hypospray/medipen/stimpak = 5
+		)
+
 /*--------------------------------------------------------------*/
 
 /datum/job/church/f13acolyte
@@ -203,24 +247,30 @@
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/stimpak)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/stimpak5)
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/church)
+	ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
+	ADD_TRAIT(H, TRAIT_GENERIC, src)
+	ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
+	ADD_TRAIT(H, TRAIT_MACHINE_SPIRITS, src)
 
 /datum/outfit/loadout/proselytizer
-	name = "Enforcer"
-	suit = /obj/item/clothing/suit/hooded/robes/cotc/proselytizer
+	name = "Enforcer of His Debts"
+	suit = /obj/item/clothing/suit/armor/riot/knight/tabard
 	suit_store = /obj/item/gun/energy/laser/aer9
 	backpack_contents = list(
+		/obj/item/clothing/suit/hooded/robes/cotc/acolyte = 1,
 		/obj/item/melee/classic_baton = 1,
+		/obj/item/melee/unarmed/sappers = 1,
 		/obj/item/restraints/legcuffs/bola = 1,
 		/obj/item/stock_parts/cell/ammo/mfc = 2,
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1
 		)
 
 /datum/outfit/loadout/healer
-	name = "Healer"
+	name = "Healer of His Vitality"
 	suit = /obj/item/clothing/suit/hooded/robes/cotc/acolyte
 	backpack_contents = list(
 		/obj/item/book/granter/trait/midsurgery = 1,
-		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1
+		/obj/item/storage/box/medicine/stimpaks/stimpaks5 = 2
 		)
 
 /*--------------------------------------------------------------*/

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -1114,3 +1114,72 @@
 		if(initial(liber.filterToxins))
 			liber.filterToxins = TRUE
 	L.metabolism_efficiency += metab_inibition
+
+/datum/reagent/toxin/radscorp
+	name = "Radscorpion Venom"
+	description = "Venom extracted from a radscorpion."
+	color = "#8C7918" // rgb: 140, 121, 24
+	taste_description = "sweetness"
+	taste_mult = 1.2
+	value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
+	toxpwr = 1.3
+	ghoulfriendly = TRUE
+
+/datum/reagent/toxin/silversting
+	name = "Silver Sting"
+	description = "A poison made from adding silver dust to radscorpion venom."
+	color = "#F0DE97" // rgb: 240, 222, 151
+	taste_description = "metallic sweetness"
+	taste_mult = 1.2
+	value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
+	toxpwr = 1.5
+	ghoulfriendly = TRUE
+
+/datum/reagent/toxin/silversting/on_mob_add(mob/living/carbon/human/M)
+	..()
+	if(isliving(M))
+		M.adjustStaminaLoss(90)
+
+/datum/reagent/toxin/bleakvenom
+	name = "Bleak Venom"
+	description = "A concentrated and highly toxic poison made from radscorpion and cazador venoms."
+	color = "#3D2D18" // rgb: 61, 45, 24
+	taste_description = "bleakness"
+	taste_mult = 1.5
+	value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
+	toxpwr = 2.7
+	ghoulfriendly = TRUE
+
+/datum/reagent/toxin/motherdarkness
+	name = "Mother Darkness"
+	description = "A hallucinogenic poison made by mixing radscorpion and cazador venoms with datura tea."
+	color = "#2E2236" // rgb: 46, 34, 54
+	taste_description = "numbing bitterness"
+	taste_mult = 4
+	value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
+	toxpwr = 1.7
+	ghoulfriendly = TRUE
+
+/datum/reagent/toxin/motherdarkness/on_mob_add(mob/living/carbon/human/M)
+	..()
+	if(isliving(M))
+		M.adjustStaminaLoss(75)
+
+/datum/reagent/toxin/motherdarkness/on_mob_life(mob/living/carbon/M)
+	M.blur_eyes(3)
+	M.hallucination += 5
+	return ..()
+
+/datum/reagent/toxin/darkdatura
+	name = "Dark Datura"
+	description = "A tribal poison made of datuta tea and acetone."
+	color = "#E3E0DA" // rgb: 227, 224, 218
+	taste_description = "dirt"
+	taste_mult = 1.2
+	value = REAGENT_VALUE_COMMON //Encouraging people to mix toxins for reasons beyond harming each other or mixing reagents such as pen acid.
+	toxpwr = 1.2
+	ghoulfriendly = TRUE
+
+/datum/reagent/toxin/darkdatura/on_mob_life(mob/living/carbon/M)
+	M.blur_eyes(3)
+	..()

code/modules/reagents/chemistry/recipes/toxins.dm

@@ -122,3 +122,31 @@
 	results = list(/datum/reagent/toxin/spewium = 5)
 	required_reagents = list (/datum/reagent/toxin/skewium = 1, /datum/reagent/consumable/ethanol/buffalo = 2, /datum/reagent/consumable/ethanol/yellowpulque = 2)
 	mix_message = "<span class='danger'>The mixture gives off a nauseating odor.</span>"
+
+/datum/chemical_reaction/silversting
+	name = "Silver Sting"
+	id = /datum/reagent/toxin/silversting
+	results = list(/datum/reagent/toxin/silversting = 3)
+	required_reagents = list (/datum/reagent/toxin/radscorp = 2, /datum/reagent/silver = 1)
+	mix_message = "<span class='danger'>The mixture shines in the light.</span>"
+
+/datum/chemical_reaction/bleakvenom
+	name = "Bleak Venom"
+	id = /datum/reagent/toxin/bleakvenom
+	results = list(/datum/reagent/toxin/bleakvenom = 6)
+	required_reagents = list (/datum/reagent/toxin/radscorp = 3, /datum/reagent/toxin/cazador_venom = 3)
+	mix_message = "<span class='danger'>The mixture hisses and inspires hopelessness.</span>"
+
+/datum/chemical_reaction/motherdarkness
+	name = "Mother Darkness"
+	id = /datum/reagent/toxin/motherdarkness
+	results = list(/datum/reagent/toxin/motherdarkness = 5)
+	required_reagents = list (/datum/reagent/toxin/radscorp = 4, /datum/reagent/consumable/ethanol/daturatea = 1)
+	mix_message = "<span class='danger'>The mixture fizzes and bubbles as it darkens.</span>"
+
+/datum/chemical_reaction/darkdatura
+	name = "Dark Datura"
+	id = /datum/reagent/toxin/darkdatura
+	results = list(/datum/reagent/toxin/darkdatura = 10)
+	required_reagents = list (/datum/reagent/consumable/ethanol/daturatea = 8, /datum/reagent/acetone = 2)
+	mix_message = "<span class='danger'>The mixture bubbles and gives off noxious fumes.</span>"