From 8530808d7243ed49005e8244731964d0826abb84 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 22:06:14 -0700 Subject: [PATCH] wew --- code/game/gamemodes/cult/cult_items.dm | 5 +++++ code/game/gamemodes/cult/cult_items.dm.rej | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 code/game/gamemodes/cult/cult_items.dm.rej diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index ad7174f02a..55f8ece5e6 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -54,6 +54,11 @@ desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods." icon = 'icons/obj/wizard.dmi' icon_state = "render" + item_state = "knife" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + inhand_x_dimension = 32 + inhand_y_dimension = 32 w_class = WEIGHT_CLASS_SMALL force = 15 throwforce = 25 diff --git a/code/game/gamemodes/cult/cult_items.dm.rej b/code/game/gamemodes/cult/cult_items.dm.rej deleted file mode 100644 index 5fbfc399bf..0000000000 --- a/code/game/gamemodes/cult/cult_items.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm (rejected hunks) -@@ -55,6 +57,8 @@ - item_state = "knife" - lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' -+ inhand_x_dimension = 32 -+ inhand_y_dimension = 32 - w_class = WEIGHT_CLASS_SMALL - force = 15 - throwforce = 25