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

Final fixes

Browse Source
This commit is contained in:
ZomgPonies
2015-04-04 23:30:49 -04:00
parent 91e8b909c0
commit 91cb7b8b32
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+4 -4
View File
@@ -236,7 +236,7 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "head" && processing_dismember.name != "groin")
processing_dismember.droplimb(1,pick(0,1,2))
processing_dismember.droplimb(1,pick(0,1,2),0,1)
limbs_affected -= 1
@@ -260,7 +260,7 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "head" && processing_dismember.name != "groin")
processing_dismember.droplimb(1,pick(0,2))
processing_dismember.droplimb(1,pick(0,2),0,1)
limbs_affected -= 1
else
@@ -270,7 +270,7 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "head" && processing_dismember.name != "groin")
processing_dismember.droplimb(1,pick(0,2))
processing_dismember.droplimb(1,pick(0,2),0,1)
limbs_affected -= 1
if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
@@ -292,7 +292,7 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "head" && processing_dismember.name != "groin")
processing_dismember.droplimb(1,1)
processing_dismember.droplimb(1,1,0,1)
limbs_affected -= 1
if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -240,9 +240,9 @@ emp_act
del(src)
var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
if(!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
if(affecting.is_stump() || !affecting || affecting.status & ORGAN_DESTROYED)
user << "<span class='danger'>They are missing that limb!</span>"
return 0
return 1
var/hit_area = affecting.name
if(user != src)