Fixes Tajaran appearance and reverts update_lying() for now.

This commit is contained in:
Erthilo
2012-05-31 17:35:04 +01:00
parent 8a69a6416c
commit 621b5f8179
5 changed files with 9 additions and 8 deletions
+2 -2
View File
@@ -105,7 +105,7 @@
icon_state = "table2-active"
return 1
if(victim)
victim.update_lying()
victim.update_clothing()
victim = null
if(updatesicon)
icon_state = "table2-idle"
@@ -134,7 +134,7 @@
if(updatesicon)
icon_state = "table2-active"
src.victim = M
M.update_lying()
M.update_clothing()
processing_objects.Add(src)
del(W)
return
+1 -1
View File
@@ -795,7 +795,7 @@ var/list/sacrificed = list()
return fizzle()
cultist.loc = src.loc
cultist.lying = 1
cultist.update_lying()
cultist.update_clothing()
for(var/mob/living/carbon/human/C in orange(1,src))
if(iscultist(C))
C.say("N'ath reth sh'yro eth d'rekkathnor!")
+1 -1
View File
@@ -184,7 +184,7 @@
if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled || istype(usr, /mob/living/silicon/pai)))
return
M.pixel_y = 6
M.update_lying()
M.update_clothing()
density = 1
icon_state = "up"
..()
@@ -150,7 +150,8 @@
..()
spawn(5) // Failsafe for.. weirdness.
rebuild_appearance()
update_clothing()
update_body()
/*var/known_languages = list()
known_languages.Add("english")*/
+3 -3
View File
@@ -35,13 +35,13 @@
// TODO: this check and the lyingcheck variable should probably be removed in favor of the visual_lying check
if((lyingcheck != lying) || (buckle_check != (buckled ? 1 : 0))) //This is a fix for falling down / standing up not updating icons. Instead of going through and changing every
spawn(5)
update_lying() //instance in the code where lying is modified, I've just added a new variable "lyingcheck" which will be compared
update_clothing() //instance in the code where lying is modified, I've just added a new variable "lyingcheck" which will be compared
lyingcheck = lying //to lying, so if lying ever changes, update_clothing() will run like normal.
if(stat == 2)
if(!lying && !buckled)
lying = 1
update_lying()
update_clothing()
return
life_tick++
@@ -138,7 +138,7 @@
if (stat != 0)
if(!lying)
lying = 1 //Seriously, stay down :x
update_lying()
update_clothing()