Merge pull request #31795 from AnturK/random-runtimes

Random runtime fixes.
This commit is contained in:
Leo
2017-10-17 12:19:36 -02:00
committed by CitadelStationBot
parent 9691c9130f
commit 88486f97ca
4 changed files with 9 additions and 7 deletions
@@ -223,10 +223,11 @@ There are several things that need to be remembered:
if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES)))
overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/eyes.dmi')
var/mutable_appearance/glasses_overlay = overlays_standing[GLASSES_LAYER]
if(OFFSET_GLASSES in dna.species.offset_features)
glasses_overlay.pixel_x += dna.species.offset_features[OFFSET_GLASSES][1]
glasses_overlay.pixel_y += dna.species.offset_features[OFFSET_GLASSES][2]
overlays_standing[GLASSES_LAYER] = glasses_overlay
if(glasses_overlay)
if(OFFSET_GLASSES in dna.species.offset_features)
glasses_overlay.pixel_x += dna.species.offset_features[OFFSET_GLASSES][1]
glasses_overlay.pixel_y += dna.species.offset_features[OFFSET_GLASSES][2]
overlays_standing[GLASSES_LAYER] = glasses_overlay
apply_overlay(GLASSES_LAYER)
@@ -814,7 +814,8 @@
M.jitteriness = 0
if(M.has_dna())
M.dna.remove_all_mutations()
..()
if(!QDELETED(M)) //We were a monkey, now a human
..()
/datum/reagent/medicine/antihol
name = "Antihol"