Смятые стикеры можно выбросить в мусорку (#13741)

* fix place crumpled sticker into disposal bin * Update code/modules/paperwork/stickers.dm Co-authored-by: NinjaPikachuska <[email protected]> --------- Co-authored-by: NinjaPikachuska <[email protected]>
TauCetiStation · Jan 28, 2025 · 42eaea1 · 42eaea1
1 parent a5886a1
commit 42eaea1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/code/modules/paperwork/stickers.dm b/code/modules/paperwork/stickers.dm
@@ -37,6 +37,8 @@
 		return
 	if(!istype(target, /obj/structure) && !ismachinery(target))
 		return
+	if (crumpled)
+		return ..()
 
 	var/list/click_params = params2list(params)
 	var/matrix/M = matrix()

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
@@ -127,8 +127,14 @@
 		for(var/mob/living/holdermob in I.contents)
 			holdermob.log_combat(usr, "placed in disposals")
 
+	if(istype(I, /obj/item/weapon/paper/sticker))
+		var/obj/item/weapon/paper/sticker/S = I
+		if (!S.crumpled)
+			return
+
 	if(!I || !I.canremove || I.flags & NODROP)
 		return
+
 	user.drop_from_inventory(I, src)
 
 	user.visible_message("<span class='notice'>[user.name] places \the [I] into the [src].</span>", self_message = "<span class='notice'>You place \the [I] into the [src].</span>")