Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/game/objects/items/weaponry.dm

@@ -477,20 +477,12 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	throw_speed = 5
 	throw_range = 2
 	attack_verb = list("busted")
+	var/impressiveness = 45
 
-/obj/item/statuebust/attack_self(mob/living/user)
-	add_fingerprint(user)
-	user.examinate(src)
-
-/obj/item/statuebust/examine(mob/living/user)
+/obj/item/statuebust/Initialize()
 	. = ..()
-	if(.)
-		return
-	if (!isliving(user))
-		return
-	user.visible_message("[user] stops to admire [src].", \
-						 "<span class='notice'>You take in [src], admiring its fine craftsmanship.</span>")
-	SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artgood", /datum/mood_event/artgood)
+	AddElement(/datum/element/art, impressiveness)
+	addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, 1000)), 0)
 
 /obj/item/tailclub
 	name = "tail club"
@@ -566,6 +558,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	force = 10
 	throwforce = 12
 	attack_verb = list("beat", "smacked")
+	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5)
 	w_class = WEIGHT_CLASS_BULKY
 	var/homerun_ready = 0
 	var/homerun_able = 0