Minor Advanced Cult Fixes (MrMelbert#142)

SS13-Source-Archive · Feb 5, 2022 · 0b95ea9 · 0b95ea9
1 parent ff81aab
commit 0b95ea9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/jollystation_modules/code/modules/antagonists/advanced_cult/blood_cult/blood_cult_theme.dm b/jollystation_modules/code/modules/antagonists/advanced_cult/blood_cult/blood_cult_theme.dm
@@ -76,7 +76,7 @@
 /datum/cult_theme/narsie/get_allowed_runes(datum/antagonist/advanced_cult/cultist_datum)
 	. = ..()
 	var/datum/advanced_antag_datum/cultist/cultist = cultist_datum.linked_advanced_datum
-	if(!cultist.conversion_allowed)
+	if(!cultist?.conversion_allowed) // If the cultist has no linked datum, it's a convertee, so it's safe to assume conversion is allowed
 		. -= "Revive"
 		. -= "Summon Cultist"
 		. -= "Boil Blood"

diff --git a/...tation_modules/code/modules/antagonists/advanced_cult/clock_cult/items/ratvar_hardsuit.dm b/...tation_modules/code/modules/antagonists/advanced_cult/clock_cult/items/ratvar_hardsuit.dm
@@ -18,6 +18,7 @@
 	name = "\improper Rat'varian clockwork suit"
 	desc = "A heavily-armored exosuit worn by warriors of the Rat'varian cult. It can withstand hard vacuum."
 	icon_state = "clockwork_cuirass"
+	worn_icon_state = "clockwork_cuirass"
 	inhand_icon_state = "clockwork_cuirass_inhand"
 	w_class = WEIGHT_CLASS_BULKY
 	allowed = list(/obj/item/clockwork_slab, /obj/item/melee/ratvar_spear, /obj/item/tank/internals, /obj/item/construction/rcd/clock)
@@ -28,3 +29,8 @@
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	resistance_flags = NONE
+
+// Hack to get around hooded things changing their icon state
+/obj/item/clothing/suit/hooded/clock/ToggleHood()
+	. = ..()
+	icon_state = initial(icon_state)
diff --git a/jollystation_modules/code/modules/antagonists/advanced_cult/conversion_rune.dm b/jollystation_modules/code/modules/antagonists/advanced_cult/conversion_rune.dm
@@ -118,7 +118,7 @@
 		return FALSE
 
 	convertee.heal_and_revive(50, span_warning("[convertee] writhes in pain as the sigil below [convertee.p_them()] flashes!"))
-	to_chat(convertee, span_heavy_brass("AAAAAAAAAAAAAA-"))
+	to_chat(convertee, cult.team_theme.our_cult_span("AAAAAAAAAAAAAA-", bold = TRUE))
 
 	var/datum/antagonist/advanced_cult/new_cultist = convertee.mind.add_antag_datum(/datum/antagonist/advanced_cult/convertee)
 	if(!new_cultist)

diff --git a/jollystation_modules/code/modules/antagonists/advanced_cult/magic_invoker.dm b/jollystation_modules/code/modules/antagonists/advanced_cult/magic_invoker.dm
@@ -86,7 +86,7 @@
 
 	if(our_theme.scribing_takes_blood && ishuman(owner))
 		var/mob/living/carbon/human/human_owner = owner
-		human_owner.bleed(rune ? 40 : 10)
+		human_owner.bleed(rune ? 10 : 40)
 		human_owner.cause_pain(pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM), 8)
 
 	var/datum/action/new_spell