From 8bb98f92ca5635063c4f54f2ece5e1f53af45ee2 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 1 Apr 2020 00:47:29 +0200 Subject: [PATCH 1/2] It's past midnight, time for your runtimes flattening. --- code/game/objects/items/pinpointer.dm | 2 +- code/modules/mob/living/simple_animal/guardian/guardian.dm | 3 +++ code/modules/spells/spell_types/summonitem.dm | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 0c9c1704a9..090c2f6d57 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -83,7 +83,7 @@ /obj/item/pinpointer/crew/proc/trackable(mob/living/carbon/human/H) var/turf/here = get_turf(src) - if((H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under)) + if(H && (H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = H.w_uniform // Suit sensors must be on maximum. diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 3a1df8c0b3..b90a36d575 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -112,6 +112,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' recolorentiresprite = TRUE + if(!recolorentiresprite) + cooloverlay = mutable_appearance(icon, theme) + add_overlay(cooloverlay) /mob/living/simple_animal/hostile/guardian/Login() //if we have a mind, set its name to ours when it logs in ..() diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index d0e415fb2a..ca56e51272 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -105,7 +105,7 @@ if(item_to_retrieve.loc) item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly disappears!") - if(!L.put_in_hands(item_to_retrieve)) + if(!isitem(item_to_retrieve) || !L.put_in_hands(item_to_retrieve)) item_to_retrieve.forceMove(L.drop_location()) item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears!") playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, 1) From 5f128447f527d757148b2750b6f4bef2bc21fca1 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 1 Apr 2020 02:21:50 +0200 Subject: [PATCH 2/2] Update guardian.dm --- code/modules/mob/living/simple_animal/guardian/guardian.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index b90a36d575..41c56169d0 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -112,9 +112,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' recolorentiresprite = TRUE - if(!recolorentiresprite) - cooloverlay = mutable_appearance(icon, theme) - add_overlay(cooloverlay) + if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason + cooloverlay = mutable_appearance(icon, theme) + add_overlay(cooloverlay) /mob/living/simple_animal/hostile/guardian/Login() //if we have a mind, set its name to ours when it logs in ..()