Merge fixes.

This commit is contained in:
Ren Erthilo
2012-04-26 18:35:15 +01:00
parent 112c1cb0bc
commit 4f48a518ab
5 changed files with 23 additions and 23 deletions
+2 -2
View File
@@ -156,8 +156,8 @@ mob/living/carbon/proc/handle_hallucinations()
halbody = image('human.dmi',target,"husk_s",TURF_LAYER)
if(4)
halbody = image('alien.dmi',target,"alienother",TURF_LAYER)
// if(5)
// halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER)
if(5)
halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER)
if(client) client.images += halbody
spawn(rand(50,80)) //Only seen for a brief moment.