Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

code/modules/paperwork/paper.dm

@@ -260,6 +260,7 @@
 		t = replacetext(t, "\[row\]", "</td><tr>")
 		t = replacetext(t, "\[cell\]", "<td>")
 		t = replacetext(t, "\[logo\]", "<img src = ntlogo.png>")
+		t = replacetext(t, "\[sglogo\]", "<img src = sglogo.png>")
 
 		t = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[t]</font>"
 	else // If it is a crayon, and he still tries to use these, make them empty!
@@ -274,6 +275,7 @@
 		t = replacetext(t, "\[row\]", "")
 		t = replacetext(t, "\[cell\]", "")
 		t = replacetext(t, "\[logo\]", "")
+		t = replacetext(t, "\[sglogo\]", "")
 
 		t = "<font face=\"[crayonfont]\" color=[P ? P.colour : "black"]><b>[t]</b></font>"
 

code/modules/paperwork/stamps.dm

@@ -56,6 +56,10 @@
 	name = "quartermaster's stamp"
 	icon_state = "stamp-qm"
 
+/obj/item/weapon/stamp/solgov
+	name = "solgov stamp"
+	icon_state = "stamp-sg"
+
 // Syndicate stamp to forge documents.
 /obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob)