cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Aliens no longer gib [NON-MODULAR] (#1714)

Browse Source 
* Update alien_embryo.dm

* Update alien_embryo.dm

* Some other minor bugfixes

* Update alien_embryo.dm

* Update alien_embryo.dm

* Update code/modules/mob/living/carbon/alien/special/alien_embryo.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update alien_embryo.dm

* Update alien_embryo.dm

* Update alien_embryo.dm

Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
Gandalf
2020-11-23 21:56:24 +01:00
committed by GitHub
co-authored by Azarak
parent 9116d6f265
commit 4331050876
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+15 -7
View File
@@ -60,7 +60,7 @@
/obj/item/organ/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success=TRUE)
/obj/item/organ/body_egg/alien_embryo/proc/AttemptGrow()
if(!owner || bursting)
return
@@ -102,13 +102,21 @@
new_xeno.notransform = 0
new_xeno.invisibility = 0
if(gib_on_success)
new_xeno.visible_message("<span class='danger'>[new_xeno] bursts out of [owner] in a shower of gore!</span>", "<span class='userdanger'>You exit [owner], your previous host.</span>", "<span class='hear'>You hear organic matter ripping and tearing!</span>")
owner.gib(TRUE)
new_xeno.visible_message("<span class='danger'>[new_xeno] bursts out of [owner] in a shower of gore!</span>", "<span class='userdanger'>You exit [owner], your previous host.</span>", "<span class='hear'>You hear organic matter ripping and tearing!</span>")
//owner.gib(TRUE) - ORIGINAL
//SKYRAT EDIT CHANGE - ALIEN QOL
if(owner.getBruteLoss() >= 150)
for(var/obj/item/bodypart/BP in owner.bodyparts) //We want to check if there is a chest to dismember.
if(BP.name == "chest")
BP.dismember()
break
else
new_xeno.visible_message("<span class='danger'>[new_xeno] wriggles out of [owner]!</span>", "<span class='userdanger'>You exit [owner], your previous host.</span>")
owner.adjustBruteLoss(40)
owner.cut_overlay(overlay)
var/obj/item/bodypart/affecting = owner.get_bodypart("chest")
if(affecting)
affecting.receive_damage(40)
owner.spawn_gibs()
//SKYRAT EDIT END
owner.cut_overlay(overlay)
qdel(src)
modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm
+5 -5
View File
@@ -160,7 +160,7 @@
var/mob/living/simple_animal/hostile/true_changeling/T = owner
if(T.devouring)
T << "<span class='warning'>We are already feasting on a human!</span>"
return 0
return FALSE
var/list/potential_targets = list()
for(var/mob/living/carbon/human/H in range(1, usr))
if(H == T.stored_changeling || (H.mind && H.mind.has_antag_datum(/datum/antagonist/changeling))) //You can't eat changelings in human form
@@ -168,24 +168,24 @@
potential_targets.Add(H)
if(!potential_targets.len)
T << "<span class='warning'>There are no humans nearby!</span>"
return 0
return FALSE
var/mob/living/carbon/human/lunch
if(potential_targets.len == 1)
lunch = potential_targets[1]
else
lunch = input(T, "Choose a human to devour.", "Lunch") as null|anything in potential_targets
if(!lunch && !ishuman(lunch))
return 0
return FALSE
if(lunch.getBruteLoss() + lunch.getFireLoss() >= 200) //Overall physical damage, basically
T.visible_message("<span class='warning'>[lunch] provides no further nutrients for [T]!</span>", \
"<span class='danger'>[lunch] has no more useful flesh for us to consume!!</span>")
return 0
return FALSE
T.devouring = TRUE
T.visible_message("<span class='warning'>[T] begins ripping apart and feasting on [lunch]!</span>", \
"<span class='danger'>We begin to feast upon [lunch]...</span>")
if(!do_mob(usr, 50, target = lunch))
T.devouring = FALSE
return 0
return FALSE
T.devouring = FALSE
lunch.adjustBruteLoss(60)
T.visible_message("<span class='warning'>[T] tears a chunk from [lunch]'s flesh!</span>", \