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

ADD Clown Uplink #1805

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Back/backpack_king.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingBackpackClownKing = сундук короля клоунов
.desc = Mein Clownskönig, эти люди проливают кровь за тебя...
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Belt/quiver.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingBeltQuiverKingClown = хонковский колчан для стрел
.desc = Лучший друг хонк папы.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Hands/gloves_king.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingHandsGlovesClownKing = руки короля
.desc = Власть в этих руках.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingHeadHelmetHardsuitKingClown = рыбья головешка
.desc = Это не маскировка. Это не спасение от космоса. Это судьба.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingUniformJumpsuitClownKing = детская пижама короля
.desc = Ей уже 50 лет. Воняет величием.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Mask/mask_king.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingMaskClownKing = лицо короля
.desc = Лицо короля всегда прекрасно.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingOuterHardsuitKingClown = тело короля королей
.desc = Он старше вселенной.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Shoes/shoes_king.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingShoesClownKing = королевские шлёпоходы
.desc = Легенда гласит, что прошлый король умер из-за попадания стрелы в пятку.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/nofun.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-CrateNoFunToyBox = королевский ящик с игрушками
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/reagents/meta/narcotics.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
reagent-name-sweet-prank = сладкий розыгрыш
reagent-desc-sweet-prank = Очень смешной наркотик клоуна, который избавит вас от необходимости смотреть на этот жестокий и несмешной мир!
reagent-name-neonicotinoid = неоникатиноид
reagent-desc-neonicotinoid = Менее опасная форма никотина, всё равно убивает растения.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/reagents/sweetprank.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sweetprank-effect-eye-disconnect = Ваши глаза погружаются в мир веселья!
sweetprank-effect-eye-fun = Вы чувствуете сильное веселье.
sweetprank-effect-blindness = Ваши глаза показывают истинный мир!
sweetprank-effect-pupils = Ваши зрачки постепенно расширяются!
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/storage/clown_case.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClownCase = чемодан короля клоунов
.desc = Это совсем не смешная шутка.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ uplink-mindslave-implanter-desc = { ent-MindSlaveImplant.desc }
#JobItems
uplink-mime-relic-name = { ent-SacredRelicMime }
uplink-mime-relic-desc = Ценная реликвия Ордена Тишины, Вашего ордена. Зажав в руке, позволяет мимам поставить сразу три невидимые стены, закрывающие широкий проход, раз в 90 секунд.
uplink-king-clown-name = { ent-CrateNoFunToyBox }
uplink-king-clown-desc = Ящик, содержащий в себе наследие короля Хонк Государя из Хонк-Государства.

# Pointless
uplink-expensive-lighter-name = { ent-ExpensiveLighterSyndicate }
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/arrows.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ArrowClown = стрела на липучке
.desc = Так сильно прилипает... Неужели она смазана клеем?!
16 changes: 16 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/cb.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ent-CLPacific = подарок на день рождения
.desc = В мире веселья давайте скажем "нет" насилию.
ent-CLClusterFlash = нервы короля
.desc = Это будет сногсшибательное шоу!
ent-CLClusterBomb = кнурла
.desc = Сейчас будет бомбезный розыгрыш!
ent-CLClusterClusterBomb = ои
.desc = Ого. Нам пиздец.
ent-CLClusterHole = дыра офицера
.desc = Оно оттягивает или притягивает...?
ent-CLClusterClusterHole = кластерная кластерная граната
.desc = КАК МОЖНО БОЛЬШЕ!!!
ent-CLClusterClusterClusterHole = кластерная кластерная кластерная граната
.desc = Это уже не смешно...
ent-CLSnapPop = разрыв
.desc = Бабах!
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/ss220/weapons/crossbow.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ ent-WeaponMiniEnergyCrossbow = мини энерго-арбалет
.desc = Оружие, излюбленное специалистами синдиката, предпочитающими работать скрытно.
ent-WeaponEnergyCrossbow = энерго-арбалет
.desc = Оружие, спроектированное методом обратной инженерии с использованием технологий синдиката. Средних размеров и слабее "оригинала".

ent-CrossbowKingClown = арбалет сладкой мести
.desc = Месть может жалить до глубины души.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/sugar_hammer.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-SugarHammer = сахарный молот
.desc = Месть часто подают холодной, но теперь она ещё и сладкая.
17 changes: 17 additions & 0 deletions Resources/Prototypes/SS220/Catalog/Fills/Crates/antags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
id: CrateNoFunToyBox
name: the royal toy box
parent: CrateToyBox
suffix: Antag
components:
- type: StorageFill
contents:
- id: ClownCase
- id: ClothingOuterHardsuitKingClown
- id: ClothingBeltQuiverKingClown
- id: ClothingBackpackClownKing
- id: ClothingUniformJumpsuitClownKing
- id: ClothingShoesClownKing
- id: ClothingMaskClownKing
- id: ClothingHandsGlovesClownKing
- id: ClothingEyesGlassesGarGiga
18 changes: 18 additions & 0 deletions Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,24 @@
components:
- SurplusBundle

- type: listing
id: UplinkKingClown
name: uplink-king-clown-name
description: uplink-king-clown-desc
productEntity: CrateNoFunToyBox
cost:
Telecrystal: 20
categories:
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- Clown
- !type:BuyerWhitelistCondition
blacklist:
components:
- SurplusBundle

# Pointless

- type: listing
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- type: entity
parent: ClothingBackpackClown
id: ClothingBackpackClownKing
name: the clown king's chest
suffix: Unremoveable
description: Mein Clownskönig, these people are shedding blood for you...
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/cluwne.rsi
- type: Unremoveable
deleteOnDrop: false
lockToHands: false
- type: Storage
grid:
- 0,0,8,6
# - type: StorageFill
# contents:
# - id: ClothingShoesClownKing
# - id: ClothingUniformJumpsuitClownKing
# - id: ClothingMaskClownKing
# - id: ClothingHandsGlovesClownKing
# не работает из-за бага с Unremoveable
23 changes: 23 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Belt/quiver_clown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: ClothingBeltQuiver
id: ClothingBeltQuiverKingClown
name: honkovsky quiver for arrows
description: Honk Dad's best friend.
components:
- type: Storage
grid:
- 0,0,15,7
whitelist:
tags:
- Arrow
- Plunger
- GlassShard
- ReinforcedGlassShard
- PlasmaGlassShard
- UraniumGlassShard
- ClockworkGlassShard
- Crowbar
- type: StorageFill
contents:
- id: ArrowClown
amount: 64
10 changes: 10 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Hand/gloves_king.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingHandsGlovesColorWhite
id: ClothingHandsGlovesClownKing
name: the king's hands
suffix: Unremoveable
description: The power is in these hands.
components:
- type: Insulated
- type: Unremoveable
lockToHands: false
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
#KingClown Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitKingClown
name: fish firebrand
description: This is not a disguise. This is not an escape from space. It's fate.
components:
- type: BreathMask
- type: Sprite
sprite: SS220/Clothing/Head/Hardsuits/king_clown.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hardsuits/king_clown.rsi
equipSound: /Audio/Mecha/mechmove03.ogg
unequipSound: /Audio/Effects/Emotes/parp1.ogg
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.85
Heat: 0.85
Radiation: 0.6
- type: FireProtection
reduction: 0.2
- type: PointLight
color: green
radius: 6
energy: 4
=======
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

#Security Pilot Hardsuit
Expand Down Expand Up @@ -49,6 +78,7 @@
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Piercing: 0.8

#SuperMatter operator's Hardsuit
- type: entity
Expand Down
24 changes: 24 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Masks/mask_king.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: entity
parent: ClothingMaskClownBase
id: ClothingMaskClownKing
name: face of the king
suffix: Unremoveable
description: The king's face is always beautiful.
components:
- type: Sprite
sprite: Clothing/Mask/cluwne.rsi
- type: Clothing
sprite: Clothing/Mask/cluwne.rsi
- type: Unremoveable
lockToHands: false
- type: AddAccentClothing
accent: StutteringAccent
- type: FlashImmunity
- type: EyeProtection
- type: Armor
modifiers:
coefficients:
Blunt: 0.95
Slash: 0.95
Piercing: 0.95
Heat: 0.95
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#KingClown Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitKingClown
name: the body of the king of kings
description: He is older than the universe.
components:
- type: Sprite
sprite: SS220/Clothing/OuterClothing/Hardsuits/king_clown.rsi
- type: Clothing
sprite: SS220/Clothing/OuterClothing/Hardsuits/king_clown.rsi
- type: PressureProtection
highPressureMultiplier: 0.05
lowPressureMultiplier: 1000
- type: Unremoveable
lockToHands: false
- type: ExplosionResistance
damageCoefficient: 0.5
=======
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: entity
Expand Down Expand Up @@ -53,6 +72,29 @@
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.6
Caustic: 0.6
Stamina: 0.4
Radiation: 0.5
- type: ClothingSpeedModifier
walkModifier: 0.8
sprintModifier: 0.9
- type: HeldSpeedModifier
#ss220 special_sounds start
- type: SpecialSounds
- type: Vocal
sounds:
Male: MaleEvil
Female: FemaleEvil
Unsexed: MaleEvil
#ss220 special_sounds end
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitKingClown
- type: Tag
tags:
- MonkeyWearable
- Hardsuit
- WhitelistChameleon
Heat: 0.7
Caustic: 0.7
Radiation: 0.50
Expand All @@ -63,6 +105,7 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot
clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot

#SuperMatter operator's Hardsuit
- type: entity
Expand Down
26 changes: 26 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Shoes/shoes_king.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: entity
parent: ClothingShoesClown
id: ClothingShoesClownKing
name: the king's shoes
suffix: Unremoveable
description: Legend has it that the last king died due to an arrow hitting his heel.
components:
- type: Sprite
sprite: Clothing/Shoes/Specific/cluwne.rsi
- type: Clothing
sprite: Clothing/Shoes/Specific/cluwne.rsi
- type: Unremoveable
lockToHands: false
- type: NoSlip
- type: ItemSlots
slots:
item:
name: clothing-boots-sidearm
whitelist:
tags:
- Knife
- Sidearm
- type: ContainerFill
containers:
item:
- CombatKnife
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: ClothingUniformJumpsuitClown
id: ClothingUniformJumpsuitClownKing
name: children's pajamas of the king
suffix: Unremoveable
description: She is already 50 years old. She reeks of greatness.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/cluwne.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/cluwne.rsi
- type: Unremoveable
lockToHands: false
- type: Tag
tags:
- ClothMade
Loading
Loading