Skip to content

Oldstation Updates #6580

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

Merged
merged 2 commits into from
May 13, 2025
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
207 changes: 54 additions & 153 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@

/// MONKESTATION ADDITION - Adds Charlie Station region, for the Charlie Station ID console.
/// Name for the Charlie Station region.
#define REGION_CHARLIE_STATION "Charlie Station"
#define REGION_CHARLIE_STATION "Ancient Station"
/// Used to seed the accesses_by_region list in SSid_access. A list of all ACCESS_AWAY regional accesses.
#define REGION_ACCESS_CHARLIE_STATION list( \
ACCESS_AWAY_GENERAL, \
Expand Down
18 changes: 9 additions & 9 deletions code/controllers/subsystem/id_access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -326,18 +326,18 @@ SUBSYSTEM_DEF(id_access)
desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den"
desc_by_access["[ACCESS_PERMABRIG]"] = "Permabrig" // monkestation edit: add permabrig-only access
//MONKESTATION ADDITION - Adds descriptions to Charlie Station access levels. Used for Charlie Station ID Console.
desc_by_access["[ACCESS_AWAY_GENERAL]"] = "Charlie Station General"
desc_by_access["[ACCESS_AWAY_SCIENCE]"] = "Charlie Station Science"
desc_by_access["[ACCESS_AWAY_GENERAL]"] = "Station General Access"
desc_by_access["[ACCESS_AWAY_SCIENCE]"] = "Delta Station Science"
desc_by_access["[ACCESS_AWAY_MAINTENANCE]"] = "Charlie Station Maintenance"
desc_by_access["[ACCESS_AWAY_SUPPLY]"] = "Charlie Station Supply"
desc_by_access["[ACCESS_AWAY_GENERIC1]"] = "Charlie Station Generic 1"
desc_by_access["[ACCESS_AWAY_GENERIC2]"] = "Charlie Station Generic 2"
desc_by_access["[ACCESS_AWAY_GENERIC3]"] = "Charlie Station Generic 3"
desc_by_access["[ACCESS_AWAY_GENERIC4]"] = "Charlie Station Generic 4"
desc_by_access["[ACCESS_AWAY_SUPPLY]"] = "Alpha Station Supply"
desc_by_access["[ACCESS_AWAY_GENERIC1]"] = "Station Generic 1"
desc_by_access["[ACCESS_AWAY_GENERIC2]"] = "Station Generic 2"
desc_by_access["[ACCESS_AWAY_GENERIC3]"] = "Station Generic 3"
desc_by_access["[ACCESS_AWAY_GENERIC4]"] = "Station Generic 4"
desc_by_access["[ACCESS_AWAY_COMMAND]"] = "Charlie Station Command"
desc_by_access["[ACCESS_AWAY_MEDICAL]"] = "Charlie Station Medical"
desc_by_access["[ACCESS_AWAY_MEDICAL]"] = "Beta Station Medical"
desc_by_access["[ACCESS_AWAY_SEC]"] = "Charlie Station Security"
desc_by_access["[ACCESS_AWAY_ENGINEERING]"] = "Charlie Station Engineering"
desc_by_access["[ACCESS_AWAY_ENGINEERING]"] = "Beta Station Engineering"
//END OF ADDITION

/**
Expand Down
4 changes: 2 additions & 2 deletions code/datums/id_trim/ruins.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
ACCESS_AWAY_GENERAL,
ACCESS_AWAY_SCIENCE
)
assignment = "Charlie Station Scientist"
assignment = "Delta Station Scientist"

/// Trim for the oldstation ruin/Charlie station
/datum/id_trim/job/away/old/eng
Expand All @@ -67,7 +67,7 @@
ACCESS_ENGINEERING,
ACCESS_ENGINE_EQUIP
)
assignment = "Charlie Station Engineer"
assignment = "Beta Station Engineer"

/// Trim for the oldstation ruin/Charlie station to access APCs and other equipment
/datum/id_trim/job/away/old/equipment
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/camera/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/autoname, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/emp_proof, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/motion, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/autoname/old, 0)

/datum/armor/machinery_camera
melee = 50
Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/camera/presets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
/obj/machinery/camera/autoname
var/number = 0 //camera number in area

/obj/machinery/camera/autoname/old
network = list("Alpha", "Beta", "Charlie", "Delta",)
status = 0

//This camera type automatically sets it's name to whatever the area that it's in is called.
/obj/machinery/camera/autoname/Initialize(mapload)
..()
Expand Down
6 changes: 6 additions & 0 deletions code/game/machinery/computer/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,10 @@
network = list("mine", "auxbase", "vault")
circuit = null

/obj/machinery/computer/security/old
name = "\improper worn camera console"
desc = "A security console with access to the station's camera network. The screen barley flickers to life."
network = list("Alpha", "Beta", "Charlie", "Delta",)
circuit = null

#undef DEFAULT_MAP_SIZE
8 changes: 4 additions & 4 deletions code/game/objects/items/cards/card_ids.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/card/id/away/old/cmo
name = "Charlie Station Chief Medical Officer's ID card"
desc = "A faded Charlie Station ID card. You can make out the rank \"Chief Medical Officer\"."
name = "Beta Station Chief Medical Officer's ID card"
desc = "A faded Beta Station ID card. You can make out the rank \"Chief Medical Officer\"."
trim = /datum/id_trim/job/away/old/cmo

/obj/item/card/id/away/old/chef
Expand All @@ -9,6 +9,6 @@
trim = /datum/id_trim/job/away/old/chef

/obj/item/card/id/away/old/explorer
name = "Charlie Station Explorer's ID card"
desc = "A faded Charlie Station ID card. You can make out the rank \"Explorer\"."
name = "Beta Station Explorer's ID card"
desc = "A faded Beta Station ID card. You can make out the rank \"Explorer\"."
trim = /datum/id_trim/job/away/old/explorer
8 changes: 4 additions & 4 deletions code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -877,13 +877,13 @@
trim = /datum/id_trim/job/away/old/sec /// MONKESTATION EDIT - Turns all Charlie Station trims into /datum/id_trim/job trims

/obj/item/card/id/away/old/sci
name = "Charlie Station Scientist's ID card"
desc = "A faded Charlie Station ID card. You can make out the rank \"Scientist\"."
name = "Delta Station Scientist's ID card"
desc = "A faded Delta Station ID card. You can make out the rank \"Scientist\"."
trim = /datum/id_trim/job/away/old/sci /// MONKESTATION EDIT - Turns all Charlie Station trims into /datum/id_trim/job trims

/obj/item/card/id/away/old/eng
name = "Charlie Station Engineer's ID card"
desc = "A faded Charlie Station ID card. You can make out the rank \"Station Engineer\"."
name = "Beta Station Engineer's ID card"
desc = "A faded Beta Station ID card. You can make out the rank \"Station Engineer\"."
trim = /datum/id_trim/job/away/old/eng /// MONKESTATION EDIT - Turns all Charlie Station trims into /datum/id_trim/job trims

/obj/item/card/id/away/old/equipment
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/datums/id_trim/ruins.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ACCESS_ENGINEERING,
ACCESS_ENGINE_EQUIP
)
assignment = "Charlie Station Chief Medical Officer"
assignment = "Beta Station Chief Medical Officer"
sechud_icon_state = SECHUD_CHIEF_MEDICAL_OFFICER_AWAY

/datum/id_trim/job/away/old/chef
Expand Down Expand Up @@ -77,7 +77,7 @@
ACCESS_ENGINEERING,
ACCESS_ENGINE_EQUIP
)
assignment = "Charlie Station Explorer"
assignment = "Beta Station Explorer"
sechud_icon_state = SECHUD_EXPLORER_AWAY

/datum/id_trim/job/away/old/sci
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

/datum/computer_file/program/card_mod/old
filename = "charliestationidwriter"
filedesc = "Charlie Station Access Management"
filedesc = "Station Access Management"
available_on_ntnet = FALSE //charlie station only fools

//every access i could find on charlie station ids
Expand Down Expand Up @@ -87,7 +87,7 @@

/datum/computer_file/program/card_mod/old/ui_static_data(mob/user)
var/list/data = list()
data["station_name"] = "Charlie Station" //we arent ss13, don't show as such (despite the fact this isn't shown anywhere??)
data["station_name"] = "Station" //we arent ss13, don't show as such (despite the fact this isn't shown anywhere??)
data["centcom_access"] = is_centcom
data["minor"] = target_dept || minor ? TRUE : FALSE

Expand Down Expand Up @@ -125,7 +125,7 @@
trim_state = null

/datum/id_trim/job/away/old/custom
assignment = "Charlie Station Crew"
assignment = "Station Crew"
minimal_access = list(
ACCESS_AWAY_GENERAL,
ACCESS_ROBOTICS,
Expand All @@ -147,5 +147,5 @@
)

/obj/item/card/id/away/old/custom
name = "Charlie Station ID card"
desc = "A card used to provide ID and determine access across Charlie Station."
name = "Station ID card"
desc = "A card used to provide ID and determine access across the Station."
Loading