diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index f5f17bfbcc0..ba9f0d3f0b6 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -10913,3 +10913,19 @@ id: 757 time: '2025-01-20T02:05:52.0000000+00:00' url: https://github.com/space-sunrise/space-station-14/pull/1153 +- author: VigersRay + changes: + - message: "\u0418\u0437 \u0448\u043A\u0430\u0444\u0430 \u043A\u0430\u043F\u0438\ + \u0442\u0430\u043D\u0430 \u0443\u0434\u0430\u043B\u0435\u043D \u0431\u0440\u043E\ + \u043D\u0435\u0436\u0438\u043B\u0435\u0442 \u0438 \u0442\u043E\u0440\u0436\u0435\ + \u0441\u0442\u0432\u0435\u043D\u043D\u0430\u044F \u043A\u0443\u0440\u0442\u043A\ + \u0430." + type: Remove + - message: "\u0412 \u043B\u043E\u0430\u0434\u0430\u0443\u0442 \u0432\u0435\u0440\ + \u0445\u043D\u0435\u0439 \u043E\u0434\u0435\u0436\u0434\u044B \u043A\u0430\u043F\ + \u0438\u0442\u0430\u043D\u0430 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\ + \u0430 \u0442\u043E\u0440\u0436\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u0430\ + \u044F \u043A\u0443\u0440\u0442\u043A\u0430." + type: Tweak + id: 758 + time: '2025-01-20T02:30:26.912646+00:00' diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 02850a0ac54..dbc10f4a640 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -46,7 +46,7 @@ prob: 0.25 - id: ClothingBeltSheathFilled - id: ClothingHeadsetAltCommand - - id: ClothingOuterArmorCaptainCarapace + #- id: ClothingOuterArmorCaptainCarapace # Sunrise-Edit - id: CommsComputerCircuitboard - id: DoorRemoteCommand - id: MedalCase @@ -58,7 +58,6 @@ - id: SpaceCash1000 - id: WeaponDisabler - id: ClothingEyesGlassesCommand - - id: ClothingOuterCoatCaptain # Sunrise-Edit - id: FlippoLighterSunriseCap # Sunrise-Flippo # No laser table + Laser table diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 9043354a315..d82739e96be 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -82,10 +82,15 @@ # Outer clothing - type: loadout - id: CaptainOuterClothing + id: CaptainOuterArmor equipment: outerClothing: ClothingOuterArmorCaptainCarapace +- type: loadout + id: CaptainOuterCoat + equipment: + outerClothing: ClothingOuterCoatCaptain + - type: loadout id: CaptainWintercoat equipment: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 9bdad774338..b1ff985d1f7 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -141,7 +141,8 @@ id: CaptainOuterClothing name: loadout-group-captain-outerclothing loadouts: - - CaptainOuterClothing + - CaptainOuterArmor # Sunrise-Edit + - CaptainOuterCoat # Sunrise-Edit - CaptainWintercoat - type: loadoutGroup