Merge branch 'master' into secfire

cmss13-devs · Sep 1, 2024 · e7c2786 · e7c2786
2 parents fe4fd4e + 41cd77c
commit e7c2786
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
@@ -762,6 +762,24 @@
 	storage_flags = STORAGE_FLAGS_BOX
 	display_maptext = FALSE
 
+/obj/item/storage/pill_bottle/packet/Initialize()
+	. = ..()
+	RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(try_forced_folding))
+
+/obj/item/storage/pill_bottle/packet/proc/try_forced_folding(datum/source, mob/user)
+	SIGNAL_HANDLER
+
+	if(!isturf(loc))
+		return
+
+	if(locate(/obj/item/reagent_container/pill) in src)
+		return
+
+	UnregisterSignal(src, COMSIG_ITEM_DROPPED)
+	storage_close(user)
+	to_chat(user, SPAN_NOTICE("You throw away [src]."))
+	qdel(src)
+
 /obj/item/storage/pill_bottle/packet/tricordrazine
 	name = "Tricordazine pill packet"
 	icon_state = "tricordrazine_packet"

diff --git a/html/changelogs/AutoChangeLog-pr-7060.yml b/html/changelogs/AutoChangeLog-pr-7060.yml
@@ -0,0 +1,4 @@
+author: "hislittlecuzingames"
+delete-after: True
+changes:
+  - qol: "Deletes empty pill packets when dropped."