Merge pull request #1304 from ArchieBeepBoop/mimicode

blacklists bots from mimic transformation
This commit is contained in:
Dahlular
2021-06-20 04:24:02 -06:00
committed by GitHub
+4 -3
View File
@@ -41,7 +41,8 @@
var/playerTfTime
var/static/mimic_blacklisted_transform_items = typecacheof(list(
/obj/item/projectile,
/obj/item/radio/intercom))
/obj/item/radio/intercom,
/mob/living/simple_animal/bot))
var/playstyle_string = "<span class='boldannounce'>You are a mimic</span></b>, a tricky creature that can take the form of \
almost any item nearby by shift-clicking it. While morphed, you move slowly and do less damage. \
Finally, you can restore yourself to your original form while morphed by shift-clicking yourself. \
@@ -89,7 +90,7 @@
if(.)
if(stealthed)
restore()
if(A.stat != DEAD)
if(A.stat == CONSCIOUS)
adjustBruteLoss(-3) //We heal 3 damage
/mob/living/simple_animal/hostile/hs13mimic/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
@@ -197,8 +198,8 @@
/mob/living/simple_animal/hostile/hs13mimic/proc/restore()
//back to normal mimic sprite
medhudupdate()
stealthed = FALSE
medhudupdate()
name = initial(name)
icon = 'hyperstation/icons/mobs/mimic.dmi'
icon_state = "mimic"