Merge remote-tracking branch 'upstream/main' into faith-selection-fix

NPC1314 · Jun 26, 2024 · 790d780 · 790d780
2 parents b803499 + b97601a
commit 790d780
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/code/modules/clothing/rogueclothes/neck.dm b/code/modules/clothing/rogueclothes/neck.dm
@@ -150,6 +150,11 @@
 	desc = ""
 	icon_state = "necra"
 
+/obj/item/clothing/neck/roguetown/psicross/ravox
+	name = "amulet of Ravox"
+	desc = ""
+	icon_state = "ravox"
+
 /obj/item/clothing/neck/roguetown/psicross/silver
 	name = "silver psycross"
 	icon_state = "psicrossiron"

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/monk.dm
@@ -17,7 +17,7 @@
 /datum/outfit/job/roguetown/adventurer/monk/pre_equip(mob/living/carbon/human/H)
 	..()
 	head = /obj/item/clothing/head/roguetown/roguehood
-	neck = /obj/item/clothing/neck/roguetown/psicross
+	neck = /obj/item/clothing/neck/roguetown/psicross/ravox
 	shoes = /obj/item/clothing/shoes/roguetown/shortboots
 	cloak = /obj/item/clothing/cloak/raincloak/furcloak/brown
 	armor = /obj/item/clothing/suit/roguetown/shirt/robe

diff --git a/code/modules/mob/living/stats.dm b/code/modules/mob/living/stats.dm
@@ -54,9 +54,8 @@
 					change_stat(S, H.dna.species.specstats[S])
 		switch(H.age)
 			if(AGE_MIDDLEAGED)
-				change_stat("endurance", 1) //if a stat isn't listed then it dosen't have a bonus or negative
-				change_stat("perception", 1)
-				change_stat("constitution", 1)
+				change_stat("speed", -1)
+				change_stat("endurance", 1)
 			if(AGE_OLD)
 				change_stat("strength", -2)
 				change_stat("speed", -1)

diff --git a/icons/roguetown/clothing/neck.dmi b/icons/roguetown/clothing/neck.dmi