Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit df51b30

Browse files
MoltijoeToasterBiome
Moltijoe
and
ToasterBiome
authored
Deletes all gamemodes in favor of storytellers (#22661)
* storytellers * Update _base_event.dm * Update _base_event.dm * storytellers and midround events * work * antags * last * Update vote.dm * fixes * Update backrooms.dm * so long gay dynamic * Update vote.dm * dynamic unit test * cleanup * delete minimum pop * fix * storyteller tweaks * traitor awakening * Update traitor.dm * Update _basemap.dm * Update ghost.dm * oh god so much stuff * Update _logging.dm * buh bye events * Update nuclearbomb.dm * Update collections.ts * Revert "Update collections.ts" This reverts commit ff93cf1. * maybe * fix * fix * Update game_mode.dm * fixes * fixes and more logging * oh good gravy * Update portal_storm.dm * bring them back * Update gamemode_subsystem.dm * Update admin_verbs.dm * Update force_event.dm * damnit * Update _base_event.dm * fixes * more * it compiles :) * more * passes linter * Update radiation_leak.dm * Update dolphin_migration.dm * Update brother.dm * Update gamemode_subsystem.dm * Update _base_event.dm * Update _base_event.dm * updates * fixup * add vampire remove prompt * Update vampire.dm * Update vampire.dm * Update vampire.dm * Update _base_event.dm * Update gamemode_subsystem.dm * Update gamemode_subsystem.dm * Update dolphin_migration.dm * fix migration * title icon * fixes * formatting * Update gamemode_subsystem.dm * Update tzimisce.dm * Update tzimisce.dm * Update gamemode_subsystem.dm * Update storytellers.dm * tweak for our pop * Update darkspawn.dm * Update gamemode_subsystem.dm * tweaks and fixes * more and less roundstart * Update ghost.dm * lol lets just port the voting system * Update scrubber_overflow.dm * fix scrubber * bye gamemode * cleanup * Update clown_operative.dm * Update clown_operative.dm * Update _base_event.dm * probably fixed * Update supermatter_surge.dm * buh bye * Update brain_trauma.dm * more * new pseudogamemode vote * tweaks * Update gamemode_subsystem.dm * Update high_priority_bounty.dm * Update gamemode_subsystem.dm * Update storytellers.dm * Update high_priority_bounty.dm * tweaks * Update high_priority_bounty.dm * Update high_priority_bounty.dm * fixes * fixes * tweak * Update obsessed.dm * so long pal * Update battleroyale.dm * deletions * Update implant_dusting.dm * bye * uplinks fix * Update uplink_items.dm * Update uplink_items.dm * delete more gamemodes * more * lol one ctrl f change * hm what * Update antagonists.dm * Revert "Update antagonists.dm" This reverts commit c3c2ee1. * Revert "hm what" This reverts commit 43dbbce. * Revert "lol one ctrl f change" This reverts commit 95e28f5. * cleanup * more stuff * more deletion * this one gone too * you and only you i shall save * Update revolution.dm * hold this please * it's done * bye admin stuff * Update uplink.dm * Update alert.dm * should be fine * fixes * tweaks * fixes * fixes * Update ticker.dm * this is important * Update heretic.dm * Update clown_operative.dm * rewrite * fixes * Update clockwork_cult.dm * fixes * Update uplink_items.dm * reorganize * Update objective.dm * rewrite nightmare * Update storytellers.dm * tweak * tweaks * Update stray_cargo.dm * Update stray_cargo.dm * Update stray_cargo.dm * delete unneeded tgui * Update ticker.dm * Update roundend.dm * Update anomaly_grav.dm * Update gamemode_subsystem.dm * Update statpanel.dm * Update statpanel.dm * no additional delay * clean up * Update _base_event.dm * Update _event.dm * antag token and brothers * no token picked * Update _base_event.dm --------- Co-authored-by: Byemoh <[email protected]>
1 parent 67c10b5 commit df51b30

File tree

468 files changed

+10709
-17685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

468 files changed

+10709
-17685
lines changed

‎code/__DEFINES/anomalies.dm‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,44 @@
2020
///Defines if rad anomaly can spawn rad goat can have
2121
#define ANOMALY_RADIATION_NO_GOAT 0
2222
#define ANOMALY_RADIATION_YES_GOAT 1
23+
24+
/**
25+
* # Anomaly Defines
26+
* This file contains defines for the random event anomaly subtypes.
27+
*/
28+
29+
///Time in ticks before the anomaly goes poof/explodes depending on type.
30+
#define ANOMALY_COUNTDOWN_TIMER (200 SECONDS) // monke edit: 99 seconds -> 200 seconds
31+
32+
/**
33+
* Nuisance/funny anomalies
34+
*/
35+
36+
///Time in seconds before anomaly spawns
37+
#define ANOMALY_START_MEDIUM_TIME (6 EVENT_SECONDS)
38+
///Time in seconds before anomaly is announced
39+
#define ANOMALY_ANNOUNCE_MEDIUM_TIME (2 EVENT_SECONDS)
40+
///Let them know how far away the anomaly is
41+
#define ANOMALY_ANNOUNCE_MEDIUM_TEXT "long range scanners. Expected location:"
42+
43+
/**
44+
* Chaotic but not harmful anomalies. Give the station a chance to find it on their own.
45+
*/
46+
47+
///Time in seconds before anomaly spawns
48+
#define ANOMALY_START_HARMFUL_TIME (2 EVENT_SECONDS)
49+
///Time in seconds before anomaly is announced
50+
#define ANOMALY_ANNOUNCE_HARMFUL_TIME (30 EVENT_SECONDS)
51+
///Let them know how far away the anomaly is
52+
#define ANOMALY_ANNOUNCE_HARMFUL_TEXT "localized scanners. Detected location:"
53+
54+
/**
55+
* Anomalies that can fuck you up. Give them a bit of warning.
56+
*/
57+
58+
///Time in seconds before anomaly spawns
59+
#define ANOMALY_START_DANGEROUS_TIME (2 EVENT_SECONDS)
60+
///Time in seconds before anomaly is announced
61+
#define ANOMALY_ANNOUNCE_DANGEROUS_TIME (30 EVENT_SECONDS)
62+
///Let them know how far away the anomaly is
63+
#define ANOMALY_ANNOUNCE_DANGEROUS_TEXT "localized scanners. Detected location:"

‎code/__DEFINES/antagonists.dm‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@
184184
/// Checks if the given mob is a wizard
185185
#define IS_WIZARD(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/wizard))
186186

187+
/// Checks if the given mob is a devil
188+
#define IS_DEVIL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/devil))
189+
187190
/// Checks if the given mob is a revolutionary. Will return TRUE for rev heads as well.
188191
#define IS_REVOLUTIONARY(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/rev))
189192

@@ -193,6 +196,15 @@
193196
/// Checks if the given mob is a malf ai.
194197
#define IS_MALF_AI(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/malf_ai))
195198

199+
/// Checks if the given mob is infected.
200+
#define IS_INFECTED(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/zombie))
201+
202+
/// Checks if the given mob is a changeling
203+
#define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling))
204+
205+
/// Checks if the given mob is a vampire
206+
#define IS_VAMPIRE(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vampire))
207+
196208
// Antag resource defines
197209
#define ANTAG_RESOURCE_DARKSPAWN "psi"
198210
#define ANTAG_RESOURCE_VAMPIRE "blood"

‎code/__DEFINES/callbacks.dm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
#define GLOBAL_PROC "some_magic_bullshit"
22
/// A shorthand for the callback datum, [documented here](datum/callback.html)
33
#define CALLBACK new /datum/callback
4+
5+
///Per the DM reference, spawn(-1) will execute the spawned code immediately until a block is met.
6+
#define MAKE_SPAWN_ACT_LIKE_WAITFOR -1
7+
///Create a codeblock that will not block the callstack if a block is met.
8+
#define ASYNC spawn(MAKE_SPAWN_ACT_LIKE_WAITFOR)
9+
410
#define INVOKE_ASYNC world.ImmediateInvokeAsync

‎code/__DEFINES/dcs/signals/signals_event.dm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Grey Tide event signals
2+
/// Sent when the Grey Tide event begins affecting the station.
3+
/// (list/area/greytide_areas)
4+
#define COMSIG_GLOB_GREY_TIDE "grey_tide"
5+
6+
/// A different signal, used specifically for flickering the lights during the event
7+
#define COMSIG_GLOB_GREY_TIDE_LIGHT "grey_tide_light"
8+
9+
/// Signal sent by round event controls when they create round event datums before calling setup() on them: (datum/round_event_control/source_event_control, datum/round_event/created_event)
10+
#define COMSIG_CREATED_ROUND_EVENT "creating_round_event"

‎code/__DEFINES/dcs/signals/signals_global.dm‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
#define COMSIG_GLOB_PRE_RANDOM_EVENT "!pre_random_event"
4040
/// Do not allow this random event to continue.
4141
#define CANCEL_PRE_RANDOM_EVENT (1<<0)
42-
/// Called by (/datum/round_event_control/RunEvent).
43-
#define COMSIG_GLOB_RANDOM_EVENT "!random_event"
44-
/// Do not allow this random event to continue.
45-
#define CANCEL_RANDOM_EVENT (1<<0)
4642
/// a person somewhere has thrown something : (mob/living/carbon/carbon_thrower, target)
4743
#define COMSIG_GLOB_CARBON_THROW_THING "!throw_thing"
4844
/// a trapdoor remote has sent out a signal to link with a trapdoor

‎code/__DEFINES/events.dm‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,23 @@
77
#define EVENT_READY 1
88
#define EVENT_CANCELLED 2
99
#define EVENT_INTERRUPTED 3
10+
11+
/// Return from admin setup to stop the event from triggering entirely.
12+
#define ADMIN_CANCEL_EVENT "cancel event"
13+
14+
/// Event can never be triggered by wizards
15+
#define NEVER_TRIGGERED_BY_WIZARDS -1
16+
/// Event can only run on a map set in space
17+
#define EVENT_SPACE_ONLY (1 << 0)
18+
/// Event can only run on a map which is a planet
19+
#define EVENT_PLANETARY_ONLY (1 << 1)
20+
/// Event timer in seconds
21+
#define EVENT_SECONDS *0.5
22+
23+
///Backstory key for the fugitive solo backstories
24+
#define FUGITIVE_BACKSTORY_WALDO "waldo"
25+
#define FUGITIVE_BACKSTORY_INVISIBLE "invisible"
26+
///Backstory keys for the fugitive team backstories
27+
#define FUGITIVE_BACKSTORY_PRISONER "prisoner"
28+
#define FUGITIVE_BACKSTORY_CULTIST "cultist"
29+
#define FUGITIVE_BACKSTORY_SYNTH "synth"

‎code/__DEFINES/flags.dm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
9999
#define MEGAFAUNA_SPAWN_ALLOWED (1<<5)
100100
/// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
101101
#define NOTELEPORT (1<<6)
102+
/// Protected from certain events
103+
#define EVENT_PROTECTED (1<<7)
102104

103105
// Update flags for [/atom/proc/update_appearance]
104106
/// Update the atom's name

‎code/__DEFINES/is_helpers.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
7979
#define isslimeperson(A) (is_species(A, /datum/species/jelly/slime))
8080
#define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent))
8181
#define iszombie(A) (is_species(A, /datum/species/zombie))
82-
#define isinfectedzombie(A) (is_species(A, /datum/species/zombie/infectious/gamemode))
82+
#define IS_INFECTEDzombie(A) (is_species(A, /datum/species/zombie/infectious/gamemode))
8383
#define isspitter(A) (is_species(A, /datum/species/zombie/infectious/gamemode/spitter))
8484
#define isskeleton(A) (is_species(A, /datum/species/skeleton))
8585
#define ismoth(A) (is_species(A, /datum/species/moth))

‎code/__DEFINES/jobs.dm‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,75 @@
1+
/**
2+
* =======================
3+
* WARNING WARNING WARNING
4+
* WARNING WARNING WARNING
5+
* WARNING WARNING WARNING
6+
* =======================
7+
* These names are used as keys in many locations in the database
8+
* you cannot change them trivially without breaking job bans and
9+
* role time tracking, if you do this and get it wrong you will die
10+
* and it will hurt the entire time
11+
*/
12+
13+
//No department
14+
#define JOB_ASSISTANT "Assistant"
15+
//Command
16+
#define JOB_CAPTAIN "Captain"
17+
#define JOB_HEAD_OF_PERSONNEL "Head of Personnel"
18+
#define JOB_HEAD_OF_SECURITY "Head of Security"
19+
#define JOB_RESEARCH_DIRECTOR "Research Director"
20+
#define JOB_CHIEF_ENGINEER "Chief Engineer"
21+
#define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer"
22+
//Silicon
23+
#define JOB_AI "AI"
24+
#define JOB_CYBORG "Cyborg"
25+
#define JOB_PERSONAL_AI "Personal AI"
26+
//Security
27+
#define JOB_WARDEN "Warden"
28+
#define JOB_BRIG_PHYSICIAN "Brig Physician"
29+
#define JOB_DETECTIVE "Detective"
30+
#define JOB_SECURITY_OFFICER "Security Officer"
31+
#define JOB_SECURITY_OFFICER_MEDICAL "Security Officer (Medical)"
32+
#define JOB_SECURITY_OFFICER_ENGINEERING "Security Officer (Engineering)"
33+
#define JOB_SECURITY_OFFICER_SCIENCE "Security Officer (Science)"
34+
#define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)"
35+
//Engineering
36+
#define JOB_STATION_ENGINEER "Station Engineer"
37+
#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
38+
//Medical
39+
#define JOB_MEDICAL_DOCTOR "Medical Doctor"
40+
#define JOB_PARAMEDIC "Paramedic"
41+
#define JOB_CHEMIST "Chemist"
42+
#define JOB_VIROLOGIST "Pathologist"
43+
//Science
44+
#define JOB_SCIENTIST "Scientist"
45+
#define JOB_ROBOTICIST "Roboticist"
46+
#define JOB_GENETICIST "Geneticist"
47+
//Supply
48+
#define JOB_QUARTERMASTER "Quartermaster"
49+
#define JOB_CARGO_TECHNICIAN "Cargo Technician"
50+
#define JOB_SHAFT_MINER "Shaft Miner"
51+
#define JOB_BITRUNNER "Bitrunner"
52+
//Service
53+
#define JOB_BARTENDER "Bartender"
54+
#define JOB_BOTANIST "Botanist"
55+
#define JOB_COOK "Cook"
56+
#define JOB_JANITOR "Janitor"
57+
#define JOB_CLOWN "Clown"
58+
#define JOB_MIME "Mime"
59+
#define JOB_CURATOR "Curator"
60+
#define JOB_LAWYER "Lawyer"
61+
#define JOB_CHAPLAIN "Chaplain"
62+
#define JOB_PSYCHOLOGIST "Psychologist"
63+
64+
65+
66+
// we should probably use these, but it'll be part of a different pr, otherwise it can break shit
67+
// i'm leaving this here though as a reminder... hopefully
68+
69+
70+
71+
72+
173
#define JOB_AVAILABLE 0
274
#define JOB_UNAVAILABLE_GENERIC 1
375
#define JOB_UNAVAILABLE_BANNED 2

‎code/__DEFINES/logging.dm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#define LOG_RADIO_EMOTE (1 << 20)
4848
#define LOG_SPEECH_INDICATORS (1 << 21)
4949
#define LOG_TRANSPORT (1 << 22)
50+
#define LOG_STORYTELLER (1 << 23)
5051

5152
//Yogger's Loggers
5253
#define LOG_NTSL (1 << 23)
@@ -95,6 +96,7 @@
9596
#define LOG_CATEGORY_ATTACK "attack"
9697
#define LOG_CATEGORY_CONFIG "config"
9798
#define LOG_CATEGORY_DYNAMIC "dynamic"
99+
#define LOG_CATEGORY_STORYTELLER "storyteller"
98100
#define LOG_CATEGORY_ECONOMY "economy"
99101
#define LOG_CATEGORY_FILTER "filter"
100102
#define LOG_CATEGORY_MANIFEST "manifest"

0 commit comments

Comments
 (0)