bleh

shiptest-ss13 · Jan 25, 2025 · eca76c4 · eca76c4
1 parent c3f801d
commit eca76c4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
@@ -112,6 +112,7 @@
 		"stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png',
 		"stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png',
 		"stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png',
+		"stamp-solgov_generic" = 'icons/stamp_icons/large_stamp-solgov_generic.png',
 		"stamp-solgov_captain" = 'icons/stamp_icons/large_stamp-solgov_captain.png',
 		"stamp-solgov_ok" = 'icons/stamp_icons/large_stamp-solgov_ok.png',
 		"stamp-solgov_deny" = 'icons/stamp_icons/large_stamp-solgov_deny.png',

diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
@@ -253,7 +253,7 @@
 	var/new_stamp_datum = new /datum/paper_stamp(stamp_class, stamp_x, stamp_y, rotation)
 	LAZYADD(raw_stamp_data, new_stamp_datum);
 
-	if(!stamp_iconstate || LAZYLEN(stamp_cache) > MAX_PAPER_STAMPS_OVERLAYS)
+	if(!stamp_icon_state || LAZYLEN(stamp_cache) > MAX_PAPER_STAMPS_OVERLAYS)
 		return
 
 	var/mutable_appearance/stamp_overlay = mutable_appearance('icons/obj/bureaucracy.dmi', "paper_[stamp_icon_state]")

diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
@@ -236,11 +236,9 @@
 			for(var/infoline as anything in params["info"])
 				printinfo += infoline
 			for(var/stampinfo as anything in params["stampinfo"])
-				var/stamp = stampinfo[1]
-				if(!istype(stamp, /obj/item/stamp/chameleon))
-					var/obj/item/stamp/real_stamp = new stamp()
-					var/stamp_detail = real_stamp.get_writing_implement_details()
-					printblank.add_stamp(stamp_detail["stamp_class"], stampinfo[2], stampinfo[3], stampinfo[4], stamp)
+				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/paper)
+				var/class = sheet.icon_class_name(stampinfo[1])
+				printblank.add_stamp(class, stampinfo[2], stampinfo[3], stampinfo[4])
 			printblank.name = "paper - [printname]"
 			printblank.add_raw_text(printinfo, advanced_html = TRUE)
 			printblank.update_appearance()

diff --git a/icons/stamp_icons/solgov_generic.png b/icons/stamp_icons/solgov_generic.png
diff --git a/strings/blanks/indie_blanks.json b/strings/blanks/indie_blanks.json
@@ -5,8 +5,7 @@
 		"name": "Outpost Fax Sheet",
 		"info": [
 			"<table width=\"100%\"frame=\"below\"height=\"32px\"><tr valign=\"top\"><td><font face=\"Times\"size=\"1\">Frontier Outpost Authority<br>Fax Sheet</td><td><div align=\"right\"><font face=\"Times\"size=\"1\">FOA-FAX</td></tr></table><center><font face=\"Times\"size=\"1\">This form available for free use and copy for use within the jurisdiction of the <u><br>Frontier Outpost Authority</u>.<hr><table width=\"100%\"cellspacing=\"0\"><tr><td width=\"50%\"><font face=\"Times\"size=\"1\"><b>FAX TO</b><hr>[_] Frontier Outpost Authority<br>[_] Vessel:<br>[_____________________]</td><td width=\"50%\"><font face=\"Times\"size=\"1\"><b>FAX FROM</b><hr>Vessel:<br>[_____________________]<br><b><center>Time Sent: [_____]</td></tr><tr><td colspan=\"2\"><font face=\"Times\"size=\"1\"><b><br><center>FAX WRITTEN BELOW</b></td></tr></table><hr>"
-		],
-		"stampinfo": [["/obj/item/stamp/nanotrasen/captain", 0, 0, 0]]
+		]
 	},
 	{
 		"code": "FOA-BFM",