diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index 2acc3f98c2..7285298283 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -6,16 +6,7 @@ SUBSYSTEM_DEF(assets) var/list/preload = list() /datum/controller/subsystem/assets/Initialize(timeofday) - - var/list/priority_assets = list( - /datum/asset/simple/goonchat - ) - - for(var/type in priority_assets) - var/datum/asset/A = new type() - A.register() - - for(var/type in typesof(/datum/asset) - (priority_assets | list(/datum/asset, /datum/asset/simple))) + for(var/type in typesof(/datum/asset)) var/datum/asset/A = type if (type != initial(A._abstract)) get_asset_datum(type) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 10d7113139..f63b282920 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -140,6 +140,7 @@ "jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js', ) + /datum/asset/simple/goonchat assets = list( "json2.min.js" = 'code/modules/goonchat/browserassets/js/json2.min.js', diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 2795d1a328..243fbdbe78 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -21,7 +21,6 @@ resistance_flags = FLAMMABLE max_integrity = 50 dog_fashion = /datum/dog_fashion/head - /* var/info //What's actually written on the paper. var/info_links //A different version of the paper which includes html links at fields and EOF @@ -43,11 +42,11 @@ if(!istype(G) || G.transfer_prints) H.reagents.add_reagent(contact_poison,contact_poison_volume) contact_poison = null - ui.check_view_all() + //ui.check_view_all() ..() /obj/item/paper/dropped(mob/user) - ui.check_view(user) + //ui.check_view(user) return ..() @@ -55,11 +54,11 @@ . = ..() pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) - ui = new /datum/oracle_ui(src, 420, 600, get_asset_datum(/datum/asset/spritesheet/simple/paper)) - ui.can_resize = FALSE + //ui = new /datum/oracle_ui(src, 420, 600, get_asset_datum(/datum/asset/spritesheet/simple/paper)) + //ui.can_resize = FALSE update_icon() updateinfolinks() - +/* /obj/item/paper/oui_getcontent(mob/target) if(!target.is_literate() || force_stars) force_stars = FALSE @@ -78,7 +77,7 @@ if(iscyborg(target)) return get_dist(src, target) < 2 return ..() - +*/ /obj/item/paper/update_icon_state() if(resistance_flags & ON_FIRE) icon_state = "paper_onfire" @@ -92,10 +91,6 @@ /obj/item/paper/examine(mob/user) . = ..() . += "Alt-click to fold it." - if(oui_canview(user)) - ui.render(user) - else - . += "You're too far away to read it!" /obj/item/paper/proc/show_content(mob/user) user.examinate(src) @@ -118,7 +113,7 @@ if((loc == usr && usr.stat == CONSCIOUS)) name = "paper[(n_name ? text("- '[n_name]'") : null)]" add_fingerprint(usr) - ui.render_all() + //ui.render_all() /obj/item/paper/suicide_act(mob/user) user.visible_message("[user] scratches a grid on [user.p_their()] wrist with the paper! It looks like [user.p_theyre()] trying to commit sudoku...") @@ -184,7 +179,7 @@ for(var/i in 1 to min(fields, 15)) addtofield(i, "write", 1) info_links = info_links + "write" - ui.render_all() + //ui.render_all() /obj/item/paper/proc/clearpaper() @@ -324,7 +319,7 @@ add_overlay(stampoverlay) to_chat(user, "You stamp the paper with your rubber stamp.") - ui.render_all() + //ui.render_all() if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) @@ -385,5 +380,3 @@ /obj/item/paper/crumpled/bloody icon_state = "scrap_bloodied" - -*/