cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14290 from SandPoot/properlegioninheritance

Browse Source 
Legions pass their type to the mob they infect
This commit is contained in:
silicons
2021-03-01 18:35:37 -07:00
committed by GitHub
parent 7af3c986ad eb4fcd8a00
commit b5bb90ecf8
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
View File

@@ -42,6 +42,8 @@
A.GiveTarget(target) A.GiveTarget(target)
A.friends = friends A.friends = friends
A.faction = faction.Copy() A.faction = faction.Copy()
if(!A == /mob/living/simple_animal/hostile/poison/bees/toxin)
A.my_creator = type
ranged_cooldown = world.time + ranged_cooldown_time ranged_cooldown = world.time + ranged_cooldown_time
/mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget() /mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget()
@@ -88,6 +90,7 @@
density = FALSE density = FALSE
del_on_death = 1 del_on_death = 1
var/swarming = FALSE var/swarming = FALSE
var/my_creator = null
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize() /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize()
. = ..() . = ..()
@@ -205,11 +208,7 @@
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
visible_message("<span class='warning'>[name] burrows into the flesh of [H]!</span>") visible_message("<span class='warning'>[name] burrows into the flesh of [H]!</span>")
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L = check_infest_type(H)
if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
else
L = new(H.loc)
visible_message("<span class='warning'>[L] staggers to [L.p_their()] feet!</span>") visible_message("<span class='warning'>[L] staggers to [L.p_their()] feet!</span>")
H.death() H.death()
H.adjustBruteLoss(1000) H.adjustBruteLoss(1000)
@@ -217,6 +216,20 @@
H.forceMove(L) H.forceMove(L)
qdel(src) qdel(src)
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/check_infest_type(mob/living/carbon/human/human)
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
var/list/blacklisted_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf)
if(HAS_TRAIT(human, TRAIT_DWARF)) //dwarf legions aren't just fluff!
L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(human.loc)
else if(my_creator)
if(my_creator in blacklisted_types)
L = new(human.loc)
else
L = new my_creator(human.loc)
else
L = new(human.loc)
return L
//Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions) //Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions)
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced /mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced
stat_attack = DEAD stat_attack = DEAD