mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
Adjusts all get_temperature() accesses to compare it to a value (#95236)
## About The Pull Request ``get_temperature()`` returns a value in kelvins, not a boolean. Trying to treat it as such will result in ***any*** item with a thermal value, like condensers, being treated as a lighter. ## Why It's Good For The Game Consistency, allows us to have actually functioning cooling items that don't act like lighters all the time. ## Changelog 🆑 fix: Condensers can no longer be used to ignite things /🆑
This commit is contained in:
@@ -132,10 +132,10 @@
|
||||
/datum/wound/pierce/bleed/check_grab_treatments(obj/item/tool, mob/user)
|
||||
// if we're using something hot but not a cautery, we need to be aggro grabbing them first,
|
||||
// so we don't try treating someone we're eswording
|
||||
return tool.get_temperature()
|
||||
return tool.get_temperature() >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST
|
||||
|
||||
/datum/wound/pierce/bleed/treat(obj/item/tool, mob/user)
|
||||
if(tool.tool_behaviour == TOOL_CAUTERY || tool.get_temperature())
|
||||
if(tool.tool_behaviour == TOOL_CAUTERY || tool.get_temperature() >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
|
||||
tool_cauterize(tool, user)
|
||||
|
||||
/datum/wound/pierce/bleed/on_xadone(power)
|
||||
|
||||
@@ -168,14 +168,14 @@
|
||||
/datum/wound/slash/flesh/check_grab_treatments(obj/item/tool, mob/user)
|
||||
if(istype(tool, /obj/item/gun/energy/laser))
|
||||
return TRUE
|
||||
if(tool.get_temperature()) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording
|
||||
if(tool.get_temperature() >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/datum/wound/slash/flesh/treat(obj/item/tool, mob/user)
|
||||
if(istype(tool, /obj/item/gun/energy/laser))
|
||||
las_cauterize(tool, user)
|
||||
else if(tool.tool_behaviour == TOOL_CAUTERY || tool.get_temperature())
|
||||
else if(tool.tool_behaviour == TOOL_CAUTERY || tool.get_temperature() >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
|
||||
tool_cauterize(tool, user)
|
||||
|
||||
/datum/wound/slash/flesh/try_handling(mob/living/user)
|
||||
|
||||
Reference in New Issue
Block a user