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

View File

@@ -223,7 +223,7 @@
usr << "This can only be done to instances of type /datum"
return
src.holder.marked_datum_weak = weakref(D)
src.holder.marked_datum = D
href_list["datumrefresh"] = href_list["mark_object"]
else if(href_list["rotatedatum"])
@@ -476,10 +476,7 @@
usr << "This can only be done on mobs with clients"
return
nanomanager.close_uis(H)
H.client.cache.Cut()
var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui)
assets.send(H)
nanomanager.send_resources(H.client)
usr << "Resource files sent"
H << "Your NanoUI Resource files have been refreshed"

View File

@@ -45,7 +45,7 @@
</tr></table>
<div align='center'>
<b><font size='1'>[replacetext("[D.type]", "/", "/<wbr>")]</font></b>
[holder.marked_datum() == D ? "<br/><font size='1' color='red'><b>Marked Object</b></font>" : ""]
[holder.marked_datum == D ? "<br/><font size='1' color='red'><b>Marked Object</b></font>" : ""]
</div>
</td>
<td width='50%'>