From a02e6ab03e5111ca1265a4c89cf0fd1718931c2a Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 22 Jun 2020 21:30:54 +0300 Subject: [PATCH] Compile --- code/modules/mapping/minimaps.dm | 1 - code/modules/mob/transform_procs.dm | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/mapping/minimaps.dm b/code/modules/mapping/minimaps.dm index b2d7540ab8..7a62e9ab44 100644 --- a/code/modules/mapping/minimaps.dm +++ b/code/modules/mapping/minimaps.dm @@ -75,7 +75,6 @@ //we're done baking, now we ship it. register_asset("minimap-[id].png", map_icon) register_asset("minimap-[id]-meta.png", meta_icon) - send_asset_list(user, list("minimap-[id].png" = map_icon, "minimap-[id]-meta.png" = meta_icon)) /datum/minimap/proc/send(mob/user) if(!id) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index d92947e98e..49b8a028dd 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -1,7 +1,7 @@ #define TRANSFORMATION_DURATION 22 /mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_DEFAULTMSG)) - if (notransform || transformation_timer) + if(mob_transforming || transformation_timer) return if(tr_flags & TR_KEEPITEMS) @@ -11,7 +11,7 @@ dropItemToGround(W) //Make mob invisible and spawn animation - notransform = TRUE + mob_transforming = TRUE Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE) icon = null cut_overlays() @@ -156,7 +156,7 @@ //Could probably be merged with monkeyize but other transformations got their own procs, too /mob/living/carbon/proc/humanize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_DEFAULTMSG)) - if (notransform || transformation_timer) + if (mob_transforming || transformation_timer) return //now the rest @@ -169,7 +169,7 @@ client.screen -= W //Make mob invisible and spawn animation - notransform = TRUE + mob_transforming = TRUE Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE) icon = null @@ -362,7 +362,7 @@ qdel(src) /mob/living/carbon/human/proc/Robotize(delete_items = 0, transfer_after = TRUE) - if (mob_transforming) + if(mob_transforming) return for(var/obj/item/W in src) if(delete_items)