Adds drums, makeshift drums, and bongos (#16662)

* adds drums, makeshift drums, and bongos

* removed useless variables

code/datums/supplypacks.dm

@@ -1084,7 +1084,8 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
 					/obj/item/device/instrument/harmonica,
 					/obj/structure/piano/xylophone,
 					/obj/structure/piano/random,
-					/obj/item/device/instrument/bikehorn)
+					/obj/item/device/instrument/bikehorn,
+					/obj/item/device/instrument/drum)
 	name = "Random instrument"
 	cost = 50
 	containertype = /obj/structure/closet/crate
@@ -1103,7 +1104,8 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
 					/obj/structure/piano/xylophone,
 					/obj/structure/piano/minimoog,
 					/obj/structure/piano,
-					/obj/item/device/instrument/bikehorn)
+					/obj/item/device/instrument/bikehorn,
+					/obj/item/device/instrument/drum)
 	name = "Big band instrument collection"
 	cost = 500
 	containertype = /obj/structure/largecrate

code/game/objects/items.dm

@@ -855,7 +855,7 @@
 
 //Used in twohanding
 /obj/item/proc/wield(mob/user, var/inactive = FALSE)
-	if(!user.can_wield())
+	if(!user.can_wield(src))
 		user.show_message("You can't wield \the [src] as it's too heavy.")
 		return
 

code/game/objects/items/devices/instruments.dm

@@ -28,6 +28,9 @@
 		return 1
 	interact(user)
 
+/obj/item/device/instrument/drum/drum_makeshift/bongos/attack_self(mob/user as mob)
+	interact(user)
+
 /obj/item/device/instrument/interact(mob/user as mob)
 	if(!user)
 		return
@@ -136,3 +139,51 @@
 	throw_speed = 3
 	throw_range = 15
 	hitsound = 'sound/items/bikehorn.ogg'
+
+
+/obj/item/device/instrument/drum
+	name = "drum"
+	desc = "Are you ready to be the king of the Rhumba beat?"
+	icon_state = "drum"
+	item_state = "drum"
+	force = 10
+	attack_verb = list("drums", "beats", "smashes")
+	instrumentId = "drum"
+	flags = TWOHANDABLE | MUSTTWOHAND
+	hitsound = 'sound/items/drumhit.ogg'
+
+/obj/item/device/instrument/drum/drum_makeshift
+	name = "makeshift drum"
+	desc = "A crudely built drum that is, in essence, a wooden bowl with a leather sheet stretched taut over its surface. Despite its primitive design, you can extract a rather wide range of pitches and notes from this pile of trash"
+	icon_state = "drum_makeshift"
+	item_state = "drum_makeshift"
+	w_class = W_CLASS_TINY
+	force = 5
+	flags = TWOHANDABLE
+	instrumentId = "drum"
+	var/decondrop = 1 //determines how many parts to drop if deconstructed
+
+/obj/item/device/instrument/drum/drum_makeshift/bongos
+	name = "bongos"
+	desc = "Simple makeshift set of double drums that can be played by anyone with a pair of hands."
+	icon_state = "drum_bongo"
+	item_state = "drum_bongo"
+	w_class = W_CLASS_LARGE
+	flags = TWOHANDABLE | MUSTTWOHAND
+	instrumentId = "drum"
+	hitsound = 'sound/items/drumhit.ogg'
+	decondrop = 2 //determines how many parts to drop if deconstructed
+
+/obj/item/device/instrument/drum/drum_makeshift/attackby(obj/item/I,mob/user,params)
+	if(iswirecutter(I)) //wirecutters disassembles drums and bongos and gives you proper drops based on [decondrop] defined above
+		playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
+		visible_message("<span class='notice'>[user] cuts the leather face off \the [src] with \the [I]. </span>")
+		for (var/i = 1 to decondrop)
+			new /obj/item/trash/bowl(get_turf(src))
+			new /obj/item/stack/sheet/leather(get_turf(src))
+		qdel(src)
+	if (istype(I,/obj/item/device/instrument/drum/drum_makeshift)) //adding a drum to a drum makes bongos.
+		visible_message("<span class='notice'>[user] combines the two drums to create a set of bongos.</span>")
+		new /obj/item/device/instrument/drum/drum_makeshift/bongos(get_turf(src))
+		qdel(src)
+		qdel(I)

code/modules/food/customizables.dm

@@ -82,6 +82,13 @@
 		to_chat(user, "<span class='notice'>You fashion a crude mortar out of the wooden bowl and a metal sheet.</span>")
 		qdel(src)
 		user.put_in_hands(mortimer)
+	if(istype(I,/obj/item/stack/sheet/leather))
+		var/obj/item/stack/sheet/leather/L = I
+		L.use(1)
+		var/obj/item/device/instrument/drum/drum_makeshift/drumbowl = new(get_turf(src))
+		to_chat(user, "<span class='notice'>You fashion a crude drum out of the wooden bowl and a leather sheet.</span>")
+		qdel(src)
+		user.put_in_hands(drumbowl)
 	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
 		if(!recursiveFood && istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable))
 			to_chat(user, "<span class='warning'>Sorry, no recursive food.</span>")

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -438,3 +438,8 @@
 		"wear_id")
 
 	reset_vars_after_duration(resettable_vars, duration)
+
+/mob/living/carbon/monkey/can_wield(obj/item/I)
+	//used for making wield exceptions for 2 handed items
+	if (istype(I,/obj/item/device/instrument/drum/drum_makeshift/bongos))
+		return 1