From 1ed0d48da130674821d8a2db521a306bb8b04b50 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 12 Jan 2017 00:06:58 -0500 Subject: [PATCH] fixes for conflict and a map runtime --- code/game/gamemodes/cult/ritual.dm | 5 ++++- icons/obj/clothing/suits.dmi | Bin 162122 -> 162122 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 737d5a4c6bc..25d36079625 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -36,7 +36,10 @@ canbypass = 1 /obj/item/weapon/tome/New() - icon_state = ticker.mode.cultdat.tome_icon + if(!ticker) + icon_state = "tome" + else + icon_state = ticker.mode.cultdat.tome_icon ..() /obj/item/weapon/tome/examine(mob/user) diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4a3a484a14f1725135f5a3d799597ac35d3eefbb..48d76f691aa67127368e6803d220bdf9489698a6 100644 GIT binary patch delta 1989 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 XoqJqVb^6DHuLy^)2m!aR2m+gMYeeF8