diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index f971a881ea1..eb731099936 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -42,14 +42,14 @@
throwforce = 25
var/cooldown = 0
-/obj/item/weapon/melee/cultblade/dagger/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/weapon/melee/cultblade/dagger/afterattack(mob/living/target, mob/living/carbon/human/user)
..()
- if(cooldown <= world.time && prob(50) && !target.stat)
- if(ishuman(target))
+ if(ishuman(target))
+ var/mob/living/carbon/human/bleeder = target
+ if(cooldown <= world.time && prob(50) && (!bleeder.stat || (!bleeder.species.flags & NO_BLOOD)))
visible_message("The runes on the blade absorb the blood of [target]!")
- var/mob/living/carbon/human/H = target
- H.drip(500)
- cooldown = world.time + 2400
+ bleeder.drip(500)
+ cooldown = world.time + 2400
/obj/item/weapon/legcuffs/bolas/cult
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index b350ecfc7ae..078393b0c70 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -226,9 +226,6 @@
if(ticker.mode.name == "cult")
if(!canbypass == 1)//not an admin-tome, check things
var/datum/game_mode/cult/cult_mode = ticker.mode
- if(!("eldergod" in cult_mode.objectives) || !("slughter" in cult_mode.objectives))
- to_chat(user, "[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!")
- return
if(!cult_mode.narsie_condition_cleared)
to_chat(user, "There is still more to do before unleashing [cult_mode.cultdat.entity_name] power!")
return
@@ -238,6 +235,9 @@
if(cult_mode.demons_summoned)
to_chat(user, "\"We are already here. There is no need to try to summon us now.\"")
return
+ if(!("eldergod" in cult_mode.objectives) || !("slughter" in cult_mode.objectives))
+ to_chat(user, "[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!")
+ return
var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No")
if(confirm_final == "No")
to_chat(user, "You decide to prepare further before scribing the rune.")
@@ -254,8 +254,8 @@
var/mob/living/carbon/human/H = user
var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot")
var/obj/item/organ/external/affecting = H.get_organ(ran_zone(dam_zone))
- user.visible_message("[user] cuts open their \the [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.mode.cultdat.entity_title3].")
- user.apply_damage(initial(rune_to_scribe.scribe_damage), ticker.mode.cultdat.dam_type, affecting)
+ user.visible_message("[user] cuts open their \The [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.mode.cultdat.entity_title3].")
+ user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE , affecting)
if(!do_after(user, initial(rune_to_scribe.scribe_delay)-scribereduct, target = get_turf(user)))
for(var/V in shields)
var/obj/machinery/shield/S = V
diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm
index d13675ee3d9..29aaeffefee 100644
--- a/code/game/magic/Uristrunes.dm
+++ b/code/game/magic/Uristrunes.dm
@@ -39,7 +39,7 @@ var/runetype = "rune"
I.Blend(icon('icons/effects/uristrunes.dmi', "[runetype]-[1 << i]"), ICON_OVERLAY)
- I.SwapColor(rgb(0, 0, 0, 100), rgb(100, 0, 0, 200))
+ I.SwapColor(rgb(0, 0, 0, 100), rgb(100, 0, 0, 200))//TO DO COMMENT:NEED TO ADJUST FOR DIFFRNET CULTS
I.SwapColor(rgb(0, 0, 0, 50), rgb(150, 0, 0, 200))
for(var/x = 1, x <= 32, x++)
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index f3487854ace..880ed534d10 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -8,10 +8,8 @@
/turf/simulated/wall/cult/New()
new /obj/effect/overlay/temp/cult/turf(src)
- ..()
- //if(ticker.mode.cultdat.theme != "blood")//THE ONLY REASON THIS IS COMMENTED OUT IF CUASE I NEED TO FIGURE OUT THIS SHIT WITH WALL SMOOTHING
- // icon = 'icons/turf/walls/cult_[ticker.mode.cultdat.theme]_wall.dmi'//CALM YOUR TITS
icon_state = ticker.mode.cultdat.cult_wall_icon_state
+ ..()
/turf/simulated/wall/cult/artificer
name = "runed stone wall"
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 9b82458c7b1..622ba52955b 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -31,6 +31,7 @@
..()
name = "[ticker.mode.cultdat.get_name(const_type)] ([rand(1, 1000)])"
real_name = ticker.mode.cultdat.get_name(const_type)
+ icon_living = ticker.mode.cultdat.get_icon(const_type)
icon_state = ticker.mode.cultdat.get_icon(const_type)
for(var/spell in construct_spells)
AddSpell(new spell(null))
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index c51a531b2f8..d3aa7f158b1 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/icons/turf/walls/cult_fire_wall.dmi b/icons/turf/walls/cult_fire_wall.dmi
deleted file mode 100644
index 85e549341d4..00000000000
Binary files a/icons/turf/walls/cult_fire_wall.dmi and /dev/null differ
diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi
index 5239f7b1e06..3ab86f21370 100644
Binary files a/icons/turf/walls/cult_wall.dmi and b/icons/turf/walls/cult_wall.dmi differ