From dc783795db36bef9df3fda20b3ef817c705af8ce Mon Sep 17 00:00:00 2001 From: nemvar <47324920+nemvar@users.noreply.github.com> Date: Mon, 23 Sep 2019 23:02:59 +0200 Subject: [PATCH] Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) --- code/__HELPERS/unsorted.dm | 4 ++-- code/datums/components/butchering.dm | 2 +- code/datums/components/explodable.dm | 14 +++++++------- code/datums/components/jousting.dm | 2 +- code/datums/components/thermite.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 4 ++-- code/game/objects/effects/decals/cleanable.dm | 4 ++-- .../objects/effects/decals/cleanable/robots.dm | 2 +- code/game/objects/items.dm | 12 +++++++----- code/game/objects/items/candle.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 10 +++++----- code/game/objects/items/devices/flashlight.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/melee/energy.dm | 4 ++-- code/game/objects/items/plushes.dm | 2 +- code/game/objects/items/sharpener.dm | 2 +- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/sheets/leather.dm | 2 +- code/game/objects/items/stacks/sheets/mineral.dm | 4 ++-- code/game/objects/items/storage/boxes.dm | 2 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/items/toys.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 2 +- code/game/objects/structures/false_walls.dm | 2 +- code/game/objects/structures/flora.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 10 +++++----- code/game/objects/structures/statues.dm | 4 ++-- code/game/objects/structures/window.dm | 4 ++-- code/game/turfs/simulated/floor/mineral_floor.dm | 4 ++-- code/game/turfs/simulated/wall/mineral_walls.dm | 6 +++--- .../antagonists/changeling/powers/mutations.dm | 2 +- .../antagonists/wizard/equipment/artefact.dm | 2 +- code/modules/clothing/head/misc_special.dm | 4 ++-- code/modules/events/spacevine.dm | 4 ++-- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- .../food_and_drinks/drinks/drinks/bottle.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 4 ++-- code/modules/hydroponics/grown/corn.dm | 2 +- code/modules/hydroponics/grown/potato.dm | 2 +- code/modules/hydroponics/grown/pumpkin.dm | 2 +- code/modules/hydroponics/grown/root.dm | 2 +- code/modules/hydroponics/grown/towercap.dm | 4 ++-- code/modules/mining/lavaland/ash_flora.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 4 ++-- .../living/carbon/human/species_types/golems.dm | 2 +- .../mob/living/simple_animal/friendly/mouse.dm | 2 +- .../simple_animal/hostile/megafauna/colossus.dm | 2 +- code/modules/paperwork/contract.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- code/modules/paperwork/paperbin.dm | 2 +- code/modules/paperwork/paperplane.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/paperwork/ticketmachine.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 2 +- code/modules/reagents/reagent_containers/glass.dm | 2 +- code/modules/reagents/reagent_containers/spray.dm | 2 +- .../xenobiology/crossbreeding/_status_effects.dm | 2 +- code/modules/surgery/advanced/lobotomy.dm | 2 +- code/modules/surgery/advanced/viral_bonding.dm | 2 +- code/modules/surgery/bodyparts/bodyparts.dm | 2 +- code/modules/surgery/cavity_implant.dm | 2 +- code/modules/surgery/mechanic_steps.dm | 4 ++-- code/modules/surgery/organic_steps.dm | 4 ++-- 63 files changed, 100 insertions(+), 98 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index b03c97f24cc..5817994664f 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -767,7 +767,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list( /obj/item/pipe))) /proc/can_embed(obj/item/W) - if(W.is_sharp()) + if(W.get_sharpness()) return 1 if(is_pointed(W)) return 1 @@ -1478,7 +1478,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) #define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitRemove, ##target, ##trait, ##source) ///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback. -/proc/___TraitAdd(target,trait,source) +/proc/___TraitAdd(target,trait,source) if(!target || !trait || !source) return if(islist(target)) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index be610ae0947..d92ab45a389 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -24,7 +24,7 @@ /datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user) if(user.a_intent == INTENT_HARM && M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it? - if(butchering_enabled && (can_be_blunt || source.is_sharp())) + if(butchering_enabled && (can_be_blunt || source.get_sharpness())) INVOKE_ASYNC(src, .proc/startButcher, source, M, user) return COMPONENT_ITEM_NO_ATTACK diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 094dce211d4..66bc308bbce 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -5,7 +5,7 @@ var/light_impact_range = 2 var/flash_range = 3 var/equipped_slot //For items, lets us determine where things should be hit. - + /datum/component/explodable/Initialize(devastation_range_override, heavy_impact_range_override, light_impact_range_override, flash_range_override) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE @@ -20,8 +20,8 @@ RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/explodable_attack) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - - + + if(devastation_range_override) devastation_range = devastation_range_override @@ -45,14 +45,14 @@ /datum/component/explodable/proc/explodable_attack(datum/source, atom/movable/target, mob/living/user) check_if_detonate(target) -///Called when you attack a specific body part of the thing this is equipped on. Useful for exploding pants. +///Called when you attack a specific body part of the thing this is equipped on. Useful for exploding pants. /datum/component/explodable/proc/explodable_attack_zone(datum/source, damage, damagetype, def_zone) if(!def_zone) return if(damagetype != BURN) //Don't bother if it's not fire. return if(!is_hitting_zone(def_zone)) //You didn't hit us! ha! - return + return detonate() /datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot) @@ -87,13 +87,13 @@ if(I.body_parts_covered & bodypart.body_part) return TRUE return FALSE - + /datum/component/explodable/proc/check_if_detonate(target) if(!isitem(target)) return var/obj/item/I = target - if(!I.is_hot()) + if(!I.get_temperature()) return detonate() //If we're touching a hot item we go boom diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index 288e9693bc6..cf2570cb950 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -45,7 +45,7 @@ var/knockdown_chance = (target_buckled? mounted_knockdown_chance_per_tile : unmounted_knockdown_chance_per_tile) * current var/knockdown_time = (target_buckled? mounted_knockdown_time : unmounted_knockdown_time) var/damage = (target_buckled? mounted_damage_boost_per_tile : unmounted_damage_boost_per_tile) * current - var/sharp = I.is_sharp() + var/sharp = I.get_sharpness() var/msg if(damage) msg += "[user] [sharp? "impales" : "slams into"] [target] [sharp? "on" : "with"] their [parent]" diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index 660b4eee2d2..ce397f9fea5 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -88,5 +88,5 @@ thermite_melt() /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params) - if(thing.is_hot()) + if(thing.get_temperature()) thermite_melt(user) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 1743b42ac34..5f700973a9f 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -234,10 +234,10 @@ return 0 /obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params) - if(C.is_hot() > 300)//If the temperature of the object is over 300, then ignite + if(C.get_temperature() > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma airlock ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]") log_game("Plasma airlock ignited by [key_name(user)] in [AREACOORD(src)]") - ignite(C.is_hot()) + ignite(C.get_temperature()) else return ..() diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 2cc1d74bd23..d4263dbd1c4 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -54,11 +54,11 @@ if(!reagents.total_volume) //scooped up all of it qdel(src) return - if(W.is_hot()) //todo: make heating a reagent holder proc + if(W.get_temperature()) //todo: make heating a reagent holder proc if(istype(W, /obj/item/clothing/mask/cigarette)) return else - var/hotness = W.is_hot() + var/hotness = W.get_temperature() reagents.expose_temperature(hotness) to_chat(user, "You heat [name] with [W]!") else diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 67997d98702..63d64150971 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -55,7 +55,7 @@ reagents.add_reagent(/datum/reagent/oil, 30) /obj/effect/decal/cleanable/oil/attackby(obj/item/I, mob/living/user) - var/attacked_by_hot_thing = I.is_hot() + var/attacked_by_hot_thing = I.get_temperature() if(attacked_by_hot_thing) visible_message("[user] tries to ignite [src] with [I]!", "You try to ignite [src] with [I].") log_combat(user, src, (attacked_by_hot_thing < 480) ? "tried to ignite" : "ignited", I) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 2e56723d419..e1540c68096 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -14,7 +14,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) ///Icon file for right inhand overlays var/righthand_file = 'icons/mob/inhands/items_righthand.dmi' - ///Icon file for mob worn overlays. + ///Icon file for mob worn overlays. ///no var for state because it should *always* be the same as icon_state var/icon/mob_overlay_icon //Forced mob worn layer instead of the standard preferred ssize. @@ -548,7 +548,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(hit_atom && !QDELETED(hit_atom)) SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) - if(is_hot() && isliving(hit_atom)) + if(get_temperature() && isliving(hit_atom)) var/mob/living/L = hit_atom L.IgniteMob() var/itempush = 1 @@ -611,10 +611,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(flags & ITEM_SLOT_NECK) owner.update_inv_neck() -/obj/item/proc/is_hot() +///Returns the temperature of src. If you want to know if an item is hot use this proc. +/obj/item/proc/get_temperature() return heat -/obj/item/proc/is_sharp() +///Returns the sharpness of src. If you want to get the sharpness of an item use this. +/obj/item/proc/get_sharpness() return sharpness /obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting) @@ -641,7 +643,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) location.hotspot_expose(flame_heat, 5) /obj/item/proc/ignition_effect(atom/A, mob/user) - if(is_hot()) + if(get_temperature()) . = "[user] lights [A] with [src]." else . = "" diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 1165501d9a9..fa9c25960a0 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -34,7 +34,7 @@ light() //honk return ..() -/obj/item/candle/is_hot() +/obj/item/candle/get_temperature() return lit * heat /obj/item/candle/proc/light(show_message) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index e99d34e0681..267e3f72d72 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -94,7 +94,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(istype(mask_item, /obj/item/clothing/mask/cigarette)) return mask_item -/obj/item/match/is_hot() +/obj/item/match/get_temperature() return lit * heat /obj/item/match/firebrand @@ -298,7 +298,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/fire_act(exposed_temperature, exposed_volume) light() -/obj/item/clothing/mask/cigarette/is_hot() +/obj/item/clothing/mask/cigarette/get_temperature() return lit * heat // Cigarette brands. @@ -583,7 +583,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM add_overlay(lighter_overlay) /obj/item/lighter/ignition_effect(atom/A, mob/user) - if(is_hot()) + if(get_temperature()) . = "With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool." /obj/item/lighter/proc/set_lit(new_lit) @@ -661,7 +661,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/process() open_flame() -/obj/item/lighter/is_hot() +/obj/item/lighter/get_temperature() return lit * heat @@ -710,7 +710,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM add_overlay(lighter_overlay) /obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user) - if(is_hot()) + if(get_temperature()) . = "After some fiddling, [user] manages to light [A] with [src]." diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 7e4489f72df..fb427e22aa8 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -317,7 +317,7 @@ damtype = "fire" START_PROCESSING(SSobj, src) -/obj/item/flashlight/flare/is_hot() +/obj/item/flashlight/flare/get_temperature() return on * heat /obj/item/flashlight/flare/torch diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 7bd0ebfc76a..e1cae56ae64 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -54,5 +54,5 @@ var/obj/item/tank/T = W blow(T, user) return - if (W.is_sharp() || W.is_hot() || is_pointed(W)) + if (W.get_sharpness() || W.get_temperature() || is_pointed(W)) burst() diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 1ff57cdf762..c326d5e7ad4 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -27,7 +27,7 @@ /obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna) return FALSE -/obj/item/melee/transforming/energy/is_sharp() +/obj/item/melee/transforming/energy/get_sharpness() return active * sharpness /obj/item/melee/transforming/energy/process() @@ -45,7 +45,7 @@ STOP_PROCESSING(SSobj, src) set_light(0) -/obj/item/melee/transforming/energy/is_hot() +/obj/item/melee/transforming/energy/get_temperature() return active * heat /obj/item/melee/transforming/energy/ignition_effect(atom/A, mob/user) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 05fb5a64972..9f70c98e223 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -114,7 +114,7 @@ to_chat(user, "You try to pet [src], but it has no stuffing. Aww...") /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params) - if(I.is_sharp()) + if(I.get_sharpness()) if(!grenade) if(!stuffed) to_chat(user, "You already murdered it!") diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index a3eec9a74c5..e93d6502a74 100644 --- a/code/game/objects/items/sharpener.dm +++ b/code/game/objects/items/sharpener.dm @@ -18,7 +18,7 @@ if(I.force >= max || I.throwforce >= max)//no esword sharpening to_chat(user, "[I] is much too powerful to sharpen further!") return - if(requires_sharpness && !I.is_sharp()) + if(requires_sharpness && !I.get_sharpness()) to_chat(user, "You can only sharpen items that are already sharp, such as knives!") return if(istype(I, /obj/item/melee/transforming/energy)) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index c3eb51b7b6e..5c781fdb79f 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -99,7 +99,7 @@ to_chat(user, "You can not use \the [src] on [M]!") /obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params) - if(I.tool_behaviour == TOOL_WIRECUTTER || I.is_sharp()) + if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness()) if(get_amount() < 2) to_chat(user, "You need at least two gauzes to do this!") return diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 9ab519026dd..a02adf83cfe 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -218,7 +218,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ //Step one - dehairing. /obj/item/stack/sheet/animalhide/attackby(obj/item/W, mob/user, params) - if(W.is_sharp()) + if(W.get_sharpness()) playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1) user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") if(do_after(user, 50, target = src)) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 3abefe3cce2..9bdcacb531a 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -177,11 +177,11 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \ . = ..() /obj/item/stack/sheet/mineral/plasma/attackby(obj/item/W as obj, mob/user as mob, params) - if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite + if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite var/turf/T = get_turf(src) message_admins("Plasma sheets ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") log_game("Plasma sheets ignited by [key_name(user)] in [AREACOORD(T)]") - fire_act(W.is_hot()) + fire_act(W.get_temperature()) else return ..() diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 2ad80d530bb..502745291d9 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -879,7 +879,7 @@ if(SMILEY) desc = "A paper sack with a crude smile etched onto the side." return 0 - else if(W.is_sharp()) + else if(W.get_sharpness()) if(!contents.len) if(item_state == "paperbag_None") user.show_message("You cut eyeholes into [src].", MSG_VISUAL) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 49a9ab06a84..70ff8acc78d 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -223,7 +223,7 @@ . = ..() . += "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." -/obj/item/weldingtool/is_hot() +/obj/item/weldingtool/get_temperature() return welding * heat //Returns whether or not the welding tool is currently on. diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 82756daac28..3262350f25c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -78,7 +78,7 @@ to_chat(user, "You fill the balloon with the contents of [I].") I.reagents.trans_to(src, 10, transfered_by = user) update_icon() - else if(I.is_sharp()) + else if(I.get_sharpness()) balloon_burst() else return ..() diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 509d5f7d13f..2d51eca9489 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -45,7 +45,7 @@ LINEN BINS return /obj/item/bedsheet/attackby(obj/item/I, mob/user, params) - if(I.tool_behaviour == TOOL_WIRECUTTER || I.is_sharp()) + if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness()) var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3) transfer_fingerprints_to(C) C.add_fingerprint(user) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 884b392cf55..e70bf8f4227 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -234,7 +234,7 @@ canSmoothWith = list(/obj/structure/falsewall/plasma, /turf/closed/wall/mineral/plasma) /obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params) - if(W.is_hot() > 300) + if(W.get_temperature() > 300) var/turf/T = get_turf(src) message_admins("Plasma falsewall ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") log_game("Plasma falsewall ignited by [key_name(user)] in [AREACOORD(T)]") diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 735e87925c3..ed109a08bf4 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -14,7 +14,7 @@ /obj/structure/flora/tree/attackby(obj/item/W, mob/user, params) if(log_amount && (!(flags_1 & NODECONSTRUCT_1))) - if(W.is_sharp() && W.force > 0) + if(W.get_sharpness() && W.force > 0) if(W.hitsound) playsound(get_turf(src), W.hitsound, 100, FALSE, FALSE) user.visible_message("[user] begins to cut down [src] with [W].","You begin to cut down [src] with [W].", "You hear the sound of sawing.") diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 61d49f4c1d1..008d4519de8 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -250,7 +250,7 @@ return /obj/structure/mineral_door/transparent/plasma/attackby(obj/item/W, mob/user, params) - if(W.is_hot()) + if(W.get_temperature()) var/turf/T = get_turf(src) message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") log_game("Plasma mineral door ignited by [key_name(user)] in [AREACOORD(T)]") @@ -293,8 +293,8 @@ return crowbar_door(user, I) /obj/structure/mineral_door/wood/attackby(obj/item/I, mob/living/user) - if(I.is_hot()) - fire_act(I.is_hot()) + if(I.get_temperature()) + fire_act(I.get_temperature()) return return ..() @@ -328,8 +328,8 @@ return crowbar_door(user, I) /obj/structure/mineral_door/paperframe/attackby(obj/item/I, mob/living/user) - if(I.is_hot()) //BURN IT ALL DOWN JIM - fire_act(I.is_hot()) + if(I.get_temperature()) //BURN IT ALL DOWN JIM + fire_act(I.get_temperature()) return if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (obj_integrity < max_integrity)) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 3269d5e464c..df8203bcab7 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -125,11 +125,11 @@ . = ..() /obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params) - if(W.is_hot() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite + if(W.get_temperature() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite var/turf/T = get_turf(src) message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") log_game("Plasma statue ignited by [key_name(user)] in [AREACOORD(T)]") - ignite(W.is_hot()) + ignite(W.get_temperature()) else return ..() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9686969942f..d685c1f8c89 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -859,8 +859,8 @@ /obj/structure/window/paperframe/attackby(obj/item/W, mob/user) - if(W.is_hot()) - fire_act(W.is_hot()) + if(W.get_temperature()) + fire_act(W.get_temperature()) return if(user.a_intent == INTENT_HARM) return ..() diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index 5ff37504b52..b38fffbbffe 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -43,10 +43,10 @@ PlasmaBurn(exposed_temperature) /turf/open/floor/mineral/plasma/attackby(obj/item/W, mob/user, params) - if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite + if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma flooring was ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]") log_game("Plasma flooring was ignited by [key_name(user)] in [AREACOORD(src)]") - ignite(W.is_hot()) + ignite(W.get_temperature()) return ..() diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index 0d269bce75d..ba0c76c988b 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -94,10 +94,10 @@ canSmoothWith = list(/turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma) /turf/closed/wall/mineral/plasma/attackby(obj/item/W, mob/user, params) - if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite + if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma wall ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]") log_game("Plasma wall ignited by [key_name(user)] in [AREACOORD(src)]") - ignite(W.is_hot()) + ignite(W.get_temperature()) return ..() @@ -133,7 +133,7 @@ canSmoothWith = list(/turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/closed/wall/mineral/wood/nonmetal) /turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user) - if(W.is_sharp() && W.force) + if(W.get_sharpness() && W.force) var/duration = (48/W.force) * 2 //In seconds, for now. if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/twohanded/fireaxe)) duration /= 4 //Much better with hatchets and axes. diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 22416f4fe8c..4b0d57d5fef 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -326,7 +326,7 @@ /obj/item/projectile/tentacle/proc/tentacle_stab(mob/living/carbon/human/H, mob/living/carbon/C) if(H.Adjacent(C)) for(var/obj/item/I in H.held_items) - if(I.is_sharp()) + if(I.get_sharpness()) C.visible_message("[H] impales [C] with [H.p_their()] [I.name]!", "[H] impales you with [H.p_their()] [I.name]!") C.apply_damage(I.force, BRUTE, BODY_ZONE_CHEST) H.do_item_attack_animation(C, used_item = I) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index ee7bfce740f..763bce8ef90 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -289,7 +289,7 @@ /obj/item/voodoo/attackby(obj/item/I, mob/user, params) if(target && cooldown < world.time) - if(I.is_hot()) + if(I.get_temperature()) to_chat(target, "You suddenly feel very hot") target.adjust_bodytemperature(50) GiveHint(target) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 2d076e938b3..19d2e8b2ed4 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -17,7 +17,7 @@ name = "welding helmet" desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH item_state = "welding" materials = list(/datum/material/iron=1750, /datum/material/glass=400) flash_protect = 2 @@ -85,7 +85,7 @@ hitsound = hitsound_off STOP_PROCESSING(SSobj, src) -/obj/item/clothing/head/hardhat/cakehat/is_hot() +/obj/item/clothing/head/hardhat/cakehat/get_temperature() return on * heat /obj/item/clothing/head/hardhat/cakehat/energycake diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 993dd8824ab..375781237e4 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -251,7 +251,7 @@ holder.obj_integrity = holder.max_integrity /datum/spacevine_mutation/woodening/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage) - if(I.is_sharp()) + if(I.get_sharpness()) . = expected_damage * 0.5 else . = expected_damage @@ -331,7 +331,7 @@ /obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user) var/damage_dealt = I.force - if(I.is_sharp()) + if(I.get_sharpness()) damage_dealt *= 4 if(I.damtype == BURN) damage_dealt *= 4 diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 3b91a3640c2..0916c20167b 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -98,7 +98,7 @@ to_chat(user, "You fill [src] with [trans] units of the contents of [target].") /obj/item/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params) - var/hotness = I.is_hot() + var/hotness = I.get_temperature() if(hotness && reagents) reagents.expose_temperature(hotness) to_chat(user, "You heat [name] with [I]!") diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 8a17182a407..99a6cb3f293 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -462,7 +462,7 @@ ..() /obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params) - if(I.is_hot() && !active) + if(I.get_temperature() && !active) active = TRUE log_bomber(user, "has primed a", src, "for detonation") diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 10f5db66dbb..5d25605a387 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -184,7 +184,7 @@ All foods are distributed among various categories. Use common sense. var/obj/item/reagent_containers/food/snacks/customizable/C = new custom_food_type(get_turf(src)) C.initialize_custom_food(src, S, user) return 0 - var/sharp = W.is_sharp() + var/sharp = W.get_sharpness() if(sharp) if(slice(sharp, W, user)) return 1 @@ -357,7 +357,7 @@ All foods are distributed among various categories. Use common sense. /obj/item/reagent_containers/food/snacks/store/attackby(obj/item/W, mob/user, params) ..() if(W.w_class <= WEIGHT_CLASS_SMALL & !istype(W, /obj/item/reagent_containers/food/snacks)) //can't slip snacks inside, they're used for custom foods. - if(W.is_sharp()) + if(W.get_sharpness()) return 0 if(stored_item) return 0 diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index 691cbb8344f..6c852c426d5 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -40,7 +40,7 @@ throw_range = 7 /obj/item/grown/corncob/attackby(obj/item/grown/W, mob/user, params) - if(W.is_sharp()) + if(W.get_sharpness()) to_chat(user, "You use [W] to fashion a pipe out of the corn cob!") new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) qdel(src) diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 20f2a357b60..fad916030dc 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -38,7 +38,7 @@ /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params) - if(W.is_sharp()) + if(W.get_sharpness()) to_chat(user, "You cut the potato into wedges with [W].") var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges remove_item_from_storage(user) diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index dbd240a54d1..6254fb5bcc1 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -28,7 +28,7 @@ wine_power = 20 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params) - if(W.is_sharp()) + if(W.get_sharpness()) user.show_message("You carve a face into [src]!", MSG_VISUAL) new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc) qdel(src) diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index 871d1535a0d..ac171b4e45c 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -26,7 +26,7 @@ wine_power = 30 /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params) - if(I.is_sharp()) + if(I.get_sharpness()) to_chat(user, "You sharpen the carrot into a shiv with [I].") var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv remove_item_from_storage(user) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 27586cca405..f2209d151b4 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -50,7 +50,7 @@ /obj/item/reagent_containers/food/snacks/grown/wheat)) /obj/item/grown/log/attackby(obj/item/W, mob/user, params) - if(W.is_sharp()) + if(W.get_sharpness()) user.show_message("You make [plank_name] out of \the [src]!", MSG_VISUAL) var/seed_modifier = 0 if(seed) @@ -191,7 +191,7 @@ add_overlay("bonfire_grill") else return ..() - if(W.is_hot()) + if(W.get_temperature()) StartBurning() if(grill) if(user.a_intent != INTENT_HARM && !(W.item_flags & ABSTRACT)) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 2da3df26d7c..a763d368bfc 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -58,7 +58,7 @@ harvested = FALSE /obj/structure/flora/ash/attackby(obj/item/W, mob/user, params) - if(!harvested && needs_sharp_harvest && W.is_sharp()) + if(!harvested && needs_sharp_harvest && W.get_sharpness()) user.visible_message("[user] starts to harvest from [src] with [W].","You begin to harvest from [src] with [W].") if(do_after(user, harvest_time, target = src)) harvest(user) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 41a64a73985..2226f72b03c 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1490,7 +1490,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) switch(hit_area) if(BODY_ZONE_HEAD) - if(!I.is_sharp() && armor_block < 50) + if(!I.get_sharpness() && armor_block < 50) if(prob(I.force)) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20) if(H.stat == CONSCIOUS) @@ -1520,7 +1520,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.update_inv_glasses() if(BODY_ZONE_CHEST) - if(H.stat == CONSCIOUS && !I.is_sharp() && armor_block < 50) + if(H.stat == CONSCIOUS && !I.get_sharpness() && armor_block < 50) if(prob(I.force)) H.visible_message("[H] is knocked down!", \ "You're knocked down!") diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 61c488e6d77..8ac51d633cc 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -791,7 +791,7 @@ if(resistance_flags & ON_FIRE) return - if(P.is_hot()) + if(P.get_temperature()) visible_message("[src] bursts into flames!") fire_act() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 9ca1742d843..fe6cf9b8053 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -119,7 +119,7 @@ . += "It's dripping with fuel and smells terrible." /obj/item/reagent_containers/food/snacks/deadmouse/attackby(obj/item/I, mob/user, params) - if(I.is_sharp() && user.a_intent == INTENT_HARM) + if(I.get_sharpness() && user.a_intent == INTENT_HARM) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/meat/slab/mouse(loc) to_chat(user, "You butcher [src].") diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index a44f66d5544..78c785a7d4e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -420,7 +420,7 @@ Difficulty: Very Hard ActivationReaction(user, ACTIVATE_TOUCH) /obj/machinery/anomalous_crystal/attackby(obj/item/I, mob/user, params) - if(I.is_hot()) + if(I.get_temperature()) ActivationReaction(user, ACTIVATE_HEAT) else ActivationReaction(user, ACTIVATE_WEAPON) diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index ade1e44cd8e..064ad6e83cb 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -173,7 +173,7 @@ attempt_signature(user) else if(istype(P, /obj/item/stamp)) to_chat(user, "You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.") - else if(P.is_hot()) + else if(P.get_temperature()) user.visible_message("[user] brings [P] next to [src], but [src] does not catch fire!", "[src] refuses to ignite!") else return ..() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 823453ea6ad..c5a3e794e3d 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -315,7 +315,7 @@ to_chat(user, "You stamp the paper with your rubber stamp.") - if(P.is_hot()) + if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ "You miss the paper and accidentally light yourself on fire!") diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 16c677a6481..1b3891992c8 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -156,7 +156,7 @@ qdel(src) /obj/item/paper_bin/bundlenatural/attackby(obj/item/W, mob/user) - if(W.is_sharp()) + if(W.get_sharpness()) to_chat(user, "You snip \the [src], spilling paper everywhere.") var/turf/T = get_turf(src.loc) while(total_paper > 0) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index fecbef8ca31..c0705fd22cf 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -84,7 +84,7 @@ internalPaper.attackby(P, user) //spoofed attack to update internal paper. update_icon() - else if(P.is_hot()) + else if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ "You miss [src] and accidentally light yourself on fire!") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index aba7bcc5fed..330bea16010 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -181,7 +181,7 @@ . = ..() AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg') -/obj/item/pen/edagger/is_sharp() +/obj/item/pen/edagger/get_sharpness() return on * sharpness /obj/item/pen/edagger/suicide_act(mob/user) diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index 5f6191cfa4e..ce3cebb9cc8 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -214,7 +214,7 @@ /obj/item/ticket_machine_ticket/attackby(obj/item/P, mob/living/carbon/human/user, params) //Stolen from papercode ..() - if(P.is_hot()) + if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ "You miss the paper and accidentally light yourself on fire!") diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 35e7f6fe86f..2dd12e0db21 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -442,7 +442,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( ///Handles all the logic of sawing off guns, /obj/item/gun/ballistic/proc/sawoff(mob/user, obj/item/saw) - if(!saw.is_sharp() || !is_type_in_typecache(saw, GLOB.gun_saw_types)) //needs to be sharp. Otherwise turned off eswords can cut this. + if(!saw.get_sharpness() || !is_type_in_typecache(saw, GLOB.gun_saw_types)) //needs to be sharp. Otherwise turned off eswords can cut this. return if(sawn_off) to_chat(user, "\The [src] is already shortened!") diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index d92cac0a510..85114111dbc 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -91,7 +91,7 @@ reagents.clear_reagents() /obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params) - var/hotness = I.is_hot() + var/hotness = I.get_temperature() if(hotness && reagents) reagents.expose_temperature(hotness) to_chat(user, "You heat [name] with [I]!") diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 2d8939a0a9e..b2e2252b8f1 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -122,7 +122,7 @@ to_chat(user, "You switch the nozzle setting to [stream_mode ? "\"stream\"":"\"spray\""]. You'll now use [amount_per_transfer_from_this] units per use.") /obj/item/reagent_containers/spray/attackby(obj/item/I, mob/user, params) - var/hotness = I.is_hot() + var/hotness = I.get_temperature() if(hotness && reagents) reagents.expose_temperature(hotness) to_chat(user, "You heat [name] with [I]!") diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 554a5844b63..189f7ac976b 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -562,7 +562,7 @@ datum/status_effect/stabilized/blue/on_remove() name = "burning fingertips" desc = "You shouldn't see this." -/obj/item/hothands/is_hot() +/obj/item/hothands/get_temperature() return 290 //Below what's required to ignite plasma. /datum/status_effect/stabilized/darkpurple diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index aeb4ddaffec..64032428a93 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -28,7 +28,7 @@ time = 100 /datum/surgery_step/lobotomize/tool_check(mob/user, obj/item/tool) - if(implement_type == /obj/item && !tool.is_sharp()) + if(implement_type == /obj/item && !tool.get_sharpness()) return FALSE return TRUE diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm index d940a14e996..3e2df7833da 100644 --- a/code/modules/surgery/advanced/viral_bonding.dm +++ b/code/modules/surgery/advanced/viral_bonding.dm @@ -26,7 +26,7 @@ /datum/surgery_step/viral_bond/tool_check(mob/user, obj/item/tool) if(implement_type == TOOL_WELDER || implement_type == /obj/item) - return tool.is_hot() + return tool.get_temperature() return TRUE diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index fcb0625554f..208a4b236e9 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -99,7 +99,7 @@ ..() /obj/item/bodypart/attackby(obj/item/W, mob/user, params) - if(W.is_sharp()) + if(W.get_sharpness()) add_fingerprint(user) if(!contents.len) to_chat(user, "There is nothing left inside [src]!") diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index aff5068528c..3886d5e324e 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -17,7 +17,7 @@ /datum/surgery_step/handle_cavity/tool_check(mob/user, obj/item/tool) if(istype(tool, /obj/item/cautery) || istype(tool, /obj/item/gun/energy/laser)) return FALSE - return !tool.is_hot() + return !tool.get_temperature() /datum/surgery_step/handle_cavity/preop(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/bodypart/chest/CH = target.get_bodypart(BODY_ZONE_CHEST) diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm index 1bc76334e4d..ccad80557c1 100644 --- a/code/modules/surgery/mechanic_steps.dm +++ b/code/modules/surgery/mechanic_steps.dm @@ -14,7 +14,7 @@ "[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)].") /datum/surgery_step/mechanic_incise/tool_check(mob/user, obj/item/tool) - if(implement_type == /obj/item && !tool.is_sharp()) + if(implement_type == /obj/item && !tool.get_sharpness()) return FALSE return TRUE @@ -35,7 +35,7 @@ "[user] begins to screw the shell of [target]'s [parse_zone(target_zone)].") /datum/surgery_step/mechanic_close/tool_check(mob/user, obj/item/tool) - if(implement_type == /obj/item && !tool.is_sharp()) + if(implement_type == /obj/item && !tool.get_sharpness()) return FALSE return TRUE diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 9202262bc2a..39d15839491 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -12,7 +12,7 @@ "[user] begins to make an incision in [target]'s [parse_zone(target_zone)].") /datum/surgery_step/incise/tool_check(mob/user, obj/item/tool) - if(implement_type == /obj/item && !tool.is_sharp()) + if(implement_type == /obj/item && !tool.get_sharpness()) return FALSE return TRUE @@ -83,7 +83,7 @@ /datum/surgery_step/close/tool_check(mob/user, obj/item/tool) if(implement_type == TOOL_WELDER || implement_type == /obj/item) - return tool.is_hot() + return tool.get_temperature() return TRUE