Skip to content

Commit

Permalink
UI fully working
Browse files Browse the repository at this point in the history
  • Loading branch information
@AffectedArc07 @MarkSuckerberg
AffectedArc07 authored and MarkSuckerberg committed Jan 7, 2020
1 parent 6a0df5d commit 3de90a9
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 43 deletions.
30 changes: 15 additions & 15 deletions code/game/objects/items/devices/PDA/PDA.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ GLOBAL_LIST_EMPTY(PDAs)

if(!owner)
dat += "Warning: No owner information entered. Please swipe card.<br><br>"
dat += "<img src=pda_refresh.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=Refresh'>Retry</a>"
dat += "[PDAIMG(refresh)] <a href='byond://?src=[REF(src)];choice=Refresh'>Retry</a>"
else
switch (mode)
if(0)
Expand Down Expand Up @@ -298,27 +298,27 @@ GLOBAL_LIST_EMPTY(PDAs)
pai = null
update_icon()
else
dat += "<li><img src=pda_status.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=pai;option=1'>pAI Device Configuration</a></li>"
dat += "<li><img src=pda_status.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=pai;option=2'>Eject pAI Device</a></li>"
dat += "<li>[PDAIMG(status)] <a href='byond://?src=[REF(src)];choice=pai;option=1'>pAI Device Configuration</a></li>"
dat += "<li>[PDAIMG(status)] <a href='byond://?src=[REF(src)];choice=pai;option=2'>Eject pAI Device</a></li>"

if(1)
dat += "<h4><img src=pda_notes.png class=pda_icon> Notekeeper V2.2</h4>"
dat += "<h4>[PDAIMG(notes)] Notekeeper V2.2</h4>"
dat += "<a href='byond://?src=[REF(src)];choice=Edit'>Edit</a><br>"
if(notescanned)
dat += "(This is a scanned image, editing it may cause some text formatting to change.)<br>"
dat += "<HR><font face=\"[PEN_FONT]\">[(!notehtml ? note : notehtml)]</font>"

if(2)
dat += "<h4><img src=pda_mail.png class=pda_icon> SpaceMessenger V3.9.6</h4>"
dat += "<img src=pda_bell.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=Toggle Ringer'>Ringer: [silent == 1 ? "Off" : "On"]</a><br>"
dat += "<img src=pda_mail.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=Toggle Messenger'>Send / Receive: [toff == 1 ? "Off" : "On"]</a><br>"
dat += "<img src=pda_bell.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=Ringtone'>Set Ringtone</a><br>"
dat += "<img src=pda_mail.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=21'>Clear Messages</a><br>"
dat += "<h4>[PDAIMG(mail)] SpaceMessenger V3.9.6</h4>"
dat += "[PDAIMG(bell)] <a href='byond://?src=[REF(src)];choice=Toggle Ringer'>Ringer: [silent == 1 ? "Off" : "On"]</a><br>"
dat += "[PDAIMG(mail)] <a href='byond://?src=[REF(src)];choice=Toggle Messenger'>Send / Receive: [toff == 1 ? "Off" : "On"]</a><br>"
dat += "[PDAIMG(bell)] <a href='byond://?src=[REF(src)];choice=Ringtone'>Set Ringtone</a><br>"
dat += "[PDAIMG(mail)] <a href='byond://?src=[REF(src)];choice=21'>View Message Log</a><br>"

if(cartridge)
dat += cartridge.message_header()

dat += "<h4><img src=pda_mail.png class=pda_icon> Detected PDAs</h4>"
dat += "<h4>[PDAIMG(mail)] Detected PDAs</h4>"

dat += "<ul>"
var/count = 0
Expand All @@ -336,13 +336,13 @@ GLOBAL_LIST_EMPTY(PDAs)
if(count == 0)
dat += "None detected.<br>"
else if(cartridge && cartridge.spam_enabled)
dat += "<img src=pda_mail.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=MessageAll'>Send To All</a>"
dat += "[PDAIMG(mail)] <a href='byond://?src=[REF(src)];choice=MessageAll'>Send To All</a>"

if(21)
dat += "<h4><img src=pda_mail.png class=pda_icon> SpaceMessenger V3.9.6</h4>"
dat += "<img src=pda_blank.png class=pda_icon> <a href='byond://?src=[REF(src)];choice=Clear'> Clear Messages</a>"
dat += "<h4>[PDAIMG(mail)] SpaceMessenger V3.9.6</h4>"
dat += "[PDAIMG(blank)] <a href='byond://?src=[REF(src)];choice=Clear'> Clear Messages</a>"

dat += "<h4><img src=pda_mail.png class=pda_icon> Messages</h4>"
dat += "[PDAIMG(mail)] Messages</h4>"

dat += tnote
dat += "<br>"
Expand All @@ -354,7 +354,7 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += "</center>"

if(3)
dat += "<h4><img src=pda_atmos.png class=pda_icon> Atmospheric Readings</h4>"
dat += "<h4>[PDAIMG(atmos)] Atmospheric Readings</h4>"

var/turf/T = user.loc
if(isnull(T))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/PDA/PDA_types.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
name = "curator PDA"
icon_state = "pda-library"
icon_alert = "pda-r-library"
default_cartridge = /obj/item/cartridge/curator
// default_cartridge = /obj/item/cartridge/curator
inserted_item = /obj/item/pen/fountain
desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
Expand Down
57 changes: 30 additions & 27 deletions code/game/objects/items/devices/PDA/cart.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,13 @@
access = CART_SECURITY
spam_enabled = 1

/obj/item/cartridge/curator
name = "\improper Lib-Tweet cartridge"
icon_state = "cart-s"
access = CART_NEWSCASTER
// DISABLED BECAUSE IT DONT FUCKIN' WORK
/*
///obj/item/cartridge/curator
// name = "\improper Lib-Tweet cartridge"
// icon_state = "cart-s"
// access = CART_NEWSCASTER
*/

/obj/item/cartridge/roboticist
name = "\improper B.O.O.P. Remote Control cartridge"
Expand Down Expand Up @@ -181,7 +184,7 @@
name = "\improper Value-PAK cartridge"
desc = "Now with 350% more value!" //Give the Captain...EVERYTHING! (Except Mime, Clown, and Syndie)
icon_state = "cart-c"
access = ~(CART_CLOWN | CART_MIME | CART_REMOTE_DOOR)
access = ~(CART_CLOWN | CART_MIME | CART_REMOTE_DOOR | CART_NEWSCASTER)
bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
spam_enabled = 1

Expand Down Expand Up @@ -214,7 +217,6 @@
menu = "<h4>[PDAIMG(signaler)] Remote Signaling System</h4>"

menu += {"
<a href='byond://?src=[REF(src)];choice=Send Signal'>Send Signal</A><BR>
Frequency:
<a href='byond://?src=[REF(src)];choice=Signal Frequency;sfreq=-10'>-</a>
<a href='byond://?src=[REF(src)];choice=Signal Frequency;sfreq=-2'>-</a>
Expand All @@ -227,15 +229,16 @@ Code:
<a href='byond://?src=[REF(src)];choice=Signal Code;scode=-1'>-</a>
[radio.code]
<a href='byond://?src=[REF(src)];choice=Signal Code;scode=1'>+</a>
<a href='byond://?src=[REF(src)];choice=Signal Code;scode=5'>+</a><br>"}
<a href='byond://?src=[REF(src)];choice=Signal Code;scode=5'>+</a><br><br>
<a href='byond://?src=[REF(src)];choice=Send Signal'>Send Signal</A><BR>"}
if (42) //status displays
menu = "<h4>[PDAIMG(status)] Station Status Display Interlink</h4>"

menu += "\[ <A HREF='?src=[REF(src)];choice=Status;statdisp=blank'>Clear</A> \]<BR>"
menu += "\[ <A HREF='?src=[REF(src)];choice=Status;statdisp=shuttle'>Shuttle ETA</A> \]<BR>"
menu += "\[ <A HREF='?src=[REF(src)];choice=Status;statdisp=message'>Message</A> \]"
menu += "<ul><li> Line 1: <A HREF='?src=[REF(src)];choice=Status;statdisp=setmsg1'>[ message1 ? message1 : "(none)"]</A>"
menu += "<li> Line 2: <A HREF='?src=[REF(src)];choice=Status;statdisp=setmsg2'>[ message2 ? message2 : "(none)"]</A></ul><br>"
menu += "<ul><li> Line 1: <A HREF='?src=[REF(src)];choice=Status;statdisp=setmsg1'>[ message1 ? message1 : "(None)"]</A>"
menu += "<li> Line 2: <A HREF='?src=[REF(src)];choice=Status;statdisp=setmsg2'>[ message2 ? message2 : "(None)"]</A></ul><br>"
menu += "\[ Alert: <A HREF='?src=[REF(src)];choice=Status;statdisp=alert;alert=default'>None</A> |"
menu += " <A HREF='?src=[REF(src)];choice=Status;statdisp=alert;alert=redalert'>Red Alert</A> |"
menu += " <A HREF='?src=[REF(src)];choice=Status;statdisp=alert;alert=lockdown'>Lockdown</A> |"
Expand Down Expand Up @@ -305,7 +308,7 @@ Code:
menu = "<h4>[PDAIMG(medical)] Medical Record List</h4>"
if(GLOB.data_core.general)
for(var/datum/data/record/R in sortRecord(GLOB.data_core.general))
menu += "<a href='byond://?src=[REF(src)];choice=Medical Records;target=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]<br>"
menu += "[PDAIMG(medical)] <a href='byond://?src=[REF(src)];choice=Medical Records;target=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]</a><br>"
menu += "<br>"
if(441)
menu = "<h4>[PDAIMG(medical)] Medical Record</h4>"
Expand Down Expand Up @@ -348,7 +351,7 @@ Code:
menu = "<h4>[PDAIMG(cuffs)] Security Record List</h4>"
if(GLOB.data_core.general)
for (var/datum/data/record/R in sortRecord(GLOB.data_core.general))
menu += "<a href='byond://?src=[REF(src)];choice=Security Records;target=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]<br>"
menu += "[PDAIMG(cuffs)] <a href='byond://?src=[REF(src)];choice=Security Records;target=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]</a><br>"

menu += "<br>"
if(451)
Expand Down Expand Up @@ -441,7 +444,7 @@ Code:
for(var/S in SSshuttle.requestlist)
var/datum/supply_order/SO = S
menu += "<li>#[SO.id] - [SO.pack.name] requested by [SO.orderer]</li>"
menu += "</ol><font size=\"-3\">Upgrade NOW to Space Parts & Space Vendors PLUS for full remote order control and inventory management."
// menu += "</ol><font size=\"-3\">Upgrade NOW to Space Parts & Space Vendors PLUS for full remote order control and inventory management." DOESNT EXIST, SO COMMENTED OUT

if (48) // quartermaster ore logs
menu = list("<h4>[PDAIMG(crate)] Ore Silo Logs</h4>")
Expand Down Expand Up @@ -692,31 +695,31 @@ Code:
if(active_bot.paicard && active_bot.paicard.pai)
menu += "[active_bot.paicard.pai.name]"
if(active_bot.bot_core.allowed(usr))
menu += " (<A href='byond://?src=[REF(src)];op=ejectpai'><i>eject</i></A>)"
menu += " (<A href='byond://?src=[REF(src)];op=ejectpai'><i>Eject</i></A>)"
else
menu += "<i>none</i>"
menu += "<i>None</i>"

//MULEs!
if(active_bot.bot_type == MULE_BOT)
var/mob/living/simple_animal/bot/mulebot/MULE = active_bot
var/atom/Load = MULE.load
menu += "<BR>Current Load: [ !Load ? "<i>none</i>" : "[Load.name] (<A href='byond://?src=[REF(src)];mule=unload'><i>unload</i></A>)" ]<BR>"
menu += "Destination: [MULE.destination ? MULE.destination : "<i>None</i>"] (<A href='byond://?src=[REF(src)];mule=destination'><i>set</i></A>)<BR>"
menu += "<BR>Current Load: [ !Load ? "<i>None</i>" : "[Load.name] (<A href='byond://?src=[REF(src)];mule=unload'><i>Unload</i></A>)" ]<BR>"
menu += "Destination: [MULE.destination ? MULE.destination : "<i>None</i>"] <A href='byond://?src=[REF(src)];mule=destination'><i>Set</i></A><BR>"
menu += "Set ID: [MULE.suffix] <A href='byond://?src=[REF(src)];mule=setid'><i> Modify</i></A><BR>"
menu += "Power: [MULE.cell ? MULE.cell.percent() : 0]%<BR>"
menu += "Home: [!MULE.home_destination ? "<i>none</i>" : MULE.home_destination ]<BR>"
menu += "Delivery Reporting: <A href='byond://?src=[REF(src)];mule=report'>[MULE.report_delivery ? "(<B>On</B>)": "(<B>Off</B>)"]</A><BR>"
menu += "Auto Return Home: <A href='byond://?src=[REF(src)];mule=autoret'>[MULE.auto_return ? "(<B>On</B>)": "(<B>Off</B>)"]</A><BR>"
menu += "Auto Pickup Crate: <A href='byond://?src=[REF(src)];mule=autopick'>[MULE.auto_pickup ? "(<B>On</B>)": "(<B>Off</B>)"]</A><BR><BR>" //Hue.
menu += "Home: [!MULE.home_destination ? "<i>None</i>" : MULE.home_destination ]<BR>"
menu += "Delivery Reporting: <A href='byond://?src=[REF(src)];mule=report'>[MULE.report_delivery ? "<B>On</B>": "<B>Off</B>"]</A><BR>"
menu += "Auto Return Home: <A href='byond://?src=[REF(src)];mule=autoret'>[MULE.auto_return ? "<B>On</B>": "<B>Off</B>"]</A><BR>"
menu += "Auto Pickup Crate: <A href='byond://?src=[REF(src)];mule=autopick'>[MULE.auto_pickup ? "<B>On</B>": "<B>Off</B>"]</A><BR><BR>" //Hue.

menu += "\[<A href='byond://?src=[REF(src)];mule=stop'>Stop</A>\] "
menu += "\[<A href='byond://?src=[REF(src)];mule=go'>Proceed</A>\] "
menu += "\[<A href='byond://?src=[REF(src)];mule=home'>Return Home</A>\]<BR>"
menu += "<A href='byond://?src=[REF(src)];mule=stop'>Stop</A> "
menu += "<A href='byond://?src=[REF(src)];mule=go'>Proceed</A> "
menu += "<A href='byond://?src=[REF(src)];mule=home'>Return Home</A><BR>"

else
menu += "<BR>\[<A href='byond://?src=[REF(src)];op=patroloff'>Stop Patrol</A>\] " //patrolon
menu += "\[<A href='byond://?src=[REF(src)];op=patrolon'>Start Patrol</A>\] " //patroloff
menu += "\[<A href='byond://?src=[REF(src)];op=summon'>Summon Bot</A>\]<BR>" //summon
menu += "<BR><A href='byond://?src=[REF(src)];op=patroloff'>Stop Patrol</A>" //patrolon
menu += "<A href='byond://?src=[REF(src)];op=patrolon'>Start Patrol</A>" //patroloff
menu += "<A href='byond://?src=[REF(src)];op=summon'>Summon Bot</A><BR>" //summon
menu += "Keep an ID inserted to upload access codes upon summoning."

menu += "<HR><A href='byond://?src=[REF(src)];op=botlist'>[PDAIMG(back)]Return to bot list</A>"
Expand All @@ -729,7 +732,7 @@ Code:
var/mob/living/simple_animal/bot/Bot = B
if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled || !(bot_access_flags & Bot.bot_type)) //Only non-emagged bots on the same Z-level are detected!
continue //Also, the PDA must have access to the bot type.
menu += "<A href='byond://?src=[REF(src)];op=control;bot=[REF(Bot)]'><b>[Bot.name]</b> ([Bot.get_mode()])<BR>"
menu += "[PDAIMG(medbot)] <A href='byond://?src=[REF(src)];op=control;bot=[REF(Bot)]'><b>[Bot.name]</b> ([Bot.get_mode()])</a><BR>"
botcount++
if(!botcount) //No bots at all? Lame.
menu += "No bots found.<BR>"
Expand Down

0 comments on commit 3de90a9

Please sign in to comment.