Merge branch 'master' into upstream-merge

This commit is contained in:
BongaTheProto
2024-03-24 16:41:07 -05:00
72 changed files with 1099 additions and 524 deletions
@@ -20,6 +20,15 @@
ckeywhitelist = list()
donator_group_id = DONATOR_GROUP_TIER_2
// Head
/datum/gear/donator/head/chameleon
name = "Chameleon Hat"
path = /obj/item/clothing/head/chameleon
cost = 2
ckeywhitelist = list()
donator_group_id = DONATOR_GROUP_TIER_2
// Mask
/datum/gear/donator/mask/ninja_replica
name = "Replica Ninja Mask"
@@ -27,3 +36,10 @@
cost = 1
ckeywhitelist = list()
donator_group_id = DONATOR_GROUP_TIER_2
/datum/gear/donator/mask/chameleon
name = "Chameleon Mask"
path = /obj/item/clothing/mask/chameleon
cost = 2
ckeywhitelist = list()
donator_group_id = DONATOR_GROUP_TIER_2
@@ -1,24 +1,24 @@
/datum/gear/hands/paicard
name = "pAI device"
description = "A personal AI device for checking and downloading various personalities."
path = /obj/item/paicard
/datum/gear/hands/tailbag
name = "Tailbag"
description = "A bag for holding small personal items, which fastens around the base of the tail."
path = /obj/item/storage/tailbag
/datum/gear/hands/tarotdeck
name = "Tarot Deck"
description = "A full 78 card deck of Tarot Cards, no refunds on false predicitons."
path = /obj/item/toy/cards/deck/tarot
//MODIFIED COSTS - MODULAR SPLURT
/datum/gear/hands/straightrazor
cost = 6
/datum/gear/hands/flask
cost = 1
/datum/gear/hands/cigar
cost = 2
/datum/gear/hands/paicard
name = "pAI device"
description = "A personal AI device for checking and downloading various personalities."
path = /obj/item/paicard
/datum/gear/hands/tailbag
name = "Tailbag"
description = "A bag for holding small personal items, which fastens around the base of the tail."
path = /obj/item/storage/wallet/tailbag
/datum/gear/hands/tarotdeck
name = "Tarot Deck"
description = "A full 78 card deck of Tarot Cards, no refunds on false predicitons."
path = /obj/item/toy/cards/deck/tarot
//MODIFIED COSTS - MODULAR SPLURT
/datum/gear/hands/straightrazor
cost = 6
/datum/gear/hands/flask
cost = 1
/datum/gear/hands/cigar
cost = 2