@@ -202,7 +202,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
|
||||
var/list/boostable_nodes = techweb_item_boost_check(src)
|
||||
if (boostable_nodes)
|
||||
for(var/id in boostable_nodes)
|
||||
var/datum/techweb_node/node = SSresearch.techweb_nodes[id]
|
||||
var/datum/techweb_node/node = SSresearch.techweb_node_by_id(id)
|
||||
if(!node)
|
||||
continue
|
||||
research_msg += sep
|
||||
research_msg += node.display_name
|
||||
sep = ", "
|
||||
@@ -553,7 +555,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
|
||||
/obj/item/throw_impact(atom/A, datum/thrownthing/throwingdatum)
|
||||
if(A && !QDELETED(A))
|
||||
SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, A, throwingdatum)
|
||||
if(is_hot() && isliving(A))
|
||||
if(get_temperature() && isliving(A))
|
||||
var/mob/living/L = A
|
||||
L.IgniteMob()
|
||||
var/itempush = 1
|
||||
@@ -620,10 +622,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
|
||||
if(flags & ITEM_SLOT_NECK)
|
||||
owner.update_inv_neck()
|
||||
|
||||
/obj/item/proc/is_hot()
|
||||
/obj/item/proc/get_temperature()
|
||||
return heat
|
||||
|
||||
/obj/item/proc/is_sharp()
|
||||
/obj/item/proc/get_sharpness()
|
||||
return sharpness
|
||||
|
||||
/obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting)
|
||||
@@ -650,7 +652,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
|
||||
location.hotspot_expose(flame_heat, 1)
|
||||
|
||||
/obj/item/proc/ignition_effect(atom/A, mob/user)
|
||||
if(is_hot())
|
||||
if(get_temperature())
|
||||
. = "<span class='notice'>[user] lights [A] with [src].</span>"
|
||||
else
|
||||
. = ""
|
||||
|
||||
Reference in New Issue
Block a user