Merge pull request #9856 from Ghommie/Ghommie-cit367

This commit is contained in:
Lin
2020-10-02 00:49:56 -03:00
committed by Dip
parent 20c30a15d1
commit ac25b449f7
39 changed files with 675 additions and 588 deletions
+6
View File
@@ -619,6 +619,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/proc/is_sharp()
return sharpness
/obj/item/proc/get_temperature()
return heat
/obj/item/proc/get_sharpness()
return sharpness
/obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting)
if(affecting.can_dismember(src))
if((sharpness || damtype == BURN) && w_class >= WEIGHT_CLASS_NORMAL && force >= 10)