cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sharp burn weapons can now disember (#20043)

Browse Source 
* Sharp burn weapons can now disember

* Update code/modules/surgery/organs/organ_external.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-01-06 22:17:13 +01:00
committed by GitHub
co-authored by Farie82
parent 8561231357
commit ecf6d798b1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/organ_external.dm
+7 -4
View File
@@ -262,10 +262,11 @@
var/mob/living/carbon/owner_old = owner //Need to update health, but need a reference in case the below check cuts off a limb.
//If limb took enough damage, try to cut or tear it off
if(owner)
if(!(limb_flags & CANNOT_DISMEMBER) && brute_dam >= max_damage)
if(prob(brute / 2))
if(sharp)
droplimb(0, DROPLIMB_SHARP)
if(sharp && !(limb_flags & CANNOT_DISMEMBER))
if(brute_dam >= max_damage && prob(brute / 2))
droplimb(0, DROPLIMB_SHARP)
if(burn_dam >= max_damage && prob(burn / 2))
droplimb(0, DROPLIMB_BURN)
if(owner_old)
owner_old.updatehealth("limb receive damage")
@@ -493,6 +494,8 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!disintegrate)
disintegrate = DROPLIMB_SHARP
if(disintegrate == DROPLIMB_BURN && istype(src, /obj/item/organ/external/head))
disintegrate = DROPLIMB_SHARP //Lets not make sharp burn weapons delete brains.
switch(disintegrate)
if(DROPLIMB_SHARP)