mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 10:33:30 +01:00
Prevents toy chainsaws from making dead people into meat.
This commit is contained in:
@@ -189,7 +189,7 @@ emp_act
|
||||
/mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
|
||||
if(!I || !user) return 0
|
||||
|
||||
if((istype(I, /obj/item/weapon/butch/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == I_HARM)
|
||||
if((istype(I, /obj/item/weapon/butch/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw) || !istype(I, /obj/item/weapon/twohanded/chainsaw/rubber)) && src.stat == DEAD && user.a_intent == I_HARM)
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc))
|
||||
newmeat.name = src.real_name + newmeat.name
|
||||
newmeat.subjectname = src.real_name
|
||||
@@ -477,4 +477,4 @@ emp_act
|
||||
/mob/living/carbon/human/water_act(volume, temperature, source)
|
||||
..()
|
||||
if(temperature >= 330) bodytemperature = bodytemperature + (temperature - bodytemperature)
|
||||
if(temperature <= 280) bodytemperature = bodytemperature - (bodytemperature - temperature)
|
||||
if(temperature <= 280) bodytemperature = bodytemperature - (bodytemperature - temperature)
|
||||
|
||||
Reference in New Issue
Block a user