Skip to content

Commit

Permalink
Snow Legions will now properly infect dead mobs + New snow legion reg…
Browse files Browse the repository at this point in the history
…enerative cores (#22715)

* Snowman Stuff

* plz work

* Revert "plz work"

This reverts commit aa60f62.

* lets see

* work bitch

* fixed it

* let see

* ok this should be right now

* whoops

* wtf
  • Loading branch information
N3D6 authored Oct 28, 2024
1 parent 829729c commit 986175c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
13 changes: 11 additions & 2 deletions code/modules/mining/equipment/regenerative_core.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,22 @@
/obj/item/organ/regenerative_core/legion
desc = "A strange rock that crackles with power. It can be used to heal quickly, but it will rapidly decay into uselessness. Radiation found in active space installments will slow its healing effects."
icon_state = "legion_soul"
base_icon_state = "legion_soul"

/obj/item/organ/regenerative_core/legion/Initialize(mapload)
. = ..()
update_appearance(UPDATE_ICON)

/obj/item/organ/regenerative_core/update_icon_state()
. = ..()
icon_state = inert ? "legion_soul_inert" : "legion_soul"
icon_state = inert ? "[base_icon_state]_inert" : "[base_icon_state]"
for(var/datum/action/A as anything in actions)
A.build_all_button_icons()

/obj/item/organ/regenerative_core/update_overlays()
. = ..()
if(!inert && !preserved)
. += "legion_soul_crackle"
. += "[base_icon_state]_crackle"

/obj/item/organ/regenerative_core/legion/go_inert()
..()
Expand All @@ -157,3 +158,11 @@
/obj/item/organ/regenerative_core/legion/preserved(implanted = 0)
..()
desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay."


// Snow Legion Core

/obj/item/organ/regenerative_core/legion/snow
desc = "A strangely hard snowball that crackles with power. It can be used to heal quickly, but it will rapidly decay into uselessness. Radiation found in active space installments may slow its healing effects."
icon_state = "slegion_soul"
base_icon_state = "slegion_soul"
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
icon_aggro = "snowlegion_alive"
icon_dead = "snowlegion"
crusher_loot = /obj/item/crusher_trophy/legion_skull
loot = list(/obj/item/organ/regenerative_core/legion)
loot = list(/obj/item/organ/regenerative_core/legion/snow)
brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/snow

// Snow Legion skull
Expand All @@ -212,6 +212,7 @@
icon_living = "snowlegion_head"
icon_aggro = "snowlegion_head"
icon_dead = "snowlegion_head"
can_infest_dead = TRUE

/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life(seconds_per_tick = SSMOBS_DT, times_fired)
if(isturf(loc))
Expand All @@ -223,10 +224,12 @@
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
visible_message(span_warning("[name] burrows into the flesh of [H]!"))
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
var/legion_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff!
L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
else
L = new(H.loc)
legion_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf
if(istype(src, /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/snow))
legion_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow
L = new legion_type(H.loc)
visible_message(span_warning("[L] staggers to [L.p_their()] feet!"))
H.death()
H.adjustBruteLoss(1000)
Expand Down
Binary file modified icons/obj/surgery.dmi
Binary file not shown.

0 comments on commit 986175c

Please sign in to comment.