Fixes a few runtimes

This commit is contained in:
Tastyfish
2016-05-23 18:58:50 -04:00
parent 87c13977af
commit 7efe0beb94
9 changed files with 28 additions and 21 deletions
+2 -1
View File
@@ -43,7 +43,8 @@
timer_end()
if((!secured)||(cooldown > 0)) return 0
pulse(0)
loc.visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
if(loc)
loc.visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
cooldown = 2
spawn(10)
process_cooldown()
+5 -4
View File
@@ -1,12 +1,13 @@
/mob/living/silicon/pai/death(gibbed)
/mob/living/silicon/pai/death(gibbed, cleanWipe)
if(stat == DEAD)
return
force_fold_out()
if(!cleanWipe)
force_fold_out()
var/turf/T = get_turf_or_move(loc)
for (var/mob/M in viewers(T))
M.show_message("\red [src] emits a dull beep before it loses power and collapses.", 3, "\red You hear a dull beep followed by the sound of glass crunching.", 2)
M.show_message("<span class=warning>[src] emits a dull beep before it loses power and collapses.</span>", 3, "<span class=warning>You hear a dull beep followed by the sound of glass crunching.</span>", 2)
name = "pAI debris"
desc = "The unfortunate remains of some poor personal AI device."
icon_state = "[chassis]_dead"
@@ -24,5 +25,5 @@
if(mind) qdel(mind)
living_mob_list -= src
ghostize()
if(icon_state != "[chassis]_dead")
if(icon_state != "[chassis]_dead" || cleanWipe)
qdel(src)
@@ -140,13 +140,15 @@
/mob/living/simple_animal/hostile/poison/bees/worker/Destroy()
if(beehome)
beehome.bees.Remove(src)
if(beehome.bees)
beehome.bees.Remove(src)
beehome = null
..()
/mob/living/simple_animal/hostile/poison/bees/worker/death(gibbed)
if(beehome)
beehome.bees.Remove(src)
if(beehome.bees)
beehome.bees.Remove(src)
beehome = null
..()
+1 -1
View File
@@ -40,7 +40,7 @@
usr.emote(message)
/mob/proc/say_dead(var/message)
if(!src.client.holder)
if(!(client && client.holder))
if(!config.dsay_allowed)
to_chat(src, "<span class='danger'>Deadchat is globally muted.</span>")
return
+4 -4
View File
@@ -31,7 +31,7 @@
return 0
if(target.get_species() == "Machine")//i know organ robot might be enough but i am not taking chances...
return 0
if(!affected.encased)//no bone, problem.
if(affected && !affected.encased) //no bone, problem.
return 0
return 1
@@ -43,9 +43,9 @@
if(affected && (affected.status & ORGAN_ROBOT))
return 0//no operating on robotic limbs in an organic surgery
if(!affected.encased)//no bones no problem.
return 1
return 0
if(affected && affected.encased) //no bones no problem.
return 0
return 1
/datum/surgery/organ_manipulation/alien/can_start(mob/user, mob/living/carbon/target)
if(istype(target,/mob/living/carbon/alien/humanoid))