cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes encryption keys to no longer be headsets >.>

Browse Source 
Changes the encryption key path from /obj/item/device/radio/headset/encryptionkey/ to /obj/item/device/encryptionkey/

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3207 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
VivianFoxfoot@gmail.com
2012-02-28 01:44:17 +00:00
parent 0cd813a786
commit 7addeb0ab6
3 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/PDA/uplink.dm
+1 -1
View File
@@ -205,7 +205,7 @@
if("botchat")
if (uses >= 3)
uses -= 3
new /obj/item/device/radio/headset/encryptionkey/binary(get_turf(hostpda))
new /obj/item/device/encryptionkey/binary(get_turf(hostpda))
feedback_add_details("traitor_uplink_items_bought","BT")
if("singubeacon")
if(uses >= 7)
code/game/objects/radio/encryptionkey.dm
+26 -21
View File
@@ -1,98 +1,103 @@
/obj/item/device/radio/headset/encryptionkey/
/obj/item/device/encryptionkey/
name = "Standard Encrpytion Key"
desc = "An encyption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN."
icon = 'radio.dmi'
icon_state = "cypherkey"
item_state = ""
var/translate_binary = 0
var/translate_hive = 0
var/list/channels = list()
/obj/item/device/radio/headset/encryptionkey/New()
/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/device/encryptionkey/New()
/obj/item/device/radio/headset/encryptionkey/traitor
/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/device/encryptionkey/traitor
channels = list("Syndicate" = 1)
origin_tech = "syndicate=3"
/obj/item/device/radio/headset/encryptionkey/binary
/obj/item/device/encryptionkey/binary
translate_binary = 1
origin_tech = "syndicate=3"
/obj/item/device/radio/headset/encryptionkey/headset_sec
/obj/item/device/encryptionkey/headset_sec
name = "Security Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Security" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_eng
/obj/item/device/encryptionkey/headset_eng
name = "Engineering Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Engineering" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_rob
/obj/item/device/encryptionkey/headset_rob
name = "Robotics Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Engineering" = 1, "Science" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_med
/obj/item/device/encryptionkey/headset_med
name = "Medical Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Medical" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_sci
/obj/item/device/encryptionkey/headset_sci
name = "Science Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Science" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_medsci
/obj/item/device/encryptionkey/headset_medsci
name = "Medical Research Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Medical" = 1, "Science" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_com
/obj/item/device/encryptionkey/headset_com
name = "Command Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Command" = 1)
/obj/item/device/radio/headset/encryptionkey/heads/captain
/obj/item/device/encryptionkey/heads/captain
name = "Captain's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0)
/obj/item/device/radio/headset/encryptionkey/heads/rd
/obj/item/device/encryptionkey/heads/rd
name = "Research Director's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Science" = 1, "Command" = 1)
/obj/item/device/radio/headset/encryptionkey/heads/hos
/obj/item/device/encryptionkey/heads/hos
name = "Head of Security's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Security" = 1, "Command" = 1)
/obj/item/device/radio/headset/encryptionkey/heads/ce
/obj/item/device/encryptionkey/heads/ce
name = "Chief Engineer's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Engineering" = 1, "Command" = 1)
/obj/item/device/radio/headset/encryptionkey/heads/cmo
/obj/item/device/encryptionkey/heads/cmo
name = "Chief Medical Officer's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Medical" = 1, "Command" = 1)
/obj/item/device/radio/headset/encryptionkey/heads/hop
/obj/item/device/encryptionkey/heads/hop
name = "Head of Personnel's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0)
/obj/item/device/radio/headset/encryptionkey/headset_mine
/obj/item/device/encryptionkey/headset_mine
name = "Mining Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Mining" = 1)
/obj/item/device/radio/headset/encryptionkey/heads/qm
/obj/item/device/encryptionkey/heads/qm
name = "Quartermaster's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Cargo" = 1, "Mining" = 1)
/obj/item/device/radio/headset/encryptionkey/headset_cargo
/obj/item/device/encryptionkey/headset_cargo
name = "Cargo Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
channels = list("Cargo" = 1)
code/game/objects/radio/headset.dm
+23 -23
View File
@@ -11,12 +11,12 @@
var/protective_temperature = 0
var/translate_binary = 0
var/translate_hive = 0
var/obj/item/device/radio/headset/encryptionkey/keyslot1 = null
var/obj/item/device/radio/headset/encryptionkey/keyslot2 = null
var/obj/item/device/encryptionkey/keyslot1 = null
var/obj/item/device/encryptionkey/keyslot2 = null
/obj/item/device/radio/headset/New()
..()
keyslot1 = new /obj/item/device/radio/headset/encryptionkey/
keyslot1 = new /obj/item/device/encryptionkey/
recalculateChannels()
/obj/item/device/radio/headset/traitor
@@ -24,7 +24,7 @@
/obj/item/device/radio/headset/traitor/New()
..()
del(keyslot1)
keyslot1 = new /obj/item/device/radio/headset/encryptionkey/traitor
keyslot1 = new /obj/item/device/encryptionkey/traitor
recalculateChannels()
/obj/item/device/radio/headset/binary
@@ -32,7 +32,7 @@
/obj/item/device/radio/headset/binary/New()
..()
del(keyslot1)
keyslot1 = new /obj/item/device/radio/headset/encryptionkey/binary
keyslot1 = new /obj/item/device/encryptionkey/binary
recalculateChannels()
/obj/item/device/radio/headset/headset_sec
@@ -40,117 +40,117 @@
desc = "This is used by your elite security force. To access the security channel, use :s."
icon_state = "sec_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_sec
keyslot2 = new /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_eng
name = "Engineering Radio Headset"
desc = "When the engineers wish to chat like girls. To access the engineering channel, use :e. "
icon_state = "eng_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_eng
keyslot2 = new /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_rob
name = "Robotics Radio Headset"
desc = "Made specifically for the roboticists who cannot decide between departments. To access the engineering channel, use :e. For research, use :n."
icon_state = "rob_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_rob
keyslot2 = new /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/headset_med
name = "Medical Radio Headset"
desc = "A headset for the trained staff of the medbay. To access the medical channel, use :m."
icon_state = "med_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_med
keyslot2 = new /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_sci
name = "Science Radio Headset"
desc = "A sciency headset. Like usual. To access the science channel, use :n."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_sci
keyslot2 = new /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_medsci
name = "Medical Research Radio Headset"
desc = "A headset that is a result of the mating between medical and science. To access the medical channel, use :m. For science, use :n."
icon_state = "med_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_medsci
keyslot2 = new /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/headset_com
name = "Command Radio Headset"
desc = "A headset with a commanding channel. To access the command channel, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_com
keyslot2 = new /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/heads/captain
name = "Captain's Headset"
desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/captain
keyslot2 = new /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/rd
name = "Research Director's Headset"
desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/rd
keyslot2 = new /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/hos
name = "Head of Security's Headset"
desc = "The headset of the man who protects your worthless lifes. To access the security channel, use :s. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/hos
keyslot2 = new /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/ce
name = "Chief Engineer's Headset"
desc = "The headset of the guy who is in charge of morons. To access the engineering channel, use :e. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/ce
keyslot2 = new /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/cmo
name = "Chief Medical Officer's Headset"
desc = "The headset of the highly trained medical chief. To access the medical channel, use :m. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/cmo
keyslot2 = new /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/hop
name = "Head of Personnel's Headset"
desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/hop
keyslot2 = new /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/headset_mine
name = "Mining Radio Headset"
desc = "Headset used by miners. How useless. To access the mining channel, use :d."
icon_state = "mine_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_mine
keyslot2 = new /obj/item/device/encryptionkey/headset_mine
/obj/item/device/radio/headset/heads/qm
name = "Quartermaster's Headset"
desc = "The headset of the man who control your toiletpaper supply. To access the cargo channel, use :q. For mining, use :d."
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/heads/qm
keyslot2 = new /obj/item/device/encryptionkey/heads/qm
/obj/item/device/radio/headset/headset_cargo
name = "Cargo Radio Headset"
desc = "Headset used by the QM's slaves. To access the cargo channel, use :q."
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/radio/headset/encryptionkey/headset_cargo
keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
// ..()
user.machine = src
if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/radio/headset/encryptionkey/ ))))
if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))
return
if(istype(W, /obj/item/weapon/screwdriver))
@@ -183,7 +183,7 @@
else
user << "This headset doesn't have any encryption keys! How useless..."
if(istype(W, /obj/item/device/radio/headset/encryptionkey/))
if(istype(W, /obj/item/device/encryptionkey/))
if(keyslot1 && keyslot2)
user << "The headset can't hold another key!"
return