cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #671 from ZomgPonies/limb

Browse Source 
Much downgraded Limb Overhaul
This commit is contained in:
Fox-McCloud
2015-03-29 00:44:03 -04:00
parent 72dea4c27c 315d9572be
commit 27b5d5bb9f
6 changed files with 106 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+8 -8
View File
@@ -232,8 +232,8 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "groin" && processing_dismember.name != "head")
processing_dismember.droplimb(1,1,1)
if(processing_dismember.name != "chest" && processing_dismember.name != "head")
processing_dismember.droplimb(1,0,1,pick(0,1,2))
limbs_affected -= 1
@@ -256,8 +256,8 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "groin" && processing_dismember.name != "head")
processing_dismember.droplimb(1,1,1)
if(processing_dismember.name != "chest" && processing_dismember.name != "head")
processing_dismember.droplimb(1,0,1,pick(0,2))
limbs_affected -= 1
else
@@ -266,8 +266,8 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "groin" && processing_dismember.name != "head")
processing_dismember.droplimb(1,1,1)
if(processing_dismember.name != "chest" && processing_dismember.name != "head")
processing_dismember.droplimb(1,0,1,pick(0,2))
limbs_affected -= 1
if (!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
@@ -288,8 +288,8 @@
while(limbs_affected != 0)
processing_dismember = pick(organs)
if(processing_dismember.name != "chest" && processing_dismember.name != "groin" && processing_dismember.name != "head")
processing_dismember.droplimb(1,1,1)
if(processing_dismember.name != "chest" && processing_dismember.name != "head")
processing_dismember.droplimb(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_damage.dm
+2 -4
View File
@@ -7,8 +7,8 @@
var/total_burn = 0
var/total_brute = 0
for(var/datum/organ/external/O in organs) //hardcoded to streamline things a bit
total_brute += O.brute_dam
total_burn += O.burn_dam
total_brute += O.brute_dam
total_burn += O.burn_dam
health = 100 - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
//TODO: fix husking
if( (((100 - total_burn) < config.health_threshold_dead) && stat == DEAD) && (!species.flags & IS_SYNTHETIC))//100 only being used as the magic human max health number, feel free to change it if you add a var for it -- Urist
@@ -62,7 +62,6 @@
/mob/living/carbon/human/adjustBruteLoss(var/amount)
if(species && species.brute_mod)
amount = amount*species.brute_mod
if(amount > 0)
take_overall_damage(amount, 0)
else
@@ -72,7 +71,6 @@
/mob/living/carbon/human/adjustFireLoss(var/amount)
if(species && species.burn_mod)
amount = amount*species.burn_mod
if(amount > 0)
take_overall_damage(0, amount)
else
code/modules/mob/living/carbon/human/human_defense.dm
-5
View File
@@ -319,11 +319,6 @@ emp_act
if(Iforce > 10 || Iforce >= 5 && prob(33))
forcesay(hit_appends) //forcesay checks stat already
if (I.damtype == BRUTE)
if((affecting.brute_dam + I.force) >= affecting.max_damage * config.organ_health_multiplier)
if(I.edge && prob(I.force))
affecting.dismember_limb()
/* //Melee weapon embedded object code. Commented out, as most people on the forums seem to find this annoying and think it does not contribute to general gameplay. - Dave
if (I.damtype == BRUTE && !I.is_robot_module())
var/damage = I.force