Merge pull request #5519 from Colfer1/master

Peaceflower no longer KILLS YOU
ARF-SS13 · Oct 21, 2024 · 5a43da5 · 5a43da5
2 parents aaafd24 + 3cccfb4
commit 5a43da5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
@@ -173,7 +173,9 @@ Slimecrossing Armor
 		if("Destroy Flower")
 			to_chat(user, span_notice("The flower begins to wither atop your head."))
 			if(do_after(user, 15 SECONDS, stay_close = FALSE))
+				REMOVE_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
 				user.RemoveElement(/datum/element/photosynthesis, -1, -1, -1, -1, 4, 0.5, 0.2, 0)
+				drop_location(src)
 				qdel(src)
 		if("Create A Flower")
 			to_chat(user, span_notice("The flower begins to bloom atop your head."))