This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 456
Deletes shadowling + Reworks darkspawn #20581
Merged
JohnFulpWillard
merged 812 commits into
yogstation13:master
from
Moltijoe:ShadowspawnDarkling
Apr 8, 2024
Merged
Changes from all commits
Commits
Show all changes
812 commits
Select commit
Hold shift + click to select a range
b17d900
Update core_abilities.dm
Moltijoe 43f656a
Update psi_web.dm
Moltijoe 08a772a
more
Moltijoe d346662
more
Moltijoe 69ab871
Update darkspawn_team.dm
Moltijoe acb9dc7
Update darkspawn_team.dm
Moltijoe 2306d88
attempts start
Moltijoe 874375c
Merge branch 'master' into ShadowspawnDarkling
Moltijoe 8a5a974
why even bother
Moltijoe 7ded3e6
Update _class.dm
Moltijoe c93cfc0
tgui
Moltijoe dd42979
lint
Moltijoe f826a71
tgui hurts me
Moltijoe 58a0855
Update passive_upgrades.dm
Moltijoe 85f84d8
panel
Moltijoe f636532
lore?
Moltijoe 188edaa
tweaks
Moltijoe dc39642
descriptions
Moltijoe f2d7665
Update passive_upgrades.dm
Moltijoe f070b47
so much more
Moltijoe ce5a2fb
done?
Moltijoe c7d0b95
class selection work
Moltijoe e278668
fixes
Moltijoe 5bc0729
wow, it actually works
Moltijoe 9f0873d
Update _class.dm
Moltijoe 5a7934a
working tgui
Moltijoe 89ec5fd
Update AntagInfoDarkspawn.tsx
Moltijoe e53e9f8
it works well enough
Moltijoe 97071e1
tweaks
Moltijoe f5f3bbb
Update darkspawn.dm
Moltijoe 8dcc86f
Update passive_upgrades.dm
Moltijoe 479ec1f
Update passive_upgrades.dm
Moltijoe 69b2588
lol
Moltijoe 54be1d7
Update core_abilities.dm
Moltijoe 5e1d6cd
Update darkspawn_team.dm
Moltijoe 547964f
Update _class.dm
Moltijoe 9c448cb
tweaks
Moltijoe 3224cd4
Update game_options.txt
Moltijoe eb09fd0
Update darkspawn_antag.dm
Moltijoe 3f299a1
Update darkspawn_antag.dm
Moltijoe 9857327
flavour
Moltijoe a0f8673
Update AntagInfoDarkspawn.tsx
Moltijoe 97c1d83
Update darkspawn.dm
Moltijoe 7f29b4f
reformatting for ease of reading
Moltijoe 04fc6a2
forgot this
Moltijoe 53b0729
Update darkspawn_team.dm
Moltijoe 6bb7bd6
admin stuff
Moltijoe 272f1ef
updates
Moltijoe 8b8607d
more
Moltijoe ca00059
Update offensive_upgrades.dm
Moltijoe 9f7d5de
Update darkspawn.dm
Moltijoe c381abd
Update darkspawn_team.dm
Moltijoe 2786b1b
Update darkspawn_team.dm
Moltijoe a560eb3
fix the bug
Moltijoe e769cb1
Update darkspawn.dm
Moltijoe 0a3a92b
Update darkspawn_team.dm
Moltijoe 00cb4ce
Update darkspawn_team.dm
Moltijoe 947bd44
roundend text
Moltijoe a5f9e97
Update darkspawn_team.dm
Moltijoe eb77883
lore descriptions and help
Moltijoe fcf886e
Create darkspawn_actions.dmi
Moltijoe 07cec79
ImagesInTgui
Moltijoe 818e4af
Update psi_web.dm
Moltijoe 9d5af58
Update _class.dm
Moltijoe 57867e3
text
Moltijoe cb18980
Update AntagInfoDarkspawn.tsx
Moltijoe 1e203fa
tweaks for icons
Moltijoe 67e9c9c
sprites
Moltijoe 11dbd20
Update veil_spells.dm
Moltijoe ef9b9e9
Update psi_web.dm
Moltijoe cdde156
tweaks
Moltijoe 3f2cf9b
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe 104ac72
no double succ and lower pop
Moltijoe beb3dfd
Update game_options.txt
Moltijoe cb17a12
so many fixes
Moltijoe 579174e
quick
Moltijoe bb1ca82
Update darkspawn.dm
Moltijoe d73ef35
tweaks
Moltijoe e088efa
Update darkspawn_antag.dm
Moltijoe c33cd7f
move
Moltijoe 2eec806
Update veil.dm
Moltijoe d9e76d5
Update veil_spells.dm
Moltijoe cd63495
Update debuffs.dm
Moltijoe 1f5ea64
Update veil.dm
Moltijoe a22f292
Update veil.dm
Moltijoe bdbfba7
Update veil.dm
Moltijoe 983c004
bruh
Moltijoe c308df6
sacrament fullheal
Moltijoe 338b788
css styles
Moltijoe de920a1
Update shadowpeople.dm
Moltijoe 6ffe8f7
Update psi_web.dm
Moltijoe e7809d5
Update shadowpeople.dm
Moltijoe 6de8660
tweaks
Moltijoe 68df383
Update shadow_caster.dm
Moltijoe 93d65cb
Update darkspawn_antag.dm
Moltijoe c5147e4
fray
Moltijoe 41b8b76
Update mixed_abilities.dm
Moltijoe ca4ea50
Update mixed_abilities.dm
Moltijoe ce9fcfb
actions
Moltijoe 4713aaf
icons
Moltijoe 12b932d
all sprites done
Moltijoe 1614911
Update code/__DEFINES/maths.dm
Moltijoe f1ee3f8
spell requirements
Moltijoe cab4c98
Merge branch 'ShadowspawnDarkling' of https://github.com/Moltijoe/Yog…
Moltijoe ede4975
Update core_abilities.dm
Moltijoe 756f963
fulp, wow
Moltijoe 7b9eb75
Update say.dm
Moltijoe 9c75c90
Update _open.dm
Moltijoe dbfea9d
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe 2cbfee2
tweaks
Moltijoe 9ab48cf
fixes tweaks and deluge
Moltijoe c5e9661
Update veil.dm
Moltijoe 1f1cda3
done
Moltijoe e2e93d4
Update veil.dm
Moltijoe c0fbc31
bugfixes
Moltijoe a75a430
Update darkspawn_antag.dm
Moltijoe 56d43b3
Update utility_upgrades.dm
Moltijoe 7bcb43e
Update game_options.txt
Moltijoe 9ba84ee
Update roundend.css
Moltijoe 1034d97
Update internal_cam.dm
Moltijoe 756b239
fix camera consoles
Moltijoe 1060834
Update fighter_abilities.dm
Moltijoe 9a0fa3a
tweaks
Moltijoe f724deb
Update darkspawn_team.dm
Moltijoe 689df63
title card
Moltijoe 58412a4
Update screen_full.dmi
Moltijoe c897f94
thrall not veil
Moltijoe f12c4ef
Update thrall_tumor.dm
Moltijoe d3b2cca
thrall stuff
Moltijoe 3dd1b9f
work
Moltijoe 776996f
more
Moltijoe 844b4fd
thrall organ fixes
Moltijoe f34d888
antag hud and resist cooldown
Moltijoe fde2fbc
Update crawling_shadows.dm
Moltijoe e27c462
they're BACK
Moltijoe 3c08611
Update darkspawn_antag.dm
Moltijoe c3b351f
Update illusion.dm
Moltijoe 759ca0f
can't compile at school
Moltijoe 71e181a
Update illusion.dm
Moltijoe 2ed7db3
Update _divulge.dm
Moltijoe 0332922
tweaks
Moltijoe e6b8d04
restrain body sprite
Moltijoe 7a23b93
Update code/__DEFINES/traits.dm
Moltijoe 3edc99d
Update code/datums/components/internal_cam.dm
Moltijoe ed35696
Update code/datums/status_effects/debuffs/debuffs.dm
Moltijoe a643939
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_progen…
Moltijoe e24159a
Update yogstation/code/modules/guardian/abilities/major/time.dm
Moltijoe 002fa05
Update code/game/machinery/camera/camera.dm
Moltijoe 2d465fa
Update code/game/turfs/open/_open.dm
Moltijoe c934e65
Update code/modules/mob/living/living.dm
Moltijoe d0355b7
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_abilit…
Moltijoe decf4ed
Update code/modules/mob/living/simple_animal/hostile/illusion.dm
Moltijoe d4685b3
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_abilit…
Moltijoe 0d620d5
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_abilit…
Moltijoe 9b35300
thank you fulp
Moltijoe 9a10ec8
more fulp
Moltijoe 932676c
alerts
Moltijoe 7d41417
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe a74b592
fixes and cleave
Moltijoe 4c1dbb9
Update offensive_upgrades.dm
Moltijoe ee8ceac
work
Moltijoe ebad78c
Update darkspawn_antag.dm
Moltijoe e8c74cc
undying and tweaks
Moltijoe 8630004
more
Moltijoe 6aedeaa
Update shadowpeople.dm
Moltijoe c01c60d
tweaks
Moltijoe 6291459
Update warlock_abilities.dm
Moltijoe 5043538
nerf scout
Moltijoe e6ed933
Update darkspawn_team.dm
Moltijoe fcbad8a
Update darkspawn_antag.dm
Moltijoe 9566a4a
no non darkspawn guns
Moltijoe 2537171
Update core_abilities.dm
Moltijoe 33be0a1
Update illusion.dm
Moltijoe a8d9c40
Update darkspawn_progenitor.dm
Moltijoe 5c6f594
Update darkspawn_antag.dm
Moltijoe 0ad5ef2
checks
Moltijoe 5a0cec7
tweaks
Moltijoe c22ebd8
Update warlock_abilities.dm
Moltijoe 3e192c2
Update scout_abilities.dm
Moltijoe d47b36c
Update scout_abilities.dm
Moltijoe 9a2f5eb
Update scout_abilities.dm
Moltijoe 45d0c92
counterplay
Moltijoe 1970a0e
Update debuffs.dm
Moltijoe ec1b4c7
Update debuffs.dm
Moltijoe 2918ecd
scout sigils
Moltijoe 7e412e8
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe 1d0d355
Update changelog.css
Moltijoe 668abcc
Merge branch 'ShadowspawnDarkling' of https://github.com/Moltijoe/Yog…
Moltijoe 8c91e41
tweaks
Moltijoe 0e9deae
Update darkspawn_antag.dm
Moltijoe 81b8e11
Update darkspawn_team.dm
Moltijoe 211875f
Update darkspawn_antag.dm
Moltijoe 1600165
Update darkspawn_antag.dm
Moltijoe 0d2b878
tweaks and beam
Moltijoe 8ef4e0d
tweaks
Moltijoe f15dbb0
darkspawn names
Moltijoe dd765c1
nullspace
Moltijoe f33e443
Update AntagInfoDarkspawn.tsx
Moltijoe 792bd27
Update names.dm
Moltijoe b3301ec
Update darkspawn_antag.dm
Moltijoe 2ce6716
Update darkspawn_team.dm
Moltijoe 3ac5e00
Update darkspawn_antag.dm
Moltijoe b9f3e73
Update darkspawn_antag.dm
Moltijoe 261f011
Update darkspawn_antag.dm
Moltijoe 01a1712
Update umbral_tendrils.dm
Moltijoe 173d5fb
tweaks
Moltijoe 5bc4380
tweaks
Moltijoe 9eade99
rename
Moltijoe 5bca24c
healing tweak
Moltijoe e0c5b16
team and ui
Moltijoe 93523f4
counterplay and code quality
Moltijoe df5d560
tweaks, guide, and deadchat
Moltijoe ed08b70
preview icon
Moltijoe 91993fd
tweaks and mindblast quality
Moltijoe 75f264f
tweaks
Moltijoe 27138f9
thrall flavour reshuffle
Moltijoe 3104908
Update cooldown_action.dm
Moltijoe ef33900
Update names.dm
Moltijoe 0517797
tweaks
Moltijoe e589f15
clone
Moltijoe e67e0b2
tweaks
Moltijoe 404ae2f
innate panopticon
Moltijoe 1bc4643
noflash and refresh abilities
Moltijoe 16ef4b5
warlock tweak and thrall mind/devour will
Moltijoe 9cb9f44
Update debuffs.dm
Moltijoe 6c0276b
Update debuffs.dm
Moltijoe 7f9d969
feedback
Moltijoe 3404b12
so many tweaks
Moltijoe e3d4548
Merge branch 'master' into ShadowspawnDarkling
Moltijoe af611ec
Merge branch 'ShadowspawnDarkling' of https://github.com/Moltijoe/Yog…
Moltijoe 6fad188
Update arrow.dm
Moltijoe 42e1e75
camera and extract
Moltijoe fc5741e
so many tweaks
Moltijoe 718db9b
Update fighter_abilities.dm
Moltijoe 85a4b2b
fixes
Moltijoe 7939f76
no more testing
Moltijoe f29e967
Update darkspawn_antag.dm
Moltijoe 07a9fbd
Update passive_upgrades.dm
Moltijoe d1bba78
Update thrall_spells.dm
Moltijoe 54a5468
uh oh, i can't stop
Moltijoe 63e45a9
Merge branch 'master' into ShadowspawnDarkling
Moltijoe 6a1259e
Update dynamic_rulesets_roundstart.dm
Moltijoe 9e1982a
dynamic
Moltijoe 77f7253
Update dynamic_rulesets_roundstart.dm
Moltijoe c2a798f
tweaks
Moltijoe 6047f17
Update darkspawn_team.dm
Moltijoe 3558292
null burst sprite
Moltijoe 86e6cb3
tweaks to status effects
Moltijoe 30842be
no more weather
Moltijoe 02965d3
last fulps
Moltijoe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,10 @@ | ||
| #define ANTAG_DATUM_VAMPIRE /datum/antagonist/vampire | ||
| #define ANTAG_DATUM_THRALL /datum/antagonist/thrall | ||
| #define ANTAG_DATUM_SLING /datum/antagonist/shadowling | ||
| #define ANTAG_DATUM_DARKSPAWN /datum/antagonist/darkspawn | ||
| #define ANTAG_DATUM_VEIL /datum/antagonist/veil | ||
| #define ANTAG_DATUM_THRALL /datum/antagonist/thrall | ||
| #define ANTAG_DATUM_INFILTRATOR /datum/antagonist/infiltrator | ||
| #define ANTAG_DATUM_HIJACKEDAI /datum/antagonist/hijacked_ai | ||
| #define ANTAG_DATUM_SINFULDEMON /datum/antagonist/sinfuldemon | ||
|
|
||
| #define NOT_DOMINATING -1 | ||
| #define MAX_LEADERS_GANG 3 | ||
| #define INITIAL_DOM_ATTEMPTS 3 | ||
| #define INITIAL_DOM_ATTEMPTS 3 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| //Defines specifically for the darkspawn game mode | ||
| #define DARKSPAWN_MUNDANE 0 | ||
| #define DARKSPAWN_DIVULGED 1 | ||
| #define DARKSPAWN_PROGENITOR 2 | ||
|
|
||
| #define DARKSPAWN_SCOUT (1<<0) | ||
| #define DARKSPAWN_FIGHTER (1<<1) | ||
| #define DARKSPAWN_WARLOCK (1<<2) | ||
| #define ALL_DARKSPAWN_CLASSES (DARKSPAWN_SCOUT | DARKSPAWN_FIGHTER | DARKSPAWN_WARLOCK) | ||
|
|
||
| /// things that you use and it fucks someone up | ||
| #define STORE_OFFENSE "offense" | ||
| ///things that you use and it does something less straightforward | ||
| #define STORE_UTILITY "utility" | ||
| ///things that always happen all the time | ||
| #define STORE_PASSIVE "passives" | ||
|
|
||
| ///used by the antag datum and class component to handle power purchasing | ||
| #define COMSIG_DARKSPAWN_PURCHASE_POWER "purchase_power" | ||
| ///used by the psi_web to handle upgrading existing abilities | ||
| #define COMSIG_DARKSPAWN_UPGRADE_ABILITY "upgrade_ability" | ||
| ///used by the psi_web to handle refunding ability upgrades | ||
| #define COMSIG_DARKSPAWN_DOWNGRADE_ABILITY "downgrade_ability" | ||
|
|
||
| #define STAFF_UPGRADE_CONFUSION (1<<0) | ||
| #define STAFF_UPGRADE_HEAL (1<<1) | ||
| #define STAFF_UPGRADE_LIGHTEATER (1<<2) | ||
| #define STAFF_UPGRADE_EXTINGUISH (1<<3) | ||
| #define TENDRIL_UPGRADE_TWIN (1<<4) | ||
| #define TENDRIL_UPGRADE_CLEAVE (1<<5) | ||
| #define STAFF_UPGRADE_EFFICIENCY (1<<6) |
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
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
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
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
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.