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

Merge branch 'master' into premium-kas-for-borgs

Browse Source
This commit is contained in:
shellspeed1
2022-09-23 17:00:02 -07:00
committed by GitHub
parent 2d90e0ab33 e70987eec0
commit 142c07c51d
68 changed files with 828 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -1232,6 +1232,51 @@ GLOBAL_LIST_EMPTY(PDAs)
continue
. += P
//borg pda stuff
/mob/living/silicon/robot/proc/cmd_send_pdamesg(mob/user)
var/list/plist = list()
var/list/namecounts = list()
if(aiPDA.toff)
to_chat(user, "Turn on your receiver in order to send messages.")
return
for (var/obj/item/pda/P in get_viewable_pdas())
if (P == src)
continue
else if (P == aiPDA)
continue
plist[avoid_assoc_duplicate_keys(P.owner, namecounts)] = P
var/c = input(user, "Please select a PDA") as null|anything in sortList(plist)
if (!c)
return
var/selected = plist[c]
if(aicamera.stored.len)
var/add_photo = input(user,"Do you want to attach a photo?","Photo","No") as null|anything in list("Yes","No")
if(add_photo=="Yes")
var/datum/picture/Pic = aicamera.selectpicture(user)
aiPDA.picture = Pic
if(incapacitated())
return
aiPDA.create_message(src, selected)
/mob/living/silicon/robot/proc/cmd_show_message_log(mob/user)
if(incapacitated())
return
if(!isnull(aiPDA))
var/HTML = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>AI PDA Message Log</title></head><body>[aiPDA.tnote]</body></html>"
user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
else
to_chat(user, "You do not have a PDA. You should make an issue report about this.")
#undef PDA_SCANNER_NONE
#undef PDA_SCANNER_MEDICAL
#undef PDA_SCANNER_FORENSICS

6
code/game/objects/items/devices/radio/radio.dm
View File

@@ -5,6 +5,7 @@
item_state = "walkietalkie"
desc = "A basic handheld radio that communicates with local telecommunication networks."
dog_fashion = /datum/dog_fashion/back
var/list/extra_channels = list() //Allows indivudal channels, used for borgs
flags_1 = CONDUCT_1 | HEAR_1
slot_flags = ITEM_SLOT_BELT
@@ -69,6 +70,11 @@
if(keyslot.independent)
independent = TRUE
if(extra_channels)
for(var/ch_name in extra_channels)
if(!(ch_name in channels))
channels[ch_name] = extra_channels[ch_name]
for(var/ch_name in channels)
secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])