Fixes a few runtimes (#12893)

* Some runtime fixes

* fixes #12892

* Alternative fix. Better behaviour

* qdel atmos thingy when loc is null

* Eye colour init protection

* Whoops. Forgotten /

* Suggestions update

* Fixed a runtime where IPCs losing their arms would cause a runtime in the hand

* Fixes mobs being able to nuzzle a grill to dead and a runtime there

* Added extra logging to the NPCpools
This commit is contained in:
farie82
2020-02-14 22:17:29 -07:00
committed by GitHub
parent df09966258
commit 5b1941e784
10 changed files with 18 additions and 11 deletions
+2
View File
@@ -147,6 +147,8 @@ Gunshots/explosions/opening doors/less rare audio (done)
START_PROCESSING(SSobj, src)
/obj/effect/hallucination/fake_flood/process()
if(!target)
qdel(src)
if(next_expand <= world.time)
radius++
if(radius > FAKE_FLOOD_MAX_RADIUS)
+1 -2
View File
@@ -12,12 +12,11 @@
var/see_invisible = 0
var/lighting_alpha
var/eye_colour = "#000000"
var/eye_colour = "#000000" // Should never be null
var/old_eye_colour = "#000000"
var/flash_protect = 0
var/aug_message = "Your vision is augmented!"
/obj/item/organ/internal/cyberimp/eyes/insert(var/mob/living/carbon/M, var/special = 0)
..()
var/mob/living/carbon/human/H = M
+1 -1
View File
@@ -5,7 +5,7 @@
organ_tag = "eyes"
parent_organ = "head"
slot = "eyes"
var/eye_colour = "#000000"
var/eye_colour = "#000000" // Should never be null
var/list/colourmatrix = null
var/list/colourblind_matrix = MATRIX_GREYSCALE //Special colourblindness parameters. By default, it's black-and-white.
var/list/replace_colours = LIST_GREYSCALE_REPLACE
@@ -404,7 +404,7 @@ Note that amputating the affected organ does in fact remove the infection from t
fracture()
/obj/item/organ/external/proc/check_for_internal_bleeding(damage)
if(NO_BLOOD in owner.dna.species.species_traits)
if(owner && NO_BLOOD in owner.dna.species.species_traits)
return
var/local_damage = brute_dam + damage
if(damage > 15 && local_damage > 30 && prob(damage) && !is_robotic())