From 5c99bbbd452daa4709396a05cc47c78aed7e415b Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Sun, 16 Jun 2019 20:00:31 +1200 Subject: [PATCH] Undoing first step into scaling damage for fullmerge reasons --- code/_onclick/item_attack.dm | 1 - code/game/objects/items.dm | 2 -- 2 files changed, 3 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index ec742a8dfe..d23d0905e9 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -113,7 +113,6 @@ if(I.force) //CIT CHANGES START HERE - combatmode and resting checks var/totitemdamage = I.force - totitemdamage *= I.force_mult //Compression kit uses this if(iscarbon(user)) var/mob/living/carbon/tempcarb = user if(!tempcarb.combatmode) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 0765853b9c..bfa765e393 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -109,8 +109,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder! - //Compression kit vars - var/force_mult = 1 /obj/item/Initialize()