Skip to content

Commit

Permalink
Antag Accesses Fix (#4275)
Browse files Browse the repository at this point in the history
# About the pull request
Fixes UPP & CLF access to antag vendors, along with fixing who has antag
tags. Also gave UPP/TWE reps their respective accesses.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Bugs bad, consistency good.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Fixes UPP/CLF access to antag vendors.
add: Adds faction specific accesses to TWE and UPP representatives.
del: Removes pirate access from Press and Corp. Liaison.
/:cl:
  • Loading branch information
realforest2001 authored Aug 28, 2023
1 parent 9a460f6 commit 8ca40b9
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 14 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/kitchen/smartfridge.dm
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
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
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
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
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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,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

0 comments on commit 8ca40b9

Please sign in to comment.