From ed5a12c2a2ed6ef286d6a7c179d8d2f6fd4ee33e Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 7 Jul 2015 17:14:42 +0200 Subject: [PATCH] Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes" --- .../objects/items/weapons/material/kitchen.dm | 2 +- .../objects/items/weapons/material/knives.dm | 4 +- code/modules/customitems/item_spawning.dm | 64 +------------------ 3 files changed, 5 insertions(+), 65 deletions(-) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 4cfb1123f8..597affcd35 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -73,7 +73,7 @@ name = "knife" desc = "Can cut through any food." icon_state = "knife" - force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) + force_divisor = 0.2 // 12 when wielded with hardness 60 (steel) /obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index d15ac40e95..3271650d31 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -52,12 +52,11 @@ name = "kitchen knife" icon = 'icons/obj/kitchen.dmi' icon_state = "knife" - item_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." flags = CONDUCT sharp = 1 edge = 1 - force_divisor = 0.2 // 12 when wielded with hardness 60 (steel) + force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) matter = list(DEFAULT_WALL_MATERIAL = 12000) origin_tech = "materials=1" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -86,7 +85,6 @@ name = "butcher's cleaver" icon = 'icons/obj/kitchen.dmi' icon_state = "butch" - item_state = "butcher_knife" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." force_divisor = 0.25 // 15 when wielded with hardness 60 (steel) attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 86476979c5..b6a8cac9f1 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -20,7 +20,6 @@ /datum/custom_item var/assoc_key var/character_name - var/inherit_inhands = 1 //if unset, and inhands are not provided, then the inhand overlays will be invisible. var/item_icon var/item_desc var/name @@ -45,19 +44,10 @@ if(item_desc) item.desc = item_desc if(item_icon) - if(!istype(item)) - item.icon = CUSTOM_ITEM_OBJ - item.icon_state = item_icon - return - else if(!inherit_inhands) - item.icon = CUSTOM_ITEM_OBJ - item.icon_state = item_icon - item.item_state = null - item.item_state_slots = null - item.item_icons = null + item.icon = CUSTOM_ITEM_OBJ + item.icon_state = item_icon + if(istype(item, /obj/item)) item.icon_override = CUSTOM_ITEM_MOB - else - apply_icons(item) // Kits are dumb so this is going to have to be hardcoded/snowflake. if(istype(item, /obj/item/device/kit)) @@ -76,52 +66,6 @@ return item -/datum/custom_item/proc/apply_icons(var/obj/item/item) - var/list/new_item_icons = list() - var/list/new_item_state_slots = list() - - var/list/available_states = icon_states(CUSTOM_ITEM_MOB) - - //If l_hand or r_hand are not present, preserve them using item_icons/item_state_slots - //Then use icon_override to make every other slot use the custom sprites by default. - //This has to be done before we touch any of item's vars - if(!("[item_icon]_l" in available_states)) - new_item_state_slots[slot_l_hand_str] = get_state(item, slot_l_hand_str, "_l") - new_item_icons[slot_l_hand_str] = get_icon(item, slot_l_hand_str, 'icons/mob/items/lefthand.dmi') - if(!("[item_icon]_r" in available_states)) - new_item_state_slots[slot_r_hand_str] = get_state(item, slot_r_hand_str, "_r") - new_item_icons[slot_r_hand_str] = get_icon(item, slot_r_hand_str, 'icons/mob/items/righthand.dmi') - - item.icon = CUSTOM_ITEM_OBJ - item.icon_state = item_icon - item.item_state = null - item.item_state_slots = new_item_state_slots - item.item_icons = new_item_icons - item.icon_override = CUSTOM_ITEM_MOB - -//this has to mirror the way update_inv_*_hand() selects the state -/datum/custom_item/proc/get_state(var/obj/item/item, var/slot_str, var/hand_str) - var/t_state - if(item.item_state_slots && item.item_state_slots[slot_str]) - t_state = item.item_state_slots[slot_str] - else if(item.item_state) - t_state = item.item_state - else - t_state = item.icon_state - if(item.icon_override) - t_state += hand_str - return t_state - -//this has to mirror the way update_inv_*_hand() selects the icon -/datum/custom_item/proc/get_icon(var/obj/item/item, var/slot_str, var/icon/hand_icon) - var/icon/t_icon - if(item.icon_override) - t_icon = item.icon_override - else if(item.item_icons && (slot_str in item.item_icons)) - t_icon = item.item_icons[slot_str] - else - t_icon = hand_icon - return t_icon // Parses the config file into the custom_items list. /hook/startup/proc/load_custom_items() @@ -163,8 +107,6 @@ current_data.name = field_data if("item_icon") current_data.item_icon = field_data - if("inherit_inhands") - current_data.inherit_inhands = text2num(field_data) if("item_desc") current_data.item_desc = field_data if("req_access")