Preparing for the summer: baseball and dodgeballs! (#19627)

* welcome to the space jam

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/objects/items/sport.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Henri215
2022-11-25 22:50:17 -06:00
committed by GitHub
co-authored by Contrabang Sirryan2002
parent 5912278a08
commit dfb85e6460
7 changed files with 95 additions and 73 deletions
-14
View File
@@ -10,20 +10,6 @@
/obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER
/obj/item/beach_ball
icon = 'icons/misc/beach.dmi'
icon_state = "ball"
name = "beach ball"
item_state = "beachball"
density = FALSE
anchored = FALSE
w_class = WEIGHT_CLASS_TINY
force = 0.0
throwforce = 0.0
throw_speed = 1
throw_range = 20
flags = CONDUCT
/obj/item/petcollar
name = "pet collar"
desc = "The latest fashion accessory for your favorite pets!"