cyberpresidentvanellope/Skyrat-tg
1
0
Fork 0
mirror of https://github.com/Skyrat-SS13/Skyrat-tg.git synced 2026-08-25 05:48:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] DeathMatch Rolling Antag Fix (#26935)

Browse Source 
* DeathMatch Rolling Antag Fix (#82030)

## About The Pull Request

Gives Deathmatch players the TRAIT_TEMPORARY_BODY which is checked
during antag rolls while trimming candidates.

## Why It's Good For The Game

Closes https://github.com/tgstation/tgstation/issues/81725

## Changelog

🆑
fix: Deathmatch players should no longer be able to roll any midround
antagonist.
/🆑

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>

* DeathMatch Rolling Antag Fix

---------

Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-03-18 22:10:41 -04:00
committed by GitHub
co-authored by John Willard Bilbo367
parent 1d6397294c
commit 7a94964706
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
+1 -3
View File
@@ -80,11 +80,9 @@
if (is_banned_from(creature.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE)))
trimmed_list.Remove(creature)
continue
if (isnull(creature.mind))
continue
if (restrict_ghost_roles && (creature.mind.assigned_role.title in GLOB.exp_specialmap[EXP_TYPE_SPECIAL])) // Are they playing a ghost role?
if (restrict_ghost_roles && !(creature.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) // Are they not playing a station role?
trimmed_list.Remove(creature)
continue
if (creature.mind.assigned_role.title in restricted_roles) // Does their job allow it?