cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes the mess between ROLE_REV and ROLE_REV_HEAD [MDB IGNORE] (#10705)

Browse Source 
* Fixes the mess between ROLE_REV and ROLE_REV_HEAD (#64068)

* Fixes the mess between ROLE_REV and ROLE_REV_HEAD

* Update code/modules/client/preferences/migrations/tgui_prefs_migration.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Update revolution.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Fixes the mess between ROLE_REV and ROLE_REV_HEAD

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-01-15 16:28:00 +00:00
committed by GitHub
co-authored by Mothblocks John Willard
parent 98311e9542
commit c3b1510356
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/role_preferences.dm
-1
View File
@@ -145,7 +145,6 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_SYNDICATE_INFILTRATOR = 0,
// I'm not too sure why these are here, but they're not moving.
ROLE_REV = 14,
ROLE_PAI = 0,
ROLE_INTERNAL_AFFAIRS = 0,
ROLE_SENTIENCE = 0,
code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+1 -1
View File
@@ -98,7 +98,7 @@
persistent = TRUE
antag_datum = /datum/antagonist/rev/head
antag_flag = ROLE_PROVOCATEUR
antag_flag_override = ROLE_REV
antag_flag_override = ROLE_REV_HEAD
restricted_roles = list(
JOB_AI,
JOB_CYBORG,
code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+1 -1
View File
@@ -542,7 +542,7 @@
name = "Revolution"
persistent = TRUE
antag_flag = ROLE_REV_HEAD
antag_flag_override = ROLE_REV
antag_flag_override = ROLE_REV_HEAD
antag_datum = /datum/antagonist/rev/head
minimum_required_age = 14
restricted_roles = list(
code/modules/antagonists/revolution/revolution.dm
+2 -1
View File
@@ -162,6 +162,7 @@
/datum/antagonist/rev/head
name = "\improper Head Revolutionary"
antag_hud_name = "rev_head"
job_rank = ROLE_REV_HEAD
preview_outfit = /datum/outfit/revolutionary
@@ -368,7 +369,7 @@
var/list/datum/mind/nonhuman_promotable = list()
for(var/datum/mind/khrushchev in non_heads)
if(khrushchev.current && !khrushchev.current.incapacitated() && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client)
if(ROLE_REV in khrushchev.current.client.prefs.be_special)
if((ROLE_REV_HEAD in khrushchev.current.client.prefs.be_special) || (ROLE_PROVOCATEUR in khrushchev.current.client.prefs.be_special))
if(ishuman(khrushchev.current))
promotable += khrushchev
else
code/modules/client/preferences/migrations/tgui_prefs_migration.dm
+2
View File
@@ -43,6 +43,8 @@
// "Familes [sic] Antagonists" was the old name of the catch-all.
migrate_antagonist("Familes Antagonists", list(ROLE_FAMILIES, ROLE_FAMILY_HEAD_ASPIRANT))
// If you have an antagonist enabled, it will add the alternative preferences for said antag in be_special.
// will_exist is the role we check if enabled, to_add list is the antagonists we add onto the be_special list.
/datum/preferences/proc/migrate_antagonist(will_exist, list/to_add)
if (will_exist in be_special)
for (var/add in to_add)