Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2019-11-10 23:23:36 +01:00
parent b3ef41a10f c4849ead74
commit 09860d463f
1399 changed files with 9581 additions and 9696 deletions
@@ -76,7 +76,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("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
 				"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")