cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Terror event spawns now pick players randomly (#15026)

Browse Source 
* v1

* cleanup

* Refactor (AA request)

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
This commit is contained in:
Kyep
2020-12-03 18:32:29 +00:00
committed by GitHub
co-authored by Kyep
parent 8c2605ade4
commit 73b9aae95d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/spider_terror.dm
+12 -3
View File
@@ -16,7 +16,10 @@
log_and_message_admins("Warning: Could not spawn any mobs for event Terror Spiders")
/datum/event/spider_terror/start()
var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE)
// It is necessary to wrap this to avoid the event triggering repeatedly.
INVOKE_ASYNC(src, .proc/wrappedstart)
/datum/event/spider_terror/proc/wrappedstart()
var/spider_type
var/infestation_type
if((length(GLOB.clients)) < TS_HIGHPOP_TRIGGER)
@@ -44,9 +47,15 @@
// Strongest, only used during highpop.
spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen
spawncount = 1
while(spawncount && length(vents))
var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a terror spider?", null, TRUE, source = spider_type)
if(length(candidates) < spawncount)
message_admins("Warning: not enough players volunteered to be terrors. Could only spawn [length(candidates)] out of [spawncount]!")
var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE)
while(spawncount && length(vents) && length(candidates))
var/obj/vent = pick_n_take(vents)
new spider_type(vent.loc)
var/mob/living/simple_animal/hostile/poison/terror_spider/S = new spider_type(vent.loc)
var/mob/M = pick_n_take(candidates)
S.key = M.key
spawncount--
successSpawn = TRUE