diff --git a/code/game/objects/items/toys/balls_vr.dm b/code/game/objects/items/toys/balls_vr.dm index 6c0b1c25a8..30f2c56d15 100644 --- a/code/game/objects/items/toys/balls_vr.dm +++ b/code/game/objects/items/toys/balls_vr.dm @@ -48,4 +48,23 @@ name = "purple tennis ball" desc = "A purple tennis ball. Now you've seen everything. Purple, seriously?" icon_state = "tennis_purple" - item_state = "tennis_purple" \ No newline at end of file + item_state = "tennis_purple" + +/obj/item/toy/baseball + name = "baseball" + desc = "A classic baseball; a rubber core surrounded by yarn and covered by faux leather. Getting hit with one is akin to getting punched." + icon = 'icons/obj/balls_vr.dmi' + icon_state = "baseball" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/righthand_balls_vr.dmi', + slot_r_hand_str = 'icons/mob/items/lefthand_balls_vr.dmi', + slot_wear_mask_str = 'icons/mob/mouthball_vr.dmi', + ) + item_state = "baseball" + slot_flags = SLOT_MASK + throw_range = 16 + force = 2.0 + throwforce = 5.0 + throw_speed = 5 + throw_range = 5 + w_class = ITEMSIZE_SMALL \ No newline at end of file diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index a6bc8c7d34..56366d7cdd 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -111,6 +111,7 @@ something, make sure it's not in one of the other lists.*/ prob(2);/obj/item/toy/tennis/cyan, prob(2);/obj/item/toy/tennis/blue, prob(2);/obj/item/toy/tennis/purple, + prob(1);/obj/item/toy/baseball, prob(1);/obj/item/pizzavoucher /* VOREStation Edit End */ ) diff --git a/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm index 3075c40415..732d614601 100644 --- a/code/game/objects/random/mapping_vr.dm +++ b/code/game/objects/random/mapping_vr.dm @@ -156,5 +156,6 @@ prob(2);/obj/item/toy/tennis/blue, prob(2);/obj/item/toy/tennis/purple, prob(2);/obj/item/clothing/ears/earmuffs, - prob(2);/obj/item/clothing/ears/earmuffs/headphones + prob(2);/obj/item/clothing/ears/earmuffs/headphones, + prob(2);/obj/item/toy/baseball ) \ No newline at end of file diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index fe4cee1da3..91f3e77da1 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -250,6 +250,7 @@ prob(2);/obj/item/toy/tennis/cyan, prob(2);/obj/item/toy/tennis/blue, prob(2);/obj/item/toy/tennis/purple, + prob(1);/obj/item/toy/baseball, prob(1);/obj/item/weapon/storage/box/brainzsnax, prob(1);/obj/item/weapon/storage/box/brainzsnax/red, prob(1);/obj/item/clothing/glasses/sunglasses, diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index ea8b0b30ef..be05853716 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -301,7 +301,7 @@ /obj/item/toy/tennis = 15) //VOREStation Edit End - contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake = 2) // VOREStation Add - Slurpable blobs. + contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake = 2, /obj/item/toy/baseball = 2) // VOREStation Add - Slurpable blobs. /obj/machinery/vending/cart name = "PTech" diff --git a/icons/mob/items/lefthand_balls_vr.dmi b/icons/mob/items/lefthand_balls_vr.dmi index 70455d01c2..9c34b823a5 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 286540595d..c1030a143c 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/mob/mouthball_vr.dmi b/icons/mob/mouthball_vr.dmi index f3c605ab56..3fb8a22820 100644 Binary files a/icons/mob/mouthball_vr.dmi and b/icons/mob/mouthball_vr.dmi differ diff --git a/icons/obj/balls_vr.dmi b/icons/obj/balls_vr.dmi index e85f4cab05..6900c2df12 100644 Binary files a/icons/obj/balls_vr.dmi and b/icons/obj/balls_vr.dmi differ