Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
This commit is contained in:
SinTwo
2016-08-15 12:58:00 -04:00
parent 6bb5409349
commit eabefc538a
325 changed files with 3375 additions and 41824 deletions
+2 -4
View File
@@ -620,9 +620,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(!FC.censored)
var/index = 0
for(var/datum/feed_message/FM in FC.messages)
++index
index++
if(FM.img)
send_asset(usr.client, "newscaster_photo_[sanitize(FC.channel_name)]_[index].png")
usr << browse_rsc(FM.img, "pda_news_tmp_photo_[feed["channel"]]_[index].png")
// News stories are HTML-stripped but require newline replacement to be properly displayed in NanoUI
var/body = replacetext(FM.body, "\n", "<br>")
messages[++messages.len] = list("author" = FM.author, "body" = body, "message_type" = FM.message_type, "time_stamp" = FM.time_stamp, "has_image" = (FM.img != null), "caption" = FM.caption, "index" = index)
@@ -651,8 +651,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
//NOTE: graphic resources are loaded on client login
/obj/item/device/pda/attack_self(mob/user as mob)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/pda)
assets.send(user)
user.set_machine(src)
@@ -33,12 +33,12 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
var/obj/item/weapon/cartridge/cartridge = null //current cartridge
var/list/modules = list(
list("module" = "Phone", "icon" = "mobile", "number" = 2),
list("module" = "Contacts", "icon" = "users", "number" = 3),
list("module" = "Messaging", "icon" = "envelope", "number" = 4),
list("module" = "Note", "icon" = "file-text", "number" = 5),
list("module" = "Settings", "icon" = "gear", "number" = 6)
) //list("module" = "Name of Module", "icon" = "icon name", "number" = "what tab is the module")
list("module" = "Phone", "icon" = "phone64", "number" = 2),
list("module" = "Contacts", "icon" = "person64", "number" = 3),
list("module" = "Messaging", "icon" = "comment64", "number" = 4),
list("module" = "Note", "icon" = "note64", "number" = 5),
list("module" = "Settings", "icon" = "gear64", "number" = 6)
) //list("module" = "Name of Module", "icon" = "icon name64", "number" = "what tab is the module")
var/selected_tab = 1
var/owner = ""
+1 -1
View File
@@ -198,7 +198,7 @@
dat += {"
<b><font size='3px'>pAI Request Module</font></b><br><br>
<p>Requesting AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.</p>
Searching for personalities, please wait...<br><br>
<img src='loading.gif' /> Searching for personalities<br><br>
<table>
<tr>
+1 -4
View File
@@ -143,9 +143,6 @@
return 0
/obj/item/weapon/card/id/proc/show(mob/user as mob)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
assets.send(user)
if(front && side)
user << browse_rsc(front, "front.png")
user << browse_rsc(side, "side.png")
@@ -365,4 +362,4 @@
desc = "An identification card of some sort. It does not look like it is issued by NT."
icon_state = "permit"
primary_color = rgb(142,94,0)
secondary_color = rgb(191,159,95)
secondary_color = rgb(191,159,95)
-1
View File
@@ -115,7 +115,6 @@
/obj/attack_ghost(mob/user)
ui_interact(user)
tg_ui_interact(user)
..()
/obj/proc/interact(mob/user)