shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3461 from Citadel-Station-13/upstream-merge-31795

Browse Source 
[MIRROR] Random runtime fixes.
This commit is contained in:
LetterJay
2017-10-18 07:35:03 -04:00
committed by GitHub
parent 9ef4ae7671 ef88abd85d
commit 271a287b52
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/update_icons.dm
+5 -4
View File
@@ -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)
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+2 -1
View File
@@ -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"