Merge pull request #14880 from Youtubeboy139/Take-me-out-to-the-Ball-Game
Take me out to the Ball Game
@@ -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"
|
||||
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
|
||||
@@ -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 */
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
@@ -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,
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 882 B After Width: | Height: | Size: 979 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |