diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 99cca32d4c2..8e474fe4083 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/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,6 +406,21 @@ return FALSE return ..() +//DODGEBALL OBJECTS + +/obj/item/weapon/beach_ball/holododgeball + icon = 'icons/obj/balls_vr.dmi' + icon_state = "dodgeball" + name = "dodgeball" + desc = "Think fast, chucklenuts!" + w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets + unacidable = TRUE + drop_sound = 'sound/items/drop/basketball.ogg' + pickup_sound = 'sound/items/pickup/basketball.ogg' + hitsound = 'sound/weapons/dodgeball.ogg' + +/obj/item/weapon/beach_ball/holododgeball/apply_hit_effect(var/mob/living/carbon/M, var/alien) + M.Weaken(10) /obj/machinery/readybutton name = "Ready Declaration Device" diff --git a/icons/obj/32x64.dmi b/icons/obj/32x64.dmi index 7b8c00eef88..493b337ad67 100644 Binary files a/icons/obj/32x64.dmi and b/icons/obj/32x64.dmi differ diff --git a/icons/obj/balls_vr.dmi b/icons/obj/balls_vr.dmi index 994be4ab974..0e8a9b20dd7 100644 Binary files a/icons/obj/balls_vr.dmi and b/icons/obj/balls_vr.dmi differ diff --git a/sound/weapons/dodgeball.ogg b/sound/weapons/dodgeball.ogg new file mode 100644 index 00000000000..3e76dcdfc8f Binary files /dev/null and b/sound/weapons/dodgeball.ogg differ