Polaris sync

code/modules/paperwork/handlabeler.dm

@@ -2,7 +2,6 @@
 	name = "hand labeler"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler0"
-	item_state = "flight"
 	var/label = null
 	var/labels_left = 30
 	var/mode = 0	//off or on.

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/paperbin.dm

@@ -2,6 +2,10 @@
 	name = "paper bin"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper_bin1"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
+			)
 	item_state = "sheet-metal"
 	throwforce = 1
 	w_class = 3

code/modules/paperwork/photography.dm

@@ -14,7 +14,7 @@
 	icon = 'icons/obj/items.dmi'
 	desc = "A camera film cartridge. Insert it into a camera to reload it."
 	icon_state = "film"
-	item_state = "electropack"
+	item_state = "camera"
 	w_class = 1.0
 
 
@@ -120,7 +120,7 @@ var/global/photo_count = 0
 	icon = 'icons/obj/items.dmi'
 	desc = "A polaroid camera. 10 photos left."
 	icon_state = "camera"
-	item_state = "electropack"
+	item_state = "camera"
 	w_class = 2.0
 	flags = CONDUCT
 	slot_flags = SLOT_BELT

code/modules/paperwork/stamps.dm

@@ -24,6 +24,10 @@
 	name = "head of security's rubber stamp"
 	icon_state = "stamp-hos"
 
+/obj/item/weapon/stamp/ward
+	name = "warden's rubber stamp"
+	icon_state = "stamp-ward"
+
 /obj/item/weapon/stamp/ce
 	name = "chief engineer's rubber stamp"
 	icon_state = "stamp-ce"
@@ -53,9 +57,18 @@
 	icon_state = "stamp-cent"
 
 /obj/item/weapon/stamp/qm
-	name = "quartermaster's stamp"
+	name = "quartermaster's rubber stamp"
 	icon_state = "stamp-qm"
 
+/obj/item/weapon/stamp/cargo
+	name = "cargo rubber stamp"
+	icon_state = "stamp-cargo"
+
+/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)