This commit is contained in:
Killian
2020-07-04 17:51:39 +01:00
parent 890effdf68
commit 68e0f2fd23
7 changed files with 65 additions and 0 deletions
+51
View File
@@ -0,0 +1,51 @@
/obj/item/toy/tennis
name = "tennis ball"
desc = "A classic tennis ball. It looks a bit worn... are those teeth marks?"
icon = 'icons/obj/balls.dmi'
icon_state = "tennis_classic"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/righthand_balls.dmi',
slot_r_hand_str = 'icons/mob/items/lefthand_balls.dmi',
slot_wear_mask_str = 'icons/mob/mouthball.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"
@@ -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))
Binary file not shown.

After

Width:  |  Height:  |  Size: 876 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

+2
View File
@@ -1064,6 +1064,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.dm"
#include "code\game\objects\items\bells.dm"
#include "code\game\objects\items\blueprints.dm"
#include "code\game\objects\items\bodybag.dm"
@@ -1762,6 +1763,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"