bugfix: sprite corrections by @PiotrTheTchaikowsky (#3692)

ss220-space · Oct 10, 2023 · b3914a6 · b3914a6
1 parent 31e968f
commit b3914a6
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 2 deletions.
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
@@ -158,7 +158,7 @@
 /obj/item/kitchen/knife/butcher/meatcleaver
 	name = "meat cleaver"
 	icon_state = "mcleaver"
-	item_state = "butch"
+	item_state = "mcleaver"
 	force = 25
 	throwforce = 15
 

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -424,6 +424,7 @@
 /obj/item/storage/box/cups
 	name = "box of paper cups"
 	desc = "It has pictures of paper cups on the front."
+	icon_state = "papercup"
 
 /obj/item/storage/box/cups/populate_contents()
 	for(var/I in 1 to 7)

diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
@@ -306,10 +306,12 @@
 	var/image/img                                //and puts a matching
 	for(var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
 		if(copy.ico.len)
-			if(findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent") || findtext(copy.ico[j], "rep"))
+			if(findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent") || findtext(copy.ico[j], "rep") || findtext(copy.ico[j], "magistrate") || findtext(copy.ico[j], "navcom"))
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-circle")
 			else if(findtext(copy.ico[j], "deny"))
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-x")
+			else if(findtext(copy.ico[j], "ok"))
+				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-check")
 			else
 				img = image('icons/obj/bureaucracy.dmi', "paper_stamp-dots")
 			img.pixel_x = copy.offset_x[j]

diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi