Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 986175c

Browse files
authored
Snow Legions will now properly infect dead mobs + New snow legion regenerative 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
1 parent 829729c commit 986175c

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

code/modules/mining/equipment/regenerative_core.dm

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,21 +134,22 @@
134134
/obj/item/organ/regenerative_core/legion
135135
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."
136136
icon_state = "legion_soul"
137+
base_icon_state = "legion_soul"
137138

138139
/obj/item/organ/regenerative_core/legion/Initialize(mapload)
139140
. = ..()
140141
update_appearance(UPDATE_ICON)
141142

142143
/obj/item/organ/regenerative_core/update_icon_state()
143144
. = ..()
144-
icon_state = inert ? "legion_soul_inert" : "legion_soul"
145+
icon_state = inert ? "[base_icon_state]_inert" : "[base_icon_state]"
145146
for(var/datum/action/A as anything in actions)
146147
A.build_all_button_icons()
147148

148149
/obj/item/organ/regenerative_core/update_overlays()
149150
. = ..()
150151
if(!inert && !preserved)
151-
. += "legion_soul_crackle"
152+
. += "[base_icon_state]_crackle"
152153

153154
/obj/item/organ/regenerative_core/legion/go_inert()
154155
..()
@@ -157,3 +158,11 @@
157158
/obj/item/organ/regenerative_core/legion/preserved(implanted = 0)
158159
..()
159160
desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay."
161+
162+
163+
// Snow Legion Core
164+
165+
/obj/item/organ/regenerative_core/legion/snow
166+
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."
167+
icon_state = "slegion_soul"
168+
base_icon_state = "slegion_soul"

code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
icon_aggro = "snowlegion_alive"
201201
icon_dead = "snowlegion"
202202
crusher_loot = /obj/item/crusher_trophy/legion_skull
203-
loot = list(/obj/item/organ/regenerative_core/legion)
203+
loot = list(/obj/item/organ/regenerative_core/legion/snow)
204204
brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/snow
205205

206206
// Snow Legion skull
@@ -212,6 +212,7 @@
212212
icon_living = "snowlegion_head"
213213
icon_aggro = "snowlegion_head"
214214
icon_dead = "snowlegion_head"
215+
can_infest_dead = TRUE
215216

216217
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life(seconds_per_tick = SSMOBS_DT, times_fired)
217218
if(isturf(loc))
@@ -223,10 +224,12 @@
223224
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
224225
visible_message(span_warning("[name] burrows into the flesh of [H]!"))
225226
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
227+
var/legion_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
226228
if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff!
227-
L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
228-
else
229-
L = new(H.loc)
229+
legion_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf
230+
if(istype(src, /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/snow))
231+
legion_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow
232+
L = new legion_type(H.loc)
230233
visible_message(span_warning("[L] staggers to [L.p_their()] feet!"))
231234
H.death()
232235
H.adjustBruteLoss(1000)

icons/obj/surgery.dmi

7.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)