diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 4d7d700ea72..38047e7d15b 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -204,7 +204,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_or_collect(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears) + H.equip_or_collect(new /obj/item/device/radio/headset/headset_mining (H), slot_ears) switch(H.backbag) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index db7165ecbd8..2695d1139fd 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -112,6 +112,12 @@ icon_state = "cargo_cypherkey" channels = list("Supply" = 1) +/obj/item/device/encryptionkey/headset_mining + name = "Mining Radio Encryption Key" + desc = "An encryption key for a radio headset. Contains cypherkeys." + icon_state = "mine_cypherkey" + channels = list("Supply" = 1, "Science" = 1) + /obj/item/device/encryptionkey/headset_service name = "Service Radio Encryption Key" desc = "An encryption key for a radio headset. Contains cypherkeys." diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 0a65ee8336f..ec15966d1a3 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -186,6 +186,16 @@ keyslot2 = new /obj/item/device/encryptionkey/headset_cargo ..() +/obj/item/device/radio/headset/headset_mining + name = "supply radio headset" + desc = "A headset used by the shaft miners to be yelled at from the QM and R&D at the same time. Channels are as follows: :u - supply, :n - science" + icon_state = "mine_headset" + item_state = "headset" + + New() + keyslot2 = new /obj/item/device/encryptionkey/headset_mining + ..() + /obj/item/device/radio/headset/headset_service name = "service radio headset" desc = "A headset used by the chef, the bartender and the botanists to plan their poisoning of the entire crew. To access the service channel, use :d." diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index cd0e181319b..dce84236454 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -197,7 +197,7 @@ corpseidaccess = "Scientist" /obj/effect/landmark/corpse/miner - corpseradio = /obj/item/device/radio/headset/headset_cargo + corpseradio = /obj/item/device/radio/headset/headset_mining corpseuniform = /obj/item/clothing/under/rank/miner corpsegloves = /obj/item/clothing/gloves/black corpseback = /obj/item/weapon/storage/backpack/industrial diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c1380602e47..a2fe6baed12 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -26,7 +26,7 @@ new /obj/item/weapon/storage/backpack/industrial(src) else new /obj/item/weapon/storage/backpack/satchel_eng(src) - new /obj/item/device/radio/headset/headset_cargo(src) + new /obj/item/device/radio/headset/headset_mining(src) new /obj/item/clothing/under/rank/miner(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/shoes/black(src) diff --git a/html/changelogs/Dylanstrategie_MineHeadset.yml b/html/changelogs/Dylanstrategie_MineHeadset.yml new file mode 100644 index 00000000000..edfddfcdf01 --- /dev/null +++ b/html/changelogs/Dylanstrategie_MineHeadset.yml @@ -0,0 +1,5 @@ +author: Dylanstrategie +delete-after: True +changes: + - rscadd: Shaft Miners now have their very own headset with a special Cargo/Mining encryption key. Roboticists and Research Directors everywhere rejoice as their bitching about the miners being too busy jacking off in a cavern to deliver minerals no longer falls on deaf ears + - imageadd: Modify the existing and unsued Mining headset and encryption key, and the existing Cargo ones to look more distinct and related to their functions diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index bf75a778efd..ed2a57f2f9d 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ