diff --git a/Resources/ConfigPresets/_CP14/Dev.toml b/Resources/ConfigPresets/_CP14/Dev.toml index 2c7525764c..cd2fdfb77d 100644 --- a/Resources/ConfigPresets/_CP14/Dev.toml +++ b/Resources/ConfigPresets/_CP14/Dev.toml @@ -1,5 +1,5 @@ [whitelist] -enabled = false +enabled = true [log] path = "logs" @@ -14,7 +14,7 @@ bindto = "::,0.0.0.0" max_connections = 100 [game] -hostname = "⚔️ CrystallEdge [RU] ⚔️ Status: Открытое тестирование" +hostname = "⚔️ CrystallEdge [RU] ⚔️ Status: Whitelist only" desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style" lobbyenabled = true soft_max_players = 40 @@ -61,4 +61,4 @@ enable_during_round = true [cp14] discord_auth_enabled = true -closet_beta_test = false \ No newline at end of file +closet_beta_test = true \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl b/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl index 0defc4e674..5be865037e 100644 --- a/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl +++ b/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl @@ -1,8 +1,2 @@ cp14-ghost-role-information-name-skeleton = Undead skeleton -cp14-ghost-role-information-name-skeleton-sword = Undead skeleton (swordsman) -cp14-ghost-role-information-name-skeleton-halberd = Undead skeleton (halberdier) -cp14-ghost-role-information-name-skeleton-archer = Undead skeleton (archer) -cp14-ghost-role-information-name-skeleton-dodger = Undead skeleton (dodger) -cp14-ghost-role-information-name-skeleton-wizard = Undead skeleton (wizard) -cp14-ghost-role-information-name-skeleton-bard = Undead skeleton (bard) cp14-ghost-role-information-description-skeleton = The spawn of necromancy, putting a living soul into dead bones. Often such souls are controlled by the necromancer, doing his bidding. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl b/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl index 45f6f69631..d08a54d9fd 100644 --- a/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl +++ b/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl @@ -1,8 +1,2 @@ cp14-ghost-role-information-name-skeleton = Оживленный скелет -cp14-ghost-role-information-name-skeleton-sword = Оживленный скелет (мечник) -cp14-ghost-role-information-name-skeleton-halberd = Оживленный скелет (алебардщик) -cp14-ghost-role-information-name-skeleton-archer = Оживленный скелет (лучник) -cp14-ghost-role-information-name-skeleton-dodger = Оживленный скелет (кинжал) -cp14-ghost-role-information-name-skeleton-wizard = Оживленный скелет (маг) -cp14-ghost-role-information-name-skeleton-bard = Оживленный скелет (бард) cp14-ghost-role-information-description-skeleton = Порождение некромантии, вселившее живую душу в мертвые кости. Часто такие души контролируются некромантом, исполняя его волю. \ No newline at end of file diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 39bc9b7657..e865c70568 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -63,6 +63,11 @@ entities: data: {} - type: BecomesStation id: Comoss + - type: CP14WeatherController + entries: + - visuals: CP14Mist + - visuals: CP14Rain + - visuals: CP14Storm - type: LightCycle - type: SunShadow - type: SunShadowCycle diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml index 8d31c12b61..d3d2d2fb9f 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml @@ -40,7 +40,6 @@ - MobMask layer: - MobLayer - - ItemMask - type: NpcFactionMember factions: - CP14Monster diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml index bc318bb7ef..9a3b617bdf 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml @@ -134,7 +134,7 @@ parent: MarkerBase components: - type: GhostRole - name: cp14-ghost-role-information-name-skeleton-halberd + name: cp14-ghost-role-information-name-skeleton allowMovement: true description: cp14-ghost-role-information-description-skeleton rules: cp14-ghost-role-information-rules-demiplane @@ -162,7 +162,7 @@ - type: GhostRoleMobSpawner prototype: CP14MobUndeadSkeletonSword - type: GhostRole - name: cp14-ghost-role-information-name-skeleton-sword + name: cp14-ghost-role-information-name-skeleton - type: entity id: SpawnPointGhostDemiplaneSkeletonDodger @@ -175,7 +175,7 @@ - type: GhostRoleMobSpawner prototype: CP14MobUndeadSkeletonDodger - type: GhostRole - name: cp14-ghost-role-information-name-skeleton-dodger + name: cp14-ghost-role-information-name-skeleton - type: entity id: SpawnPointGhostDemiplaneSkeletonArcher @@ -188,7 +188,7 @@ - type: GhostRoleMobSpawner prototype: CP14MobUndeadSkeletonArcher - type: GhostRole - name: cp14-ghost-role-information-name-skeleton-archer + name: cp14-ghost-role-information-name-skeleton - type: entity id: SpawnPointGhostDemiplaneSkeletonWizard @@ -201,7 +201,7 @@ - type: GhostRoleMobSpawner prototype: CP14MobUndeadSkeletonWizard - type: GhostRole - name: cp14-ghost-role-information-name-skeleton-wizard + name: cp14-ghost-role-information-name-skeleton - type: entity id: SpawnPointGhostDemiplaneSkeletonBard @@ -214,4 +214,4 @@ - type: GhostRoleMobSpawner prototype: CP14MobUndeadSkeletonBard - type: GhostRole - name: cp14-ghost-role-information-name-skeleton-bard \ No newline at end of file + name: cp14-ghost-role-information-name-skeleton \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml index 27eb51b01f..966269a95b 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml @@ -15,7 +15,7 @@ ambientLightColor: "#BFEEFFFF" - type: CP14CloudShadows - type: Biome - template: CP14IceOceanFill + template: CP14SandOceanFill - type: SunShadow - type: SunShadowCycle - type: Roof diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_grass_geode.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_grass_geode.yml index c557613295..8bf603909c 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_grass_geode.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_grass_geode.yml @@ -11,6 +11,9 @@ - CP14DemiplaneUnderground - CP14DemiplaneWater - CP14DemiplaneAnimalsSwamp + components: + - type: Biome + template: CP14CavesIndestructibleFill - type: dungeonConfig id: CP14DemiplaneSwampGeode