Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

restores the paper assets working on webroot assets #3780

Merged
merged 3 commits into from
Jul 3, 2023
Merged

restores the paper assets working on webroot assets #3780

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c4a9a4
update paper to work with the asset system
harryob Jul 1, 2023
75d919a
restores the browse_rsc functionality for localhost
harryob Jul 1, 2023
0a8b04f
Update code/modules/paperwork/paper.dm
harryob Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions code/modules/paperwork/paper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@


/obj/item/paper/proc/parsepencode(t, obj/item/tool/pen/P, mob/user as mob, iscrayon = 0)
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)

t = replacetext(t, "\[center\]", "<center>")
t = replacetext(t, "\[/center\]", "</center>")
t = replacetext(t, "\[br\]", "<BR>")
Expand Down Expand Up @@ -251,9 +253,9 @@
t = replacetext(t, "\[/grid\]", "</td></tr></table>")
t = replacetext(t, "\[row\]", "</td><tr>")
t = replacetext(t, "\[cell\]", "<td>")
t = replacetext(t, "\[logo\]", "<img src = wylogo.png>")
t = replacetext(t, "\[wy\]", "<img src = wylogo.png>")
t = replacetext(t, "\[uscm\]", "<img src = uscmlogo.png>")
t = replacetext(t, "\[logo\]", "<img src = [asset.get_url_mappings()["wylogo.png"]]>")
t = replacetext(t, "\[wy\]", "<img src = [asset.get_url_mappings()["wylogo.png"]]>")
t = replacetext(t, "\[uscm\]", "<img src = [asset.get_url_mappings()["uscmlogo.png"]]>")

t = "<font face=\"[deffont]\" color=[P ? P.pen_colour : "black"]>[t]</font>"
else // If it is a crayon, and he still tries to use these, make them empty!
Expand Down Expand Up @@ -619,11 +621,21 @@

/obj/item/paper/wy
icon_state = "paper_wy"
info = "<center><img src = wylogo.png></center><BR>\n<span class=\"paper_field\"></span>"

/obj/item/paper/wy/Initialize(mapload, photo_list)
. = ..()

var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
info = "<center><img src = [asset.get_url_mappings()["wylogo.png"]]></center><BR>\n<span class=\"paper_field\"></span>"

/obj/item/paper/uscm
icon_state = "paper_uscm"
info = "<center><img src = uscmlogo.png></center><BR>\n<span class=\"paper_field\"></span>"

/obj/item/paper/uscm/Initialize(mapload, photo_list)
. = ..()

var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
info = "<center><img src = [asset.get_url_mappings()["uscmlogo.png"]]></center><BR>\n<span class=\"paper_field\"></span>"

/obj/item/paper/research_notes
icon_state = "paper_wy_words"
Expand Down