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

Removes the deprecated overthrow gamemode #10434

Merged
merged 1 commit into from
Jan 14, 2024
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: 0 additions & 5 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1029,8 +1029,6 @@
#include "code\game\gamemodes\objectives\open\_open.dm"
#include "code\game\gamemodes\objectives\open\destroy_equipment.dm"
#include "code\game\gamemodes\objectives\open\explosion.dm"
#include "code\game\gamemodes\overthrow\objective.dm"
#include "code\game\gamemodes\overthrow\overthrow.dm"
#include "code\game\gamemodes\revolution\revolution.dm"
#include "code\game\gamemodes\sandbox\h_sandbox.dm"
#include "code\game\gamemodes\sandbox\sandbox.dm"
Expand Down Expand Up @@ -2071,9 +2069,6 @@
#include "code\modules\antagonists\obsessed\objectives\spend_time.dm"
#include "code\modules\antagonists\obsessed\objectives\steal_heirloom.dm"
#include "code\modules\antagonists\official\official.dm"
#include "code\modules\antagonists\overthrow\overthrow.dm"
#include "code\modules\antagonists\overthrow\overthrow_converter.dm"
#include "code\modules\antagonists\overthrow\overthrow_team.dm"
#include "code\modules\antagonists\pirate\pirate.dm"
#include "code\modules\antagonists\revenant\revenant.dm"
#include "code\modules\antagonists\revenant\revenant_abilities.dm"
Expand Down
3 changes: 0 additions & 3 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
#define BLOB_REFLECTOR_COST 15
#define BLOB_STRAIN_COLOR_LIST list("#BE5532", "#7D6EB4", "#EC8383", "#00E5B1", "#00668B", "#FFF68", "#BBBBAA", "#CD7794", "#57787B", "#3C6EC8", "#AD6570", "#823ABB")

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

//gang dominators
#define NOT_DOMINATING -1
#define MAX_LEADERS_GANG 3
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 @@ -34,7 +34,6 @@
#define ROLE_REVENANT "Revenant"
#define ROLE_DEVIL "Devil"
#define ROLE_BROTHER "Blood Brother"
#define ROLE_OVERTHROW "Syndicate Mutineer"
#define ROLE_HIVE "Hivemind Host"
#define ROLE_OBSESSED "Obsessed"
#define ROLE_SPACE_DRAGON "Space Dragon"
Expand Down Expand Up @@ -75,7 +74,6 @@ GLOBAL_LIST_INIT(antagonist_bannable_roles, list(
ROLE_REVENANT,
ROLE_DEVIL,
ROLE_BROTHER,
ROLE_OVERTHROW,
ROLE_HIVE,
ROLE_OBSESSED,
ROLE_SPACE_DRAGON,
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 @@ -103,10 +103,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
152 changes: 0 additions & 152 deletions code/game/gamemodes/overthrow/objective.dm

This file was deleted.

78 changes: 0 additions & 78 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 @@ -343,16 +343,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 @@ -484,40 +478,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 class='warning'>It appears that to install this module, you require a password you do not know.</span>") // 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 class='userdanger'>You feel your circuits being scrambled! You serve another overthrow team now!</span>") // to make it clearer for the AI
T = target_mind.add_antag_datum(/datum/antagonist/overthrow, O.team)
if(AI)
to_chat(AI, "<span class='warning'>You serve the [T.team] team now! Assist them in completing the team shared objectives, which you can see in your notes.</span>")
..()

/******************** 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
Loading
Loading