huh

CausticCove · Nov 12, 2024 · 5f6e437 · 5f6e437
1 parent 8386ace
commit 5f6e437
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/code/datums/status_effects/rogue/roguebuff.dm b/code/datums/status_effects/rogue/roguebuff.dm
@@ -315,9 +315,9 @@
 /datum/status_effect/buff/guidance/on_apply()
 	. = ..()
 	to_chat(owner, span_warning("I have better control over my accuracy!"))
-	ADD_TRAIT(owner, TRAIT_LONGSTRIDER, MAGIC_TRAIT)
+	ADD_TRAIT(owner, TRAIT_GUIDANCE, MAGIC_TRAIT)
 
 /datum/status_effect/buff/guidance/on_remove()
 	. = ..()
 	to_chat(owner, span_warning("My feeble mind muddies my warcraft once more."))
-	REMOVE_TRAIT(owner, TRAIT_LONGSTRIDER, MAGIC_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_GUIDANCE, MAGIC_TRAIT)
diff --git a/code/modules/mob/dead/new_player/sprite_accessory/genitals.dm b/code/modules/mob/dead/new_player/sprite_accessory/genitals.dm
@@ -2,7 +2,7 @@
 	icon = 'icons/mob/sprite_accessory/genitals/penis.dmi'
 	color_keys = 2
 	color_key_names = list("Member", "Skin")
-	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) //Vrell - Yes I know this is hacky but it works for now
+	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER) //Vrell - Yes I know this is hacky but it works for now
 
 /datum/sprite_accessory/penis/adjust_appearance_list(list/appearance_list, obj/item/organ/organ, obj/item/bodypart/bodypart, mob/living/carbon/owner)
 	generic_gender_feature_adjust(appearance_list, organ, bodypart, owner, OFFSET_BELT, OFFSET_BELT_F)
@@ -88,7 +88,7 @@
 /datum/sprite_accessory/testicles
 	icon = 'icons/mob/sprite_accessory/genitals/testicles.dmi'
 	color_key_name = "Sack"
-	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
+	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER)
 
 /datum/sprite_accessory/testicles/adjust_appearance_list(list/appearance_list, obj/item/organ/organ, obj/item/bodypart/bodypart, mob/living/carbon/owner)
 	generic_gender_feature_adjust(appearance_list, organ, bodypart, owner, OFFSET_BELT, OFFSET_BELT_F)
@@ -145,7 +145,7 @@
 /datum/sprite_accessory/vagina
 	icon = 'icons/mob/sprite_accessory/genitals/vagina.dmi'
 	color_key_name = "Nethers"
-	relevant_layers = list(BODY_FRONT_LAYER)
+	relevant_layers = list(BODY_ADJ_LAYER)
 
 /datum/sprite_accessory/vagina/adjust_appearance_list(list/appearance_list, obj/item/organ/organ, obj/item/bodypart/bodypart, mob/living/carbon/owner)
 	generic_gender_feature_adjust(appearance_list, organ, bodypart, owner, OFFSET_BELT, OFFSET_BELT_F)
@@ -190,7 +190,6 @@
 	name = "Cloaca"
 	default_colors = list("f99696")
 
-
 /datum/sprite_accessory/belly
 	icon = 'icons/mob/sprite_accessory/genitals/belly.dmi'
 	color_key_name = "Belly"

diff --git a/code/modules/mob/dead/new_player/sprite_accessory/tail_features.dm b/code/modules/mob/dead/new_player/sprite_accessory/tail_features.dm
@@ -71,6 +71,10 @@
 	icon_state = "stripe"
 
 //TAUR BULLSHIT MARKINGS AAAAAAAAAAAA
+
+/datum/sprite_accessory/tail_feature/taur
+	relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_FRONT_LAYER, BODY_ADJ_LAYER)
+
 /datum/sprite_accessory/tail_feature/taur/adjust_appearance_list(list/appearance_list, obj/item/organ/organ, obj/item/bodypart/bodypart, mob/living/carbon/owner)
     generic_gender_feature_adjust(appearance_list, organ, bodypart, owner, OFFSET_TAUR, OFFSET_TAUR_F)
 

diff --git a/code/modules/mob/dead/new_player/sprite_accessory/tails.dm b/code/modules/mob/dead/new_player/sprite_accessory/tails.dm
@@ -344,6 +344,8 @@
 
 
 //TAUR BULLSHIT HELP
+/datum/sprite_accessory/tail/taur
+	relevant_layers = list(BODY_FRONT_LAYER, BODY_BEHIND_LAYER)
 
 /datum/sprite_accessory/tail/taur/snake
 	name = "Snake Taur"

diff --git a/modular_hearthstone/code/modules/spells/roguetown/wizard.dm b/modular_hearthstone/code/modules/spells/roguetown/wizard.dm
@@ -955,7 +955,7 @@
 	chargedloop = /datum/looping_sound/invokegen
 	associated_skill = /datum/skill/magic/arcane
 
-/obj/effect/proc_holder/spell/invoked/fortitude/cast(list/targets, mob/user)
+/obj/effect/proc_holder/spell/invoked/guidance/cast(list/targets, mob/user)
 	var/atom/A = targets[1]
 	if(!isliving(A))
 		revert_cast()