cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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-26 01:50:17 -03:00
committed by GitHub
parent 5912278a08
commit dfb85e6460
7 changed files with 95 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/supply/supply_packs/pack_miscellaneous.dm
+5 -3
View File
@@ -26,7 +26,9 @@
/datum/supply_packs/misc/lasertag
name = "Laser Tag Crate"
contains = list(/obj/item/gun/energy/laser/tag/red,
contains = list(/obj/item/beach_ball/dodgeball,
/obj/item/beach_ball/dodgeball,
/obj/item/gun/energy/laser/tag/red,
/obj/item/gun/energy/laser/tag/red,
/obj/item/gun/energy/laser/tag/red,
/obj/item/gun/energy/laser/tag/blue,
@@ -404,7 +406,7 @@
/datum/supply_packs/misc/teamcolors //For team sports like space polo
name = "Team Jerseys Crate"
// 4 red jerseys, 4 blue jerseys, and 1 beach ball
// 4 red jerseys, 4 blue jerseys, and 1 baseball
contains = list(/obj/item/clothing/under/color/red/jersey,
/obj/item/clothing/under/color/red/jersey,
/obj/item/clothing/under/color/red/jersey,
@@ -413,7 +415,7 @@
/obj/item/clothing/under/color/blue/jersey,
/obj/item/clothing/under/color/blue/jersey,
/obj/item/clothing/under/color/blue/jersey,
/obj/item/beach_ball)
/obj/item/beach_ball/baseball)
cost = 300
containername = "team jerseys crate"