mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
[MIRROR] Kapulimbs [MDB IGNORE] (#12497)
* Kapulimbs * conflicts * part one of fixes * more fex * ugh * more fix * eee * e * more fix * Well it compiles, but we need to get digi legs working * more fixes * https://github.com/tgstation/tgstation/pull/65887 * https://github.com/tgstation/tgstation/pull/65904 * https://github.com/tgstation/tgstation/pull/65923 * more fix * now uses dna specific icon overrides. * species code no longer dictates what icon the limbs use * digitigrade legs implemenation * more fixes, species indexing, species bodyparts * remaining mutant bois * 0 * okay this work! * IPC stuffs * inv file uses * optimisation and limb string rendering digitigrade stuff * wew * partial vox support * bodymarkings are now stored on the bodypart * limb key caching * Update carbon_update_icons.dm * Update carbon_update_icons.dm * Moves our mutant variance to the new system and makes shoes squash. * all legs do it * https://github.com/tgstation/tgstation/pull/65918 * https://github.com/tgstation/tgstation/pull/65899 * https://github.com/tgstation/tgstation/pull/65990 * teshari bodytype * them teshari's aren't humans * bandaid for future proper teshari implementation * Update vox_bodyparts.dm * fixes chests and teshari implementation * fixes * fex * Update mutant_zombie_bodyparts.dm * oops * Update synthetic_lizard_bodyparts.dm * Update code/modules/mob/living/carbon/human/human_update_icons.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/human_update_icons.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/human_update_icons.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/modules/surgery/bodyparts/species_parts/ghoul_bodyparts.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/modules/surgery/bodyparts/species_parts/ghoul_bodyparts.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/modules/surgery/bodyparts/species_parts/ghoul_bodyparts.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/modules/surgery/bodyparts/species_parts/ghoul_bodyparts.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/species.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update scissors.dm * wound stuff * Update carbon_examine.dm * more stuff * Delete human_update_icons.dm * begone thot * https://github.com/tgstation/tgstation/pull/66065 * Update _external_organs.dm Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
SkyratBot
co-authored by
GoldenAlpharex
Kapu1178
Gandalf
GoldenAlpharex
Kapu1178
Gandalf
parent
0df94684c1
commit
3916ea03de
@@ -4,7 +4,6 @@
|
||||
zone = BODY_ZONE_HEAD
|
||||
slot = ORGAN_SLOT_ZOMBIE
|
||||
icon_state = "blacktumor"
|
||||
visual = FALSE
|
||||
var/causes_damage = TRUE
|
||||
var/datum/species/old_species = /datum/species/human
|
||||
var/living_transformation_time = 30
|
||||
@@ -31,7 +30,7 @@
|
||||
/obj/item/organ/zombie_infection/Remove(mob/living/carbon/M, special = 0)
|
||||
. = ..()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
if(iszombie(M) && old_species && !QDELETED(M))
|
||||
if(iszombie(M) && old_species && !special && !QDELETED(src))
|
||||
M.set_species(old_species)
|
||||
if(timer_id)
|
||||
deltimer(timer_id)
|
||||
@@ -41,7 +40,7 @@
|
||||
web of pus and viscera, bound tightly around the brain like some \
|
||||
biological harness.</span>")
|
||||
|
||||
/obj/item/organ/zombie_infection/process(delta_time)
|
||||
/obj/item/organ/zombie_infection/process(delta_time, times_fired)
|
||||
if(!owner)
|
||||
return
|
||||
if(!(src in owner.internal_organs))
|
||||
@@ -50,7 +49,7 @@
|
||||
return
|
||||
if (causes_damage && !iszombie(owner) && owner.stat != DEAD)
|
||||
owner.adjustToxLoss(0.5 * delta_time)
|
||||
if(DT_PROB(5, delta_time))
|
||||
if (DT_PROB(5, delta_time))
|
||||
to_chat(owner, span_danger("You feel sick..."))
|
||||
if(timer_id)
|
||||
return
|
||||
@@ -66,9 +65,9 @@
|
||||
not even death can stop, you will rise again!</span>")
|
||||
var/revive_time = rand(revive_time_min, revive_time_max)
|
||||
var/flags = TIMER_STOPPABLE
|
||||
timer_id = addtimer(CALLBACK(src, .proc/zombify), revive_time, flags)
|
||||
timer_id = addtimer(CALLBACK(src, .proc/zombify, owner), revive_time, flags)
|
||||
|
||||
/obj/item/organ/zombie_infection/proc/zombify()
|
||||
/obj/item/organ/zombie_infection/proc/zombify(mob/living/carbon/target)
|
||||
timer_id = null
|
||||
|
||||
if(!converts_living && owner.stat != DEAD)
|
||||
@@ -76,24 +75,24 @@
|
||||
|
||||
if(!iszombie(owner))
|
||||
old_species = owner.dna.species.type
|
||||
owner.set_species(/datum/species/zombie/infectious)
|
||||
target.set_species(/datum/species/zombie/infectious)
|
||||
|
||||
var/stand_up = (owner.stat == DEAD) || (owner.stat == UNCONSCIOUS)
|
||||
var/stand_up = (target.stat == DEAD) || (target.stat == UNCONSCIOUS)
|
||||
|
||||
//Fully heal the zombie's damage the first time they rise
|
||||
owner.setToxLoss(0, 0)
|
||||
owner.setOxyLoss(0, 0)
|
||||
owner.heal_overall_damage(INFINITY, INFINITY, INFINITY, null, TRUE)
|
||||
target.setToxLoss(0, 0)
|
||||
target.setOxyLoss(0, 0)
|
||||
target.heal_overall_damage(INFINITY, INFINITY, INFINITY, null, TRUE)
|
||||
|
||||
if(!owner.revive(full_heal = FALSE, admin_revive = FALSE))
|
||||
if(!target.revive())
|
||||
return
|
||||
|
||||
owner.grab_ghost()
|
||||
owner.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!"), span_alien("You HUNGER!"))
|
||||
playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, TRUE)
|
||||
owner.do_jitter_animation(living_transformation_time)
|
||||
owner.Stun(living_transformation_time)
|
||||
to_chat(owner, span_alertalien("You are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm your zombie brethren and spread the disease by killing others. You are a creature of hunger and violence."))
|
||||
target.grab_ghost()
|
||||
target.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!"), span_alien("You HUNGER!"))
|
||||
playsound(target.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
|
||||
target.do_jitter_animation(living_transformation_time)
|
||||
target.Stun(living_transformation_time)
|
||||
to_chat(target, span_alertalien("You are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm your zombie brethren and spread the disease by killing others. You are a creature of hunger and violence."))
|
||||
|
||||
/obj/item/organ/zombie_infection/nodamage
|
||||
causes_damage = FALSE
|
||||
|
||||
Reference in New Issue
Block a user