Merge pull request #3142 from CHOMPStationBot/upstream-merge-11706

[MIRROR] Dodgeball+

code/defines/obj.dm

@@ -130,5 +130,21 @@
 	user.drop_item()
 	src.throw_at(target, throw_range, throw_speed, user)
 
+/obj/item/weapon/beach_ball/dodgeball
+	icon = 'icons/obj/balls_vr.dmi'
+	icon_state = "dodgeball"
+	item_state = "dodgeball"
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_balls_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_balls_vr.dmi')
+	name = "dodgeball"
+	desc = "Think fast, chucklenuts!"
+	w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets
+	force = 0.1
+	throwforce = 0.1
+	throw_speed = 5
+	throw_range = 15
+	drop_sound = 'sound/items/drop/rubber.ogg'
+	pickup_sound = 'sound/items/pickup/rubber.ogg'
+	hitsound = 'sound/weapons/dodgeball.ogg'
+
 /obj/effect/spawner
 	name = "object spawner"

code/modules/holodeck/HolodeckObjects.dm

@@ -358,7 +358,7 @@
 //BASKETBALL OBJECTS
 
 /obj/item/weapon/beach_ball/holoball
-	icon = 'icons/obj/basketball.dmi'
+	icon = 'icons/obj/balls_vr.dmi'
 	icon_state = "basketball"
 	name = "basketball"
 	desc = "Here's your chance, do your dance at the Space Jam."
@@ -370,7 +370,7 @@
 /obj/structure/holohoop
 	name = "basketball hoop"
 	desc = "Boom, Shakalaka!"
-	icon = 'icons/obj/basketball.dmi'
+	icon = 'icons/obj/32x64.dmi'
 	icon_state = "hoop"
 	anchored = TRUE
 	density = TRUE
@@ -406,7 +406,6 @@
 		return FALSE
 	return ..()
 
-
 /obj/machinery/readybutton
 	name = "Ready Declaration Device"
 	desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!"