cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate

Browse Source
This commit is contained in:
Zuhayr
2016-01-30 08:49:35 +10:30
parent d5b904ca2a 34d76fdf6d
commit f31438bd77
75 changed files with 1804 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_gear.dm
+26 -2
View File
@@ -1489,7 +1489,31 @@ var/global/list/gear_datums = list()
/datum/gear/cards
display_name = "deck of cards"
path = /obj/item/weapon/deck
path = /obj/item/weapon/deck/cards
sort_category = "misc"
cost = 1
/datum/gear/tarot
display_name = "deck of tarot cards"
path = /obj/item/weapon/deck/tarot
sort_category = "misc"
cost = 1
/datum/gear/holder
display_name = "card holder"
path = /obj/item/weapon/deck/holder
sort_category = "misc"
cost = 1
/datum/gear/cardemon_pack
display_name = "Cardemon booster pack"
path = /obj/item/weapon/pack/cardemon
sort_category = "misc"
cost = 1
/datum/gear/spaceball_pack
display_name = "Spaceball booster pack"
path = /obj/item/weapon/pack/spaceball
sort_category = "misc"
cost = 1
@@ -1632,4 +1656,4 @@ var/global/list/gear_datums = list()
/datum/gear/skrell_cloth/female/pink
display_name = "skrell headtail-wear, female, pink, cloth"
path = /obj/item/clothing/ears/skrell/cloth_female/pink
path = /obj/item/clothing/ears/skrell/cloth_female/pink