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

Update localization Mark Valentinov #200

Closed
wants to merge 2 commits into from
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@ ent-BasePlushie = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-PlushieGhost = плюшевый призрак
.desc = Начало вашей собственной БАНДЫ ПРИЗРАКОВ!
ent-PlushieAlinaKotova = плюшевая Алина Котова
.desc = Милая игрушка, имеет маленькие секретики~ Этикетка сзади - специально для Алины Котова.
ent-PlushieAlinaKotovaSyndi = плюшевая Алина Котова синдикат
.desc = Милая игрушка, одета в чёрно красный оттенок униформы синдиката. Этикетка сзади - специально для Алины Котова.
ent-PlushieAlinaKotovaWedding = свадебная плюшевая Алина Котова
.desc = Милая игрушка, одета в свадебное платье, похожа на подушку. Этикетка сзади - специально для Алины Котова.
ent-PlushieLiaNiko = плюшевая Лия Нико
.desc = Милая игрушка, лучше не знать что она делала.. Этикетка сзади - спеицально для Лия Нико.
ent-PlushieMarkValentinov = плюшевая сперма
.desc = Игрушка которая состоит на 100% из спермы, и сосёт хуй.
ent-PlushieGhostRevenant = плюшевый ревенант
.desc = Такой мягкий, что вызывает желание вздремнуть...
.suffix = НЕ МАППИТЬ
Expand Down
24 changes: 24 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,30 @@
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000

#Clown syndie Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSyndieClown
noSpawn: true
name: syndie clown hardsuit helmet
description: nuh uh
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndiclown.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/syndiclown.rsi
- type: PointLight
color: green
- type: PressureProtection
highPressureMultiprier: 0.08
lowPressureMultiplier: 1000
- type: Armor
modifiers:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9

- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSyndieCommander
Expand Down
31 changes: 31 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,37 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndie

#Clown syndicate Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitClownSyndie
name: Clown syndie hardsuit
description: A heavily armored clowned hardsuit for work in special operatioins.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/syndiclown.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/syndiclown.rsi
- type: PressureProtection
highPressureMultiplier: 0.05
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.5
Heat: 0.5
Radiation: 0.5
Caustic: 0.5
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndieClown

#Cybersun Juggernaut Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Human]
sponsorOnly: false # Corvax-Sponsors
coloring:
default:
type:
Expand All @@ -27,7 +26,6 @@
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Human]
sponsorOnly: false # Corvax-Sponsors
coloring:
default:
type:
Expand All @@ -39,4 +37,4 @@
- !type:SkinColoring
sprites:
- sprite: Mobs/Customization/cat_parts.rsi
state: tail_cat_wag # Corvax-Sponsors
state: tail_cat_wag
95 changes: 95 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,100 @@
- type: Sprite
state: plushie_rouny

- type: entity
parent: BasePlushie
id: PlushieAlinaKotova
name: plushie Alina Kotova
description: A cute toy with some secrets~ Back label - Specially for Alina Kotova
components:
- type: Sprite
state: PlushAlina
- type: EmitSoundOnUse
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Animals/cat_meow.ogg
- type: MeleeWeapon
soundHit:
path: /Audio/Animals/cat_meow.ogg

- type: entity
parent: BasePlushie
id: PlushieAlinaKotovaWedding
name: plushie wedding Alina Kotova
description: A cute toy dressed in a white wedding dress. It looks like a pillow. - Specially for Alina Kotova
components:
- type: Sprite
state: PlushAlinaWedding
- type: EmitSoundOnUse
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Animals/cat_meow.ogg
- type: MeleeWeapon
soundHit:
path: /Audio/Animals/cat_meow.ogg


- type: entity
parent: BasePlushie
id: PlushieAlinaKotovaSyndi
name: plushie Alina Kotova Syndicate
description: A cute toy dressed in the black and red shade of the syndicate uniform. - Specially for Alina Kotova
components:
- type: Sprite
state: PlushAlinaSyndi
- type: EmitSoundOnUse
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Animals/cat_meow.ogg
- type: MeleeWeapon
soundHit:
path: /Audio/Animals/cat_meow.ogg

- type: entity
parent: BasePlushie
id: PlushieLiaNiko
name: plushie Lia Niko
description: A cute toy, it's better not to know what she was doing... - Specially for Lia Niko
components:
- type: Sprite
state: PlushLiaNiko
- type: EmitSoundOnUse
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Animals/cat_meow.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Animals/cat_meow.ogg
- type: MeleeWeapon
soundHit:
path: /Audio/Animals/cat_meow.ogg

- type: entity
parent: BasePlushie
id: PlushieMarkValentinov
name: plushie Mark Valentinov
description: A cute toy, very slimy and sticky to the touch, suspicious. - Specially for Mark Valentinov
components:
- type: Sprite
state: PlushMark

- type: entity
parent: BasePlushie
id: PlushieLamp
Expand All @@ -167,6 +261,7 @@
radius: 1.5
energy: 2
netsync: false

- type: entity
parent: BasePlushie
id: PlushieLizard #Weh!
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png
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.
Binary file modified Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Maded by SuZIForD",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "icon-flash"
}
]
}
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.
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Made by PuroSlavKing (github) for SS14",
"size": {
"x": 32,
"y": 32
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "idk",
"size": {
"x": 32,
"y": 32
Expand All @@ -23,4 +23,4 @@
"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
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Alekshhh for SS14",
"copyright": "Created by discord:IAmRasputin#5242",
"size": {
"x": 32,
"y": 32
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.
15 changes: 15 additions & 0 deletions Resources/Textures/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@
{
"name": "carpplush"
},
{
"name": "PlushAlina"
},
{
"name": "PlushAlinaSyndi"
},
{
"name": "PlushAlinaWedding"
},
{
"name": "PlushLiaNiko"
},
{
"name": "PlushMark"
},
{
"name": "narplush"
},
Expand Down
Loading