Skip to content

Commit a42cec2

Browse files
Add ringbox and loadout rings! (#546)
1 parent 729021a commit a42cec2

File tree

10 files changed

+94
-5
lines changed

10 files changed

+94
-5
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
BoxCandleSmall: 2
2222
Urn: 5
2323
Bible: 1
24+
SilverRing: 2 # CD
25+
RingBox: 2 # CD
2426
emaggedInventory:
2527
ClothingOuterArmorCult: 1
2628
ClothingHeadHelmetCult: 1

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

+4
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@
205205
- FreezerElectronics
206206
- CassetteTape #CD Change
207207
- TapeRecorder #CD Change
208+
- GoldRing # CD
209+
- SilverRing # CD
210+
- GoldRingDiamond # CD
211+
- SilverRingDiamond # CD
208212
- type: EmagLatheRecipes
209213
emagStaticRecipes:
210214
- BoxLethalshot

Resources/Prototypes/Loadouts/loadout_groups.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
- LunchboxYellow # CD
6161
- Cane # CD
6262
- MedCrutchesForearm # CD
63+
- GoldRing # CD
64+
- SilverRing # CD
6365

6466
- type: loadoutGroup
6567
id: Glasses
@@ -671,8 +673,8 @@
671673
minLimit: 0
672674
loadouts:
673675
- CargoTechnicianWintercoat
674-
- CargoBomber # CD
675-
676+
- CargoBomber # CD
677+
676678
- type: loadoutGroup
677679
id: CargoTechnicianShoes
678680
name: loadout-group-cargo-technician-shoes
@@ -1166,7 +1168,7 @@
11661168
- ChiefMedicalOfficerTurtleneckJumpsuit
11671169
- ChiefMedicalOfficerTurtleneckJumpskirt
11681170
- ChiefMedicalOfficerFormalsuit # CD
1169-
1171+
11701172
- type: loadoutGroup
11711173
id: ChiefMedicalOfficerOuterClothing
11721174
name: loadout-group-chief-medical-officer-outerclothing
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
- type: entity
2+
parent: [ BoxBase, BaseBagOpenClose ]
3+
id: RingBox
4+
name: ring box
5+
description: Made from a high quality wood!
6+
components:
7+
- type: Sprite
8+
sprite: _CD/Objects/Specific/Chapel/ringbox.rsi
9+
layers:
10+
- state: ring-box-closed
11+
map: [ "closeLayer" ]
12+
- state: ring-box-open
13+
map: [ "openLayer" ]
14+
visible: false
15+
- type: StaticPrice
16+
price: 50
17+
- type: Appearance
18+
- type: Storage # No restrictions on purpose. If someone wants to propose with a clown horn let them!
19+
capacity: 5

Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
storage:
1717
back:
1818
- CDDogtags
19-
19+
2020
- type: loadout
2121
id: PlushieVox
2222
storage:
@@ -76,3 +76,15 @@
7676
storage:
7777
back:
7878
- MedCrutchesForearm
79+
80+
- type: loadout
81+
id: GoldRing
82+
storage:
83+
back:
84+
- GoldRing
85+
86+
- type: loadout
87+
id: SilverRing
88+
storage:
89+
back:
90+
- SilverRing

Resources/Prototypes/_CD/Recipes/Lathes/misc.yml

+31-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,34 @@
1414
completetime: 3
1515
materials:
1616
Steel: 250
17-
Plastic: 250
17+
Plastic: 250
18+
19+
- type: latheRecipe
20+
id: GoldRing
21+
result: GoldRing
22+
completetime: 10
23+
materials:
24+
Gold: 500
25+
26+
- type: latheRecipe
27+
id: SilverRing
28+
result: SilverRing
29+
completetime: 10
30+
materials:
31+
Silver: 500
32+
33+
- type: latheRecipe
34+
id: GoldRingDiamond
35+
result: GoldRingDiamond
36+
completetime: 15
37+
materials:
38+
Gold: 500
39+
Diamond: 100
40+
41+
- type: latheRecipe
42+
id: SilverRingDiamond
43+
result: SilverRingDiamond
44+
completetime: 15
45+
materials:
46+
Silver: 500
47+
Diamond: 100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"version": 1,
3+
"license": "CC0-1.0",
4+
"copyright": "Created by Beck Thompson for SS14 (Delta-V). Ported to Cosmic Drift",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "ring-box-open"
12+
},
13+
{
14+
"name": "ring-box-closed"
15+
},
16+
{
17+
"name": "ring"
18+
}
19+
]
20+
}
Loading
Loading
Loading

0 commit comments

Comments
 (0)