Merge remote-tracking branch 'upstream/master' into night_shift

# Conflicts:
#	paradise.dme
This commit is contained in:
tigercat2000
2018-03-30 10:20:21 -07:00
142 changed files with 537 additions and 873 deletions
+1 -1
View File
@@ -773,7 +773,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set desc = "Force the client to redownload NanoUI Resources"
// Close open NanoUIs.
nanomanager.close_user_uis(usr)
SSnanoui.close_user_uis(usr)
// Re-load the assets.
var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui)