Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
ayaaa
  • Loading branch information
musicmanvr committed Mar 26, 2024
1 parent 6cbbc8e commit 512d932
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ ghost-role-information-smile-description = The sweetest creature in the world. S
ghost-role-information-punpun-name = Pun Pun
ghost-role-information-punpun-description = An honorable member of the monkey society in charge of the bar and helping the bartenders in any way he can.
ghost-role-information-petrock-name = Pet rock
ghost-role-information-petrock-description = You are a sentient pet rock, exist in a perpetual state of harmony as a mineral aboard a space station.
ghost-role-information-xeno-name = Xeno
ghost-role-information-xeno-description = You are a xeno, co-operate with your hive to kill all crewmembers!
ghost-role-information-xeno-rules = You are an antagonist, smack, slash, and wack!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,7 @@ hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you.
petting-success-tesla = You pet {THE($target)}, violating the laws of nature and physics.
petting-failure-tesla = You reach out towards {THE($target)}, but it zaps your hand away.
petting-success-rock = You pet {THE($target)} on {POSS-ADJ($target)} rocky little head.
petting-failure-rock = You fail to pet {THE($target)}, a non-moving object. Good job!
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -500,5 +500,5 @@
grid:
- 0,0,1,1
- type: Sprite
sprite:
state:
sprite: Objects/Fun/pet_rock_box.rsi
state: icon
35 changes: 35 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1504,14 +1504,28 @@
description: A normal rock.
abstract: true
components:
- type: InteractionPopup
successChance: 0.99
interactSuccessString: petting-success-rock
interactFailureString: petting-failure-rock
interactSuccessSpawn: EffectHearts
- type: Item
size: Tiny
- type: Anchorable # Only known way to pet the rock.
- type: Sprite
sprite: Objects/Fun/pet_rock.rsi
state: icon
- type: EmitSoundOnCollide
sound:
path: /Audio/Effects/hit_kick.ogg
- type: GhostRole
prob: 1
makeSentient: true
allowSpeech: true
allowMovement: false
name: ghost-role-information-petrock-name
description: ghost-role-information-petrock-description
- type: GhostTakeoverAvailable
- type: Clothing
quickEquip: false
sprite: Objects/Fun/pet_rock.rsi
Expand All @@ -1533,6 +1547,8 @@
- type: Sprite
sprite: Objects/Fun/pet_rock.rsi
state: icon
- type: GhostRole
prob: 0
- type: PhysicalComposition
materialComposition:
Steel: 10
Expand All @@ -1554,6 +1570,25 @@
- type: StaticPrice
price: 1

- type: entity
parent: BasePetRock
id: NamedPetRock
name: pet rock
suffix: Random Name
description:
components:
- type: RandomMetadata # He's your best friend.
nameSegments:
- names_first_male
- type: Sprite
sprite: Objects/Fun/pet_rock.rsi
state: icon
- type: PhysicalComposition
materialComposition:
Steel: 10
- type: StaticPrice
price: 1

- type: entity
parent: BasePetRock
id: FredRock
Expand Down
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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions Resources/Textures/Objects/Fun/pet_rock_box.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by ghostprince",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 512d932

Please sign in to comment.