shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10128 from Seris02/clownheadset

Browse Source 
gives the clown a headset with a clown megaphone loudmode
This commit is contained in:
Ghom
2019-12-26 13:58:45 +01:00
committed by GitHub
parent 7892d84f09 e125dae871
commit 512d046f18
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/headset.dm
+8
View File
@@ -230,6 +230,14 @@ GLOBAL_LIST_INIT(channel_tokens, list(
icon_state = "srv_headset" icon_state = "srv_headset"
keyslot = new /obj/item/encryptionkey/headset_service keyslot = new /obj/item/encryptionkey/headset_service
/obj/item/radio/headset/headset_clown
name = "clown's headset"
desc = "A headset for the clown. Finally. A megaphone you can't take away."
icon_state = "srv_headset"
keyslot = new /obj/item/encryptionkey/headset_service
command = TRUE
commandspan = SPAN_CLOWN
/obj/item/radio/headset/headset_cent /obj/item/radio/headset/headset_cent
name = "\improper CentCom headset" name = "\improper CentCom headset"
desc = "A headset used by the upper echelons of Nanotrasen." desc = "A headset used by the upper echelons of Nanotrasen."
code/game/objects/items/devices/radio/radio.dm
+2 -1
View File
@@ -29,6 +29,7 @@
var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios. var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios.
var/use_command = FALSE // If true, broadcasts will be large and BOLD. var/use_command = FALSE // If true, broadcasts will be large and BOLD.
var/command = FALSE // If true, use_command can be toggled at will. var/command = FALSE // If true, use_command can be toggled at will.
var/commandspan = SPAN_COMMAND //allow us to set what the fuck we want for headsets
// Encryption key handling // Encryption key handling
var/obj/item/encryptionkey/keyslot var/obj/item/encryptionkey/keyslot
@@ -206,7 +207,7 @@
return return
if(use_command) if(use_command)
spans |= SPAN_COMMAND spans |= commandspan
/* /*
Roughly speaking, radios attempt to make a subspace transmission (which Roughly speaking, radios attempt to make a subspace transmission (which