cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 16:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680)

Browse Source
This commit is contained in:
nemvar
2019-09-23 23:02:59 +02:00
committed by Rob Bailey
parent cfc7a263ac
commit dc783795db
63 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable.dm
+2 -2
View File
@@ -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, "<span class='notice'>You heat [name] with [W]!</span>")
else
code/game/objects/effects/decals/cleanable/robots.dm
+1 -1
View File
@@ -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("<span class='warning'>[user] tries to ignite [src] with [I]!</span>", "<span class='warning'>You try to ignite [src] with [I].</span>")
log_combat(user, src, (attacked_by_hot_thing < 480) ? "tried to ignite" : "ignited", I)