Skip to content
This repository has been archived by the owner on Sep 8, 2022. It is now read-only.

[MIRROR] Heads of staff (and qm) get a box of radio keys for their department #1439

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Next Next commit
Heads of staff (and qm) get a box of radio keys for their department …
…(#7426)

* key boxes are in

* new icons!

* wory

* icon touch up

* adds to lockers

* src missing

* clown can get in on this too

* gold box touchup

* fixed the broken sprites

Co-authored-by: Candycaneannihalator <candycane@thisisnotarealaddr.com>
Co-authored-by: etherware-novice <candy@notarealaddr.com>
3 people authored and SinguloBot committed Sep 4, 2022
commit 4a6baa32cf2be1508429be8b2dc5d529647aaba2
30 changes: 30 additions & 0 deletions code/game/objects/items/devices/radio/encryptionkey.dm
Original file line number Diff line number Diff line change
@@ -34,6 +34,18 @@
icon_state = "bin_cypherkey"
translate_binary = TRUE

<<<<<<< HEAD
=======
/obj/item/encryptionkey/amplification
name = "amplification module key"
amplification = TRUE

// Makes sure neither channel messages show up.
/obj/item/encryptionkey/amplification/Initialize()
. = ..()
desc = "An amplification module key for a radio headset. It will enable the \"Loud mode\" ability on any headset it is inserted into."

>>>>>>> 8b722667a7... Heads of staff (and qm) get a box of radio keys for their department (#7426)
/obj/item/encryptionkey/headset_sec
name = "security radio encryption key"
icon_state = "sec_cypherkey"
@@ -84,31 +96,49 @@
icon_state = "cap_cypherkey"
channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_ENGINEERING = 0, RADIO_CHANNEL_SCIENCE = 0, RADIO_CHANNEL_MEDICAL = 0, RADIO_CHANNEL_SUPPLY = 0, RADIO_CHANNEL_SERVICE = 0, RADIO_CHANNEL_EXPLORATION = 0)

/obj/item/encryptionkey/heads/captain/fake
channels = list(RADIO_CHANNEL_SERVICE = 1)

/obj/item/encryptionkey/heads/rd
name = "\proper the research director's encryption key"
icon_state = "rd_cypherkey"
channels = list(RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_EXPLORATION = 1, RADIO_CHANNEL_COMMAND = 1)

/obj/item/encryptionkey/heads/rd/fake
channels = list(RADIO_CHANNEL_SERVICE = 1)

/obj/item/encryptionkey/heads/hos
name = "\proper the head of security's encryption key"
icon_state = "hos_cypherkey"
channels = list(RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_COMMAND = 1)

/obj/item/encryptionkey/heads/hos/fake
channels = list(RADIO_CHANNEL_SERVICE = 1)

/obj/item/encryptionkey/heads/ce
name = "\proper the chief engineer's encryption key"
icon_state = "ce_cypherkey"
channels = list(RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_COMMAND = 1)

/obj/item/encryptionkey/heads/ce/fake
channels = list(RADIO_CHANNEL_SERVICE = 1)

/obj/item/encryptionkey/heads/cmo
name = "\proper the chief medical officer's encryption key"
icon_state = "cmo_cypherkey"
channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_COMMAND = 1)

/obj/item/encryptionkey/heads/cmo/fake
channels = list(RADIO_CHANNEL_SERVICE = 1)

/obj/item/encryptionkey/heads/hop
name = "\proper the head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_COMMAND = 1)

/obj/item/encryptionkey/heads/hop/fake
channels = list(RADIO_CHANNEL_SERVICE = 1)

/obj/item/encryptionkey/headset_cargo
name = "supply radio encryption key"
icon_state = "cargo_cypherkey"
75 changes: 75 additions & 0 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
* Replacement light boxes.
* Action Figure Boxes
* Various paper bags.
* Encrpytion key boxes.
*
* For syndicate call-ins see uplink_kits.dm
*/
@@ -1289,4 +1290,78 @@
for(var/i in 1 to 4)
new /obj/item/clothing/accessory/armband/deputy(src)
new /obj/item/card/id/pass/deputy(src)
<<<<<<< HEAD

=======

/obj/item/storage/box/radiokey
name = "box of generic radio keys"
desc = "You shouldn't be seeing this. Ahelp."
icon_state = "radiobox"
var/radio_key = /obj/item/encryptionkey

/obj/item/storage/box/radiokey/PopulateContents()
for(var/i in 1 to 7)
new radio_key(src)

/obj/item/storage/box/radiokey/com
name = "box of command staff's radio keys"
desc = "A spare radio key for each command staff, plus an amplification key and a generic command key."
icon_state = "radiobox_gold"

/obj/item/storage/box/radiokey/com/PopulateContents()
new /obj/item/encryptionkey/heads/rd(src)
new /obj/item/encryptionkey/heads/hos(src)
new /obj/item/encryptionkey/heads/ce(src)
new /obj/item/encryptionkey/heads/cmo(src)
new /obj/item/encryptionkey/heads/hop(src)
new /obj/item/encryptionkey/headset_com(src)
new /obj/item/encryptionkey/amplification(src)

/obj/item/storage/box/radiokey/sci
name = "box of science radio keys"
desc = "For SCIENCE!"
radio_key = /obj/item/encryptionkey/headset_sci

/obj/item/storage/box/radiokey/sec
name = "box of security radio keys"
desc = "Grants access to the station's security radio."
radio_key = /obj/item/encryptionkey/headset_sec

/obj/item/storage/box/radiokey/eng
name = "box of engineering radio keys"
desc = "Dooms you to listen to Poly for all eternity."
radio_key = /obj/item/encryptionkey/headset_eng

/obj/item/storage/box/radiokey/med
name = "box of medical radio keys"
desc = "9 out of 10 doctors reccomend."
radio_key = /obj/item/encryptionkey/headset_med

/obj/item/storage/box/radiokey/srv
name = "box of service radio keys"
desc = "The channel for servants."
radio_key = /obj/item/encryptionkey/headset_service

/obj/item/storage/box/radiokey/car
name = "box of cargo tech radio keys" // qm can always buy mining conscript
desc = "Slaves you to the quartermaster."
radio_key = /obj/item/encryptionkey/headset_cargo

/obj/item/storage/box/radiokey/cap // admin spawn
name = "glorious box of captain's radio keys"
desc = "All-access radio."
icon_state = "radiobox_gold"
radio_key = /obj/item/encryptionkey/heads/captain

/obj/item/storage/box/radiokey/clown // honk
name = "\improper H.O.N.K. CO fake encryption keys"
desc = "Totally prank your friends with these realistic encryption keys!"

/obj/item/storage/box/radiokey/clown/PopulateContents()
new /obj/item/encryptionkey/heads/rd/fake(src)
new /obj/item/encryptionkey/heads/hos/fake(src)
new /obj/item/encryptionkey/heads/ce/fake(src)
new /obj/item/encryptionkey/heads/cmo/fake(src)
new /obj/item/encryptionkey/heads/hop/fake(src)
>>>>>>> 8b722667a7... Heads of staff (and qm) get a box of radio keys for their department (#7426)
Original file line number Diff line number Diff line change
@@ -23,3 +23,4 @@
new /obj/item/storage/photo_album/QM(src)
new /obj/item/circuitboard/machine/ore_silo(src)
new /obj/item/card/id/departmental_budget/car(src)
new /obj/item/storage/box/radiokey/car(src)
Original file line number Diff line number Diff line change
@@ -35,7 +35,15 @@
new /obj/item/storage/photo_album/CE(src)
new /obj/item/card/id/departmental_budget/eng(src)
new /obj/item/storage/bag/construction(src)
<<<<<<< HEAD

=======
new /obj/item/construction/rcd/loaded(src)
new /obj/item/storage/box/command_keys(src)
new /obj/item/rcd_ammo/large(src)
new /obj/item/storage/box/radiokey/eng(src)

>>>>>>> 8b722667a7... Heads of staff (and qm) get a box of radio keys for their department (#7426)
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
Original file line number Diff line number Diff line change
@@ -107,6 +107,12 @@
new /obj/item/reagent_containers/food/drinks/bottle/synthflesh(src)
new /obj/item/card/id/departmental_budget/med(src)
new /obj/item/extrapolator(src)
<<<<<<< HEAD
=======
new /obj/item/storage/box/command_keys(src)
new /obj/item/storage/lockbox/medal/med(src)
new /obj/item/storage/box/radiokey/med(src)
>>>>>>> 8b722667a7... Heads of staff (and qm) get a box of radio keys for their department (#7426)

/obj/structure/closet/secure_closet/animal
name = "animal control"
Original file line number Diff line number Diff line change
@@ -32,7 +32,11 @@
new /obj/item/circuitboard/machine/techfab/department/science(src)
new /obj/item/storage/photo_album/RD(src)
new /obj/item/card/id/departmental_budget/sci(src)
<<<<<<< HEAD

if(CONFIG_GET(number/roundstart_bluespace_miners))
for(var/i in 1 to CONFIG_GET(number/roundstart_bluespace_miners))
new /obj/item/circuitboard/machine/bluespace_miner(src)
new /obj/item/circuitboard/machine/bluespace_miner(src)
=======
new /obj/item/storage/box/radiokey/sci(src)
>>>>>>> 8b722667a7... Heads of staff (and qm) get a box of radio keys for their department (#7426)
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@
new /obj/item/door_remote/captain(src)
new /obj/item/storage/photo_album/Captain(src)
new /obj/item/card/id/departmental_budget/civ(src)
new /obj/item/storage/box/radiokey/com(src)

/obj/structure/closet/secure_closet/hop
name = "\proper head of personnel's locker"
@@ -65,6 +66,7 @@
new /obj/item/circuitboard/machine/techfab/department/service(src)
new /obj/item/storage/photo_album/HoP(src)
new /obj/item/card/id/departmental_budget/srv(src)
new /obj/item/storage/box/radiokey/srv(src)

/obj/structure/closet/secure_closet/brig_phys
name = "\proper brig physician's locker"
@@ -124,6 +126,7 @@
new /obj/item/circuitboard/machine/techfab/department/security(src)
new /obj/item/storage/photo_album/HoS(src)
new /obj/item/card/id/departmental_budget/sec(src)
new /obj/item/storage/box/radiokey/sec(src)

/obj/structure/closet/secure_closet/warden
name = "\proper warden's locker"
7 changes: 6 additions & 1 deletion code/game/objects/structures/crates_lockers/crates/wooden.dm
Original file line number Diff line number Diff line change
@@ -20,4 +20,9 @@
new /obj/item/pneumatic_cannon/pie(src)
new /obj/item/reagent_containers/food/snacks/pie/cream(src)
new /obj/item/storage/crayons(src)
new /obj/item/soundsynth(src)
<<<<<<< HEAD
new /obj/item/soundsynth(src)
=======
new /obj/item/soundsynth(src)
new /obj/item/storage/box/radiokey/clown(src)
>>>>>>> 8b722667a7... Heads of staff (and qm) get a box of radio keys for their department (#7426)