Undoing first step into scaling damage for fullmerge reasons

This commit is contained in:
BlackMajor
2019-06-16 20:00:31 +12:00
parent c5f79c9da8
commit 5c99bbbd45
2 changed files with 0 additions and 3 deletions
-1
View File
@@ -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)
-2
View File
@@ -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()