diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 4e60163547..c59cc6e714 100644 --- a/code/defines/obj.dm +++ b/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" diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 99cca32d4c..ee7060dfd8 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,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!" diff --git a/icons/mob/items/lefthand_balls_vr.dmi b/icons/mob/items/lefthand_balls_vr.dmi index 2f65e0969a..70455d01c2 100644 Binary files a/icons/mob/items/lefthand_balls_vr.dmi and b/icons/mob/items/lefthand_balls_vr.dmi differ diff --git a/icons/mob/items/righthand_balls_vr.dmi b/icons/mob/items/righthand_balls_vr.dmi index ba2bccac38..286540595d 100644 Binary files a/icons/mob/items/righthand_balls_vr.dmi and b/icons/mob/items/righthand_balls_vr.dmi differ diff --git a/icons/obj/32x64.dmi b/icons/obj/32x64.dmi index 7b8c00eef8..493b337ad6 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 994be4ab97..e85f4cab05 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 0000000000..3e76dcdfc8 Binary files /dev/null and b/sound/weapons/dodgeball.ogg differ