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.

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

Antag ban fixes. #12783

Merged
merged 2 commits into from Apr 26, 2016
Merged

Antag ban fixes. #12783

merged 2 commits into from Apr 26, 2016

Conversation

mustafakalash
Copy link
Contributor

@mustafakalash mustafakalash commented Apr 26, 2016

Fixes #12685.
Fixes banning for some antag roles applying a syndicate ban instead.
Fixes malf selecting players with AI bans.
Fixes some antag roles not showing up in the manual ban menu.

Makes sure all antag roles have a bantype var.
Applying a syndicate ban now bans all roles rather than the old, hacky method.
Removes checks for syndicate bans and replaces with checks for individual roles where applicable.
Replaces bantype var with id datum.

Not tested.

… a syndicate ban. Makes sure all antag roles have a bantype var. Applying a syndicate ban now bans all roles rather than the old, hacky method. Removes checks for syndicate bans and replaces with checks for individual roles where applicable.
@mustafakalash
Copy link
Contributor Author

Do not merge, making changes and testing.

@mustafakalash
Copy link
Contributor Author

Ready for review and merge. Tested working.

@PsiOmegaDelta
Copy link
Member

👍

@Asanadas Asanadas merged commit 3c52007 into Baystation12:dev Apr 26, 2016
@mustafakalash mustafakalash deleted the jobban branch April 26, 2016 23:26
@mloc
Copy link
Contributor

mloc commented Apr 28, 2016

Needs a migration.

@PsiOmegaDelta
Copy link
Member

PsiOmegaDelta commented Apr 28, 2016

Went over the changes. I think this should cover it?

-- UPDATE erro_ban SET job="Borer" WHERE job="borer"; -- Should we assume case insensitive?
UPDATE erro_ban SET job="Xenomorph" WHERE job="xeno";
-- UPDATE erro_ban SET job="actor" WHERE job="actor"; -- Same
UPDATE erro_ban SET job="ert" WHERE job="Emergency Response Team";
UPDATE erro_ban SET job="mercenary" WHERE job="operative";
--UPDATE erro_ban SET job="raider" WHERE job="raider"; -- Same
-- UPDATE erro_ban SET job="wizard" WHERE job="wizard"; -- Same
-- UPDATE erro_ban SET job="changeling" WHERE job="changeling"; -- Same
-- UPDATE erro_ban SET job="cultist" WHERE job="cultist"; -- Same
-- UPDATE erro_ban SET job="loyalist" WHERE job="loyalist"; -- Same
-- UPDATE erro_ban SET job="revolutionary" WHERE job="revolutionary"; -- Same

PsiOmegaDelta added a commit to PsiOmegaDelta/Baystation12 that referenced this pull request Apr 28, 2016
PsiOmegaDelta added a commit to PsiOmegaDelta/Baystation12 that referenced this pull request Apr 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants