cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes grub event end announcement not functioning

Browse Source
This commit is contained in:
Heroman
2020-01-14 05:58:38 +10:00
parent fcd8fd1370
commit ede140ec9c
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/global_lists_vr.dm
View File

@@ -428,6 +428,8 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
SPECIES_GOLEM, //Some special species that may or may not be ever used in event too, SPECIES_GOLEM, //Some special species that may or may not be ever used in event too,
SPECIES_SHADEKIN) //Shadefluffers just poof away SPECIES_SHADEKIN) //Shadefluffers just poof away
/var/global/list/existing_solargrubs = list()
/hook/startup/proc/init_vore_datum_ref_lists() /hook/startup/proc/init_vore_datum_ref_lists()
var/paths var/paths

4
code/modules/events/grubinfestation_vr.dm
View File

@@ -3,7 +3,6 @@
endWhen = 200 endWhen = 200
var/spawncount = 1 var/spawncount = 1
var/list/vents = list() var/list/vents = list()
var/list/grubs = list()
var/give_positions = 0 var/give_positions = 0
/datum/event/grub_infestation/setup() /datum/event/grub_infestation/setup()
@@ -31,7 +30,7 @@
/datum/event/grub_infestation/end() /datum/event/grub_infestation/end()
var/list/area_names = list() var/list/area_names = list()
for(var/grub in grubs) for(var/grub in existing_solargrubs)
var/mob/living/G = grub var/mob/living/G = grub
if(!G || G.stat == DEAD) if(!G || G.stat == DEAD)
continue continue
@@ -44,4 +43,3 @@
if(area_names.len) if(area_names.len)
var/english_list = english_list(area_names) var/english_list = english_list(area_names)
command_announcement.Announce("Sensors have narrowed down remaining active solargrubs to the followng areas: [english_list]", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') command_announcement.Announce("Sensors have narrowed down remaining active solargrubs to the followng areas: [english_list]", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
grubs.Cut()

8
code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
View File

@@ -54,6 +54,10 @@ List of things solar grubs should be able to do:
/datum/say_list/solargrub /datum/say_list/solargrub
emote_see = list("squelches", "squishes") emote_see = list("squelches", "squishes")
/mob/living/simple_mob/vore/solargrub/New()
existing_solargrubs += src
..()
/mob/living/simple_mob/vore/solargrub/Life() /mob/living/simple_mob/vore/solargrub/Life()
. = ..() . = ..()
if(!.) return if(!.) return
@@ -123,6 +127,10 @@ List of things solar grubs should be able to do:
set_light(0) set_light(0)
..() ..()
/mob/living/simple_mob/vore/solargrub/Destroy()
existing_solargrubs -= src
..()
/mob/living/simple_mob/vore/solargrub/handle_light() /mob/living/simple_mob/vore/solargrub/handle_light()
. = ..() . = ..()
if(. == 0 && !is_dead()) if(. == 0 && !is_dead())

2
code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
View File

@@ -50,6 +50,7 @@ var/global/list/grub_machine_overlays = list()
/mob/living/simple_mob/animal/solargrub_larva/New() /mob/living/simple_mob/animal/solargrub_larva/New()
..() ..()
existing_solargrubs += src
powermachine = new(src) powermachine = new(src)
sparks = new(src) sparks = new(src)
sparks.set_up() sparks.set_up()
@@ -62,6 +63,7 @@ var/global/list/grub_machine_overlays = list()
return ..() return ..()
/mob/living/simple_mob/animal/solargrub_larva/Destroy() /mob/living/simple_mob/animal/solargrub_larva/Destroy()
existing_solargrubs -= src
QDEL_NULL(powermachine) QDEL_NULL(powermachine)
QDEL_NULL(sparks) QDEL_NULL(sparks)
QDEL_NULL(machine_effect) QDEL_NULL(machine_effect)