zzz

Monkestation · Sep 23, 2023 · 43c2e5d · 43c2e5d
1 parent ab781dc
commit 43c2e5d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/code/modules/antagonists/wizard/grand_ritual/fluff.dm b/code/modules/antagonists/wizard/grand_ritual/fluff.dm
@@ -3,7 +3,7 @@
  */
 /obj/item/book/manual/ancient_parchment
 	name = "ancient parchment"
-	icon = 'icons/obj/wizard.dmi'
+	icon = 'icons/obj/scrolls.dmi'
 	icon_state = "scroll-ancient"
 	unique = TRUE
 	w_class = WEIGHT_CLASS_SMALL

diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -3057,13 +3057,13 @@
 
 /datum/reagent/hauntium/on_mob_metabolize(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	to_chat(affected_mob, span_userdanger("You feel an evil presence inside you!"))
-	if(affected_mob.mob_biotypes & MOB_UNDEAD)
+	if(affected_mob.mob_biotypes & MOB_UNDEAD) //monkestation temp removal: || HAS_MIND_TRAIT(affected_mob, TRAIT_MORBID))
 		affected_mob.add_mood_event("morbid_hauntium", /datum/mood_event/morbid_hauntium, name) //8 minutes of slight mood buff if undead or morbid
 	else
 		affected_mob.add_mood_event("hauntium_spirits", /datum/mood_event/hauntium_spirits, name) //8 minutes of mood debuff
 
 /datum/reagent/hauntium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
-	if(affected_mob.mob_biotypes & MOB_UNDEAD) //if morbid or undead, acts like an addiction-less drug
+	if(affected_mob.mob_biotypes & MOB_UNDEAD) //if morbid or undead, acts like an addiction-less drug //monkestation temp removal: || HAS_MIND_TRAIT(affected_mob, TRAIT_MORBID))
 		affected_mob.remove_status_effect(/datum/status_effect/jitter)
 		affected_mob.AdjustStun(-50 * REM * seconds_per_tick)
 		affected_mob.AdjustKnockdown(-50 * REM * seconds_per_tick)

diff --git a/code/modules/spells/spell_types/self/mutate.dm b/code/modules/spells/spell_types/self/mutate.dm
@@ -51,7 +51,7 @@
 /datum/action/cooldown/spell/apply_mutations/mutate/cast(mob/living/carbon/human/cast_on)
 	..()
 	/*if(HAS_TRAIT(cast_on, TRAIT_USES_SKINTONES) || HAS_TRAIT(cast_on, TRAIT_MUTANT_COLORS))
-		return*/ //monkestation removal, we dont have this refactor yet
+		return*/ //monkestation temp removal, we dont have this refactor yet
 	// Our caster has a species that doesn't greenify when hulked, so we will do it manually.
 	cast_on.add_atom_colour("#00FF00", TEMPORARY_COLOUR_PRIORITY)
 

diff --git a/icons/obj/scrolls.dmi b/icons/obj/scrolls.dmi
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi