mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-12 09:54:03 +00:00
45c14f6330
Adds SIGNAL_HANDLER, a macro that sets SHOULD_NOT_SLEEP(TRUE). This should ideally be required on all new signal callbacks. Adds BLOCKING_SIGNAL_HANDLER, a macro that does nothing except symbolize "this is an older signal that didn't necessitate a code rewrite". It should not be allowed for new work. This comes from discussion around #52735, which yields by calling input, and (though it sets the return type beforehand) will not properly return the flag to prevent attack from slapping. To fix 60% of the yielding cases, WrapAdminProcCall no longer waits for another admin's proc call to finish. I'm not an admin, so I don't know how many behinds this has saved, but if this is problematic for admins I can just make it so that it lets you do it anyway. I'm not sure what the point of this babysitting was anyway. Requested by @optimumtact. Changelog cl admin: Calling a proc while another admin is calling one will no longer wait for the first to finish. You will simply just have to call it again. /cl
54 lines
1.4 KiB
Plaintext
54 lines
1.4 KiB
Plaintext
/datum/component/spawner
|
|
var/mob_types = list(/mob/living/simple_animal/hostile/carp)
|
|
var/spawn_time = 300 //30 seconds default
|
|
var/list/spawned_mobs = list()
|
|
var/spawn_delay = 0
|
|
var/max_mobs = 5
|
|
var/spawn_text = "emerges from"
|
|
var/list/faction = list("mining")
|
|
|
|
|
|
|
|
/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs)
|
|
if(_spawn_time)
|
|
spawn_time=_spawn_time
|
|
if(_mob_types)
|
|
mob_types=_mob_types
|
|
if(_faction)
|
|
faction=_faction
|
|
if(_spawn_text)
|
|
spawn_text=_spawn_text
|
|
if(_max_mobs)
|
|
max_mobs=_max_mobs
|
|
|
|
RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning)
|
|
START_PROCESSING(SSprocessing, src)
|
|
|
|
/datum/component/spawner/process()
|
|
try_spawn_mob()
|
|
|
|
|
|
/datum/component/spawner/proc/stop_spawning(force)
|
|
SIGNAL_HANDLER
|
|
|
|
STOP_PROCESSING(SSprocessing, src)
|
|
for(var/mob/living/simple_animal/L in spawned_mobs)
|
|
if(L.nest == src)
|
|
L.nest = null
|
|
spawned_mobs = null
|
|
|
|
/datum/component/spawner/proc/try_spawn_mob()
|
|
var/atom/P = parent
|
|
if(spawned_mobs.len >= max_mobs)
|
|
return 0
|
|
if(spawn_delay > world.time)
|
|
return 0
|
|
spawn_delay = world.time + spawn_time
|
|
var/chosen_mob_type = pick(mob_types)
|
|
var/mob/living/simple_animal/L = new chosen_mob_type(P.loc)
|
|
L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1)
|
|
spawned_mobs += L
|
|
L.nest = src
|
|
L.faction = src.faction
|
|
P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
|