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

Jump to bottom

Role datums #18296

Closed
wants to merge 67 commits into from
Closed

Role datums #18296

wants to merge 67 commits into from

Conversation

MadmanMartian
Copy link
Contributor

So we can actually put this on the test server

STUFF MAY BE BROKEN. NOTIFY US IF YOU SEE SOMETHING FUCKY

@IconDiffBot
Copy link

IconDiffBot commented May 17, 2018 •
edited
Loading

Icons with diff:

icons/effects/effects.dmi
Key Old New Status
rune_communication[4] rune_communication[4] Created
rune_communication[8] rune_communication[8] Created
rune_communication[5] rune_communication[5] Created
rune_communication[2] rune_communication[2] Created
rune_communication rune_communication Created
rune_communication[7] rune_communication[7] Created
rune_communication[6] rune_communication[6] Created
rune_communication[1] rune_communication[1] Created
rune_communication[3] rune_communication[3] Created
icons/effects/uristrunes.dmi
Key Old New Status
blank blank Removed
Created
icons/logos.dmi
Key Old New Status
vox-logo vox-logo Created
blob-logo blob-logo Created
wish-logo wish-logo Created
change-logoa change-logoa Created
nuke-logo nuke-logo Created
apprentice-logo apprentice-logo Created
change-logob change-logob Created
nano-logo nano-logo Created
monkey-logo monkey-logo Created
wizard-logo wizard-logo Created
cult-logo cult-logo Created
rev_head-logo rev_head-logo Created
rev-logo rev-logo Created
synd-logo synd-logo Created
elite-logo elite-logo Created
vampire-logo vampire-logo Created
ert-logo ert-logo Created
nuke-logo-leader nuke-logo-leader Created
bomb-logo bomb-logo Created
death-logo death-logo Created
malf-logo malf-logo Created
thrall-logo thrall-logo Created
high-logo high-logo Created
icons/mob/mob.dmi
Key Old New Status
cult-logo cult-logo Removed
necromancer necromancer Removed
rev_head-logo rev_head-logo Removed
wizard wizard Removed
vampthrall vampthrall Removed
greytide_head greytide_head Removed
nano-logo nano-logo Removed
synd synd Removed
cult cult Removed
minion minion Removed
vampire-logo vampire-logo Removed
change-logoa change-logoa Removed
thrall-logo thrall-logo Removed
wizard-logo wizard-logo Removed
apprentice apprentice Removed
death-logo death-logo Removed
rev-logo rev-logo Removed
ert-logo ert-logo Removed
vampire2 vampire2 Removed
cultOLD cultOLD Removed
change-logob change-logob Removed
apprentice-logo apprentice-logo Removed
synd-L synd-L Removed
synd-logo synd-logo Removed
greytide greytide Removed
vox-logo vox-logo Removed
vampire vampire Removed
nuke-logo nuke-logo Removed
rev rev Removed
rev_head rev_head Removed
icons/mob/screen_spells.dmi
Key Old New Status
vamp_shapeshift vamp_shapeshift Created
vampire_hypno vampire_hypno Created
vampire_cloak vampire_cloak Created
vampire_bats vampire_bats Created
vampire_glare vampire_glare Created
vamp_spell_base vamp_spell_base Created
cult_closed cult_closed Created
cult_spell_ready cult_spell_ready Created
vampire_disaese vampire_disaese Created
cult_open cult_open Created
vampire_rejuv vampire_rejuv Created
cult_word cult_word Created
vampire_enthrall vampire_enthrall Created
cult_spell_base cult_spell_base Created
cult_erase cult_erase Created
vamp_spell_ready vamp_spell_ready Created
vampire_screech vampire_screech Created
icons/obj/cult.dmi
Key Old New Status
runetrigger-build[2] runetrigger-build[2] Created
runetrigger-build runetrigger-build Created
altar-spawn[10] altar-spawn[10] Created
test[3] test[3] Created
pamphlet[8] pamphlet[8] Created
test[6] test[6] Created
altar-spawn[9] altar-spawn[9] Created
altar-spawn[11] altar-spawn[11] Created
altar-spawn[5] altar-spawn[5] Created
altar-spawn[12] altar-spawn[12] Created
test[1] test[1] Created
test[2] test[2] Created
test[4] test[4] Created
altar-spawn[13] altar-spawn[13] Created
altar-spawn[4] altar-spawn[4] Created
pamphlet pamphlet Created
altar-spawn[3] altar-spawn[3] Created
pamphlet[2] pamphlet[2] Created
pamphlet[3] pamphlet[3] Created
runetrigger-build[1] runetrigger-build[1] Created
altar-spawn[7] altar-spawn[7] Created
altar-spawn altar-spawn Created
altar_overlay altar_overlay Created
altar-spawn[1] altar-spawn[1] Created
test[5] test[5] Created
pamphlet[6] pamphlet[6] Created
runetrigger-build[4] runetrigger-build[4] Created
altar_damage2 altar_damage2 Created
altar-spawn[14] altar-spawn[14] Created
pamphlet[5] pamphlet[5] Created
pamphlet[4] pamphlet[4] Created
runetrigger-build[3] runetrigger-build[3] Created
runetrigger-build[7] runetrigger-build[7] Created
pamphlet[1] pamphlet[1] Created
altar-spawn[6] altar-spawn[6] Created
pamphlet[7] pamphlet[7] Created
altar-spawn[8] altar-spawn[8] Created
runetrigger-build[8] runetrigger-build[8] Created
runetrigger-build[6] runetrigger-build[6] Created
altar-spawn[2] altar-spawn[2] Created
altar_damage1 altar_damage1 Created
runetrigger-build[5] runetrigger-build[5] Created
altar altar Created
test test Created
icons/role_HUD_icons.dmi
Key Old New Status
rev-logo rev-logo Created
wizard-logo wizard-logo Created
nuke-logo nuke-logo Created
nuke-logo-leader nuke-logo-leader Created
vampire-logo vampire-logo Created
necro-logo necro-logo Created
greytide_leader-logo greytide_leader-logo Created
greytide-logo greytide-logo Created
minion-logo minion-logo Created
cult-logo cult-logo Created
thrall-logo thrall-logo Created
apprentice-logo apprentice-logo Created
rev_head-logo rev_head-logo Created

@DamianX DamianX mentioned this pull request May 17, 2018
Closed
MadmanMartian and others added 25 commits June 22, 2018 13:49
@MadmanMartian
removes depreciated factions list (#17318)
48abbf7
@MadmanMartian
Actually implements RoleTopic (#17311)
8b5e59a
@ShiftyRail @MadmanMartian
Adds vampire to role datums. (#17326)
f79574a 
* Extended, role datums edition

The joke is that it's not extended but vampire

* .dme and a small mistake

* Re-implements everything related to vampire.

Notably, the life() procs.
Mostly, it's copypaste, but with of course changed for antag datums.
Minor refactor on the way icons are updated; previously, this was in
Life(), now it's only when needed.

* Vampire, part 2

* Requested changes

* Whoops
@MadmanMartian
Ports changeling to role datums (#17245)
d2e58ff 
* re-adds changeling mode via the new role datums

* change to RoleTopic

* changelings now don't work on faction but on role. Gamemodes can now create roles as well as factions. RoleTopic now works.

* removes hitler

* changeling vial now works again. Macros corrected.

* adds the absorb objective, adds objectives to changeling

* Adds argument to ReturnObjectivesString where the name is given or not

* apparently there's no need for src. to differentiate local and global variables

* removes redundant functions, IsFulfilled returns parent, etc.
@MadmanMartian
Adds maxrole check, client check, and desires_role & is_jobbanned che…
baf0a98 
…cks to latespawn (#17373)
@gbasood @MadmanMartian
Role datums, with a real rebase and fixed up a bit of code on the way
1ae7c55
@DeityLink @MadmanMartian
Cult 3.0 : Faction Code + Tracing Runes & Paying in Blood + Communica…
1cb0fa2 
…tion Rune (#17432)

* on the first day I drew my blood

* on the second day I learned their names

* on the third day we built an altar

* on the fourth day we communed with him

* on the fifth day I fixed some issues pointed out by DamianQ

* and then some

* and then some more

* ok that's all for now
@DeityLink @MadmanMartian
Role Panel & rune fix (#17487)
2623fc3 
* role panel

* role panel 2

* role panel 3

* role panel 4

* role panel 5

* role panel 6
@DeityLink @MadmanMartian
logos (#17527)
eba9ebd
@DeityLink @MadmanMartian
role procs (#17504)
16f4a12
@MadmanMartian
rounds now actually end (#17501)
2f9017d
@ShiftyRail @MadmanMartian
Vampire, antag datums : take 2 (#17421)
1934daf 
* Vampire, antag datums : take 2

* Gee Sood

* HEAVILY WIP COMMIT

- Added glare, but it doesn't work (yet)
- Icons
- A few fixes in previous spells

THIS COMMIT IS MESSY AND VERY WIP - DEBUG TEXT, COMMENTED STUFF I
SHOULDN'T HAVE, ETC, ETC.
Just doing it so that it's not lost.:

* Conflicts part 2

* Bugfixes, nicer icons, added Shapeshift

* getAllVampSpells()
@DeityLink @MadmanMartian
Faction/Role Hud Icons (#17577)
a3efcce 
* factionhudicons

* aqafgazefazdf

* better

* betterer
@DeityLink @MadmanMartian
Role Panel extras (#17603)
7568486 
* rolepanelextras

* rolepanelextras 2

* rolepanelextras 3

* rolepanelextras 4

* etcaetera
@MadmanMartian
Adds ling intro sound, adds gamemode orphaned role process handling, …
1aa2b9a 
…adds role process handling to factions. Changeling the changeling HUD to show how much genetic damage you have sustained, changes the changeling greeting. (#17713)
@DeityLink @MadmanMartian
[Cult 3.0] mostly Cult Altar related stuff (#17723)
85a68ee 
* cultaltar

* cultaltar 2

* cultaltar 3

* cultaltar 4
@MadmanMartian
Adds rev to role datums (#17873)
8f4e603
@MadmanMartian
Role datums tator, double agents, and nuclear operatives (#17935)
dda3b9b 
* It's not calling things on members for some reason.

* there's probably a to_chat(world in here somewhere

* double agents

* nuke ops tomorrow. Tonight we gondola

* nuke ops bois

* Almost forgot the objective
@ShiftyRail @MadmanMartian
Ports Vampire to role_datums. (#17937)
b4ada1f 
* Ports Vampire to role_datums.

* Spells

* Spells r dum

* A lot of stuff

* tgstat

* I dun get it

* to_chat(world) madness

* Stash

* Fixes a few things

* Enthrall, more fixes

* Changes

* (Almost) all spells !

* Almost done

* Final touch.

* Cleaning up review comments, real objectives.

* What a dummy.

* Adds ling intro sound, adds gamemode orphaned role process handling, adds role process handling to factions. Changeling the changeling HUD to show how much genetic damage you have sustained, changes the changeling greeting. (#17713)

* [Cult 3.0] mostly Cult Altar related stuff (#17723)

* cultaltar

* cultaltar 2

* cultaltar 3

* cultaltar 4

* Adds rev to role datums (#17873)

* Ports Vampire to role_datums.

* Spells

* Spells r dum

* A lot of stuff

* tgstat

* Role datums tator, double agents, and nuclear operatives (#17935)

* It's not calling things on members for some reason.

* there's probably a to_chat(world in here somewhere

* double agents

* nuke ops tomorrow. Tonight we gondola

* nuke ops bois

* Almost forgot the objective

* I dun get it

* to_chat(world) madness

* Stash

* Fixes a few things

* Enthrall, more fixes

* Changes

* (Almost) all spells !

* Almost done

* Final touch.

* Cleaning up review comments, real objectives.

* What a dummy.

* Haha

* Update acquire_blood.dm

* Change the orders of things

* Redundant

* I can't believe I didnd't fix that sooner

It's probably because I'm retarded lmao
@MadmanMartian
role datums fixes and tweaks (#18277)
48872e7 
* * makes raging mages actually work
 * removes the 'protect master' objective, instead uses the protect objective
 * removes heavily redundant and useless vampire gamemode tweaks. master vampire is now handled through the role creating its own faction if one is not provided.
 * CreateRoles diversified, new filterAvailablePlayers proc, and now it actually works
 * Fixes mixed
 * Fixes syndicate agents becoming other sorts of syndicate agents, causing syndicate agent recursion
 * Fixes check antagonist for factions and roles not newlining after a role has been viewed

* moves rolecheck to faction, rather than having a snowflake check for traitor

* all my problems were because of a missed return 1

* more role fixes!

* removes debug
@MadmanMartian
oh ye I'm feelin it
4fb1dc3
@MadmanMartian
didn't test enough, apparently
bba440a
@MadmanMartian
hitlers abound
940ad71
@MadmanMartian
this meant you weren't equipped as a mid-round antag
1261111
@MadmanMartian
IN CASE OF WIZARD, BREAK GLASS
00e2967
@MadmanMartian MadmanMartian changed the base branch from Bleeding-Edge to role_datums June 22, 2018 13:39
@MadmanMartian MadmanMartian changed the base branch from role_datums to Bleeding-Edge June 22, 2018 13:40
@MadmanMartian MadmanMartian mentioned this pull request Jul 2, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
No open projects
Role Datums (Progress Tracker)
  
Never.
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@MadmanMartian @IconDiffBot @DeityLink @jknpj @Intigracy @N3X15 @ShiftyRail @DamianX @gbasood