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

Storytellers #22565

Closed
wants to merge 128 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
f19df09
storytellers
ToasterBiome Aug 17, 2024
184dc44
Update _base_event.dm
Moltijoe Sep 4, 2024
5b58d18
Update _base_event.dm
Moltijoe Sep 4, 2024
ebc3d0a
storytellers and midround events
Moltijoe Sep 4, 2024
dae5b39
work
Moltijoe Sep 4, 2024
f45a579
antags
Moltijoe Sep 4, 2024
36a70c9
last
Moltijoe Sep 4, 2024
61335df
Update vote.dm
Moltijoe Sep 4, 2024
c90bd1d
fixes
Moltijoe Sep 4, 2024
dbec322
Update backrooms.dm
Moltijoe Sep 4, 2024
bb3ca94
so long gay dynamic
Moltijoe Sep 4, 2024
60e4d4d
Update vote.dm
Moltijoe Sep 4, 2024
c580e4a
dynamic unit test
Moltijoe Sep 4, 2024
a44159c
cleanup
Moltijoe Sep 4, 2024
f6ea9fe
delete minimum pop
Moltijoe Sep 4, 2024
c8e8bc2
fix
Moltijoe Sep 11, 2024
dd5903d
storyteller tweaks
Moltijoe Sep 11, 2024
b52a775
traitor awakening
Moltijoe Sep 11, 2024
a587fbe
Update traitor.dm
Moltijoe Sep 11, 2024
ad62249
Update _basemap.dm
Moltijoe Sep 11, 2024
6392035
Update ghost.dm
Moltijoe Sep 11, 2024
7f0deb7
oh god so much stuff
Moltijoe Sep 11, 2024
24ec52e
Update _logging.dm
Moltijoe Sep 11, 2024
aaaa54a
buh bye events
Moltijoe Sep 11, 2024
b9f02ce
Merge branch 'master' into storyteller
Moltijoe Sep 11, 2024
ad3ddc3
Update nuclearbomb.dm
Moltijoe Sep 11, 2024
ff93cf1
Update collections.ts
Moltijoe Sep 11, 2024
74f43cb
Revert "Update collections.ts"
Moltijoe Sep 11, 2024
5118e90
maybe
Moltijoe Sep 16, 2024
1e3b3fd
fix
Moltijoe Sep 16, 2024
eb9099e
fix
Moltijoe Sep 16, 2024
190690b
Update game_mode.dm
Moltijoe Sep 16, 2024
e5816a3
fixes
Moltijoe Sep 16, 2024
4b88cc5
fixes and more logging
Moltijoe Sep 16, 2024
63b5752
oh good gravy
Moltijoe Sep 17, 2024
2644538
Update portal_storm.dm
Moltijoe Sep 17, 2024
7f4563e
bring them back
Moltijoe Sep 17, 2024
989db8f
Update gamemode_subsystem.dm
Moltijoe Sep 17, 2024
69130dd
Update admin_verbs.dm
Moltijoe Sep 17, 2024
5a1f887
Update force_event.dm
Moltijoe Sep 17, 2024
417232e
damnit
Moltijoe Sep 18, 2024
274d8d9
Update _base_event.dm
Moltijoe Sep 18, 2024
064ef62
fixes
Moltijoe Sep 18, 2024
95ef90e
more
Moltijoe Sep 18, 2024
f207157
it compiles :)
Moltijoe Sep 18, 2024
54cd879
more
Moltijoe Sep 18, 2024
b88ee56
passes linter
Moltijoe Sep 18, 2024
398ca8f
Update radiation_leak.dm
Moltijoe Sep 18, 2024
d76c30a
Update dolphin_migration.dm
Moltijoe Sep 18, 2024
6238587
Update brother.dm
Moltijoe Sep 18, 2024
f9fa880
Update gamemode_subsystem.dm
Moltijoe Sep 18, 2024
8d8addd
Update _base_event.dm
Moltijoe Sep 19, 2024
883379f
Update _base_event.dm
Moltijoe Sep 19, 2024
b197664
updates
Moltijoe Sep 19, 2024
7f5e8e9
fixup
Moltijoe Sep 19, 2024
24bcbdf
add vampire remove prompt
Moltijoe Sep 19, 2024
d52afc3
Update vampire.dm
Moltijoe Sep 19, 2024
f6ce49e
Update vampire.dm
Moltijoe Sep 19, 2024
0edfef2
Update vampire.dm
Moltijoe Sep 19, 2024
894a073
Update _base_event.dm
Moltijoe Sep 19, 2024
9a886e9
Update gamemode_subsystem.dm
Moltijoe Sep 20, 2024
de2db94
Update gamemode_subsystem.dm
Moltijoe Sep 20, 2024
f76bcae
Update dolphin_migration.dm
Moltijoe Sep 20, 2024
29c4006
fix migration
Moltijoe Sep 20, 2024
1f5dafd
title icon
Moltijoe Sep 21, 2024
11f03b7
fixes
Moltijoe Sep 21, 2024
c39d030
formatting
Moltijoe Sep 21, 2024
3fcbee5
Update gamemode_subsystem.dm
Moltijoe Sep 21, 2024
c52ad0f
Update tzimisce.dm
Moltijoe Sep 21, 2024
9dd3c2f
Update tzimisce.dm
Moltijoe Sep 21, 2024
b9684ed
Update gamemode_subsystem.dm
Moltijoe Sep 22, 2024
c88c38c
Update storytellers.dm
Moltijoe Sep 22, 2024
865c2a0
tweak for our pop
Moltijoe Sep 22, 2024
ff70089
Update darkspawn.dm
Moltijoe Sep 22, 2024
1487dd3
Merge branch 'master' into storyteller
Moltijoe Sep 22, 2024
4b7dfa1
Update gamemode_subsystem.dm
Moltijoe Sep 22, 2024
e2b2d16
tweaks and fixes
Moltijoe Sep 22, 2024
e2268ab
more and less roundstart
Moltijoe Sep 22, 2024
a29a6cf
Update ghost.dm
Moltijoe Sep 23, 2024
b46b181
lol lets just port the voting system
Moltijoe Sep 23, 2024
e069bfa
Update scrubber_overflow.dm
Moltijoe Sep 23, 2024
08c2779
fix scrubber
Moltijoe Sep 23, 2024
ef3ee24
bye gamemode
Moltijoe Sep 23, 2024
99c3c63
cleanup
Moltijoe Sep 23, 2024
3704764
Update clown_operative.dm
Moltijoe Sep 23, 2024
b7bd462
Update clown_operative.dm
Moltijoe Sep 23, 2024
18837e5
Update _base_event.dm
Moltijoe Sep 23, 2024
e351605
probably fixed
Moltijoe Sep 23, 2024
404a8c3
Update supermatter_surge.dm
Moltijoe Sep 23, 2024
cf40d59
buh bye
Moltijoe Sep 23, 2024
4026300
Update brain_trauma.dm
Moltijoe Sep 24, 2024
52ca0c5
more
Moltijoe Sep 24, 2024
a968b36
new pseudogamemode vote
Moltijoe Sep 25, 2024
2b2642e
tweaks
Moltijoe Sep 25, 2024
58e2cd7
Update gamemode_subsystem.dm
Moltijoe Sep 25, 2024
6f862c4
Update high_priority_bounty.dm
Moltijoe Sep 25, 2024
58fcf20
Update gamemode_subsystem.dm
Moltijoe Sep 25, 2024
d051d75
Update storytellers.dm
Moltijoe Sep 25, 2024
853b4f2
Update high_priority_bounty.dm
Moltijoe Sep 25, 2024
95d064c
tweaks
Moltijoe Sep 25, 2024
67ac979
Update high_priority_bounty.dm
Moltijoe Sep 25, 2024
131dca4
Update high_priority_bounty.dm
Moltijoe Sep 25, 2024
3198446
fixes
Moltijoe Sep 26, 2024
b146978
fixes
Moltijoe Sep 26, 2024
706f933
tweak
Moltijoe Sep 27, 2024
2e181e6
Update obsessed.dm
Moltijoe Sep 27, 2024
eb14f91
so long pal
Moltijoe Sep 27, 2024
2de2782
Update battleroyale.dm
Moltijoe Sep 28, 2024
dc2d7d4
deletions
Moltijoe Sep 28, 2024
8f7b537
Update implant_dusting.dm
Moltijoe Sep 28, 2024
b6749cd
bye
Moltijoe Sep 28, 2024
24cbf32
uplinks fix
Moltijoe Sep 28, 2024
cc79c0e
Update uplink_items.dm
Moltijoe Sep 28, 2024
31107e2
Update uplink_items.dm
Moltijoe Sep 28, 2024
06d0bb0
delete more gamemodes
Moltijoe Sep 28, 2024
afee667
more
Moltijoe Sep 28, 2024
95e28f5
lol one ctrl f change
Moltijoe Sep 28, 2024
43dbbce
hm what
Moltijoe Sep 28, 2024
c3c2ee1
Update antagonists.dm
Moltijoe Sep 28, 2024
97ce27f
Revert "Update antagonists.dm"
Moltijoe Sep 28, 2024
ea23cd8
Revert "hm what"
Moltijoe Sep 28, 2024
e947a66
Revert "lol one ctrl f change"
Moltijoe Sep 28, 2024
84cc09b
cleanup
Moltijoe Sep 28, 2024
0e8fa9f
more stuff
Moltijoe Sep 28, 2024
7bd721d
more deletion
Moltijoe Sep 28, 2024
f1571e8
this one gone too
Moltijoe Sep 28, 2024
9797b47
you and only you i shall save
Moltijoe Sep 28, 2024
e445db5
Update revolution.dm
Moltijoe Sep 28, 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
Prev Previous commit
Next Next commit
Revert "hm what"
This reverts commit 43dbbce.
Moltijoe committed Sep 28, 2024
commit ea23cd88e9b795aba6f8bf2f17a3220686aa54b2
5 changes: 1 addition & 4 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
@@ -199,11 +199,8 @@
/// Checks if the given mob is infected.
#define IS_INFECTED(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/zombie))

/// Checks if the given mob is a clockcultist.
#define IS_CLOCK_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/clockcult))

/// Checks if the given mob is infected.
#define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling))
#define IS_CLOCK_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/clockcult))

// Antag resource defines
#define ANTAG_RESOURCE_DARKSPAWN "psi"
2 changes: 1 addition & 1 deletion code/datums/saymode.dm
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
mode = MODE_CHANGELING

/datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language)
if(ismob(user.pulledby) && IS_CHANGELING(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
if(ismob(user.pulledby) && is_changeling(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
to_chat(user, span_warning("Our abilities are being dampened! We cannot speak through the hivemind!"))
return FALSE
switch(user.lingcheck())
3 changes: 3 additions & 0 deletions code/game/gamemodes/changeling/changeling.dm
Original file line number Diff line number Diff line change
@@ -164,6 +164,9 @@ GLOBAL_VAR(changeling_team_objective_type)
of the Thing being sent to a station in this sector is highly likely. It may be in the guise of any crew member. Trust nobody - suspect everybody. Do not announce this to the crew, \
as paranoia may spread and inhibit workplace efficiency."

/proc/is_changeling(mob/M) //Usefull check changeling
return M?.mind?.has_antag_datum(/datum/antagonist/changeling)

/proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof)
var/datum/dna/chosen_dna = chosen_prof.dna
user.real_name = chosen_prof.name
2 changes: 1 addition & 1 deletion code/modules/antagonists/changeling/powers/headcrab.dm
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
return
if(QDELETED(user)) // Yogs: Implies maybe that the user was already gibbed or something. Prevents a null mob loc later on
return
if(ismob(user.pulledby) && IS_CHANGELING(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
if(ismob(user.pulledby) && is_changeling(user.pulledby) && user.pulledby.grab_state >= GRAB_NECK)
to_chat(user, span_warning("Our abilities are being dampened! We cannot use [src]!"))
return
..()