Skip to content

Commit

Permalink
Merge branch 'master' into junglevrmap
Browse files Browse the repository at this point in the history
  • Loading branch information
Repede authored Dec 30, 2023
2 parents deee1d9 + 71ad8f7 commit dad77fe
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions maps/yw/items/encryptionkey_sc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
/obj/item/device/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "com_cypherkey"
channels = list("Supply" = 1, "Explorer" = 1)
channels = list("Supply" = 1, "Away Team" = 1)

/obj/item/device/encryptionkey/explorer
name = "explorer radio encryption key"
icon_state = "com_cypherkey"
channels = list("Explorer" = 1)
channels = list("Away Team" = 1)

/obj/item/device/encryptionkey/sar
name = "sar's encryption key"
icon_state = "med_cypherkey"
channels = list("Medical" = 1, "Explorer" = 1)
channels = list("Medical" = 1, "Away Team" = 1)

/obj/item/device/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0, "Explorer" = 0)
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0, "Away Team" = 1)

/obj/item/device/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1)
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1,"Away Team" = 1)

/obj/item/device/encryptionkey/heads/captain
name = "colony director's encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Explorer" = 0)
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Away Team" = 0)
2 changes: 1 addition & 1 deletion maps/yw/items/encryptionkey_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/obj/item/device/encryptionkey/pilot
icon_state = "cypherkey"
channels = list("Explorer" = 1)
channels = list("Away Team" = 1)

/obj/item/device/encryptionkey/explorer
channels = list("Away Team" = 1) //YW EDIT: Removes Science to come in line with our chain of Command

0 comments on commit dad77fe

Please sign in to comment.