From 94eab3e80cfd22d143bd4ed121e78e3294f7a144 Mon Sep 17 00:00:00 2001 From: beck-thompson Date: Wed, 29 Jan 2025 22:13:33 -0800 Subject: [PATCH] Rings! --- .../VendingMachines/Inventories/chapel.yml | 2 ++ .../Entities/Structures/Machines/lathe.yml | 4 +++ .../Prototypes/Loadouts/loadout_groups.yml | 8 +++-- .../Objects/Specific/Chapel/ringbox.yml | 20 +++++++++++ .../_CD/Loadouts/Miscellaneous/trinkets.yml | 14 +++++++- .../Prototypes/_CD/Recipes/Lathes/misc.yml | 32 +++++++++++++++++- .../Specific/Chapel/ringbox.rsi/meta.json | 20 +++++++++++ .../Chapel/ringbox.rsi/ring-box-closed.png | Bin 0 -> 180 bytes .../Chapel/ringbox.rsi/ring-box-open.png | Bin 0 -> 237 bytes .../Specific/Chapel/ringbox.rsi/ring.png | Bin 0 -> 180 bytes 10 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_CD/Entities/Objects/Specific/Chapel/ringbox.yml create mode 100644 Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/meta.json create mode 100644 Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring-box-closed.png create mode 100644 Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring-box-open.png create mode 100644 Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index cb9e06932fd..07a6864a591 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -21,6 +21,8 @@ BoxCandleSmall: 2 Urn: 5 Bible: 1 + SilverRing: 2 # CD + RingBox: 2 # CD emaggedInventory: ClothingOuterArmorCult: 1 ClothingHeadHelmetCult: 1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 29fd0146286..a6e7f73cbde 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -205,6 +205,10 @@ - FreezerElectronics - CassetteTape #CD Change - TapeRecorder #CD Change + - GoldRing # CD + - SilverRing # CD + - GoldRingDiamond # CD + - SilverRingDiamond # CD - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index b568f99e815..64a18be45b9 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -60,6 +60,8 @@ - LunchboxYellow # CD - Cane # CD - MedCrutchesForearm # CD + - GoldRing # CD + - SilverRing # CD - type: loadoutGroup id: Glasses @@ -671,8 +673,8 @@ minLimit: 0 loadouts: - CargoTechnicianWintercoat - - CargoBomber # CD - + - CargoBomber # CD + - type: loadoutGroup id: CargoTechnicianShoes name: loadout-group-cargo-technician-shoes @@ -1166,7 +1168,7 @@ - ChiefMedicalOfficerTurtleneckJumpsuit - ChiefMedicalOfficerTurtleneckJumpskirt - ChiefMedicalOfficerFormalsuit # CD - + - type: loadoutGroup id: ChiefMedicalOfficerOuterClothing name: loadout-group-chief-medical-officer-outerclothing diff --git a/Resources/Prototypes/_CD/Entities/Objects/Specific/Chapel/ringbox.yml b/Resources/Prototypes/_CD/Entities/Objects/Specific/Chapel/ringbox.yml new file mode 100644 index 00000000000..52407ef5a78 --- /dev/null +++ b/Resources/Prototypes/_CD/Entities/Objects/Specific/Chapel/ringbox.yml @@ -0,0 +1,20 @@ +- 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! + grid: + - 0,0,0,0 diff --git a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml index 6ef4af33574..a6841b6c600 100644 --- a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml @@ -16,7 +16,7 @@ storage: back: - CDDogtags - + - type: loadout id: PlushieVox storage: @@ -76,3 +76,15 @@ storage: back: - MedCrutchesForearm + +- type: loadout + id: GoldRing + storage: + back: + - GoldRing + +- type: loadout + id: SilverRing + storage: + back: + - SilverRing diff --git a/Resources/Prototypes/_CD/Recipes/Lathes/misc.yml b/Resources/Prototypes/_CD/Recipes/Lathes/misc.yml index 95c25820ffa..80b0f358bce 100644 --- a/Resources/Prototypes/_CD/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_CD/Recipes/Lathes/misc.yml @@ -14,4 +14,34 @@ completetime: 3 materials: Steel: 250 - Plastic: 250 \ No newline at end of file + 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 diff --git a/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/meta.json b/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/meta.json new file mode 100644 index 00000000000..5b027310b61 --- /dev/null +++ b/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring-box-closed.png b/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring-box-closed.png new file mode 100644 index 0000000000000000000000000000000000000000..904237390be5d16ee89c2fa3fa363ab61675d11a GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDo+>3kO=qW6p4fb76-l=_gE#E zu(&w`i8eoume$t4?)s+p_tkc9R=B&nTt9H0vX`LQX-Bii#S9+vB;0$f8deAtm>V4E zs1FdR|ND_SKeg(~G2W(U!XXTs5>0q}+8EZAIBaj~nD*9fQPIH_%wUs&L_|9SgVSj@ W#h#fZ;y_n0c)I$ztaD0eVgLZLXFR$9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring-box-open.png b/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring-box-open.png new file mode 100644 index 0000000000000000000000000000000000000000..552ca58c8bd1dca568dbbcc0a25dd046e7260f1b GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}ArbD$DG~_>EDn4#?y*WR zVQDMl*dZ6A-}kU@{iRDhC-@jN4?N@O zl2!QlQTg!m{q+y|Dp;R1Gi+a^^jD_gP3?qahdznY0~s6vrYr?dzpuBid$88$W@Drv zn}!zqp+ko@h*{*{-*@yiL(DX#Y^7B)K(!6+3>xP)STe;+DX9H(d?qxNE#qdM49JY0 fHZZ}!u#BT!@#gPdZ=mZLJYD@<);T3KF)#oC?MPlO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring.png b/Resources/Textures/_CD/Objects/Specific/Chapel/ringbox.rsi/ring.png new file mode 100644 index 0000000000000000000000000000000000000000..6f53caf36fdb77be2ab6d9168508182c76f12942 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN>3NZkO=qW6p4fb76-l=_gE#E zu(&w`iMBiro4aaX<#&oq{Z{2RE&aqLmQ8@MLeZTGx@3K<>P@oO^Z7|4^s>lT*|@yD|fd`{0IxO$HMTzn3d2+82h|03E^L O>FVdQ&MBdZfdK%am_ZHz literal 0 HcmV?d00001