[MIRROR] toilet bong altclick sanity (#807)

toilet bong altclick sanity Co-authored-by: jimmyl <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]>
Fluffy-Frontier · Feb 9, 2024 · 7e047ce · 7e047ce
1 parent 107a5d8
commit 7e047ce
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm
@@ -12,13 +12,23 @@
 /obj/structure/toiletbong/Initialize(mapload)
 	. = ..()
 	create_storage()
+<<<<<<< HEAD
 	atom_storage.attack_hand_interact = FALSE
 	atom_storage.set_holdable(list(/obj/item/food/))
 	atom_storage.max_total_storage = 100
 	atom_storage.max_slots = 12
+=======
+	AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation)))
+	create_storage(max_total_storage = 100, max_slots = 12, canhold = /obj/item/food)
+	atom_storage.attack_hand_interact = FALSE
+	atom_storage.rustle_sound = FALSE
+	atom_storage.animated = FALSE
+
+>>>>>>> 8e05b16bc ([MIRROR] toilet bong altclick sanity (#807))
 	weed_overlay = mutable_appearance('icons/obj/watercloset.dmi', "toiletbong_overlay")
 	START_PROCESSING(SSobj, src)
 
+
 /obj/structure/toiletbong/update_icon()
 	. = ..()
 	cut_overlays()
@@ -74,6 +84,9 @@
 		anchored = TRUE
 	return TRUE
 
+/obj/structure/toiletbong/proc/AfterRotation(mob/user, degrees)
+	playsound(src, 'sound/items/deconstruct.ogg', 50)
+
 /obj/structure/toiletbong/crowbar_act(mob/living/user, obj/item/tool)
 	if(anchored)
 		return FALSE
@@ -88,13 +101,6 @@
 	qdel(src)
 	return TRUE
 
-/obj/structure/toiletbong/AltClick(mob/living/user)
-	if(anchored)
-		return ..()
-	setDir(turn(dir,90))
-	playsound(src, 'sound/items/deconstruct.ogg', 50)
-	return
-
 /obj/structure/toiletbong/emag_act(mob/user, obj/item/card/emag/emag_card)
 	playsound(src, 'sound/effects/fish_splash.ogg', 50)
 	user.balloon_alert(user, "whoops!")