Skip to content

Commit

Permalink
Ports ERT features (#11415)
Browse files Browse the repository at this point in the history
* gupdate

* bounty hunters

* shutttles

* oops

* shittership

* bad var

* Revert "shittership"

This reverts commit fb2281a.

* Revert "oops"

This reverts commit a84fe10.

* Revert "shutttles"

This reverts commit 7db07b7.
  • Loading branch information
Tsar-Salat authored Nov 27, 2024
1 parent 574805c commit ecf9e0e
Show file tree
Hide file tree
Showing 13 changed files with 366 additions and 226 deletions.
30 changes: 15 additions & 15 deletions _maps/Prefab/Departments.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions _maps/shuttles/hunter/hunter_bounty.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,6 @@
#include "code\modules\antagonists\obsessed\objectives\protect.dm"
#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\pirate\pirate.dm"
#include "code\modules\antagonists\prisoner\prisoner.dm"
#include "code\modules\antagonists\revenant\revenant.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/browser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@
if ("color")
settings["mainsettings"][setting]["value"] = input(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]", settings["mainsettings"][setting]["value"]) as color
if ("boolean")
settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("Yes","No")
settings["mainsettings"][setting]["value"] = (settings["mainsettings"][setting]["value"] == "Yes") ? "No" : "Yes"
if ("ckey")
settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("none") + GLOB.directory
if (settings["mainsettings"][setting]["callback"])
Expand Down
28 changes: 26 additions & 2 deletions code/datums/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
var/mission = "Assist the station."
var/teamsize = 5
var/polldesc
/// If TRUE, gives the team members "[role] [random last name]" style names
var/random_names = TRUE
/// If TRUE, the admin who created the response team will be spawned in the briefing room in their preferred briefing outfit (assuming they're a ghost)
var/spawn_admin = FALSE
/// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
var/leader_experience = TRUE

/datum/ert/New()
if (!polldesc)
Expand Down Expand Up @@ -39,10 +45,12 @@
code = "Green"
teamsize = 1
opendoors = FALSE
leader_role = /datum/antagonist/official
roles = list(/datum/antagonist/official)
leader_role = /datum/antagonist/ert/official
roles = list(/datum/antagonist/ert/official)
rename_team = "CentCom Officials"
polldesc = "a CentCom Official"
random_names = FALSE
leader_experience = FALSE

/datum/ert/centcom_official/New()
mission = "Conduct a routine performance review of [station_name()] and its Captain."
Expand Down Expand Up @@ -80,6 +88,12 @@
rename_team = "Horde of Interns"
mission = "Assist in conflict resolution."
polldesc = "an unpaid internship opportunity with Nanotrasen"
random_names = FALSE

/datum/ert/intern/unarmed
roles = list(/datum/antagonist/ert/intern/unarmed)
leader_role = /datum/antagonist/ert/intern/leader/unarmed
rename_team = "Unarmed Horde of Interns"

/datum/ert/lawyer
roles = list(/datum/antagonist/ert/lawyer)
Expand Down Expand Up @@ -127,3 +141,13 @@
mission = "Eliminate the kudzu with extreme prejudice"
polldesc = "an elite gardening team"
code = "Vine Green"

/datum/ert/bounty_hunters
roles = list(/datum/antagonist/ert/bounty_armor, /datum/antagonist/ert/bounty_hook, /datum/antagonist/ert/bounty_synth)
leader_role = /datum/antagonist/ert/bounty_armor
teamsize = 3
opendoors = FALSE
rename_team = "Bounty Hunters"
mission = "Assist the station in catching perps, dead or alive."
polldesc = "a Centcom-hired bounty hunting gang"
random_names = FALSE
10 changes: 10 additions & 0 deletions code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,16 @@ update_label("John Doe", "Clowny")
assignment = "CentCom Attorney"
icon_state = "centcom"

/// Trim for Bounty Hunters hired by centcom.
/obj/item/card/id/silver/bounty/ert
registered_name = "Bounty Hunter"
assignment = "Bounty Hunter"
icon_state = "ert"

/obj/item/card/id/silver/bounty/ert/Initialize(mapload)
. = ..()
access = list(ACCESS_CENT_GENERAL)

/obj/item/card/id/ert/lawyer/Initialize(mapload)
. = ..()
access = list(ACCESS_CENT_GENERAL, ACCESS_COURT, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS)
Expand Down
Loading

0 comments on commit ecf9e0e

Please sign in to comment.