Fix some misc bugs

This commit is contained in:
Rob Nelson
2013-11-23 12:49:33 -08:00
parent 63c9f550f4
commit f6ac715f6a
5 changed files with 20 additions and 3 deletions

View File

@@ -499,7 +499,7 @@
if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit
Paralyse(3) // 3 gives them one second to wake up and run away a bit!
if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
sleeping = max(sleeping+2, 10)
sleeping = min(sleeping+2, 10)
else if(SA_pp > 0.15) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
if(prob(20))
spawn(0) emote(pick("giggle", "laugh"))
@@ -1169,6 +1169,8 @@
if(healths) healths.icon_state = "health7" //DEAD healthmeter
else
sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
see_in_dark = species.darksight
see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : SEE_INVISIBLE_LIVING
if(dna)
switch(dna.mutantrace)
if("slime")

View File

@@ -137,6 +137,8 @@
winset(client, "input", "text=[null]")
/mob/living/carbon/human/say_understands(var/other,var/datum/language/speaking = null)
if(has_brain_worms()) //Brain worms translate everything. Even mice and alien speak.
return 1
if (istype(other, /mob/living/silicon/ai))
return 1
if (istype(other, /mob/living/silicon/decoy))

View File

@@ -101,6 +101,17 @@
var/mob/living/carbon/human/h = mob
h.monkeyize()
/datum/disease2/effect/catbeast
name = "Kingston Syndrome"
stage = 4
badness = 2
activate(var/mob/living/carbon/mob,var/multiplier)
if(istype(mob,/mob/living/carbon/human))
var/mob/living/carbon/human/h = mob
if(h.species.name != "Tajaran")
if(h.set_species("Tajaran"))
h.regenerate_icons()
/datum/disease2/effect/suicide
name = "Suicidal Syndrome"
stage = 4