Merge branch 'master' into abductor-update

2019-11-11 00:08:59 +00:00
parent 2c36aaabee c4849ead74
commit df051186eb
1206 changed files with 8463 additions and 9091 deletions
@@ -563,7 +563,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