Skip to content

Commit

Permalink
Merge pull request #5564 from ARF-SS13/asfharh
Browse files Browse the repository at this point in the history
Asfharh
  • Loading branch information
Tk420634 authored Jan 7, 2025
2 parents 88fac1c + 54f9246 commit 4a71d07
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/chat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ SUBSYSTEM_DEF(chat)
priority = FIRE_PRIORITY_CHAT
init_order = INIT_ORDER_CHAT

var/forbid_ghosting = TRUE
var/forbid_ghosting = FALSE
var/chat_display_plane = RUNECHAT_PLANE
/*
** Base
Expand Down
16 changes: 16 additions & 0 deletions code/datums/components/spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,24 @@
// return
// activate()
if(something_in_range())
if(!am_special && blocked())
return
try_to_spawn()

/// checks if we're blocked by something
/datum/component/spawner/proc/blocked()
var/atom/A = parent
var/turf/here = get_turf(A)
for(var/obj/structure/respawner_blocker/RB in SSmonster_wave.spawn_blockers)
if(here.z != RB.z)
continue
var/maxdist = RB.protection_radius
if(maxdist <= 0)
continue
if(get_dist(RB, here) <= maxdist)
RB.blocked_something()
return TRUE

/// turns itself on for another 20ish seconds
/datum/component/spawner/proc/activate()
active = TRUE
Expand Down

0 comments on commit 4a71d07

Please sign in to comment.