This repository was archived by the owner on May 22, 2025. It is now read-only.
adds antagonists to the game #18514
Merged
adds antagonists to the game #18514
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
bold are the travelers that open files changed without further warning |
Contributor
|
wow |
This was referenced Apr 11, 2023
Contributor
|
unatomic, wow |
adamsong
added
the
Merge conflict
Contributor
|
wow who coulda guessed that an unfinished draft PR has merge conflicts. Crazy. |
Yogbot-13
added a commit
that referenced
this pull request
May 17, 2023
ToasterBiome
approved these changes
May 26, 2023
Yogbot-13
added
Feature
Yogbot-13
added a commit
that referenced
this pull request
May 26, 2023
Blundir
pushed a commit
to Blundir/Yogstation
that referenced
this pull request
May 28, 2023
* commit 1 - get me out * she lives * adds wizards * thing * surprise end hits take 1 * s * d * surprise end hits take 2 * montreal * REAl * strangelight * guilford fall * natural disasters * envelope * h * lady elect * test 321 * test 123 Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * hot toes test * ss * redundancy * s * test 2 * s² * s³ * s²³ * a pray! * life and limb * epic problem * hmm * update * fixes something * fixes something² * adds slaughter demons to the game * rend it * hmm * restores something * adds clockwork cult into the game * adds changelings to the game * cassevetes * test 101 * :) * against * shut the door * adds darkspawn to the game * sad * cashout * adds vampires to the game * 2 * summer freeze * pink frosty * test111 * adds game to the game * 2 * syndrome * test * test 2 * test 3 * test 4 * adds replay to the game? * maybe? * slo * hrn * test II * test III * test IV * new technique * ahm hum * d * sensible * c * ss13 * a * v * f --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Conflicts: code/__DEFINES/inventory.dm code/_onclick/hud/_defines.dm code/datums/emotes.dm code/game/gamemodes/changeling/changeling.dm code/game/machinery/suit_storage_unit.dm code/modules/antagonists/wizard/equipment/spellbook.dm code/modules/clothing/outfits/vv_outfit.dm code/modules/jobs/job_types/_job.dm code/modules/mob/living/carbon/human/emote.dm code/modules/mob/living/emote.dm icons/mob/inhands/weapons/swords_lefthand.dmi icons/mob/inhands/weapons/swords_righthand.dmi icons/mob/screen_clockwork.dmi icons/mob/screen_detective.dmi icons/mob/screen_midnight.dmi icons/mob/screen_operative.dmi icons/mob/screen_plasmafire.dmi icons/mob/screen_retro.dmi icons/mob/screen_slimecore.dmi icons/obj/hydroponics/equipment.dmi icons/obj/storage.dmi icons/obj/vamp_obj.dmi icons/obj/wizard.dmi yogstation/icons/mob/hud.dmi
Contributor
Author
|
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
10 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
i'll fill this out later while i test stuff but i need this out to see merge conflicts
EDIT V10 GO:
Document the changes in your pull request
changes how antag huds are handled, makes a new file, organizes everything alphabetically
kills proc holders in exchange for /datum/action/cooldown/spells, changes how devil, hivemind and sling is handled +
everything else basically
changes up some bloodsucker things and add some new sprites, this was supposed to be a bloodsucker PR but we don't have so many things i'd be better to just port things, still ports relevant bloodsucker PRs from fulp that refactor how things work.
ports tgstation/tgstation#67083,
tgstation/tgstation#56958,
tgstation/tgstation#61077,
fulpstation/fulpstation#783,
fulpstation/fulpstation#946,
fulpstation/fulpstation#559,
fulpstation/fulpstation#615,
tgstation/tgstation#61087,
tgstation/tgstation#62718,
fulpstation/fulpstation#884,
tgstation/tgstation#65180,
Closes #18572
Closes #18382
Closes #18467 ?
Closes #18345
Closes #18344
Closes #18286 ?
Closes #18116
Closes #18090
Closes #18004
Closes #17155
Closes #16612
Closes #16210
Closes #15814 ?
Closes #15386
Closes #15455
Closes #15219
Closes #11478
Closes #11472
Closes #12950
Closes #13860
Closes #13818
Closes #13524
Closes #14184
Closes #14467
Closes #14453
Wiki documentation
(most of the changes are reflected on ANTAG TGUI for easy access)
1 - change info on slaughter demon bloodcrawl
2 - add new info on spells (duffel for wiz -> spell that spawns a cursed duffelbag that slows you and bites you, shadow manip for bloodsucker -> makes different shadow structures based on level)
3 - change info on rank system (now selected on tgui window)
4 - change any info regarding brute damage for lasombra
5 - change info on toreador's objective (now leader) and lasombra's and gangrel's (reduced objective to (1 or 2) times and (1) time respectively)
6 - add info regarding sacrificing on resting place
7 - add info on zombie tzimisce
8 - summon events on 100 dynamic
Spriting
ANTAG TGUI
ANTAG INFO
NEW ANTAG NUMBER FORMAT
BLOODSUCKER
CHANGELING
DARKSPAWN
WIZAZZ
🆑 MrMelbert, JohnWillard, tralezab, Mothblocks, yours truly, dragomol
rscadd: more mousepointers, more antag UIs
rscadd: adds curse of duffelbag spell
rscadd: adds statues for toreador vampires
rscadd: you can summon events at 100 threat dynamic
rscadd: slaughter demon bloodcrawl spell
rscadd: antag info UI, shows objectives and more!
tweak: tweaks how sunlight, clans and blood is handled for bloodsuckers, adding more dynamics
tweak: changes how some clan objectives worked and starting loadouts
bugfix: fixes a lot of things
imageadd: adds a sprite for mansus inhand and other spells
imageadd: adds sprite for UI interaction
imageadd: changes cult constructs sprites
/:cl: