diff --git a/code/defines/obj.dm b/code/defines/obj.dm index f6a8ebfbe07..db64bd85465 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -100,5 +100,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 8e474fe4083..ee7060dfd89 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -406,22 +406,6 @@ 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" 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 2f65e0969a5..70455d01c20 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 ba2bccac389..286540595d5 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/balls_vr.dmi b/icons/obj/balls_vr.dmi index 0e8a9b20dd7..e85f4cab05d 100644 Binary files a/icons/obj/balls_vr.dmi and b/icons/obj/balls_vr.dmi differ