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

Cult update 1 #2455

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_animals.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,7 @@ ent-CultKangarooSpaceCorrupted = оскверненный космический
.desc = Наверное, будет плохой идеей устроить с ним боксерский поединок.
ent-CultRatCorrupted = оскверненная мышь
.desc = Откуда она вообще выползла?!
ent-FoodEggCorruptedDuckFertilized = проклятое утиное яйцо
.desc = Кто знает, быть может есть шанс, что из него что-то вылезет
ent-FoodEggCorruptedChickenFertilized = проклятое куриное яйцо
.desc = Кто знает, быть может есть шанс, что из него что-то вылезет
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ ent-MiGomyceteSeeds = пакет спор (Ми-Го)
ent-FoodNullificationShroomCult = Нулевой гриб
.desc = Мистическая напоминающая об отторжении и разложении. Не вкусно.
ent-NullificationShroomSeeds = пакет спор (Нулевой гриб)
.desc = Семена странного типа, использующиеся в основном для травли насекомых.
.desc = Пакет спор странного типа, использующиеся в основном для травли насекомых и других грибковых.
ent-FoodSidiousShroomCult = Сидиус гриб
.desc = Невероятно питательный и водянистыый, но до ужаса отторгающий, любого не подготовленного гурмана.
ent-SidiousShroomSeeds = пакет спор (Сидиус гриб)
.desc = Семена, использующиеся для выращивания невероятно питательных грибов
.desc = Пакет спор, использующиеся для выращивания невероятно питательных грибов
ent-FoodLubroShroomCult = Луброгус
.desc = Мы не придумали, что из него можно делать, но его удобно носить на ногах.
ent-LubroShroomSeeds = пакет спор (Луброгус)
.desc = Удивительный гриб, который чаще растет группами, близ водоемов.
ent-HolyWaterJug = кувшин святой воды
.desc = Сохраняйте гидратацию по божески.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_seeds.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ seeds-null-shroom-name = нулевой гриб
seeds-null-shroom-display-name = нулевой гриб
seeds-sidious-shroom-name = Сидиус гриб
seeds-sidious-shroom-display-name = Сидиус гриб
seeds-lurbo-shroom-name = Луброгус
seeds-lurbo-shroom-display-name = Луброгус
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@
Base: chicken
Dead:
Base: dead
- type: EggLayer
eggSpawn:
- id: FoodEggCorruptedChickenFertilized
- type: MovementSpeedModifier
baseWalkSpeed : 4
baseSprintSpeed : 6.5
Expand Down Expand Up @@ -370,6 +373,9 @@
amount: 2
- id: FoodMeatRotten
amount: 2
- type: EggLayer
eggSpawn:
- id: FoodEggCorruptedDuckFertilized
- type: MeleeWeapon
soundHit:
path: /Audio/Effects/bite.ogg
Expand Down
31 changes: 31 additions & 0 deletions Resources/Prototypes/SS220/Entities/Mobs/NPCs/CultYogg/eggs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: entity
id: FoodEggCorruptedDuckFertilized
parent: FoodEgg
suffix: Fertilized, Duck, CultYogg
components:
- type: Timer
- type: TimedSpawner
prototypes:
- CultDuckCorrupted
intervalSeconds: 20
minimumEntitiesSpawned: 1
maximumEntitiesSpawned: 1
- type: TimedDespawn #delete the egg after the chicken spawns
lifetime: 21

- type: entity
id: FoodEggCorruptedChickenFertilized
parent: FoodEgg
suffix: Fertilized, Chicken, CultYogg
components:
- type: Timer
- type: TimedSpawner
prototypes:
- CultChickenCorrupted
intervalSeconds: 20
minimumEntitiesSpawned: 1
maximumEntitiesSpawned: 1
- type: TimedDespawn #delete the egg after the chicken spawns
lifetime: 21
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: entity
name: LubroShroom
parent: [FoodProduceBase, ClothingShoesBase, CultYoggRestrictedItem]
id: FoodLubroShroomCult
description: Mysterious substance that calls for absorption and gag reflex.
components:
- type: Food
- type: Clothing
sprite: SS220/Objects/CultYogg/lurbo_shroom.rsi
- type: NoSlip
- type: FlavorProfile
flavors:
- menacing
- type: SolutionContainerManager
solutions:
food:
maxVol: 2.0
reagents:
- ReagentId: Nutriment
Quantity: 1
- ReagentId: Water
Quantity: 1
- type: Sprite
sprite: SS220/Objects/CultYogg/lurbo_shroom.rsi
state: produce
- type: Produce
seedId: LubroShroomSpores
- type: Extractable
grindableSolutionName: food
- type: Tag
tags:
- Omnivorous

- type: entity
parent: SeedBase
name: packet of LubroShroom spores
description: "The iconic, extremely yammy purposes."
id: LubroShroomSeeds
components:
- type: Seed
seedId: LubroShroomSpores
- type: Sprite
sprite: SS220/Objects/CultYogg/lurbo_shroom.rsi

- type: seed
id: LubroShroomSpores
name: seeds-lurbo-shroom-name
noun: seeds-noun-spores
displayName: seeds-lurbo-shroom-display-name
plantRsi: SS220/Objects/CultYogg/lurbo_shroom.rsi
packetPrototype: LubroShroomSeeds
productPrototypes:
- FoodLubroShroomCult
lifespan: 55
maturation: 12
production: 2
yield: 1
potency: 2
growthStages: 7
chemicals:
Nutriment:
Min: 1
Max: 1
PotencyDivisor: 1
Water:
Min: 1
Max: 1
PotencyDivisor: 1
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,4 @@
CultStrangeFruitSeed: 0
NullificationShroomSeeds: 0
SidiousShroomSeeds: 0
LubroShroomSeeds: 0
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,22 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "By MIXNikita for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"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
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,59 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "By MIXNikita for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dead"
},
{
"name": "harvest"
},
{
"name": "produce"
},
{
"name": "seed"
},
{
"name": "stage-1"
},
{
"name": "stage-2"
},
{
"name": "stage-3"
},
{
"name": "stage-4"
},
{
"name": "stage-5"
},
{
"name": "stage-6"
},
{
"name": "stage-7"
},
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-FEET",
"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.
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.
Loading