From 6cc89a2bc38b294d85131e60aa6569928bc7f302 Mon Sep 17 00:00:00 2001 From: Lzimann Date: Mon, 22 Aug 2016 18:17:54 -0300 Subject: [PATCH] fixing goof's shit --- code/modules/clothing/chameleon.dm | 2 +- tgstation.dme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index a30537fab72..7e9ab1f85c3 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -77,7 +77,7 @@ chameleon_blacklist += target.type var/list/temp_list = typesof(chameleon_type) for(var/V in temp_list - (chameleon_blacklist)) - if(istype(V, /obj/item)) + if(ispath(V, /obj/item)) var/obj/item/I = V if(initial(I.flags) & ABSTRACT) continue diff --git a/tgstation.dme b/tgstation.dme index 093ed54235b..408835f98bd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -14,7 +14,7 @@ // BEGIN_INCLUDE #include "_maps\__MAP_DEFINES.dm" -#include "_maps\tgstation2.dm" +#include "_maps\ministation.dm" #include "code\_compile_options.dm" #include "code\hub.dm" #include "code\world.dm"