Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from cmss13-devs:master #843

Merged
merged 3 commits into from
Jan 10, 2024
Merged

[pull] master from cmss13-devs:master #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d8faa3
Fixes tunnels not showing on the minimap (#5406)
SabreML Jan 9, 2024
c402ca1
Automatic changelog for PR #5406 [ci skip]
cm13-github Jan 9, 2024
957acdd
Automatic changelog compile [ci skip]
actions-user Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/modules/cm_aliens/structures/tunnel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@
if(resin_trap)
qdel(resin_trap)

if(hivenumber == XENO_HIVE_NORMAL)
RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling))
if(hivenumber == XENO_HIVE_NORMAL)
RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling))

SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(hivenumber), "xenotunnel")

/obj/structure/tunnel/proc/forsaken_handling()
SIGNAL_HANDLER
Expand All @@ -62,8 +64,6 @@

UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING)

SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(hivenumber), "xenotunnel")

/obj/structure/tunnel/Destroy()
if(hive)
hive.tunnels -= src
Expand Down
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5404.yml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions html/changelogs/archive/2024-01.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,8 @@
2024-01-09:
private-tristan:
- bugfix: Tunnels are now converted to forsaken on evac.
2024-01-10:
SabreML:
- bugfix: Fixed tunnels not showing on the minimap.
Tsurupeta:
- bugfix: Regular expressions in chat highlights work again.
Loading