Preparing for the summer: baseball and dodgeballs! (#19627)

* welcome to the space jam

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/objects/items/sport.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

code/game/objects/items/misc.dm

@@ -10,20 +10,6 @@
 
 /obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER
 
-/obj/item/beach_ball
-	icon = 'icons/misc/beach.dmi'
-	icon_state = "ball"
-	name = "beach ball"
-	item_state = "beachball"
-	density = FALSE
-	anchored = FALSE
-	w_class = WEIGHT_CLASS_TINY
-	force = 0.0
-	throwforce = 0.0
-	throw_speed = 1
-	throw_range = 20
-	flags = CONDUCT
-
 /obj/item/petcollar
 	name = "pet collar"
 	desc = "The latest fashion accessory for your favorite pets!"

code/game/objects/items/sport.dm

@@ -0,0 +1,83 @@
+/obj/item/beach_ball
+	name = "beach ball"
+	icon = 'icons/misc/beach.dmi'
+	desc = "An inflatable ball of fun, enjoyed on many beaches."
+	icon_state = "ball"
+	item_state = "beachball"
+	density = FALSE
+	anchored = FALSE
+	w_class = WEIGHT_CLASS_NORMAL
+	force = 0
+	throwforce = 0
+	throw_speed = 1
+	throw_range = 20
+	flags = CONDUCT
+
+/obj/item/beach_ball/baseball
+	name = "baseball"
+	desc = "Take me out to the ball game."
+	icon = 'icons/obj/basketball.dmi'
+	icon_state = "baseball"
+	item_state = "baseball"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/beach_ball/dodgeball
+	name = "dodgeball"
+	desc = "Used for playing the most violent and degrading of childhood games. This one is connected to the laser tag armour system."
+	icon = 'icons/obj/basketball.dmi'
+	icon_state = "dodgeball"
+	item_state = "dodgeball"
+	var/list/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
+
+/obj/item/beach_ball/dodgeball/throw_impact(atom/hit_atom)
+	. = ..()
+	var/mob/living/carbon/human/M = hit_atom
+	if(ishuman(hit_atom) && (M.wear_suit?.type in suit_types))
+		if(M.r_hand == src || M.l_hand == src)
+			return
+		playsound(src, 'sound/items/dodgeball.ogg', 50, 1)
+		M.KnockDown(6 SECONDS)
+
+/obj/item/beach_ball/holoball
+	name = "basketball"
+	desc = "Here's your chance, do your dance at the Space Jam."
+	icon = 'icons/obj/basketball.dmi'
+	icon_state = "basketball"
+	item_state = "basketball"
+	w_class = WEIGHT_CLASS_BULKY //Stops people from hiding it in their bags/pockets
+
+/obj/structure/holohoop
+	name = "basketball hoop"
+	desc = "Boom, Shakalaka!"
+	icon = 'icons/obj/basketball.dmi'
+	icon_state = "hoop"
+	anchored = TRUE
+	density = TRUE
+	pass_flags = LETPASSTHROW
+
+/obj/structure/holohoop/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/grab) && get_dist(src, user) <= 1)
+		var/obj/item/grab/G = W
+		if(G.state < GRAB_AGGRESSIVE)
+			to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
+			return
+		G.affecting.forceMove(loc)
+		G.affecting.Weaken(10 SECONDS)
+		visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into [src]!</span>")
+		qdel(W)
+		return
+	else if(isitem(W) && get_dist(src,user) <= 1)
+		user.drop_item(src)
+		visible_message("<span class='notice'>[user] dunks [W] into [src]!</span>")
+		return
+
+/obj/structure/holohoop/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
+	if(isitem(AM) && !istype(AM, /obj/item/projectile))
+		if(prob(50))
+			AM.forceMove(get_turf(src))
+			visible_message("<span class='notice'>Swish! [AM] lands in [src].</span>")
+		else
+			visible_message("<span class='danger'>[AM] bounces off of [src]'s rim!</span>")
+			return ..()
+	else
+		return ..()

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -51,6 +51,7 @@
 	open_door_sprite = "generic_door"
 
 /obj/structure/closet/lasertag/red/populate_contents()
+	new /obj/item/beach_ball/dodgeball(src)
 	new /obj/item/gun/energy/laser/tag/red(src)
 	new /obj/item/gun/energy/laser/tag/red(src)
 	new /obj/item/gun/energy/laser/tag/red(src)
@@ -67,6 +68,7 @@
 	open_door_sprite = "generic_door"
 
 /obj/structure/closet/lasertag/blue/populate_contents()
+	new /obj/item/beach_ball/dodgeball(src)
 	new /obj/item/gun/energy/laser/tag/blue(src)
 	new /obj/item/gun/energy/laser/tag/blue(src)
 	new /obj/item/gun/energy/laser/tag/blue(src)