diff --git a/Resources/Changelog/ChangelogAmour.yml b/Resources/Changelog/ChangelogAmour.yml index 24ee25424d..9dd7f4dc01 100644 --- a/Resources/Changelog/ChangelogAmour.yml +++ b/Resources/Changelog/ChangelogAmour.yml @@ -117,3 +117,9 @@ type: Add id: 18 time: '2024-11-28T18:00:13.0000000+00:00' +- author: BIG_Zi_348 + changes: + - message: "Добавленно обозначение антагониста ивентовому-подрывнику для окошка телепорта призраков" + type: Add + id: 19 + time: '2024-12-12T18:00:13.0000000+00:00' diff --git a/Resources/Locale/ru-RU/_white/ui/ghostTeleportMenu.ftl b/Resources/Locale/ru-RU/_white/ui/ghostTeleportMenu.ftl index fc79810ec6..c580727e81 100644 --- a/Resources/Locale/ru-RU/_white/ui/ghostTeleportMenu.ftl +++ b/Resources/Locale/ru-RU/_white/ui/ghostTeleportMenu.ftl @@ -32,3 +32,7 @@ ghost-teleport-menu-ghosts-label = Призраки ghost-teleport-menu-left-label = Вышедшие из тела ghost-teleport-menu-locations-label = Локации и объекты ghost-teleport-menu-count-label = Количество + + +global-antagonist-demolitionist-name = Подрывник +global-antagonist-demolitionist-description = Пришёл, чтобы красиво уйти diff --git a/Resources/Maps/_Honk/Shuttles/StationEvent/DemolitionistShuttle.yml b/Resources/Maps/_Honk/Shuttles/StationEvent/DemolitionistShuttle.yml index 6b117ac151..95a2b988ce 100644 --- a/Resources/Maps/_Honk/Shuttles/StationEvent/DemolitionistShuttle.yml +++ b/Resources/Maps/_Honk/Shuttles/StationEvent/DemolitionistShuttle.yml @@ -877,7 +877,7 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,2.5 parent: 1 -- proto: SpawnPointGhostDemolitionist +- proto: SpawnPointGhostDemolitionistShuttle entities: - uid: 162 components: diff --git a/Resources/Prototypes/_Honk/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/_Honk/Entities/Markers/Spawners/ghost_roles.yml index e70ac181b4..1ec0213161 100644 --- a/Resources/Prototypes/_Honk/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/_Honk/Entities/Markers/Spawners/ghost_roles.yml @@ -1,6 +1,6 @@ - type: entity parent: MarkerBase - id: SpawnPointGhostDemolitionist + id: SpawnPointGhostDemolitionistShuttle name: точка появление подрывника синдиката components: - type: GhostRole @@ -10,7 +10,7 @@ raffle: settings: default - type: GhostRoleMobSpawner - prototype: MobHumanDemolitionist + prototype: MobHumanDemolitionistShuttle - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/_Honk/Entities/Mobs/Player/human.yml b/Resources/Prototypes/_Honk/Entities/Mobs/Player/human.yml index 14da00b234..7ae59b22f7 100644 --- a/Resources/Prototypes/_Honk/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/_Honk/Entities/Mobs/Player/human.yml @@ -19,3 +19,12 @@ - Syndicate - type: AutoTraitor profile: TraitorReinforcement + +- type: entity + parent: MobHumanDemolitionist + id: MobHumanDemolitionistShuttle + name: подрывник синдиката + suffix: Human, Base, Shuttle + components: + - type: GlobalAntagonist + antagonistPrototype: globalAntagonistDemolitionist diff --git a/Resources/Prototypes/_White/Antag/globalAntagonists.yml b/Resources/Prototypes/_White/Antag/globalAntagonists.yml index 55e5544897..861d0811e4 100644 --- a/Resources/Prototypes/_White/Antag/globalAntagonists.yml +++ b/Resources/Prototypes/_White/Antag/globalAntagonists.yml @@ -75,3 +75,12 @@ name: global-antagonist-unknown-name description: global-antagonist-unknown-description weight: 12 + + +# Amour + +- type: antagonist + id: globalAntagonistDemolitionist + name: global-antagonist-demolitionist-name + description: global-antagonist-demolitionist-description + weight: 100