Merge branch 'master' into Cargo_MKII

2019-11-13 08:00:24 -05:00
parent 6e328ea1b1 4e3147b228
commit ec57e28c17
1162 changed files with 6115 additions and 6988 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