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.

Sign up for GitHub

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 rehydratable mop bucket cube, refactor the rehydratable yml #34586

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+145 −156
Open

Add rehydratable mop bucket cube, refactor the rehydratable yml #34586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a5b17a9
Refactor rehydratable items
Hrosts Jan 21, 2025
bced22a
Finish main refactor
Hrosts Jan 21, 2025
4cfd620
Add mop bucket cube
Hrosts Jan 21, 2025
455c020
Move cube sprite and item size to RehydratableAnimalCube
Hrosts Jan 22, 2025
9656ede
Fix sprite attribution
Hrosts Jan 22, 2025
afcf195
Make it follow the conventions
Hrosts Jan 23, 2025
ad3378f
Refactor wrapped cube, leave MonkeyCube tag only on the cube and the …
Hrosts Jan 23, 2025
5d4197d
Fix DehydratedSpaceCarp inheritance overwriting needed components
Hrosts Jan 23, 2025
39f9db3
no need for this comment
Hrosts Jan 23, 2025
5694da1
remove whitespace
Hrosts Jan 23, 2025
0101647
indentation
Hrosts Jan 23, 2025
836a2e8
Restore lost description
Hrosts Jan 23, 2025
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: StorageFill
contents:
- id: MopItem
- id: MopBucket
- id: MopBucketCubeWrapped
- id: Bucket
amount: 3
- id: WetFloorSign
Expand Down
35 changes: 14 additions & 21 deletions Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,28 @@

- type: entity
parent: BaseItem
name: monkey cube
abstract: true
suffix: Wrapped
id: MonkeyCubeWrapped
description: Unwrap this to get a monkey cube.
id: BaseWrappedCube
components:
- type: Item
size: Tiny
- type: SpawnItemsOnUse
items:
- id: MonkeyCube
sound:
path: /Audio/Effects/unwrap.ogg
- type: Sprite
sprite: Objects/Misc/monkeycube.rsi

- type: entity
parent: BaseWrappedCube
name: monkey cube
id: MonkeyCubeWrapped
description: Unwrap this to get a monkey cube.
components:
- type: SpawnItemsOnUse
items:
- id: MonkeyCube
- type: Sprite
state: wrapper
- type: Tag
tags:
Expand Down Expand Up @@ -64,19 +72,15 @@
state: box_variant

- type: entity
parent: MonkeyCubeWrapped
parent: BaseWrappedCube
name: kobold cube
suffix: Wrapped
id: KoboldCubeWrapped
description: Unwrap this to get a kobold cube.
components:
- type: SpawnItemsOnUse
items:
- id: KoboldCube
sound:
path: /Audio/Effects/unwrap.ogg
- type: Sprite
sprite: Objects/Misc/monkeycube.rsi
state: wrapper_kobold

- type: entity
Expand All @@ -99,18 +103,7 @@
name: monkey cube
suffix: Wrapped, Syndicate
id: SyndicateSpongeWrapped
description: Unwrap this to get a monkey cube.
components:
- type: SpawnItemsOnUse
items:
- id: SyndicateSponge
sound:
path: /Audio/Effects/unwrap.ogg
- type: Sprite
sprite: Objects/Misc/monkeycube.rsi
state: wrapper
- type: Item
size: Tiny
- type: Tag
tags:
- MonkeyCube
Loading
Loading