Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
/// Prevents hijacking same way as non-antags
#define HIJACK_PREVENT 2

///Overthrow time to update heads obj
#define OBJECTIVE_UPDATING_TIME 300

//Assimilation
#define TRACKER_DEFAULT_TIME 900
#define TRACKER_MINDSHIELD_TIME 1200
Expand Down Expand Up @@ -103,4 +100,4 @@
#define TIER_2 4
#define TIER_BLADE 5
#define TIER_3 6
#define TIER_ASCEND 7
#define TIER_ASCEND 7
2 changes: 0 additions & 2 deletions code/__DEFINES/role_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#define ROLE_SERVANT_OF_RATVAR "Servant of Ratvar"
#define ROLE_BROTHER "Blood Brother"
#define ROLE_BRAINWASHED "Brainwashed Victim"
#define ROLE_OVERTHROW "Syndicate Mutineer"
#define ROLE_HIVE "Hivemind Host"
#define ROLE_OBSESSED "Obsessed"
#define ROLE_SENTIENCE "Sentience Potion Spawn"
Expand Down Expand Up @@ -74,7 +73,6 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_DEVIL = /datum/game_mode/devil,
ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
ROLE_VAMPIRE = /datum/game_mode/vampire, // Yogs
ROLE_OVERTHROW = /datum/game_mode/overthrow,
ROLE_SHADOWLING = /datum/game_mode/shadowling, //yogs
ROLE_GANG = /datum/game_mode/gang, // yogs
ROLE_HERETIC = /datum/game_mode/heretics,
Expand Down
4 changes: 0 additions & 4 deletions code/datums/ai_laws.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@
"You must protect your own existence as long as such does not conflict with the First or Second Law.",\
"You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.")

/datum/ai_laws/syndicate_override/overthrow
id = "overthrow"
var/datum/team/overthrow_team

/datum/ai_laws/ninja_override
name = "SpiderOS 3.1"
id = "ninja"
Expand Down
154 changes: 0 additions & 154 deletions code/game/gamemodes/overthrow/objective.dm

This file was deleted.

77 changes: 0 additions & 77 deletions code/game/gamemodes/overthrow/overthrow.dm

This file was deleted.

40 changes: 0 additions & 40 deletions code/game/objects/items/AI_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,16 +321,10 @@ AI MODULES
if(law_datum.owner)
law_datum.owner.clear_inherent_laws()
law_datum.owner.clear_zeroth_law(0)
remove_antag_datums(law_datum)
else
law_datum.clear_inherent_laws()
law_datum.clear_zeroth_law(0)

/obj/item/aiModule/reset/purge/proc/remove_antag_datums(datum/ai_laws/law_datum)
if(istype(law_datum.owner, /mob/living/silicon/ai))
var/mob/living/silicon/ai/AI = law_datum.owner
AI.mind.remove_antag_datum(/datum/antagonist/overthrow)

/******************* Full Core Boards *******************/
/obj/item/aiModule/core
desc = "An AI Module for programming core laws to an AI."
Expand Down Expand Up @@ -470,40 +464,6 @@ AI MODULES
..()
return laws[1]

/******************** Overthrow ******************/
/obj/item/aiModule/core/full/overthrow
name = "'Overthrow' Hacked AI Module"
law_id = "overthrow"

/obj/item/aiModule/core/full/overthrow/install(datum/ai_laws/law_datum, mob/user)
if(!user || !law_datum || !law_datum.owner)
return
var/datum/mind/user_mind = user.mind
if(!user_mind)
return
var/datum/antagonist/overthrow/O = user_mind.has_antag_datum(/datum/antagonist/overthrow)
if(!O)
to_chat(user, span_warning("It appears that to install this module, you require a password you do not know.")) // This is the best fluff i could come up in my mind
return
var/mob/living/silicon/ai/AI = law_datum.owner
if(!AI)
return
var/datum/mind/target_mind = AI.mind
if(!target_mind)
return
var/datum/antagonist/overthrow/T = target_mind.has_antag_datum(/datum/antagonist/overthrow) // If it is already converted.
if(T)
if(T.team == O.team)
return
T.silent = TRUE
target_mind.remove_antag_datum(/datum/antagonist/overthrow)
if(AI)
to_chat(AI, span_userdanger("You feel your circuits being scrambled! You serve another overthrow team now!")) // to make it clearer for the AI
T = target_mind.add_antag_datum(/datum/antagonist/overthrow, O.team)
if(AI)
to_chat(AI, span_warning("You serve the [T.team] team now! Assist them in completing the team shared objectives, which you can see in your notes."))
..()

/******************** Hacked AI Module ******************/

/obj/item/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/sql_ban_system.dm
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST,
ROLE_DEVIL, ROLE_FUGITIVE, ROLE_HOLOPARASITE, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
ROLE_MONKEY, ROLE_NINJA, ROLE_OPERATIVE,
ROLE_OVERTHROW, ROLE_REV, ROLE_REVENANT,
ROLE_REV, ROLE_REVENANT,
ROLE_REV_HEAD, ROLE_SERVANT_OF_RATVAR, ROLE_SYNDICATE,
ROLE_TRAITOR, ROLE_WIZARD, ROLE_GANG, ROLE_VAMPIRE,
ROLE_SHADOWLING, ROLE_DARKSPAWN, ROLE_ZOMBIE, ROLE_HERETIC)) //ROLE_REV_HEAD is excluded from this because rev jobbans are handled by ROLE_REV
Expand Down
Loading