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

Рататуй #212

Merged
merged 4 commits into from
Jan 29, 2025
Merged
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
11 changes: 9 additions & 2 deletions Resources/Maps/Adventure/Adventureamber.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ entities:
name: grid
- type: Transform
pos: 0.53697205,0.547603
parent: invalid
parent: 20475
- type: BecomesStation
id: AdvAmber
- type: MapGrid
Expand Down Expand Up @@ -55314,6 +55314,13 @@ entities:
- type: Transform
pos: -17.5,-57.5
parent: 2
- proto: HatChefNPCMouseRemy
entities:
- uid: 20476
components:
- type: Transform
pos: -8.760822,-30.469727
parent: 2
- proto: CrateSecurityTrackingMindshieldImplants
entities:
- uid: 4184
Expand Down Expand Up @@ -65616,7 +65623,7 @@ entities:
pos: -16.5,-17.5
parent: 2
- type: Door
secondsUntilStateChange: -33671.855
secondsUntilStateChange: -33846.67
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down
23 changes: 15 additions & 8 deletions Resources/Maps/Adventure/Adventureaspid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11234,7 +11234,7 @@ entities:
pos: 12.5,-19.5
parent: 1
- type: Door
secondsUntilStateChange: -100025.51
secondsUntilStateChange: -100145.5
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -12168,7 +12168,7 @@ entities:
pos: 28.5,10.5
parent: 1
- type: Door
secondsUntilStateChange: -1185.4613
secondsUntilStateChange: -1305.4606
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -12743,7 +12743,7 @@ entities:
pos: -29.5,48.5
parent: 1
- type: Door
secondsUntilStateChange: -49759.195
secondsUntilStateChange: -49879.195
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -59292,7 +59292,7 @@ entities:
pos: 2.5,16.5
parent: 1
- type: Door
secondsUntilStateChange: -96985.64
secondsUntilStateChange: -97105.63
state: Closing
- type: Firelock
emergencyCloseCooldown: 184.2664844
Expand All @@ -59302,7 +59302,7 @@ entities:
pos: 3.5,16.5
parent: 1
- type: Door
secondsUntilStateChange: -80314.25
secondsUntilStateChange: -80434.24
state: Closing
- type: Firelock
emergencyCloseCooldown: 184.6998173
Expand Down Expand Up @@ -59372,7 +59372,7 @@ entities:
pos: -31.5,16.5
parent: 1
- type: Door
secondsUntilStateChange: -24989.945
secondsUntilStateChange: -25109.945
state: Closing
- uid: 5679
components:
Expand Down Expand Up @@ -59816,7 +59816,7 @@ entities:
pos: -30.5,-6.5
parent: 1
- type: Door
secondsUntilStateChange: -54289.59
secondsUntilStateChange: -54409.59
state: Closing
- uid: 5809
components:
Expand Down Expand Up @@ -60465,7 +60465,7 @@ entities:
pos: -11.5,37.5
parent: 1
- type: Door
secondsUntilStateChange: -93658.41
secondsUntilStateChange: -93778.4
state: Closing
- uid: 9591
components:
Expand Down Expand Up @@ -86549,6 +86549,13 @@ entities:
- type: Transform
pos: -13.497177,-24.441525
parent: 1
- proto: HatChefNPCMouseRemy
entities:
- uid: 18711
components:
- type: Transform
pos: 9.556043,-2.8593013
parent: 1
- proto: Hemostat
entities:
- uid: 2628
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/Adventure/Adventurebagel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109010,6 +109010,13 @@ entities:
- type: Transform
pos: 22.5,-0.5
parent: 2
- proto: HatChefNPCMouseRemy
entities:
- uid: 25297
components:
- type: Transform
pos: 24.561152,-30.371037
parent: 2
- proto: HeatExchanger
entities:
- uid: 16501
Expand Down
9 changes: 8 additions & 1 deletion Resources/Maps/Adventure/Adventurecluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ entities:
- type: MetaData
- type: Transform
pos: -0.484375,-0.5
parent: invalid
parent: 12679
- type: MapGrid
chunks:
0,0:
Expand Down Expand Up @@ -55143,6 +55143,13 @@ entities:
- type: Transform
pos: -18.5,-50.5
parent: 1
- proto: HatChefNPCMouseRemy
entities:
- uid: 12680
components:
- type: Transform
pos: 2.5185199,2.5625
parent: 1
- proto: HeadSkeleton
entities:
- uid: 8257
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/Adventure/Adventuredelta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191602,6 +191602,13 @@ entities:
- type: Transform
pos: 10.5,66.5
parent: 2
- proto: HatChefNPCMouseRemy
entities:
- uid: 40915
components:
- type: Transform
pos: -31.134789,36.573284
parent: 2
- proto: HeatExchanger
entities:
- uid: 24641
Expand Down
17 changes: 12 additions & 5 deletions Resources/Maps/Adventure/Adventureloop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ entities:
name: grid
- type: Transform
pos: 5.375742,-1.5783513
parent: invalid
parent: 13915
- type: MapGrid
chunks:
0,0:
Expand Down Expand Up @@ -40645,31 +40645,31 @@ entities:
pos: -9.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -234886.7
secondsUntilStateChange: -234998.8
state: Opening
- uid: 6747
components:
- type: Transform
pos: -8.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -234887.4
secondsUntilStateChange: -234999.5
state: Opening
- uid: 6749
components:
- type: Transform
pos: -6.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -234885.97
secondsUntilStateChange: -234998.06
state: Opening
- uid: 6750
components:
- type: Transform
pos: -5.5,51.5
parent: 2
- type: Door
secondsUntilStateChange: -234885.34
secondsUntilStateChange: -234997.44
state: Opening
- proto: CyberPen
entities:
Expand Down Expand Up @@ -71408,6 +71408,13 @@ entities:
rot: 3.141592653589793 rad
pos: -1.4779639,50.30927
parent: 2
- proto: HatChefNPCMouseRemy
entities:
- uid: 13916
components:
- type: Transform
pos: -49.472656,47.221836
parent: 2
- proto: HighSecArmoryLocked
entities:
- uid: 13965
Expand Down
11 changes: 9 additions & 2 deletions Resources/Maps/Adventure/Adventuremarathon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ entities:
- type: MetaData
- type: Transform
pos: 2.2710133,-2.4148211
parent: invalid
parent: 22632
- type: MapGrid
chunks:
-1,0:
Expand Down Expand Up @@ -10836,7 +10836,7 @@ entities:
pos: -14.5,24.5
parent: 30
- type: Door
secondsUntilStateChange: -2201.6243
secondsUntilStateChange: -2290.9458
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -96644,6 +96644,13 @@ entities:
- type: Transform
pos: -43.530403,66.65333
parent: 30
- proto: HatChefNPCMouseRemy
entities:
- uid: 22633
components:
- type: Transform
pos: -14.433979,9.226749
parent: 30
- proto: HeatExchanger
entities:
- uid: 9159
Expand Down
63 changes: 63 additions & 0 deletions Resources/Prototypes/Adventure/Roles/Animals/remy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
- type: entity
name: Реми
description: Питомец шеф-повара, маленький серый поварёнок, который мастерски балансирует между готовкой и уничтожением запасов кухни.
parent: MobMouse
suffix: Adventure
id: MobMouseRemy
components:
- type: Sprite
drawdepth: SmallMobs
sprite: Adventure\Roles\remy.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base", "movement"]
state: mouse
- type: SpriteMovement
movementLayers:
movement:
state: mouse-moving
noMovementLayers:
movement:
state: mouse
- type: GhostRole
makeSentient: true
allowSpeech: true
allowMovement: true
name: Реми, питомец шеф-повара
description: Слушайтесь шеф-повара и вдохновляйте его на шедевры. Боритесь с желанием слопать всё, что лежит на кухне, доказывая, что вы — крыса с высокой кулинарной дисциплиной.
rules: ghost-role-information-familiar-rules
mindRoles:
- MindRoleGhostRoleFamiliar
- type: GhostTakeoverAvailable
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.03"
sprite: Adventure\Roles\remy.rsi
equippedPrefix: 0
quickEquip: false
- type: NpcFactionMember
factions:
- PetsNT
- type: MobThresholds
thresholds:
0: Alive
40: Critical
60: Dead
- type: DamageStateVisuals
states:
Alive:
Base: mouse
Critical:
Base: dead
Dead:
Base: splat

- type: entity
id: HatChefNPCMouseRemy
parent: ClothingHeadHatChef
suffix: Remy
components:
- type: StorageFill
contents:
- id: MobMouseRemy
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions Resources/Textures/Adventure/Roles/remy.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from the original mouse sprite and modified by RumiTiger.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "mouse",
"directions": 4
},
{
"name": "mouse-moving",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
},
{
"name": "dead"
},
{
"name": "splat"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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