From fab7c484289e2dd0f3ec1b73094cf780d41008b5 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 13 May 2015 05:29:05 -0700 Subject: [PATCH] Fluff item removal: Compile fix This commit removes an istype check that was causing compile errors, and actually adds the updated .dme --- code/game/objects/items/weapons/cards_ids.dm | 8 -------- paradise.dme | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 2bf38626404..db8945d9063 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -166,14 +166,6 @@ /obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() - if(istype(W,/obj/item/weapon/id_wallet)) - user << "You slip [src] into [W]." - src.name = "[src.registered_name]'s [W.name] ([src.assignment])" - src.desc = W.desc - src.icon = W.icon - src.icon_state = W.icon_state - del(W) - return if(istype(W, /obj/item/weapon/id_decal/)) var/obj/item/weapon/id_decal/decal = W diff --git a/paradise.dme b/paradise.dme index b6e088f450c..52e66159a90 100644 --- a/paradise.dme +++ b/paradise.dme @@ -512,6 +512,7 @@ #include "code\game\mecha\mecha_control_console.dm" #include "code\game\mecha\mecha_parts.dm" #include "code\game\mecha\mecha_wreckage.dm" +#include "code\game\mecha\paintkits.dm" #include "code\game\mecha\combat\combat.dm" #include "code\game\mecha\combat\durand.dm" #include "code\game\mecha\combat\gygax.dm"