Skip to content
This repository was archived by the owner on Dec 23, 2025. It is now read-only.

Commit 0904287

Browse files
authored
Merge pull request RonRonstation#299 from RonRonstation/poker-update-post-factum-changes
Poker update post-factum changes
2 parents 8cfc514 + e75e429 commit 0904287

62 files changed

Lines changed: 582 additions & 125 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
stack-poker-chips = poker chips

Resources/Locale/en-US/stack/stacks.ftl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,3 @@ stack-xeno-steel = xeno steel tile
237237
stack-xeno-steel-corner = xeno steel corner tile
238238
stack-xeno-maint = xeno techmaint
239239
stack-dark-squiggly = dark steel squiggly tile
240-
241-
stack-poker-chips = poker chips

Resources/Prototypes/Catalog/Fills/Items/briefcases.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,3 @@
5959
amount: 1
6060
- id: ClothingOuterCoatJensen
6161
- id: ClothingHandsGlovesColorBlack
62-
63-
- type: entity
64-
id: BriefcasePokerSet
65-
parent: BriefcaseBrown
66-
suffix: Filled, Poker
67-
name: poker set
68-
description: Feeling lucky? Comes with two decks of cards and enough chips for a full table of 8 players, or two tables of 4.
69-
components:
70-
- type: StorageFill
71-
contents:
72-
- id: CardBoxPokerFilled
73-
- id: PokerChipRed
74-
- id: PokerChipBlue
75-
- id: PokerChipWhite
76-
- id: PokerChipGreen
77-
- id: PokerChipBlack
78-
- id: CardBoxPokerFilled

Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0.
12
- type: vendingMachineInventory
23
id: PTechInventory
34
startingInventory:
@@ -16,7 +17,9 @@
1617
EncryptionKeyScience: 2
1718
EncryptionKeySecurity: 1
1819
EncryptionKeyService: 3
20+
# start of modifications
1921
CardBoxNanotrasen: 1
22+
# end of modifications
2023
contrabandInventory:
2124
BalloonNT: 2
2225
LuxuryPen: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0.
12
- type: vendingMachineInventory
23
id: GoodCleanFunInventory
34
startingInventory:
@@ -16,8 +17,10 @@
1617
PaperCNCSheet: 6
1718
MysteryFigureBox: 2
1819
BooksBag: 3
20+
# start of modifications
1921
CardBoxPokerFilled: 4
2022
BriefcasePokerSet: 1
23+
# end of modifications
2124
contrabandInventory:
2225
Basketball: 1
2326
FoodSnackBoritos: 3

Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,3 @@
438438
back:
439439
- TowelColorMime
440440
groupBy: "towels"
441-
442-
# misc
443-
- type: loadout
444-
id: CardBoxPokerFilled
445-
storage:
446-
back:
447-
- CardBoxPokerFilled

Resources/Prototypes/Loadouts/loadout_groups.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0.
12
# Miscellaneous
23
- type: loadoutGroup
34
id: Trinkets
@@ -52,7 +53,9 @@
5253
- TowelColorSilver
5354
- TowelColorWhite
5455
- TowelColorYellow
56+
# start of modifications
5557
- CardBoxPokerFilled
58+
# end of modifications
5659

5760
- type: loadoutGroup
5861
id: Glasses

Resources/Prototypes/Ronstation/Entities/Objects/Fun/Tabletop/Pokerchips/poker_chip.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

Resources/Prototypes/Ronstation/Entities/Objects/Fun/Tabletop/Pokerchips/poker_chip_stacks.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
- type: entity
2+
id: BriefcasePokerSet
3+
parent: BriefcaseBrown
4+
suffix: Filled, Poker
5+
name: poker set
6+
description: Comes with two decks of playing cards and enough chips for a full table of 8 players, or two tables of 4. What game you play is still up to you.
7+
components:
8+
- type: Sprite
9+
sprite: _Ronstation/Objects/Storage/Briefcases/briefcase_poker.rsi
10+
state: icon
11+
- type: Item
12+
sprite: _Ronstation/Objects/Storage/Briefcases/briefcase_poker.rsi
13+
- type: StorageFill
14+
contents:
15+
- id: CardBoxPokerFilled
16+
- id: PokerChipRed
17+
- id: PokerChipBlue
18+
- id: PokerChipWhite
19+
- id: PokerChipGreen
20+
- id: PokerChipBlack
21+
- id: CardBoxPokerFilled

0 commit comments

Comments
 (0)