diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 8472a82d55d..1f47f217526 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -812,6 +812,7 @@ name = "SweatMAX" desc = "Fueled by your inner inadequacy!" icon_state = "fitness" + //VOREStation Edit Start products = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 16, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 16, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 8, @@ -820,9 +821,9 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8, /obj/item/weapon/reagent_containers/pill/diet = 8, ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, - /obj/item/weapon/towel/random = 8) + /obj/item/weapon/towel/random = 8, + /obj/item/toy/tennis = 4) - //VOREStation Edit Start prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 15, @@ -831,7 +832,8 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, /obj/item/weapon/reagent_containers/pill/diet = 25, ///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, - /obj/item/weapon/towel/random = 20) + /obj/item/weapon/towel/random = 20, + /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. diff --git a/code/game/objects/items/balls_vr.dm b/code/game/objects/items/balls_vr.dm new file mode 100644 index 00000000000..6c0b1c25a84 --- /dev/null +++ b/code/game/objects/items/balls_vr.dm @@ -0,0 +1,51 @@ +/obj/item/toy/tennis + name = "tennis ball" + desc = "A classic tennis ball; a hollow rubber sphere covered in felt. This one has seen better days, and seems to have lost most of its bounce." + icon = 'icons/obj/balls_vr.dmi' + icon_state = "tennis_classic" + 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 = "tennis_classic" + slot_flags = SLOT_MASK + throw_range = 14 + w_class = ITEMSIZE_SMALL + +/obj/item/toy/tennis/red + name = "red tennis ball" + desc = "A red tennis ball. It goes twice as fast!" + icon_state = "tennis_red" + item_state = "tennis_red" + throw_speed = 8 //base throw_speed is 4, and that's already super fast + +/obj/item/toy/tennis/yellow + name = "yellow tennis ball" + desc = "A yellow tennis ball. Or is it orange? Orangey-yellow?" + icon_state = "tennis_yellow" + item_state = "tennis_yellow" + +/obj/item/toy/tennis/green + name = "green tennis ball" + desc = "A bright green tennis ball. Tastes faintly of lime... or maybe soap." + icon_state = "tennis_green" + item_state = "tennis_green" + +/obj/item/toy/tennis/cyan + name = "cyan tennis ball" + desc = "A cyan tennis ball. What a curious color choice." + icon_state = "tennis_cyan" + item_state = "tennis_cyan" + +/obj/item/toy/tennis/blue + name = "blue tennis ball" + desc = "A blue tennis ball. Who makes blue tennis balls anyway?" + icon_state = "tennis_blue" + item_state = "tennis_blue" + +/obj/item/toy/tennis/purple + 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 diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index 4ee11fb8cb5..37dcca83197 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -107,7 +107,17 @@ something, make sure it's not in one of the other lists.*/ prob(2);/obj/item/device/camera, prob(3);/obj/item/device/pda, prob(3);/obj/item/device/radio/headset, - prob(1);/obj/item/pizzavoucher) + /* VOREStation Edit Start */ + prob(2);/obj/item/toy/tennis, + prob(2);/obj/item/toy/tennis/red, + prob(2);/obj/item/toy/tennis/yellow, + prob(2);/obj/item/toy/tennis/green, + 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/pizzavoucher + /* VOREStation Edit End */ + ) /obj/random/maintenance/security /*Maintenance loot list. This one is for around security areas*/ diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index ec2b0eaefab..8dcf567962e 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -191,6 +191,13 @@ prob(2);/obj/item/weapon/storage/box/sinpockets, prob(2);/obj/item/weapon/storage/secure/briefcase, prob(2);/obj/item/clothing/under/fluff/latexmaid, + prob(2);/obj/item/toy/tennis, + prob(2);/obj/item/toy/tennis/red, + prob(2);/obj/item/toy/tennis/yellow, + prob(2);/obj/item/toy/tennis/green, + 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/clothing/glasses/sunglasses, prob(1);/obj/item/clothing/glasses/welding, prob(1);/obj/item/clothing/gloves/yellow, diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm new file mode 100644 index 00000000000..09093b65673 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm @@ -0,0 +1,12 @@ +/datum/gear/ball + display_name = "tennis ball selection" + description = "Choose from a num- BALL!" + path = /obj/item/toy/tennis + +/datum/gear/ball/New() + ..() + var/list/balls = list() + for(var/ball in typesof(/obj/item/toy/tennis/)) + var/obj/item/toy/tennis/ball_type = ball + balls[initial(ball_type.name)] = ball_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls)) \ No newline at end of file diff --git a/icons/mob/items/lefthand_balls_vr.dmi b/icons/mob/items/lefthand_balls_vr.dmi new file mode 100644 index 00000000000..2f65e0969a5 Binary files /dev/null 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 new file mode 100644 index 00000000000..ba2bccac389 Binary files /dev/null and b/icons/mob/items/righthand_balls_vr.dmi differ diff --git a/icons/mob/mouthball_vr.dmi b/icons/mob/mouthball_vr.dmi new file mode 100644 index 00000000000..f3c605ab56e Binary files /dev/null and b/icons/mob/mouthball_vr.dmi differ diff --git a/icons/obj/balls_vr.dmi b/icons/obj/balls_vr.dmi new file mode 100644 index 00000000000..994be4ab974 Binary files /dev/null and b/icons/obj/balls_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index fffd6ee0f9b..b4c95e44588 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1065,6 +1065,7 @@ #include "code\game\objects\effects\temporary_visuals\projectiles\tracer.dm" #include "code\game\objects\items\antag_spawners.dm" #include "code\game\objects\items\apc_frame.dm" +#include "code\game\objects\items\balls_vr.dm" #include "code\game\objects\items\bells.dm" #include "code\game\objects\items\blueprints.dm" #include "code\game\objects\items\bodybag.dm" @@ -1763,6 +1764,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_eyes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_general.dm" +#include "code\modules\client\preference_setup\loadout\loadout_general_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm"