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

Deletes shadowling + Reworks darkspawn #20581

Merged
merged 812 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
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 Mar 3, 2024
43f656a
Update psi_web.dm
Moltijoe Mar 3, 2024
08a772a
more
Moltijoe Mar 3, 2024
d346662
more
Moltijoe Mar 3, 2024
69ab871
Update darkspawn_team.dm
Moltijoe Mar 3, 2024
acb9dc7
Update darkspawn_team.dm
Moltijoe Mar 3, 2024
2306d88
attempts start
Moltijoe Mar 9, 2024
874375c
Merge branch 'master' into ShadowspawnDarkling
Moltijoe Mar 9, 2024
8a5a974
why even bother
Moltijoe Mar 9, 2024
7ded3e6
Update _class.dm
Moltijoe Mar 9, 2024
c93cfc0
tgui
Moltijoe Mar 9, 2024
dd42979
lint
Moltijoe Mar 9, 2024
f826a71
tgui hurts me
Moltijoe Mar 9, 2024
58a0855
Update passive_upgrades.dm
Moltijoe Mar 9, 2024
85f84d8
panel
Moltijoe Mar 9, 2024
f636532
lore?
Moltijoe Mar 9, 2024
188edaa
tweaks
Moltijoe Mar 9, 2024
dc39642
descriptions
Moltijoe Mar 9, 2024
f2d7665
Update passive_upgrades.dm
Moltijoe Mar 9, 2024
f070b47
so much more
Moltijoe Mar 9, 2024
ce5a2fb
done?
Moltijoe Mar 9, 2024
c7d0b95
class selection work
Moltijoe Mar 10, 2024
e278668
fixes
Moltijoe Mar 10, 2024
5bc0729
wow, it actually works
Moltijoe Mar 10, 2024
9f0873d
Update _class.dm
Moltijoe Mar 10, 2024
5a7934a
working tgui
Moltijoe Mar 10, 2024
89ec5fd
Update AntagInfoDarkspawn.tsx
Moltijoe Mar 10, 2024
e53e9f8
it works well enough
Moltijoe Mar 10, 2024
97071e1
tweaks
Moltijoe Mar 10, 2024
f5f3bbb
Update darkspawn.dm
Moltijoe Mar 10, 2024
8dcc86f
Update passive_upgrades.dm
Moltijoe Mar 10, 2024
479ec1f
Update passive_upgrades.dm
Moltijoe Mar 10, 2024
69b2588
lol
Moltijoe Mar 10, 2024
54be1d7
Update core_abilities.dm
Moltijoe Mar 10, 2024
5e1d6cd
Update darkspawn_team.dm
Moltijoe Mar 10, 2024
547964f
Update _class.dm
Moltijoe Mar 10, 2024
9c448cb
tweaks
Moltijoe Mar 11, 2024
3224cd4
Update game_options.txt
Moltijoe Mar 11, 2024
eb09fd0
Update darkspawn_antag.dm
Moltijoe Mar 11, 2024
3f299a1
Update darkspawn_antag.dm
Moltijoe Mar 11, 2024
9857327
flavour
Moltijoe Mar 11, 2024
a0f8673
Update AntagInfoDarkspawn.tsx
Moltijoe Mar 11, 2024
97c1d83
Update darkspawn.dm
Moltijoe Mar 11, 2024
7f29b4f
reformatting for ease of reading
Moltijoe Mar 11, 2024
04fc6a2
forgot this
Moltijoe Mar 11, 2024
53b0729
Update darkspawn_team.dm
Moltijoe Mar 11, 2024
6bb7bd6
admin stuff
Moltijoe Mar 15, 2024
272f1ef
updates
Moltijoe Mar 16, 2024
8b8607d
more
Moltijoe Mar 16, 2024
ca00059
Update offensive_upgrades.dm
Moltijoe Mar 16, 2024
9f7d5de
Update darkspawn.dm
Moltijoe Mar 16, 2024
c381abd
Update darkspawn_team.dm
Moltijoe Mar 16, 2024
2786b1b
Update darkspawn_team.dm
Moltijoe Mar 16, 2024
a560eb3
fix the bug
Moltijoe Mar 16, 2024
e769cb1
Update darkspawn.dm
Moltijoe Mar 16, 2024
0a3a92b
Update darkspawn_team.dm
Moltijoe Mar 16, 2024
00cb4ce
Update darkspawn_team.dm
Moltijoe Mar 16, 2024
947bd44
roundend text
Moltijoe Mar 16, 2024
a5f9e97
Update darkspawn_team.dm
Moltijoe Mar 16, 2024
eb77883
lore descriptions and help
Moltijoe Mar 16, 2024
fcf886e
Create darkspawn_actions.dmi
Moltijoe Mar 16, 2024
07cec79
ImagesInTgui
Moltijoe Mar 16, 2024
818e4af
Update psi_web.dm
Moltijoe Mar 16, 2024
9d5af58
Update _class.dm
Moltijoe Mar 16, 2024
57867e3
text
Moltijoe Mar 16, 2024
cb18980
Update AntagInfoDarkspawn.tsx
Moltijoe Mar 16, 2024
1e203fa
tweaks for icons
Moltijoe Mar 16, 2024
67e9c9c
sprites
Moltijoe Mar 18, 2024
11dbd20
Update veil_spells.dm
Moltijoe Mar 18, 2024
ef9b9e9
Update psi_web.dm
Moltijoe Mar 18, 2024
cdde156
tweaks
Moltijoe Mar 18, 2024
3f2cf9b
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe Mar 18, 2024
104ac72
no double succ and lower pop
Moltijoe Mar 18, 2024
beb3dfd
Update game_options.txt
Moltijoe Mar 18, 2024
cb17a12
so many fixes
Moltijoe Mar 18, 2024
579174e
quick
Moltijoe Mar 18, 2024
bb1ca82
Update darkspawn.dm
Moltijoe Mar 18, 2024
d73ef35
tweaks
Moltijoe Mar 18, 2024
e088efa
Update darkspawn_antag.dm
Moltijoe Mar 18, 2024
c33cd7f
move
Moltijoe Mar 18, 2024
2eec806
Update veil.dm
Moltijoe Mar 18, 2024
d9e76d5
Update veil_spells.dm
Moltijoe Mar 18, 2024
cd63495
Update debuffs.dm
Moltijoe Mar 18, 2024
1f5ea64
Update veil.dm
Moltijoe Mar 18, 2024
a22f292
Update veil.dm
Moltijoe Mar 18, 2024
bdbfba7
Update veil.dm
Moltijoe Mar 18, 2024
983c004
bruh
Moltijoe Mar 18, 2024
c308df6
sacrament fullheal
Moltijoe Mar 18, 2024
338b788
css styles
Moltijoe Mar 18, 2024
de920a1
Update shadowpeople.dm
Moltijoe Mar 18, 2024
6ffe8f7
Update psi_web.dm
Moltijoe Mar 18, 2024
e7809d5
Update shadowpeople.dm
Moltijoe Mar 18, 2024
6de8660
tweaks
Moltijoe Mar 18, 2024
68df383
Update shadow_caster.dm
Moltijoe Mar 18, 2024
93d65cb
Update darkspawn_antag.dm
Moltijoe Mar 19, 2024
c5147e4
fray
Moltijoe Mar 19, 2024
41b8b76
Update mixed_abilities.dm
Moltijoe Mar 19, 2024
ca4ea50
Update mixed_abilities.dm
Moltijoe Mar 19, 2024
ce9fcfb
actions
Moltijoe Mar 20, 2024
4713aaf
icons
Moltijoe Mar 20, 2024
12b932d
all sprites done
Moltijoe Mar 20, 2024
1614911
Update code/__DEFINES/maths.dm
Moltijoe Mar 20, 2024
f1ee3f8
spell requirements
Moltijoe Mar 20, 2024
cab4c98
Merge branch 'ShadowspawnDarkling' of https://github.com/Moltijoe/Yog…
Moltijoe Mar 20, 2024
ede4975
Update core_abilities.dm
Moltijoe Mar 20, 2024
756f963
fulp, wow
Moltijoe Mar 20, 2024
7b9eb75
Update say.dm
Moltijoe Mar 20, 2024
9c75c90
Update _open.dm
Moltijoe Mar 20, 2024
dbfea9d
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe Mar 20, 2024
2cbfee2
tweaks
Moltijoe Mar 20, 2024
9ab48cf
fixes tweaks and deluge
Moltijoe Mar 20, 2024
c5e9661
Update veil.dm
Moltijoe Mar 20, 2024
1f1cda3
done
Moltijoe Mar 20, 2024
e2e93d4
Update veil.dm
Moltijoe Mar 20, 2024
c0fbc31
bugfixes
Moltijoe Mar 20, 2024
a75a430
Update darkspawn_antag.dm
Moltijoe Mar 20, 2024
56d43b3
Update utility_upgrades.dm
Moltijoe Mar 20, 2024
7bcb43e
Update game_options.txt
Moltijoe Mar 21, 2024
9ba84ee
Update roundend.css
Moltijoe Mar 21, 2024
1034d97
Update internal_cam.dm
Moltijoe Mar 21, 2024
756b239
fix camera consoles
Moltijoe Mar 21, 2024
1060834
Update fighter_abilities.dm
Moltijoe Mar 21, 2024
9a0fa3a
tweaks
Moltijoe Mar 21, 2024
f724deb
Update darkspawn_team.dm
Moltijoe Mar 21, 2024
689df63
title card
Moltijoe Mar 21, 2024
58412a4
Update screen_full.dmi
Moltijoe Mar 21, 2024
c897f94
thrall not veil
Moltijoe Mar 21, 2024
f12c4ef
Update thrall_tumor.dm
Moltijoe Mar 21, 2024
d3b2cca
thrall stuff
Moltijoe Mar 21, 2024
3dd1b9f
work
Moltijoe Mar 21, 2024
776996f
more
Moltijoe Mar 21, 2024
844b4fd
thrall organ fixes
Moltijoe Mar 21, 2024
f34d888
antag hud and resist cooldown
Moltijoe Mar 21, 2024
fde2fbc
Update crawling_shadows.dm
Moltijoe Mar 21, 2024
e27c462
they're BACK
Moltijoe Mar 22, 2024
3c08611
Update darkspawn_antag.dm
Moltijoe Mar 22, 2024
c3b351f
Update illusion.dm
Moltijoe Mar 22, 2024
759ca0f
can't compile at school
Moltijoe Mar 22, 2024
71e181a
Update illusion.dm
Moltijoe Mar 22, 2024
2ed7db3
Update _divulge.dm
Moltijoe Mar 22, 2024
0332922
tweaks
Moltijoe Mar 23, 2024
e6b8d04
restrain body sprite
Moltijoe Mar 23, 2024
7a23b93
Update code/__DEFINES/traits.dm
Moltijoe Mar 24, 2024
3edc99d
Update code/datums/components/internal_cam.dm
Moltijoe Mar 24, 2024
ed35696
Update code/datums/status_effects/debuffs/debuffs.dm
Moltijoe Mar 24, 2024
a643939
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_progen…
Moltijoe Mar 24, 2024
e24159a
Update yogstation/code/modules/guardian/abilities/major/time.dm
Moltijoe Mar 24, 2024
002fa05
Update code/game/machinery/camera/camera.dm
Moltijoe Mar 24, 2024
2d465fa
Update code/game/turfs/open/_open.dm
Moltijoe Mar 24, 2024
c934e65
Update code/modules/mob/living/living.dm
Moltijoe Mar 24, 2024
d0355b7
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_abilit…
Moltijoe Mar 24, 2024
decf4ed
Update code/modules/mob/living/simple_animal/hostile/illusion.dm
Moltijoe Mar 24, 2024
d4685b3
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_abilit…
Moltijoe Mar 24, 2024
0d620d5
Update yogstation/code/modules/antagonists/darkspawn/darkspawn_abilit…
Moltijoe Mar 24, 2024
9b35300
thank you fulp
Moltijoe Mar 24, 2024
9a10ec8
more fulp
Moltijoe Mar 24, 2024
932676c
alerts
Moltijoe Mar 24, 2024
7d41417
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe Mar 24, 2024
a74b592
fixes and cleave
Moltijoe Mar 24, 2024
4c1dbb9
Update offensive_upgrades.dm
Moltijoe Mar 24, 2024
ee8ceac
work
Moltijoe Mar 24, 2024
ebad78c
Update darkspawn_antag.dm
Moltijoe Mar 24, 2024
e8c74cc
undying and tweaks
Moltijoe Mar 24, 2024
8630004
more
Moltijoe Mar 24, 2024
6aedeaa
Update shadowpeople.dm
Moltijoe Mar 24, 2024
c01c60d
tweaks
Moltijoe Mar 24, 2024
6291459
Update warlock_abilities.dm
Moltijoe Mar 24, 2024
5043538
nerf scout
Moltijoe Mar 24, 2024
e6ed933
Update darkspawn_team.dm
Moltijoe Mar 24, 2024
fcbad8a
Update darkspawn_antag.dm
Moltijoe Mar 24, 2024
9566a4a
no non darkspawn guns
Moltijoe Mar 24, 2024
2537171
Update core_abilities.dm
Moltijoe Mar 24, 2024
33be0a1
Update illusion.dm
Moltijoe Mar 24, 2024
a8d9c40
Update darkspawn_progenitor.dm
Moltijoe Mar 24, 2024
5c6f594
Update darkspawn_antag.dm
Moltijoe Mar 24, 2024
0ad5ef2
checks
Moltijoe Mar 24, 2024
5a0cec7
tweaks
Moltijoe Mar 25, 2024
c22ebd8
Update warlock_abilities.dm
Moltijoe Mar 25, 2024
3e192c2
Update scout_abilities.dm
Moltijoe Mar 25, 2024
d47b36c
Update scout_abilities.dm
Moltijoe Mar 25, 2024
9a2f5eb
Update scout_abilities.dm
Moltijoe Mar 25, 2024
45d0c92
counterplay
Moltijoe Mar 25, 2024
1970a0e
Update debuffs.dm
Moltijoe Mar 25, 2024
ec1b4c7
Update debuffs.dm
Moltijoe Mar 25, 2024
2918ecd
scout sigils
Moltijoe Mar 25, 2024
7e412e8
Merge branch 'yogstation13:master' into ShadowspawnDarkling
Moltijoe Mar 25, 2024
1d0d355
Update changelog.css
Moltijoe Mar 25, 2024
668abcc
Merge branch 'ShadowspawnDarkling' of https://github.com/Moltijoe/Yog…
Moltijoe Mar 25, 2024
8c91e41
tweaks
Moltijoe Mar 25, 2024
0e9deae
Update darkspawn_antag.dm
Moltijoe Mar 25, 2024
81b8e11
Update darkspawn_team.dm
Moltijoe Mar 25, 2024
211875f
Update darkspawn_antag.dm
Moltijoe Mar 26, 2024
1600165
Update darkspawn_antag.dm
Moltijoe Mar 26, 2024
0d2b878
tweaks and beam
Moltijoe Mar 26, 2024
8ef4e0d
tweaks
Moltijoe Mar 26, 2024
f15dbb0
darkspawn names
Moltijoe Mar 26, 2024
dd765c1
nullspace
Moltijoe Mar 26, 2024
f33e443
Update AntagInfoDarkspawn.tsx
Moltijoe Mar 26, 2024
792bd27
Update names.dm
Moltijoe Mar 26, 2024
b3301ec
Update darkspawn_antag.dm
Moltijoe Mar 26, 2024
2ce6716
Update darkspawn_team.dm
Moltijoe Mar 26, 2024
3ac5e00
Update darkspawn_antag.dm
Moltijoe Mar 26, 2024
b9f3e73
Update darkspawn_antag.dm
Moltijoe Mar 26, 2024
261f011
Update darkspawn_antag.dm
Moltijoe Mar 26, 2024
01a1712
Update umbral_tendrils.dm
Moltijoe Mar 26, 2024
173d5fb
tweaks
Moltijoe Mar 27, 2024
5bc4380
tweaks
Moltijoe Mar 27, 2024
9eade99
rename
Moltijoe Mar 27, 2024
5bca24c
healing tweak
Moltijoe Mar 27, 2024
e0c5b16
team and ui
Moltijoe Mar 27, 2024
93523f4
counterplay and code quality
Moltijoe Mar 28, 2024
df5d560
tweaks, guide, and deadchat
Moltijoe Mar 28, 2024
ed08b70
preview icon
Moltijoe Mar 28, 2024
91993fd
tweaks and mindblast quality
Moltijoe Mar 28, 2024
75f264f
tweaks
Moltijoe Mar 28, 2024
27138f9
thrall flavour reshuffle
Moltijoe Mar 28, 2024
3104908
Update cooldown_action.dm
Moltijoe Mar 28, 2024
ef33900
Update names.dm
Moltijoe Mar 28, 2024
0517797
tweaks
Moltijoe Mar 28, 2024
e589f15
clone
Moltijoe Mar 28, 2024
e67e0b2
tweaks
Moltijoe Mar 28, 2024
404ae2f
innate panopticon
Moltijoe Mar 29, 2024
1bc4643
noflash and refresh abilities
Moltijoe Mar 29, 2024
16ef4b5
warlock tweak and thrall mind/devour will
Moltijoe Mar 30, 2024
9cb9f44
Update debuffs.dm
Moltijoe Mar 30, 2024
6c0276b
Update debuffs.dm
Moltijoe Mar 30, 2024
7f9d969
feedback
Moltijoe Mar 30, 2024
3404b12
so many tweaks
Moltijoe Mar 31, 2024
e3d4548
Merge branch 'master' into ShadowspawnDarkling
Moltijoe Mar 31, 2024
af611ec
Merge branch 'ShadowspawnDarkling' of https://github.com/Moltijoe/Yog…
Moltijoe Mar 31, 2024
6fad188
Update arrow.dm
Moltijoe Mar 31, 2024
42e1e75
camera and extract
Moltijoe Mar 31, 2024
fc5741e
so many tweaks
Moltijoe Mar 31, 2024
718db9b
Update fighter_abilities.dm
Moltijoe Mar 31, 2024
85a4b2b
fixes
Moltijoe Mar 31, 2024
7939f76
no more testing
Moltijoe Mar 31, 2024
f29e967
Update darkspawn_antag.dm
Moltijoe Mar 31, 2024
07a9fbd
Update passive_upgrades.dm
Moltijoe Mar 31, 2024
d1bba78
Update thrall_spells.dm
Moltijoe Mar 31, 2024
54a5468
uh oh, i can't stop
Moltijoe Apr 1, 2024
63e45a9
Merge branch 'master' into ShadowspawnDarkling
Moltijoe Apr 1, 2024
6a1259e
Update dynamic_rulesets_roundstart.dm
Moltijoe Apr 1, 2024
9e1982a
dynamic
Moltijoe Apr 1, 2024
77f7253
Update dynamic_rulesets_roundstart.dm
Moltijoe Apr 1, 2024
c2a798f
tweaks
Moltijoe Apr 2, 2024
6047f17
Update darkspawn_team.dm
Moltijoe Apr 2, 2024
3558292
null burst sprite
Moltijoe Apr 3, 2024
86e6cb3
tweaks to status effects
Moltijoe Apr 5, 2024
30842be
no more weather
Moltijoe Apr 6, 2024
02965d3
last fulps
Moltijoe Apr 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/shuttles/ferry_meat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
name = "podperson meat"
},
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow{
name = "shadowling meat"
name = "nightmare meat"
},
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime{
name = "slimeperson meat"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
#define ORGAN_SLOT_LUNGS "lungs"
#define ORGAN_SLOT_HEART "heart"
#define ORGAN_SLOT_ZOMBIE "zombie_infection"
#define ORGAN_SLOT_BRAIN_TUMOR "brain_tumor"
#define ORGAN_SLOT_LIVER "liver"
#define ORGAN_SLOT_TONGUE "tongue"
#define ORGAN_SLOT_VOICE "vocal_cords"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/colors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@

#define COLOR_CHANGELING_CHEMICALS "#DD66DD"
#define COLOR_DARKSPAWN_PSI "#7264FF"
#define COLOR_VELVET "#21007F"

#define COLOR_CARP_PURPLE "#aba2ff"
#define COLOR_CARP_PINK "#da77a8"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals_global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,5 @@
#define COMSIG_NARSIE_SUMMON_UPDATE "!narsie_summon_update"
/// Global signal when starlight color is changed (old_star, new_star)
#define COMSIG_STARLIGHT_COLOR_CHANGED "!starlight_color_changed"
/// Global signal sent when darkspawns ascend: (No arguments)
#define COMSIG_DARKSPAWN_ASCENSION "!darkspawn_ascension"
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals_mob/signals_living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
#define COMSIG_LIVING_STATUS_PARALYZE "living_paralyze"
///from base of mob/living/Immobilize() (amount, ignore_canstun)
#define COMSIG_LIVING_STATUS_IMMOBILIZE "living_immobilize"
///from base of mob/living/Daze() (amount, ignore_canstun)
#define COMSIG_LIVING_STATUS_DAZE "living_daze"
///from base of mob/living/Unconscious() (amount, ignore_canstun)
#define COMSIG_LIVING_STATUS_UNCONSCIOUS "living_unconscious"
///from base of mob/living/Sleeping() (amount, ignore_canstun)
Expand Down
16 changes: 16 additions & 0 deletions code/__DEFINES/dcs/signals/signals_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -459,3 +459,19 @@

/// from /obj/item/detective_scanner/scan(): (mob/user, list/extra_data)
#define COMSIG_DETECTIVE_SCANNED "det_scanned"

// /datum/element/light_eater
///from base of [/datum/element/light_eater/proc/table_buffet]: (list/light_queue, datum/light_eater)
#define COMSIG_LIGHT_EATER_QUEUE "light_eater_queue"
///from base of [/datum/element/light_eater/proc/devour]: (datum/light_eater)
#define COMSIG_LIGHT_EATER_ACT "light_eater_act"
///Prevents the default light eater behavior from running in case of immunity or custom behavior
#define COMPONENT_BLOCK_LIGHT_EATER (1<<0)
///from base of [/datum/element/light_eater/proc/devour]: (atom/eaten_light)
#define COMSIG_LIGHT_EATER_DEVOUR "light_eater_devour"


/// Flag for when /afterattack potentially acts on an item.
/// Used for the swap hands/drop tutorials to know when you might just be trying to do something normally.
/// Does not necessarily imply success, or even that it did hit an item, just intent.
#define COMPONENT_AFTERATTACK_PROCESSED_ITEM (1<<0)
3 changes: 2 additions & 1 deletion code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#define isnan(x) ( isnum((x)) && ((x) != (x)) )

#define isinternalorgan(A) (istype(A, /obj/item/organ/internal))
//#define isinternalorgan(A) (istype(A, /obj/item/organ/internal)) uncomment if we port tg organ code
Moltijoe marked this conversation as resolved.
Show resolved Hide resolved

//Turfs
//#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
Expand Down Expand Up @@ -93,6 +93,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isinsurgent(A) (is_species(A, /datum/species/ipc/self/insurgent))
#define issnail(A) (is_species(A, /datum/species/snail))
#define isandroid(A) (is_species(A, /datum/species/android))
#define isshadowperson(A) (is_species(A, /datum/species/shadow))
#define is_synth(A) (is_species(A,/datum/species/wy_synth))
#define isdummy(A) (istype(A, /mob/living/carbon/human/dummy))

Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/magic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#define SPELL_REQUIRES_MIND (1 << 6)
/// Whether the spell requires the caster have a mime vow (mindless mobs will succeed this check regardless).
#define SPELL_REQUIRES_MIME_VOW (1 << 7)

/// Whether the spell can be cast, even if the caster is unable to speak the invocation
/// (effectively making the invocation flavor, instead of required).
#define SPELL_CASTABLE_WITHOUT_INVOCATION (1 << 8)
Expand Down Expand Up @@ -87,7 +88,7 @@ DEFINE_BITFIELD(spell_requirements, list(
// Bitflags for magic resistance types
/// Default magic resistance that blocks normal magic (wizard, spells, magical staff projectiles)
#define MAGIC_RESISTANCE (1<<0)
/// Tinfoil hat magic resistance that blocks mental magic (telepathy / mind links, mind curses, abductors)
/// Tinfoil hat magic resistance that blocks mental magic (telepathy / mind links, mind curses, abductors, darkspawns)
#define MAGIC_RESISTANCE_MIND (1<<1)
/// Holy magic resistance that blocks unholy magic (revenant, vampire, voice of god)
#define MAGIC_RESISTANCE_HOLY (1<<2)
Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/maths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@
while(pixel_y < -16)
pixel_y += 32
new_y--
new_x = clamp(new_x, 0, world.maxx)
new_y = clamp(new_y, 0, world.maxy)
new_x = clamp(new_x, 1, world.maxx)
new_y = clamp(new_y, 1, world.maxy)
return locate(new_x, new_y, starting.z)

// Returns a list where [1] is all x values and [2] is all y values that overlap between the given pair of rectangles
Expand Down
5 changes: 4 additions & 1 deletion code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,10 @@

#define MEGAFAUNA_DEFAULT_RECOVERY_TIME 5

#define SHADOW_SPECIES_LIGHT_THRESHOLD 0.2
#define SHADOW_SPECIES_DIM_LIGHT 0.2 //light of this intensity suppresses healing and causes very slow burn damage
#define SHADOW_SPECIES_BRIGHT_LIGHT 0.6 //light of this intensity causes rapid burn damage (high number because movable lights are weird)
//so the problem is that movable lights ALWAYS have a luminosity of 0.5, regardless of power or distance, so even at the edge of the overlay they still do damage
//at 0.6 being bright they'll still do damage and disable some abilities, but it won't be weaponized

// Offsets defines

Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/role_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#define ROLE_LAVALAND "Lavaland"
#define ROLE_INTERNAL_AFFAIRS "Internal Affairs Agent"
#define ROLE_FUGITIVE "Fugitive"
#define ROLE_SHADOWLING "Shadowling" // Yogs
#define ROLE_VAMPIRE "Vampire" // Yogs
#define ROLE_GANG "gangster" // Yogs
#define ROLE_DARKSPAWN "darkspawn" // Yogs
Expand Down Expand Up @@ -91,7 +90,6 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_OBSESSED = /datum/antagonist/obsessed,
ROLE_INTERNAL_AFFAIRS = /datum/antagonist/traitor/internal_affairs,
ROLE_FUGITIVE = /datum/antagonist/fugitive,
ROLE_SHADOWLING = /datum/antagonist/shadowling, // Yogs
ROLE_VAMPIRE = /datum/antagonist/vampire, // Yogs
ROLE_GANG = /datum/antagonist/gang, // Yogs
ROLE_DARKSPAWN = /datum/antagonist/darkspawn, // Yogs
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
#define SPAN_SINGING "singing"
#define SPAN_CULTLARGE "cultlarge"
#define SPAN_HELIUM "small"
#define SPAN_PROGENITOR "progenitor"

//bitflag #defines for return value of the radio() proc.
#define ITALICS (1<<0)
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/span.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
#define span_phobia(str) ("<span class='phobia'>" + str + "</span>")
#define span_prefix(str) ("<span class='prefix'>" + str + "</span>")
#define span_priority(str) ("<span class='priority'>" + str + "</span>")
#define span_progenitor(str) ("<span class='progenitor'>" + str + "</span>")
#define span_purple(str) ("<span class='purple'>" + str + "</span>")
#define span_radio(str) ("<span class='radio'>" + str + "</span>")
#define span_ratvar(str) ("<span class='ratvar'>" + str + "</span>")
Expand All @@ -147,7 +148,6 @@
#define span_servradio(str) ("<span class='servradio'>" + str + "</span>")
#define span_sevtug(str) ("<span class='sevtug'>" + str + "</span>")
#define span_sevtug_small(str) ("<span class='sevtug_small'>" + str + "</span>")
#define span_shadowling(str) ("<span class='shadowling'>" + str + "</span>")
#define span_singing(str) ("<span class='singing'>" + str + "</span>")
#define span_slime(str) ("<span class='slime'>" + str + "</span>")
#define span_small(str) ("<span class='small'>" + str + "</span>")
Expand Down
12 changes: 9 additions & 3 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@

#define STATUS_EFFECT_ANTIMAGIC /datum/status_effect/antimagic //grants antimagic (and reapplies if lost) for the duration

#define STATUS_EFFECT_CREEP /datum/status_effect/creep //Provides immunity to lightburn for darkspawn, does nothing to anyone else //Yogs

#define STATUS_EFFECT_TIME_DILATION /datum/status_effect/time_dilation //Provides immunity to slowdown and halves click-delay/action times //Yogs

#define STATUS_EFFECT_DETERMINED /datum/status_effect/determined //currently in a combat high from being seriously wounded
Expand All @@ -72,6 +70,8 @@

#define STATUS_EFFECT_HOLYLIGHT_HEALBOOST /datum/status_effect/holylight_healboost //short-term heal boost that grants the chaplain favor

#define STATUS_EFFECT_SPEEDBOOST /datum/status_effect/speedboost //applies a speed boost

/////////////
// DEBUFFS //
/////////////
Expand All @@ -84,6 +84,8 @@

#define STATUS_EFFECT_PARALYZED /datum/status_effect/incapacitating/paralyzed //the affected is unable to move, use items, or stand up.

#define STATUS_EFFECT_DAZED /datum/status_effect/incapacitating/dazed //the affected is unable use items but can otherwise do everything else

#define STATUS_EFFECT_UNCONSCIOUS /datum/status_effect/incapacitating/unconscious //the affected is unconscious

#define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep
Expand Down Expand Up @@ -141,7 +143,9 @@

#define STATUS_EFFECT_STASIS /datum/status_effect/incapacitating/stasis //Halts biological functions like bleeding, chemical processing, blood regeneration, walking, etc

#define STATUS_EFFECT_BROKEN_WILL /datum/status_effect/broken_will //A 30-second sleep effect reduced by 1 second for every point of damage the target takes. //Yogs
#define STATUS_EFFECT_BROKEN_WILL /datum/status_effect/broken_will //A 30-second sleep effect, ends instantly upon taking enough damage in a single hit. //Yogs

#define STATUS_EFFECT_DEVOURED_WILL /datum/status_effect/devoured_will //A 3 minute long status effect that prevents using devour will on the owner

#define STATUS_EFFECT_AMOK /datum/status_effect/amok //Makes the target automatically strike out at adjecent non-heretics.

Expand All @@ -157,6 +161,8 @@

#define STATUS_EFFECT_VOID_CHILL /datum/status_effect/void_chill

#define STATUS_EFFECT_TAUNT /datum/status_effect/taunt //forced movement towards the person applying

/////////////
// NEUTRAL //
/////////////
Expand Down
20 changes: 18 additions & 2 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@
#define TRAIT_NOINTERACT "no_interact" //Not allowed to touch anything (even with TK) or use things in hand

#define TRAIT_POWERHUNGRY "power_hungry" // uses electricity instead of food

///Prevent species from changing while they have the trait
#define TRAIT_SPECIESLOCK "species_lock"
#define TRAIT_NOSLIPICE "noslip_ice"
#define TRAIT_NOSLIPWATER "noslip_water"
#define TRAIT_NOSLIPALL "noslip_all"
Expand Down Expand Up @@ -268,4 +269,19 @@

#define STATION_TRAIT_MOONSCORCH "station_trait_moonscorch"


///Darkspawn traits
///lets darkspawns walk through weak light
#define TRAIT_DARKSPAWN_LIGHTRES "darkspawn_lightres"
///lets darkspawns walk through any light
#define TRAIT_DARKSPAWN_CREEP "darkspawn_creep"
///permanently reduces the lucidity gained from future succs
#define TRAIT_DARKSPAWN_DEVOURED "darkspawn_devoured"
///disable psi regeneration (make sure to remove it after some time)
#define TRAIT_DARKSPAWN_PSIBLOCK "darkspawn_psiblock"
///make aoe ally buff abilities also affect allied darkspawns
#define TRAIT_DARKSPAWN_BUFFALLIES "darkspawn_allybuff"
///revives the darkspawn if they're dead and in the dark
#define TRAIT_DARKSPAWN_UNDYING "darkspawn_undying"

///reduces the cooldown of all used /datum/action/cooldown by 25%
#define TRAIT_FAST_COOLDOWNS "short_spell_cooldowns"
6 changes: 2 additions & 4 deletions code/__DEFINES/{yogs_defines}/antagonists.dm
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
31 changes: 31 additions & 0 deletions code/__DEFINES/{yogs_defines}/darkspawn.dm
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)
10 changes: 4 additions & 6 deletions code/__DEFINES/{yogs_defines}/is_helpers.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#define is_thrall(M) (istype(M, /mob/living) && M.mind?.has_antag_datum(/datum/antagonist/thrall))
#define is_shadow(M) (istype(M, /mob/living) && M.mind?.has_antag_datum(/datum/antagonist/shadowling))
#define is_shadow_or_thrall(M) (is_thrall(M) || is_shadow(M))

#define isdarkspawn(A) (A?.mind?.has_antag_datum(/datum/antagonist/darkspawn))
#define isveil(A) (A?.mind?.has_antag_datum(/datum/antagonist/veil))
#define is_darkspawn_or_veil(A) (A.mind && isdarkspawn(A) || isveil(A))
#define isthrall(A) (A?.mind?.has_antag_datum(/datum/antagonist/thrall))
#define ispsyche(A) (A?.mind?.has_antag_datum(/datum/antagonist/psyche)) //non thrall teammates
#define is_darkspawn_or_thrall(A) (A.mind && isdarkspawn(A) || isthrall(A))
#define is_team_darkspawn(A) ((A.mind && isdarkspawn(A) || isthrall(A)) || ispsyche(A) || (ROLE_DARKSPAWN in A.faction)) //also checks factions, so things can be immune to darkspawn spells without needing an antag datum

#define is_clockcult(M) (istype(M, /mob/living) && M.mind && M.mind.has_antag_datum(/datum/antagonist/clockcult))

Expand Down
6 changes: 0 additions & 6 deletions code/__DEFINES/{yogs_defines}/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,4 @@

#define REGEN_BLOOD_REQUIREMENT 40 // The amount of "blood" that a slimeperson consumes when regenerating a single limb.

#define DARKSPAWN_DIM_LIGHT 0.2 //light of this intensity suppresses healing and causes very slow burn damage
#define DARKSPAWN_BRIGHT_LIGHT 0.3 //light of this intensity causes rapid burn damage

#define DARKSPAWN_DARK_HEAL 5 //how much damage of each type (with fire damage half rate) is healed in the dark
#define DARKSPAWN_LIGHT_BURN 7 //how much damage the darkspawn receives per tick in lit areas

#define MONKIFY_BLOOD_COEFFICIENT (BLOOD_VOLUME_MONKEY/BLOOD_VOLUME_GENERIC) //the ratio of monkey to human blood volume so a 100% blood volume monkey will not instantly die when you turn it into a human with ~58% blood volume
4 changes: 2 additions & 2 deletions code/__HELPERS/maths.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///Calculate the angle between two movables and the west|east coordinate
/proc/get_angle(atom/movable/start, atom/movable/end)//For beams.
///Calculate the angle between two atoms and the west|east coordinate
/proc/get_angle(atom/start, atom/end)//For beams.
if(!start || !end)
return 0
var/dy =(32 * end.y + end.pixel_y) - (32 * start.y + start.pixel_y)
Expand Down
35 changes: 33 additions & 2 deletions code/__HELPERS/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
if(1) //Adj + Noun
return "[pick(GLOB.adjectives)] [pick(GLOB.forge_name)]"
if(2) //Vxtrin name
switch(rand(1,3))
switch(rand(1,4))
if(1) //Name
return pick(GLOB.preternis_names)
if(2) //Caste + Name
return "[pick(GLOB.preternis_class)]'[pick(GLOB.preternis_names)]"
if(3) //Caste + Name + Home
return "[pick(GLOB.preternis_class)]'[pick(GLOB.preternis_names)]'[pick(GLOB.preternis_home)]"
return "[pick(GLOB.preternis_class)]'[pick(GLOB.preternis_names)]-[capitalize(pick(GLOB.preternis_home))]"
if(4) //Name + Home
return "[pick(GLOB.preternis_names)]-[capitalize(pick(GLOB.preternis_home))]"
if(3) //Robotic name
return ipc_name()

Expand All @@ -55,6 +57,35 @@
/proc/ipc_name()
return "[pick(GLOB.posibrain_names)]-[rand(100, 999)]"

/proc/nightmare_name() //they have one segment to the name because they're shells of what a vxtrin once was
switch(rand(1,3))
if(1) //space and capital last name
return "[pick(GLOB.preternis_class)]"
if(2) //dash and lowercase last name
return "[pick(GLOB.preternis_names)]"
if(3) //apostrophe and lowercase last name
return "[pick(GLOB.preternis_home)]"

/proc/darkspawn_name() //they have three segments to their name, but have lost sane ordering
var/list/order = list("name", "class", "home")
var/name = ""
for(var/i in 1 to 3)
var/selection = pick_n_take(order)
switch(selection)
if("name")
name += "[capitalize(pick(GLOB.preternis_names))]"
if("class")
name += "[capitalize(pick(GLOB.preternis_class))]"
if("home")
name += "[capitalize(pick(GLOB.preternis_home))]"
switch(i)
if(1) //apostrophe after the first name
name += "'"
if(2) //dash after the second
name = capitalize(name)
name += "-"
return name

GLOBAL_VAR(command_name)
/proc/command_name()
if (GLOB.command_name)
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt")
GLOBAL_LIST_INIT(constellations, world.file2list("strings/names/constellations.txt"))
GLOBAL_LIST_INIT(ethereal_names, world.file2list("strings/names/ethereal.txt"))
GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))
GLOBAL_LIST_INIT(horror_names, world.file2list("strings/names/horror.txt"))
GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.txt"))
GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt"))
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/poll_ignore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#define POLL_IGNORE_CONTRACTOR_SUPPORT "contractor_support"
#define POLL_IGNORE_RAGINMAGES "raging_mages"
#define POLL_IGNORE_HERETIC_MONSTER "heretic_monsters"
#define POLL_IGNORE_DARKSPAWN_PSYCHE "darkspawn_psyche"


GLOBAL_LIST_INIT(poll_ignore_desc, list(
Expand Down
5 changes: 5 additions & 0 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -744,3 +744,8 @@ so as to remain in compliance with the most up-to-date laws."
master_ref = null
mob_viewer = null
screen_loc = ""

/atom/movable/screen/alert/psiblock
name = "Psiblock"
desc = "You have pushed your psionic powers beyond your capabilities and need time to recover."
icon_state = "shadow_mend"
Loading
Loading