Skip to content

Commit

Permalink
Merge pull request #64 from Dalexiandr/Upstream/LemirdPS
Browse files Browse the repository at this point in the history
ПР №4 Плюшемат и плюшки
  • Loading branch information
Lemirda authored Apr 30, 2024
2 parents f03d2f5 + 2d3d2e3 commit 03e52b5
Show file tree
Hide file tree
Showing 20 changed files with 357 additions and 1 deletion.
Binary file not shown.
101 changes: 101 additions & 0 deletions Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
- type: entity
parent: VendingMachine
id: VendingMachinePlushieToys
name: ОбниМат
description: Если долго всматриваться в эту плюше-мягкую бездну, то можно сгибнуть от умиления!
components:
- type: VendingMachine
pack: VendingMachinePlushieToysInventory
offState: off
brokenState: broken
normalState: normal-unshaded
- type: Advertise
pack: VendingMachinePlushieToysAds
- type: Speech
- type: Sprite
sprite: Andromeda\Evil\vendingmachineplushietoys.rsi
layers:
- state: "off"
map: ["enum.VendingMachineVisualLayers.Base"]
- state: "off"
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]

- type: advertisementsPack
id: VendingMachinePlushieToysAds
advertisements:
- Подходят для не шуточной драки!
- Мягче подушки!
- Лучший друг или лучшая подруга для сна!
- Порадуйте других людей этой умилительной плюшевой куклой!
- Вы должны их взять лишь потому что их можно жмякать!
thankyous:
- Смотрите и лапайте!
- Смотрите не умрите от милоты!
- Слышали их стоны?
- Наши игрушки на девяносто процентов состоят из доброты и на десять - из плутония! ... Наверное!
- Никаких мстительных духов внутри плюшевки!
- Отталкивают грязь, воду, кровь, кровь, пыль!
- Мягче только стены комнаты!
- Широкая палитра цветов от FFFAFA до 808080!
- Безбашенно восхитительны!

- type: vendingMachineInventory
id: VendingMachinePlushieToysInventory
startingInventory:
PlushieXeno: 2
PlushieBee: 2
PlushieRGBee: 2
PlushieHampter: 2
PlushiePenguin: 2
PlushieLizard: 2
PlushieSnake: 2
PlushieSpaceLizard: 2
PlushieVox: 2
PlushieSlime: 2
PlushieRouny: 2
PlushieMoth: 2
PlushieDiona: 2
PlushieGhost: 2
PlushieCarp: 2
PlushieHoloCarp: 2
PlushieMagicarp: 2
PlushieRainbowCarp: 2
PlushieSharkGrey: 2
PlushieSharkBlue: 2
PlushieSharkPink: 2
PlushieBear: 2
PlushieMaleToy: 2
PlushieMaleAndGun: 2
PlushieRatvar: 2
PlushieNar: 2
MrChips: 2
MrDips: 2
PlushieArachnid: 2
PlushieAtmosian: 2
PlushieGirl: 1
PlushieRD: 1
PlushieParamedic: 1
PlushieRoboMechanic: 1
PlushieChemist: 1
PlushieScientist: 1
PlushieFelSci: 1
PlushieAdv: 1
PlushieCadet: 1
PlushieSelectionist: 1
ToyMouse: 2
Basketball: 2
Football: 2
BeachBall: 2
FoamCrossbow: 2
RevolverCapGun: 2
FoamBlade: 2
ToySword: 2
FoamCutlass: 2
ClownRecorder: 2
ToyHammer: 2
PonderingOrb: 2
CrayonBox: 3
CrayonRainbow: 2
139 changes: 139 additions & 0 deletions Resources/Prototypes/Andromeda/Evil Prototype's/plushies.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
- type: entity
parent: BasePlushie
id: PlushiePaintor
name: плюшевый грустный художник
description: Это маленький плюшевый художник, ваш грустный брат по рисованию. Он вам с радостью поможет.
suffix: Андромеда
components:
- type: Sprite
sprite: Andromeda\Evil\plushiepaintor.rsi
state: icon
- type: Item
size: Small
sprite: Andromeda\Evil\plushiepaintor.rsi
- type: Storage
maxItemSize: Small
grid:
- 0,0,1,1
whitelist:
components:
- Paint
- Crayon
- type: UserInterface
interfaces:
- key: enum.StorageUiKey.Key
type: StorageBoundUserInterface
- type: PointLight
netsync: false
radius: 1.5
energy: 1.0
color: "#9932CC"
- type: StorageFill
contents:
- id: SprayPaintPurple
- id: CrayonPurple
- id: CrayonRainbow
- type: EmitSoundOnLand
sound:
collection: PaintorUse
- type: EmitSoundOnActivate
sound:
collection: PaintorUse
- type: EmitSoundOnUse
sound:
collection: PaintorUse
- type: Clothing
quickEquip: false
sprite: Andromeda\Evil\plushiepaintor.rsi
slots:
- HEAD

- type: soundCollection
id: PaintorUse
files:
- /Audio/Andromeda/Evil/SoundCollection/PlushiePaintor/karandash.ogg

- type: entity
parent: BasePlushie
id: PlushieSelectionist
name: плюшевый селекционер
description: Растрепанный исследователь-ботаник, весь в работе над селекцией растений.
suffix: Андромеда
components:
- type: Sprite
sprite: Andromeda\Evil\plushieselectionist.rsi
state: icon
- type: Item
size: Small
sprite: Andromeda\Evil\plushieselectionist.rsi
- type: Storage
maxItemSize: Small
grid:
- 0,0,0,0
whitelist:
components:
- Produce
- Seed
- type: UserInterface
interfaces:
- key: enum.StorageUiKey.Key
type: StorageBoundUserInterface
- type: PointLight
netsync: false
radius: 1.5
energy: 1.0
color: "#55eb63"

- type: entity
parent: BasePlushie
id: PlushieCadet
name: плюшевый кадет
description: Не обманывайтесь её глупой мордочкой, эта унати стоит на страже закона! ... И ... возможно на вашем лице, если вы этот закон нарушили!
suffix: Андромеда
components:
- type: Sprite
sprite: Andromeda\Evil\plushiecadet.rsi
state: icon
- type: Item
size: Small
sprite: Andromeda\Evil\plushiecadet.rsi

- type: entity
parent: BasePlushie
id: PlushieAdv
name: плюшевый авантюрист
description: От него веет жаждой приключений и карпами. Еще на 30% мягче!
suffix: Андромеда
components:
- type: Sprite
sprite: Andromeda\Evil\plushieadv.rsi
state: icon
- type: Item
size: Small
sprite: Andromeda\Evil\plushieadv.rsi
- type: EmitSoundOnUse
sound:
path: \Audio\Andromeda\Voice\Talk\vulp_exclaim.ogg
- type: EmitSoundOnLand
sound:
path: \Audio\Andromeda\Voice\Talk\vulp_exclaim.ogg
- type: EmitSoundOnActivate
sound:
path: \Audio\Andromeda\Voice\Talk\vulp_exclaim.ogg
- type: EmitSoundOnTrigger
sound:
path: \Audio\Andromeda\Voice\Talk\vulp_exclaim.ogg

- type: entity
parent: BasePlushie
id: PlushieFelSci
name: плюшевая научная ассистентка
description: От неё веет жаждой знаний.
suffix: Андромеда
components:
- type: Sprite
sprite: Andromeda\Evil\plushiefelsci.rsi
state: icon
- type: Item
size: Small
sprite: Andromeda\Evil\plushiefelsci.rsi
13 changes: 12 additions & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,15 @@
cost: 6500
category: cargoproduct-category-name-service
group: market
# А-13 Плант-О-Мат end
# А-13 Плант-О-Мат end
# А-13 ОбниМат start
- type: cargoProduct
id: VendingMachinePlushieToys
icon:
sprite: Andromeda\Evil\vendingmachineplushietoys.rsi
state: off
product: VendingMachinePlushieToys
cost: 8000
category: cargoproduct-category-name-service
group: market
# А-13 ОбниМат end
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/Andromeda/Evil/plushieadv.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by s6766, code by EvilBug for Andromeda-13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/Andromeda/Evil/plushiecadet.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by Kotiko43, code by EvilBug for Andromeda-13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/Andromeda/Evil/plushiefelsci.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by Gehok, code by EvilBug for Andromeda-13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}
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.
18 changes: 18 additions & 0 deletions Resources/Textures/Andromeda/Evil/plushiepaintor.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By EvilBug and SadBrat for Andromeda-13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By EvilBug for Andromeda-13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By EvilBug and SadBrat for Andromeda-13",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "broken"
},
{
"name": "off"
},
{
"name": "panel"
},
{
"name": "normal-unshaded",
"delays": [
[
1.5,
0.1,
1.5,
0.1
]
]
}
]
}
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.

0 comments on commit 03e52b5

Please sign in to comment.