diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 75d09ec9187..09760994297 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1889,10 +1889,16 @@ Entries: - { message: "Добавлена фигурка Офицера Синего Щита.", type: Add} id: 55760 #костыль отображения в Обновлениях time: '2024-06-09T18:59:00.0000000+00:00' - + - author: Torgovec changes: - {message: Добавлено 4 новых плаката, type: Add} - {message: Теперь нианы могут сьесть берет СИ, type: Fix} id: 55761 #костыль отображения в Обновлениях - time: '2024-06-23T04:19:00.0000000+00:00' \ No newline at end of file + time: '2024-06-23T04:19:00.0000000+00:00' + +- author: Дубик :3 + changes: + - { message: "НТ решили выдать кошельки для удобства хранения денег", type: Add} + id: 55763 #костыль отображения в Обновлениях + time: '2024-06-24T14:23:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl new file mode 100644 index 00000000000..c66893f7463 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl @@ -0,0 +1,8 @@ +ent-ADTWalletEmpty = кошелек + .desc = Легкий и удобный кожаный кошелек. +ent-ADTWalletFilled500 = { ent-ADTWalletEmpty } + .desc = { ent-ADTWalletEmpty.desc} +ent-ADTWalletFilled1000 = { ent-ADTWalletEmpty } + .desc = { ent-ADTWalletEmpty.desc} +ent-ADTWalletFilled2000 = { ent-ADTWalletEmpty } + .desc = { ent-ADTWalletEmpty.desc} \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 526d9a179b7..25b95b20c4b 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -52,7 +52,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife - - id: SpaceCash500 + - id: ADTWalletFilled500 #Blueshield - type: entity @@ -186,7 +186,7 @@ amount: 1 - id: ADTBookInvestigator - id: ADTRubberStampinvestigator - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity #noSpawn: true @@ -209,7 +209,7 @@ amount: 1 - id: ADTBookInvestigator - id: ADTRubberStampinvestigator - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -221,7 +221,7 @@ - id: BoxSurvivalMedical - id: BodyBag_Folded - id: ADTFootTag - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackERTSecurity @@ -240,8 +240,8 @@ - id: WeaponDisabler - id: Stunbaton - id: BoxSurvivalSecurity - - id: BlueshieldSuit - - id: SpaceCash1000 + #- id: BlueShieldsuit + - id: ADTWalletFilled1000 - id: OxygenTankFilled - type: Sprite sprite: ADT/Clothing/Back/blueshield_backpack.rsi diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 59f419d5dcf..9c29abd3c81 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife # Парамед теперь без МЩ и может быть антагом - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -129,7 +129,7 @@ - id: BoxSurvivalMedical - id: BodyBag_Folded - id: ADTFootTag - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -141,7 +141,7 @@ - id: BoxSurvival - id: RubberStampTrader - id: AppraisalTool - - id: SpaceCash500 + - id: ADTWalletFilled500 - id: ADTClothingOuterCoatTrader #Blueshield diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 9e8f9d42b04..8eefd6bfe38 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -44,7 +44,7 @@ amount: 1 - id: ADTBookInvestigator - id: ADTRubberStampinvestigator - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -56,7 +56,7 @@ - id: BoxSurvivalMedical - id: BodyBag_Folded - id: ADTFootTag - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelSecurity diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml new file mode 100644 index 00000000000..b5acbd3b7ed --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml @@ -0,0 +1,91 @@ +- type: entity + id: BaseADTWallet + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: wallet + description: Soft and comfortable leather wallet + noSpawn: true + suffix: ADT + components: + - type: Sprite + sprite: ADT/Objects/Device/wallet.rsi + layers: + - state: wallet_closed + - state: wallet_open + map: ["openLayer"] + - state: wallet_cash1 + map: ["wallet_cash1"] + - state: wallet_cash2 + map: ["wallet_cash2"] + - type: SwitchableWeapon + openSound: "/Audio/Items/flashlight_on.ogg" + closeSound: "/Audio/Items/flashlight_off.ogg" + sizeOpened: Tiny + sizeClosed: Tiny + - type: Item + sprite: ADT/Objects/Device/wallet.rsi + size: Tiny + - type: UseDelay + delay: 1.0 + - type: Storage + maxItemSize: Small + whitelist: + tags: + - ADTSpaceCash + grid: + - 0,0,3,1 + - type: ItemCounter + count: + tags: [ADTSpaceCash] + composite: true + layerStates: + - wallet_cash1 + - wallet_cash2 # я не ебу, почему я не могу досчитать до одного. это костыль. простите меня, потомки + - type: Appearance + +- type: entity + id: ADTWalletEmpty + parent: BaseADTWallet + name: wallet empty + description: Soft and comfortable leather wallet + suffix: ADT, Empty + components: + - type: Sprite + sprite: ADT/Objects/Device/wallet.rsi + layers: + - state: wallet_closed + - state: wallet_open + map: ["openLayer"] + +- type: entity + id: ADTWalletFilled500 + parent: BaseADTWallet + name: wallet filled + description: Soft and comfortable leather wallet + suffix: 500, Filled + components: + - type: StorageFill + contents: + - id: SpaceCash500 + +- type: entity + id: ADTWalletFilled1000 + parent: BaseADTWallet + name: wallet filled + description: Soft and comfortable leather wallet + suffix: 1000, Filled + components: + - type: StorageFill + contents: + - id: SpaceCash1000 + +- type: entity + id: ADTWalletFilled2000 + parent: BaseADTWallet + name: wallet filled + description: Soft and comfortable leather wallet + suffix: 2000, Filled + components: + - type: StorageFill + contents: + - id: SpaceCash1000 + - id: SpaceCash1000 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 95e343b3da7..bb1779ac8c3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -18,7 +18,7 @@ - id: BoxHug - id: RubberStampClown - id: CrayonRainbow - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -31,7 +31,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -44,7 +44,7 @@ - id: Flash - id: BoxForensicPad - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -57,7 +57,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -67,7 +67,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -78,7 +78,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -90,8 +90,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 - - id: SpaceCash1000 + - id: ADTWalletFilled2000 - type: entity noSpawn: true @@ -103,7 +102,7 @@ - id: BoxSurvivalEngineering - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -115,7 +114,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -127,7 +126,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -139,7 +138,7 @@ - id: BoxSurvivalMedical - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -151,7 +150,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -163,7 +162,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -173,7 +172,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -183,7 +182,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -193,7 +192,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -203,7 +202,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -214,7 +213,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -224,7 +223,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -236,7 +235,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -258,7 +257,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -269,7 +268,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -283,7 +282,7 @@ - id: CigPackBlack - id: HandLabeler - id: BoxForensicPad - - id: SpaceCash500 + - id: ADTWalletFilled500 # ERT @@ -518,7 +517,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -528,7 +527,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash500 + - id: ADTWalletFilled500 # Pirate @@ -559,4 +558,4 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 8f076c3b74c..8eec415ad93 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -17,7 +17,7 @@ contents: - id: BoxHug - id: RubberStampClown - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -30,7 +30,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -43,7 +43,7 @@ - id: Flash - id: BoxForensicPad - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -56,7 +56,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -66,7 +66,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -77,7 +77,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -89,8 +89,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 - - id: SpaceCash1000 + - id: ADTWalletFilled2000 - type: entity noSpawn: true @@ -102,7 +101,7 @@ - id: BoxSurvivalEngineering - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -114,7 +113,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -126,7 +125,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -138,7 +137,7 @@ - id: BoxSurvivalMedical - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -150,7 +149,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -162,7 +161,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -172,7 +171,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -182,7 +181,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity @@ -193,7 +192,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -203,7 +202,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -214,7 +213,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -224,7 +223,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -236,7 +235,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -258,7 +257,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -269,7 +268,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -283,7 +282,7 @@ - id: CigPackBlack - id: BoxForensicPad - id: HandLabeler - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -293,7 +292,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -303,7 +302,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash500 + - id: ADTWalletFilled500 #ADT - type: entity @@ -320,4 +319,4 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ceb82574222..74f95044a27 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -5,7 +5,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchel @@ -29,7 +29,7 @@ contents: - id: BoxHug - id: RubberStampClown - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelSecurity @@ -41,7 +41,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelSecurity @@ -53,7 +53,7 @@ - id: BoxForensicPad - id: ADTSpaceLaw - id: Flash - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelBrigmedic @@ -65,7 +65,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelMedical @@ -74,7 +74,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -85,7 +85,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -96,8 +96,7 @@ contents: - id: BoxSurvival - id: Flash - - id: SpaceCash1000 - - id: SpaceCash1000 + - id: ADTWalletFilled2000 - type: entity noSpawn: true @@ -109,7 +108,7 @@ - id: BoxSurvivalEngineering - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -121,7 +120,7 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -133,7 +132,7 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -145,7 +144,7 @@ - id: BoxSurvivalMedical - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -157,7 +156,7 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -169,7 +168,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -179,7 +178,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -189,7 +188,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -199,7 +198,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -209,7 +208,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -219,7 +218,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -231,7 +230,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -253,7 +252,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -264,7 +263,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -278,7 +277,7 @@ - id: Lighter - id: CigPackBlack - id: HandLabeler - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -288,7 +287,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -298,7 +297,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -309,7 +308,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash500 + - id: ADTWalletFilled500 #ADT - type: entity @@ -326,7 +325,7 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index d19c1e56933..bae1d0c46c0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -22,6 +22,7 @@ ADTClothingBackpackBlackLadySatchel: 2 ADTClothingBackpackLeatherLadySatchel: 2 # ADT сумки конец + ADTWalletEmpty: 5 ClothingHeadHatBeret: 2 ADTClothingHeadHatBeretBlackCivilian: 2 # ADT Кастомный чёрный берет ClothingHeadBandBlack: 1 diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml index da923b53488..0a842c02974 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -9,7 +9,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -20,4 +20,4 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist - - id: SpaceCash500 + - id: ADTWalletFilled1000 diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 3abf09eeff5..39955a49864 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -11,7 +11,7 @@ contents: - id: BoxSurvival #- id: BriefcaseIAAFilled - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -22,4 +22,4 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 0d1715461aa..9675fd440a3 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -10,7 +10,7 @@ contents: - id: BoxSurvival #- id: BriefcaseIAAFilled - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -24,4 +24,4 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml index 57dfb400984..f37cfcc5108 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml @@ -13,6 +13,9 @@ - type: PhysicalComposition materialComposition: Credit: 1 + - type: Tag + tags: + - ADTSpaceCash - type: StaticPrice price: 0 - type: Stack diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 84ab2c0e451..15a6017e2a4 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1305,3 +1305,6 @@ - type: Tag id: Microreactor + +- type: Tag + id: ADTSpaceCash \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png new file mode 100644 index 00000000000..82a1ef54f4f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json b/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json new file mode 100644 index 00000000000..0f6c2181143 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by prazat for Adventure Time Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "wallet_open" + }, + { + "name": "wallet_closed" + }, + { + "name": "wallet_cash1" + }, + { + "name": "wallet_cash2" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash1.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash1.png new file mode 100644 index 00000000000..e386644cb27 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash1.png differ diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash2.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash2.png new file mode 100644 index 00000000000..e386644cb27 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash2.png differ diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_closed.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_closed.png new file mode 100644 index 00000000000..82a1ef54f4f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_closed.png differ diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_open.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_open.png new file mode 100644 index 00000000000..bec8aad2502 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_open.png differ