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

Blank Forms: For Real This Time #2858

Closed
wants to merge 6 commits into from
Closed

Blank Forms: For Real This Time #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d55180
here goes nothing
meemofcourse Mar 24, 2024
89f6ac3
Merge remote-tracking branch 'upstream/master' into go-paperwork-moth
meemofcourse Jun 17, 2024
277ae54
Merge remote-tracking branch 'upstream/master' into go-paperwork-moth
meemofcourse Jun 21, 2024
926a2f3
Merge remote-tracking branch 'upstream/master' into go-paperwork-moth
meemofcourse Jul 14, 2024
61469d2
Merge branch 'master' into go-paperwork-moth
meemofcourse Aug 27, 2024
88aa110
Merge remote-tracking branch 'upstream/master' into go-paperwork-moth
meemofcourse Oct 5, 2024
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
3 changes: 2 additions & 1 deletion code/modules/asset_cache/asset_list_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png',
"clip_logo.png" = 'html/paperwork/clip_logo.png'
)

/datum/asset/simple/fuckywucky
Expand Down
31 changes: 28 additions & 3 deletions code/modules/paperwork/photocopier.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,30 @@
var/busy = FALSE
/// Variable needed to determine the selected category of forms on Photocopier.js
var/category
/// variable that determines where the photocopier borrows blanks from. default is independent
var/form_config = "strings/blanks/indie_blanks.json"

/obj/machinery/photocopier/nt
form_config = "strings/blanks/nt_blanks.json"

/obj/machinery/photocopier/cybersun
form_config = "strings/blanks/cybersun_blanks.json"

/obj/machinery/photocopier/suns
form_config = "strings/blanks/suns_blanks.json"

/obj/machinery/photocopier/aclf
form_config = "strings/blanks/aclf_blanks.json"

/obj/machinery/photocopier/inteq
form_config = "strings/blanks/inteq_blanks.json"

/obj/machinery/photocopier/solgov
form_config = "strings/blanks/solgov_blanks.json"

/obj/machinery/photocopier/clip
form_config = "strings/blanks/clip_blanks.json"


/obj/machinery/photocopier/Initialize()
. = ..()
Expand Down Expand Up @@ -84,7 +108,7 @@
data["num_copies"] = num_copies

try
var/list/blanks = json_decode(file2text("strings/blanks/nt_blanks.json"))
var/list/blanks = json_decode(file2text(form_config))
if (blanks != null)
data["blanks"] = blanks
data["category"] = category
Expand Down Expand Up @@ -217,8 +241,9 @@
var/list/printinfo
for(var/infoline as anything in params["info"])
printinfo += infoline
printblank.name = printname
printblank.add_raw_text(printinfo)
printblank.name = "paper - [printname]"
printblank.add_raw_text(printinfo, advanced_html = TRUE)
printblank.update_appearance()
return printblank

/**
Expand Down
Binary file added html/paperwork/clip_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions strings/blanks/aclf_blanks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"code": "ACLF-GENU-BLKH",
"category": "General Use",
"name": "Blank Header",
"info": [
"<head><table bgcolor=\"b22c20\" width=\"100%\" height=\"15%\" frame =\"below\">",
"<th><div align=\"left\"><font size=\"1\" color=\"white\" face=\"Avenir\">",
"<h1>CyberSun</h1>",
"[_____________________________]",
"</font></div></th><th>",
"<div align=\"right\"><font color=\"white\" face=\"avenir\">",
"info here <br>",
"info here <br>",
"info here <br>",
"info here <br>",
"info here <br>",
"</th></table></head>",
"<hr color=\"b22c20\" size=\"3\" ></font>"
]
},
{
"code": "ACLF-GENU-NWHR",
"category": "Higher-Up Use",
"name": "New Hire Form",
"info": [
"<head><table bgcolor=\"b22c20\" width=\"100%\" height=\"15%\" frame =\"below\">",
"<th><div align=\"left\"><font size=\"1\" color=\"white\" face=\"Avenir\">",
"<h1>CyberSun</h1>",
"[_____________________________]",
"</font></div></th><th>",
"<div align=\"right\"><font color=\"white\" face=\"avenir\">",
"info here <br>",
"info here <br>",
"info here <br>",
"info here <br>",
"info here <br>",
"</th></table></head>",
"<hr color=\"b22c20\" size=\"3\" ></font>"
]
}
]
40 changes: 40 additions & 0 deletions strings/blanks/clip_blanks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[
{
"code": "CLIP-GOV-BLKH",
"category": "Government Issued",
"name": "Blank Header",
"info": [
"<h1>",
"<table frame=\"below\" border=\"4\" width=\"100%\">",
"<th>",
"<div align=\"center\"><font size=\"4\">",
"<img src=\"clip_logo.png\">",
"Colonial League of Independent Planets",
"</font>",
"<br>[________] [______________________________]",
"</div></th></table></h1><hr width=\"90%\">",
"<center>",
"<b><font size=\"2\">[____] - [____] - [______] FS",
"</center><hr width=\"40%\"></font></b>"
]
},
{
"code": "CLIP-CMM-ENLT",
"category": "Military Issued",
"name": "Enlistment Template",
"info": [
"<h1>",
"<table frame=\"below\" border=\"4\" width=\"100%\">",
"<th>",
"<div align=\"center\"><font size=\"4\">",
"<img src=\"clip_logo\">",
"Colonial League of Independent Planets",
"</font>",
"<br>[________] [______________________________]",
"</div></th></table></h1><hr width=\"90%\">",
"<center>",
"<b><font size=\"2\">[____] - [____] - [______] FS",
"</center><hr width=\"40%\"></font></b>"
]
}
]
Loading
Loading