diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index ff641420316..c75fc634d9d 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -324,6 +324,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
if(!cultwords["travel"])
runerandom()
+
if(iscultist(user))
var/C = 0
for(var/obj/effect/rune/N in rune_list)
@@ -443,7 +444,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
w_class = 2.0
var/cultistsonly = 1
attack_self(mob/user as mob)
- if(src.cultistsonly && !iscultist(usr))
+ if(src.cultistsonly && !iscultist(user))
return
if(!cultwords["travel"])
runerandom()
@@ -468,7 +469,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
if("teleport")
var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")
var/beacon
- if(usr)
+ if(user)
beacon = input("Select the last rune", "Rune Scribing") in words
R.word1=cultwords["travel"]
R.word2=cultwords["self"]
@@ -478,7 +479,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
if("itemport")
var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")
var/beacon
- if(usr)
+ if(user)
beacon = input("Select the last rune", "Rune Scribing") in words
R.word1=cultwords["travel"]
R.word2=cultwords["other"]
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 82f4773ca09..d427e574a6f 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -421,7 +421,6 @@ var/list/sacrificed = list()
/obj/effect/rune/proc/manifest(var/mob/living/user)
var/obj/effect/rune/this_rune = src
- src = null
if(user.loc!=this_rune.loc)
return this_rune.fizzle(user)
var/mob/dead/observer/ghost
@@ -441,7 +440,7 @@ var/list/sacrificed = list()
user.visible_message("A shape forms in the center of the rune. A shape of... a man.", \
"A shape forms in the center of the rune. A shape of... a man.", \
"You hear liquid flowing.")
- D.real_name = "Unknown"
+
var/chose_name = 0
for(var/obj/item/weapon/paper/P in this_rune.loc)
if(P.info)
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index cc78995e7a1..1cf2b09c188 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -47,7 +47,7 @@
if(iscultist(user))
if(imbue == "runestun")
user.take_organ_damage(5, 0)
- call(/obj/effect/rune/proc/runestun)(T)
+ call(/obj/effect/rune/proc/runestun)(user, T)
qdel(src)
else
..() ///If its some other talisman, use the generic attack code, is this supposed to work this way?
diff --git a/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm b/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm
index 8d7bfd1460f..8bdc07b13e8 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/skeleton.dm
@@ -94,7 +94,7 @@
flesh_color = "#551A8B"
- flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE
+ flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE | NO_EMBED
spawn_flags = IS_RESTRICTED
stamina = 500 //Tireless automatons
diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/belt_mirror.dmi
index f0453c6c794..3d9a3398985 100644
Binary files a/icons/mob/belt_mirror.dmi and b/icons/mob/belt_mirror.dmi differ