cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 01:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Crit Balance Tweaks--Blobs and Stands

Browse Source
This commit is contained in:
Fox McCloud
2019-03-28 22:22:51 -04:00
parent acd191a14d
commit 7fabbe4a1c
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/gamemodes/blob/blobs/blob_mobs.dm
View File

@@ -66,14 +66,16 @@
if(!is_zombie && isturf(src.loc)) if(!is_zombie && isturf(src.loc))
for(var/mob/living/carbon/human/H in oview(src, 1)) //Only for corpse right next to/on same tile for(var/mob/living/carbon/human/H in oview(src, 1)) //Only for corpse right next to/on same tile
if(H.stat == DEAD) if(H.stat == DEAD || (!H.check_death_method() && H.health <= HEALTH_THRESHOLD_DEAD))
Zombify(H) Zombify(H)
break break
..() ..()
/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(var/mob/living/carbon/human/H) /mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(mob/living/carbon/human/H)
if(!H.check_death_method())
H.death()
var/obj/item/organ/external/head/head_organ = H.get_organ("head") var/obj/item/organ/external/head/head_organ = H.get_organ("head")
is_zombie = 1 is_zombie = TRUE
if(H.wear_suit) if(H.wear_suit)
var/obj/item/clothing/suit/armor/A = H.wear_suit var/obj/item/clothing/suit/armor/A = H.wear_suit
if(A.armor && A.armor["melee"]) if(A.armor && A.armor["melee"])
@@ -87,14 +89,15 @@
icon = H.icon icon = H.icon
speak_emote = list("groans") speak_emote = list("groans")
icon_state = "zombie2_s" icon_state = "zombie2_s"
if(head_organ)
head_organ.h_style = null head_organ.h_style = null
H.update_hair() H.update_hair()
human_overlays = H.overlays human_overlays = H.overlays
update_icons() update_icons()
H.loc = src H.forceMove(src)
pressure_resistance = 20 //5 kPa difference required to push lowered pressure_resistance = 20 //5 kPa difference required to push lowered
throw_pressure_limit = 30 //15 kPa difference required to throw lowered throw_pressure_limit = 30 //15 kPa difference required to throw lowered
loc.visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>") visible_message("<span class='warning'>The corpse of [H.name] suddenly rises!</span>")
/mob/living/simple_animal/hostile/blob/blobspore/death(gibbed) /mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
// Only execute the below if we successfuly died // Only execute the below if we successfuly died

4
code/game/gamemodes/miniantags/guardian/guardian.dm
View File

@@ -60,9 +60,9 @@
/mob/living/simple_animal/hostile/guardian/Life(seconds, times_fired) //Dies if the summoner dies /mob/living/simple_animal/hostile/guardian/Life(seconds, times_fired) //Dies if the summoner dies
..() ..()
if(summoner) if(summoner)
if(summoner.stat == DEAD) if(summoner.stat == DEAD || (!summoner.check_death_method() && summoner.health <= HEALTH_THRESHOLD_DEAD))
to_chat(src, "<span class='danger'>Your summoner has died!</span>") to_chat(src, "<span class='danger'>Your summoner has died!</span>")
visible_message("<span class='danger'>The [src] dies along with its user!</span>") visible_message("<span class='danger'>[src] dies along with its user!</span>")
ghostize() ghostize()
qdel(src) qdel(src)
snapback() snapback()