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.

Sign up for GitHub

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

Jump to bottom

Antag Accesses Fix #4275

Merged
merged 1 commit into from
Aug 28, 2023
Merged

Antag Accesses Fix #4275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/game/machinery/kitchen/smartfridge.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@
return 0

/obj/structure/machinery/smartfridge/chemistry/antag
req_one_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)

/obj/structure/machinery/smartfridge/chemistry/virology
name = "\improper Smart Virus Storage"
Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/vending/vendor_types/antag/antag_clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
name = "\improper Suspicious Automated Equipment Rack"
desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various equipment."
icon_state = "antag_clothing"
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null

listed_products = list()

Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/vending/vendor_types/antag/antag_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various gear."
icon_state = "gear"

req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null
listed_products = list()

/obj/structure/machinery/cm_vending/gear/antag/Initialize()
Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
name = "\improper Suspicious Automated Guns Rack"
desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various weapons, ammunition and explosives."
icon_state = "antag_guns"
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null

use_snowflake_points = TRUE

Expand Down
3 changes: 2 additions & 1 deletion code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
name = "\improper Suspicious Automated Guns Rack"
desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various weapons."
icon_state = "antag_guns"
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null
listed_products = list()

/obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns/Initialize()
Expand Down
9 changes: 6 additions & 3 deletions code/game/machinery/vending/vendor_types/engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@
)

/obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null

/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage
name = "\improper Electronics Vendor"
Expand All @@ -117,7 +118,8 @@
)

/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage/antag
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null

/obj/structure/machinery/cm_vending/sorted/tech/comp_storage
name = "\improper Component Storage Machine"
Expand Down Expand Up @@ -146,7 +148,8 @@
)

/obj/structure/machinery/cm_vending/sorted/tech/comp_storage/antag
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null

//------COLONY-SPECIFIC VENDORS-------

Expand Down
9 changes: 6 additions & 3 deletions code/game/machinery/vending/vendor_types/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@
/obj/structure/machinery/cm_vending/sorted/medical/antag
name = "\improper Medical Equipment Vendor"
desc = "A vending machine dispensing various pieces of medical equipment."
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null
vendor_theme = VENDOR_THEME_CLF

/obj/structure/machinery/cm_vending/sorted/medical/marinemed
Expand Down Expand Up @@ -267,7 +268,8 @@
/obj/structure/machinery/cm_vending/sorted/medical/marinemed/antag
name = "\improper Basic Medical Supplies Vendor"
desc = "A vending machine dispensing basic medical supplies."
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null
vendor_theme = VENDOR_THEME_CLF

/obj/structure/machinery/cm_vending/sorted/medical/blood
Expand Down Expand Up @@ -298,7 +300,8 @@
return

/obj/structure/machinery/cm_vending/sorted/medical/blood/antag
req_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)
req_access = null
vendor_theme = VENDOR_THEME_CLF

/obj/structure/machinery/cm_vending/sorted/medical/wall_med
Expand Down
6 changes: 6 additions & 0 deletions code/modules/gear_presets/agents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
ACCESS_CIVILIAN_MEDBAY,
ACCESS_CIVILIAN_COMMAND,
ACCESS_MARINE_MAINT,
ACCESS_UPP_GENERAL,
ACCESS_UPP_FLIGHT,
ACCESS_UPP_LEADERSHIP,
)
assignment = JOB_UPP_REPRESENTATIVE
rank = JOB_UPP_REPRESENTATIVE
Expand Down Expand Up @@ -96,6 +99,9 @@
ACCESS_CIVILIAN_MEDBAY,
ACCESS_CIVILIAN_COMMAND,
ACCESS_MARINE_MAINT,
ACCESS_TWE_GENERAL,
ACCESS_TWE_FLIGHT,
ACCESS_TWE_LEADERSHIP,
)
assignment = JOB_TWE_REPRESENTATIVE
rank = JOB_TWE_REPRESENTATIVE
Expand Down
2 changes: 0 additions & 2 deletions code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
idtype = /obj/item/card/id/silver/cl
access = list(
ACCESS_WY_GENERAL,
ACCESS_ILLEGAL_PIRATE,
ACCESS_MARINE_COMMAND,
ACCESS_MARINE_RESEARCH,
ACCESS_MARINE_MEDBAY,
Expand Down Expand Up @@ -106,7 +105,6 @@
flags = EQUIPMENT_PRESET_START_OF_ROUND

access = list(
ACCESS_ILLEGAL_PIRATE,
ACCESS_MARINE_COMMAND,
ACCESS_MARINE_RESEARCH,
ACCESS_MARINE_MEDBAY,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/apc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(

/obj/structure/machinery/power/apc/antag
cell_type = /obj/item/cell/apc
req_one_access = list(ACCESS_ILLEGAL_PIRATE)
req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL)

//------Almayer APCs ------//

Expand Down
Loading