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
Show file tree
Hide file tree
Changes from all commits
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 41 additions & 0 deletions code/__DEFINES/anomalies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,44 @@
///Defines if rad anomaly can spawn rad goat can have
#define ANOMALY_RADIATION_NO_GOAT 0
#define ANOMALY_RADIATION_YES_GOAT 1

/**
* # Anomaly Defines
* This file contains defines for the random event anomaly subtypes.
*/

///Time in ticks before the anomaly goes poof/explodes depending on type.
#define ANOMALY_COUNTDOWN_TIMER (200 SECONDS) // monke edit: 99 seconds -> 200 seconds

/**
* Nuisance/funny anomalies
*/

///Time in seconds before anomaly spawns
#define ANOMALY_START_MEDIUM_TIME (6 EVENT_SECONDS)
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_MEDIUM_TIME (2 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_MEDIUM_TEXT "long range scanners. Expected location:"

/**
* Chaotic but not harmful anomalies. Give the station a chance to find it on their own.
*/

///Time in seconds before anomaly spawns
#define ANOMALY_START_HARMFUL_TIME (2 EVENT_SECONDS)
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_HARMFUL_TIME (30 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_HARMFUL_TEXT "localized scanners. Detected location:"

/**
* Anomalies that can fuck you up. Give them a bit of warning.
*/

///Time in seconds before anomaly spawns
#define ANOMALY_START_DANGEROUS_TIME (2 EVENT_SECONDS)
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_DANGEROUS_TIME (30 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_DANGEROUS_TEXT "localized scanners. Detected location:"
12 changes: 12 additions & 0 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@
/// Checks if the given mob is a wizard
#define IS_WIZARD(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/wizard))

/// Checks if the given mob is a devil
#define IS_DEVIL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/devil))

/// Checks if the given mob is a revolutionary. Will return TRUE for rev heads as well.
#define IS_REVOLUTIONARY(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/rev))

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

/// 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 changeling
#define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling))

/// Checks if the given mob is a vampire
#define IS_VAMPIRE(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vampire))

// Antag resource defines
#define ANTAG_RESOURCE_DARKSPAWN "psi"
#define ANTAG_RESOURCE_VAMPIRE "blood"
6 changes: 6 additions & 0 deletions code/__DEFINES/callbacks.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#define GLOBAL_PROC "some_magic_bullshit"
/// A shorthand for the callback datum, [documented here](datum/callback.html)
#define CALLBACK new /datum/callback

///Per the DM reference, spawn(-1) will execute the spawned code immediately until a block is met.
#define MAKE_SPAWN_ACT_LIKE_WAITFOR -1
///Create a codeblock that will not block the callstack if a block is met.
#define ASYNC spawn(MAKE_SPAWN_ACT_LIKE_WAITFOR)

#define INVOKE_ASYNC world.ImmediateInvokeAsync
10 changes: 10 additions & 0 deletions code/__DEFINES/dcs/signals/signals_event.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Grey Tide event signals
/// Sent when the Grey Tide event begins affecting the station.
/// (list/area/greytide_areas)
#define COMSIG_GLOB_GREY_TIDE "grey_tide"

/// A different signal, used specifically for flickering the lights during the event
#define COMSIG_GLOB_GREY_TIDE_LIGHT "grey_tide_light"

/// 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)
#define COMSIG_CREATED_ROUND_EVENT "creating_round_event"
45 changes: 45 additions & 0 deletions code/__DEFINES/events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,48 @@
#define EVENT_READY 1
#define EVENT_CANCELLED 2
#define EVENT_INTERRUPTED 3

///Events that mess with or create artificial intelligences, such as vending machines and the AI itself
#define EVENT_CATEGORY_AI "AI issues"
///Events that spawn anomalies, which might be the source of anomaly cores
#define EVENT_CATEGORY_ANOMALIES "Anomalies"
///Events pertaining cargo, messages incoming to the station and job slots
#define EVENT_CATEGORY_BUREAUCRATIC "Bureaucratic"
///Events that cause breakages and malfunctions that could be fixed by engineers
#define EVENT_CATEGORY_ENGINEERING "Engineering"
///Events that spawn creatures with simple desires, such as to hunt
#define EVENT_CATEGORY_ENTITIES "Entities"
///Events that should have no harmful effects, and might be useful to the crew
#define EVENT_CATEGORY_FRIENDLY "Friendly"
///Events that affect the body and mind
#define EVENT_CATEGORY_HEALTH "Health"
///Events reserved for special occassions
#define EVENT_CATEGORY_HOLIDAY "Holiday"
///Events with enemy groups with a more complex plan
#define EVENT_CATEGORY_INVASION "Invasion"
///Events that make a mess
#define EVENT_CATEGORY_JANITORIAL "Janitorial"
///Events that summon meteors and other debris, and stationwide waves of harmful space weather
#define EVENT_CATEGORY_SPACE "Space Threats"
///Events summoned by a wizard
#define EVENT_CATEGORY_WIZARD "Wizard"

/// Return from admin setup to stop the event from triggering entirely.
#define ADMIN_CANCEL_EVENT "cancel event"

/// Event can never be triggered by wizards
#define NEVER_TRIGGERED_BY_WIZARDS -1
/// Event can only run on a map set in space
#define EVENT_SPACE_ONLY (1 << 0)
/// Event can only run on a map which is a planet
#define EVENT_PLANETARY_ONLY (1 << 1)
/// Event timer in seconds
#define EVENT_SECONDS *0.5

///Backstory key for the fugitive solo backstories
#define FUGITIVE_BACKSTORY_WALDO "waldo"
#define FUGITIVE_BACKSTORY_INVISIBLE "invisible"
///Backstory keys for the fugitive team backstories
#define FUGITIVE_BACKSTORY_PRISONER "prisoner"
#define FUGITIVE_BACKSTORY_CULTIST "cultist"
#define FUGITIVE_BACKSTORY_SYNTH "synth"
2 changes: 2 additions & 0 deletions code/__DEFINES/flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define MEGAFAUNA_SPAWN_ALLOWED (1<<5)
/// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
#define NOTELEPORT (1<<6)
/// Protected from certain events
#define EVENT_PROTECTED (1<<7)

// Update flags for [/atom/proc/update_appearance]
/// Update the atom's name
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isslimeperson(A) (is_species(A, /datum/species/jelly/slime))
#define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent))
#define iszombie(A) (is_species(A, /datum/species/zombie))
#define isinfectedzombie(A) (is_species(A, /datum/species/zombie/infectious/gamemode))
#define IS_INFECTEDzombie(A) (is_species(A, /datum/species/zombie/infectious/gamemode))
#define isspitter(A) (is_species(A, /datum/species/zombie/infectious/gamemode/spitter))
#define isskeleton(A) (is_species(A, /datum/species/skeleton))
#define ismoth(A) (is_species(A, /datum/species/moth))
Expand Down
72 changes: 72 additions & 0 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,75 @@
/**
* =======================
* WARNING WARNING WARNING
* WARNING WARNING WARNING
* WARNING WARNING WARNING
* =======================
* These names are used as keys in many locations in the database
* you cannot change them trivially without breaking job bans and
* role time tracking, if you do this and get it wrong you will die
* and it will hurt the entire time
*/

//No department
#define JOB_ASSISTANT "Assistant"
//Command
#define JOB_CAPTAIN "Captain"
#define JOB_HEAD_OF_PERSONNEL "Head of Personnel"
#define JOB_HEAD_OF_SECURITY "Head of Security"
#define JOB_RESEARCH_DIRECTOR "Research Director"
#define JOB_CHIEF_ENGINEER "Chief Engineer"
#define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer"
//Silicon
#define JOB_AI "AI"
#define JOB_CYBORG "Cyborg"
#define JOB_PERSONAL_AI "Personal AI"
//Security
#define JOB_WARDEN "Warden"
#define JOB_BRIG_PHYSICIAN "Brig Physician"
#define JOB_DETECTIVE "Detective"
#define JOB_SECURITY_OFFICER "Security Officer"
#define JOB_SECURITY_OFFICER_MEDICAL "Security Officer (Medical)"
#define JOB_SECURITY_OFFICER_ENGINEERING "Security Officer (Engineering)"
#define JOB_SECURITY_OFFICER_SCIENCE "Security Officer (Science)"
#define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)"
//Engineering
#define JOB_STATION_ENGINEER "Station Engineer"
#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
//Medical
#define JOB_MEDICAL_DOCTOR "Medical Doctor"
#define JOB_PARAMEDIC "Paramedic"
#define JOB_CHEMIST "Chemist"
#define JOB_VIROLOGIST "Pathologist"
//Science
#define JOB_SCIENTIST "Scientist"
#define JOB_ROBOTICIST "Roboticist"
#define JOB_GENETICIST "Geneticist"
//Supply
#define JOB_QUARTERMASTER "Quartermaster"
#define JOB_CARGO_TECHNICIAN "Cargo Technician"
#define JOB_SHAFT_MINER "Shaft Miner"
#define JOB_BITRUNNER "Bitrunner"
//Service
#define JOB_BARTENDER "Bartender"
#define JOB_BOTANIST "Botanist"
#define JOB_COOK "Cook"
#define JOB_JANITOR "Janitor"
#define JOB_CLOWN "Clown"
#define JOB_MIME "Mime"
#define JOB_CURATOR "Curator"
#define JOB_LAWYER "Lawyer"
#define JOB_CHAPLAIN "Chaplain"
#define JOB_PSYCHOLOGIST "Psychologist"



// we should probably use these, but it'll be part of a different pr, otherwise it can break shit
// i'm leaving this here though as a reminder... hopefully





#define JOB_AVAILABLE 0
#define JOB_UNAVAILABLE_GENERIC 1
#define JOB_UNAVAILABLE_BANNED 2
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#define LOG_RADIO_EMOTE (1 << 20)
#define LOG_SPEECH_INDICATORS (1 << 21)
#define LOG_TRANSPORT (1 << 22)
#define LOG_STORYTELLER (1 << 23)

//Yogger's Loggers
#define LOG_NTSL (1 << 23)
Expand Down Expand Up @@ -95,6 +96,7 @@
#define LOG_CATEGORY_ATTACK "attack"
#define LOG_CATEGORY_CONFIG "config"
#define LOG_CATEGORY_DYNAMIC "dynamic"
#define LOG_CATEGORY_STORYTELLER "storyteller"
#define LOG_CATEGORY_ECONOMY "economy"
#define LOG_CATEGORY_FILTER "filter"
#define LOG_CATEGORY_MANIFEST "manifest"
Expand Down
58 changes: 50 additions & 8 deletions code/__DEFINES/role_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@
#define ROLE_HERETIC "Heretic"
#define ROLE_BLOB "Blob"
#define ROLE_NINJA "Space Ninja"
#define ROLE_MONKEY "Monkey"
#define ROLE_ABDUCTOR "Abductor"
#define ROLE_REVENANT "Revenant"
#define ROLE_DEVIL "Devil"
#define ROLE_SERVANT_OF_RATVAR "Servant of Ratvar"
#define ROLE_BROTHER "Blood Brother"
#define ROLE_BRAINWASHED "Brainwashed Victim"
#define ROLE_HIVE "Hivemind Host"
#define ROLE_OBSESSED "Obsessed"
#define ROLE_SENTIENCE "Sentient Creature"
#define ROLE_MOUSE "Mouse"
Expand All @@ -42,14 +40,13 @@
#define ROLE_INTERNAL_AFFAIRS "Internal Affairs Agent"
#define ROLE_FUGITIVE "Fugitive"
#define ROLE_VAMPIRE "Vampire" // Yogs
#define ROLE_GANG "gangster" // Yogs
#define ROLE_DARKSPAWN "darkspawn" // Yogs
#define ROLE_VAMPIRICACCIDENT "Vampiric Accident"
#define ROLE_DARKSPAWN "Darkspawn" // Yogs
#define ROLE_HOLOPARASITE "Holoparasite" // Yogs
#define ROLE_HORROR "Eldritch Horror" // Yogs
#define ROLE_INFILTRATOR "Infiltrator" // Yogs
#define ROLE_ZOMBIE "Zombie"
#define ROLE_BLOODSUCKER "Bloodsucker"
#define ROLE_VAMPIRICACCIDENT "Vampiric Accident"
#define ROLE_BLOODSUCKERBREAKOUT "Bloodsucker Breakout"
#define ROLE_MONSTERHUNTER "Monster Hunter"
#define ROLE_SPACE_DRAGON "Space Dragon"
Expand Down Expand Up @@ -80,7 +77,6 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_HERETIC = /datum/antagonist/heretic,
ROLE_BLOB = /datum/antagonist/blob,
ROLE_NINJA = /datum/antagonist/ninja,
ROLE_MONKEY = /datum/antagonist/monkey,
ROLE_ABDUCTOR = /datum/antagonist/abductor,
ROLE_REVENANT = /datum/antagonist/revenant,
ROLE_DEVIL = /datum/antagonist/devil,
Expand All @@ -91,7 +87,6 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_INTERNAL_AFFAIRS = /datum/antagonist/traitor/internal_affairs,
ROLE_FUGITIVE = /datum/antagonist/fugitive,
ROLE_VAMPIRE = /datum/antagonist/vampire, // Yogs
ROLE_GANG = /datum/antagonist/gang, // Yogs
ROLE_DARKSPAWN = /datum/antagonist/darkspawn, // Yogs
ROLE_HOLOPARASITE = /datum/antagonist/guardian, // Yogs
ROLE_HORROR = /datum/antagonist/horror, // Yogs
Expand All @@ -104,11 +99,58 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_SINFULDEMON = /datum/antagonist/sinfuldemon,
ROLE_NIGHTMARE = /datum/antagonist/nightmare,
ROLE_DISEASE = /datum/antagonist/disease,
ROLE_HIVE = /datum/antagonist/hivemind,
ROLE_PIRATE = /datum/antagonist/pirate,
ROLE_SENTIENCE = /datum/antagonist/sentient_creature
))



GLOBAL_LIST_INIT(special_required_days, list(
// Roundstart
ROLE_BROTHER = 0,
ROLE_CHANGELING = 0,
ROLE_CLOWN_OPERATIVE = 14,
ROLE_CULTIST = 14,
ROLE_HERETIC = 0,
ROLE_MALF = 0,
ROLE_OPERATIVE = 14,
ROLE_REV_HEAD = 14,
ROLE_TRAITOR = 0,
ROLE_WIZARD = 14,
ROLE_SERVANT_OF_RATVAR = 14,
ROLE_BLOODSUCKER = 0,
ROLE_ASSAULT_OPERATIVE = 14,
ROLE_DARKSPAWN = 14,

// Midround
ROLE_ABDUCTOR = 0,
ROLE_ALIEN = 0,
ROLE_BLOB = 0,
ROLE_CHANGELING_MIDROUND = 0,
ROLE_CYBER_POLICE = 0,
ROLE_FUGITIVE = 0,
ROLE_LONE_OPERATIVE = 14,
ROLE_MALF_MIDROUND = 0,
ROLE_NIGHTMARE = 0,
ROLE_NINJA = 0,
ROLE_OBSESSED = 0,
ROLE_OPERATIVE_MIDROUND = 14,
ROLE_REVENANT = 0,
ROLE_SENTIENT_DISEASE = 0,
ROLE_SLEEPER_AGENT = 0,
ROLE_SPACE_DRAGON = 0,
ROLE_SPIDER = 0,
ROLE_WIZARD_MIDROUND = 14,
ROLE_VAMPIRICACCIDENT = 0,
ROLE_MONSTERHUNTER = 0,

// Latejoin
ROLE_HERETIC_SMUGGLER = 0,
ROLE_PROVOCATEUR = 14,
ROLE_SYNDICATE_INFILTRATOR = 0,
ROLE_BLOODSUCKERBREAKOUT = 0,
))

//Job defines for what happens when you fail to qualify for any job during job selection
#define BEOVERFLOW 1
#define BERANDOMJOB 2
Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/span.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#define span_bolddanger(str) ("<span class='bolddanger'>" + str + "</span>")
#define span_boldnotice(str) ("<span class='boldnotice'>" + str + "</span>")
#define span_boldwarning(str) ("<span class='boldwarning'>" + str + "</span>")
#define span_boldbig(str) ("<span class='big bold'>" + str + "</span>")
#define span_brass(str) ("<span class='brass'>" + str + "</span>")
#define span_caution(str) ("<span class='caution'>" + str + "</span>")
#define span_centcomradio(str) ("<span class='centcomradio'>" + str + "</span>")
Expand Down Expand Up @@ -79,6 +80,7 @@
#define span_inathneq_large(str) ("<span class='inathneq_large'>" + str + "</span>")
#define span_inathneq_small(str) ("<span class='inathneq_small'>" + str + "</span>")
#define span_info(str) ("<span class='info'>" + str + "</span>")
#define span_infoplain(str) ("<span class='infoplain'>" + str + "</span>")
#define span_interface(str) ("<span class='interface'>" + str + "</span>")
#define span_italics(str) ("<span class='italics'>" + str + "</span>")
#define span_large_brass(str) ("<span class='large_brass'>" + str + "</span>")
Expand Down Expand Up @@ -173,7 +175,6 @@
#define span_value(str) ("<span class='value'>" + str + "</span>")
#define span_vampirewarning(str) ("<span class='vampirewarning'>" + str + "</span>")
#define span_velvet(str) ("<span class='velvet'>" + str + "</span>")
#define span_warner(str) ("<span class='warner'>" + str + "</span>")
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
#define span_yell(str) ("<span class='yell'>" + str + "</span>")
#define span_yellowteamradio(str) ("<span class='yellowteamradio'>" + str + "</span>")
1 change: 0 additions & 1 deletion code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
#define STATUS_EFFECT_TAMING /datum/status_effect/taming //tames the target after enough tame stacks

#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
#define STATUS_EFFECT_HIVEMIND_CURSE /datum/status_effect/necropolis_curse/hivemind
#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured
#define CURSE_SPAWNING 2 //spawns creatures that attack the target only
#define CURSE_WASTING 4 //causes gradual damage
Expand Down
Loading
Loading