Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ringbox and loadout rings! #546

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
BoxCandleSmall: 2
Urn: 5
Bible: 1
SilverRing: 2 # CD
RingBox: 2 # CD
emaggedInventory:
ClothingOuterArmorCult: 1
ClothingHeadHelmetCult: 1
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@
- FreezerElectronics
- CassetteTape #CD Change
- TapeRecorder #CD Change
- GoldRing # CD
- SilverRing # CD
- GoldRingDiamond # CD
- SilverRingDiamond # CD
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxLethalshot
Expand Down
8 changes: 5 additions & 3 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
- LunchboxYellow # CD
- Cane # CD
- MedCrutchesForearm # CD
- GoldRing # CD
- SilverRing # CD

- type: loadoutGroup
id: Glasses
Expand Down Expand Up @@ -671,8 +673,8 @@
minLimit: 0
loadouts:
- CargoTechnicianWintercoat
- CargoBomber # CD
- CargoBomber # CD

- type: loadoutGroup
id: CargoTechnicianShoes
name: loadout-group-cargo-technician-shoes
Expand Down Expand Up @@ -1166,7 +1168,7 @@
- ChiefMedicalOfficerTurtleneckJumpsuit
- ChiefMedicalOfficerTurtleneckJumpskirt
- ChiefMedicalOfficerFormalsuit # CD

- type: loadoutGroup
id: ChiefMedicalOfficerOuterClothing
name: loadout-group-chief-medical-officer-outerclothing
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
parent: [ BoxBase, BaseBagOpenClose ]
id: RingBox
name: ring box
description: Made from a high quality wood!
components:
- type: Sprite
sprite: _CD/Objects/Specific/Chapel/ringbox.rsi
layers:
- state: ring-box-closed
map: [ "closeLayer" ]
- state: ring-box-open
map: [ "openLayer" ]
visible: false
- type: StaticPrice
price: 50
- type: Appearance
- type: Storage # No restrictions on purpose. If someone wants to propose with a clown horn let them!
capacity: 5
14 changes: 13 additions & 1 deletion Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
storage:
back:
- CDDogtags

- type: loadout
id: PlushieVox
storage:
Expand Down Expand Up @@ -76,3 +76,15 @@
storage:
back:
- MedCrutchesForearm

- type: loadout
id: GoldRing
storage:
back:
- GoldRing

- type: loadout
id: SilverRing
storage:
back:
- SilverRing
32 changes: 31 additions & 1 deletion Resources/Prototypes/_CD/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,34 @@
completetime: 3
materials:
Steel: 250
Plastic: 250
Plastic: 250

- type: latheRecipe
id: GoldRing
result: GoldRing
completetime: 10
materials:
Gold: 500

- type: latheRecipe
id: SilverRing
result: SilverRing
completetime: 10
materials:
Silver: 500

- type: latheRecipe
id: GoldRingDiamond
result: GoldRingDiamond
completetime: 15
materials:
Gold: 500
Diamond: 100

- type: latheRecipe
id: SilverRingDiamond
result: SilverRingDiamond
completetime: 15
materials:
Silver: 500
Diamond: 100
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by Beck Thompson for SS14 (Delta-V). Ported to Cosmic Drift",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ring-box-open"
},
{
"name": "ring-box-closed"
},
{
"name": "ring"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading