Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Перенос Енги + Возврат Амура

Browse Source
This commit is contained in:
BIGZi0348
2024-11-27 00:57:55 +03:00
parent 9b70488194
commit 23820ef1fe
27 changed files with 108 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Lobby/LobbyState.cs
View File

@@ -244,7 +244,7 @@ namespace Content.Client.Lobby
_lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob); _lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
} }
_lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] Honk Station [/font]"); _lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] Amour [/font]");
_lobby!.ChangelogLabel.SetMarkup("Список изменений:"); _lobby!.ChangelogLabel.SetMarkup("Список изменений:");
} }

2
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -109,7 +109,7 @@
Margin="0 7 0 7" /> Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton <buttons:OhioLobbyTextButton
Name="ChangelogHonk" Name="ChangelogAmour"
Access="Public" Access="Public"
ButtonText="Changelog" ButtonText="Changelog"
Margin="0 7 0 7" Margin="0 7 0 7"

2
Content.Client/Lobby/UI/LobbyGui.xaml.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.Lobby.UI
OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow(); OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow();
DiscordButton.OnPressed += _ => _stalinManager.RequestUri(); DiscordButton.OnPressed += _ => _stalinManager.RequestUri();
ChangelogHonk.OnPressed += _ => _userInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow(); ChangelogAmour.OnPressed += _ => _userInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect"); QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
} }

2
Content.Client/MainMenu/UI/MainMenuControl.xaml
View File

@@ -7,7 +7,7 @@
<BoxContainer Name="VBox" Orientation="Vertical" StyleIdentifier="MainMenuBox" MinWidth="300" > <BoxContainer Name="VBox" Orientation="Vertical" StyleIdentifier="MainMenuBox" MinWidth="300" >
<Label Name="Title" Text="HONK STATION" Align="Center" /> <Label Name="Title" Text="AMOUR" Align="Center" />
<Control MinSize="0 4" /> <Control MinSize="0 4" />

2
Content.Client/_White/Rules/RulesWikiSection.xaml
View File

@@ -1,6 +1,6 @@
<BoxContainer xmlns="https://spacestation14.io" <BoxContainer xmlns="https://spacestation14.io"
Orientation="Vertical" HorizontalExpand="True"> Orientation="Vertical" HorizontalExpand="True">
<Label Text="Правила сервера Honk Station" <Label Text="Правила сервера Amour"
StyleClasses="LabelHeading" StyleClasses="LabelHeading"
HorizontalExpand="True" HorizontalExpand="True"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>

6
Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
View File

@@ -21,8 +21,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
[Dependency] protected readonly SharedContainerSystem Container = default!; [Dependency] protected readonly SharedContainerSystem Container = default!;
[Dependency] protected readonly ItemSlotsSystem ItemSlots = default!; [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] protected readonly IPrototypeManager PrototypeManager = default!; //Honk [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; // Amour
[Dependency] protected readonly IRobustRandom RobustRandom = default!; //Honk [Dependency] protected readonly IRobustRandom RobustRandom = default!; // Amour
private HashSet<TTSVoicePrototype> _voices = new(); private HashSet<TTSVoicePrototype> _voices = new();
@@ -63,7 +63,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
.Where(x => x.BorgVoice) .Where(x => x.BorgVoice)
.ToHashSet(); .ToHashSet();
} }
//Honk // Amour
private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args) private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args)
{ {

18
Resources/Changelog/ChangelogHonk.yml → Resources/Changelog/ChangelogAmour.yml
View File

@@ -77,7 +77,7 @@
time: '2024-11-05T18:00:13.0000000+00:00' time: '2024-11-05T18:00:13.0000000+00:00'
- author: BIG_Zi_348 - author: BIG_Zi_348
changes: changes:
- message: "HOTFIX ChangelogHonk" - message: "HOTFIX"
type: Add type: Add
id: 12 id: 12
time: '2024-11-05T18:00:13.0000000+00:00' time: '2024-11-05T18:00:13.0000000+00:00'
@@ -111,3 +111,19 @@
type: Add type: Add
id: 17 id: 17
time: '2024-11-24T18:00:13.0000000+00:00' time: '2024-11-24T18:00:13.0000000+00:00'
- author: BIG_Zi_348
changes:
- message: "Добавлен самодельный зеркальный щит и его крафт."
type: Add
- message: "Добавлен самодельный отражающий жилет и его крафт. Осторожно - он очень хрупкий."
type: Add
- message: "Добавлен шлем из ведра и его крафт. Обладает повышенной защитой от гарнитурных-воров."
type: Add
- message: "Одержимый клинок способен помогать в бою."
type: Add
- message: "Священники были обучены методам сдерживания одержимых клинков."
type: Add
- message: "Двуручные молоты теперь валят на землю."
type: tweak
id: 18
time: '2024-11-26T18:00:13.0000000+00:00'

2
Resources/Locale/en-US/changelog/changelog-window.ftl
View File

@@ -13,4 +13,4 @@ changelog-button-new-entries = Changelog (new!)
changelog-tab-title-Changelog = Changelog changelog-tab-title-Changelog = Changelog
changelog-tab-title-Admin = Admin changelog-tab-title-Admin = Admin
changelog-tab-title-ChangelogWhite = Giedi Prime changelog-tab-title-ChangelogWhite = Giedi Prime
changelog-tab-title-ChangelogHonk = Honk Station changelog-tab-title-ChangelogAmour = Amour

2
Resources/Locale/ru-RU/changelog/changelog-window.ftl
View File

@@ -13,4 +13,4 @@ changelog-button-new-entries = Обновления (новые!)
changelog-tab-title-Changelog = Changelog changelog-tab-title-Changelog = Changelog
changelog-tab-title-Admin = Admin changelog-tab-title-Admin = Admin
changelog-tab-title-ChangelogWhite = Giedi Prime changelog-tab-title-ChangelogWhite = Giedi Prime
changelog-tab-title-ChangelogHonk = Honk Station changelog-tab-title-ChangelogAmour = Amour

4
Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View File

@@ -179,9 +179,9 @@
ClothingUnderwearSocksStripedThigh: 2 ClothingUnderwearSocksStripedThigh: 2
ClothingUnderwearSocksThinKnee: 1 ClothingUnderwearSocksThinKnee: 1
ClothingUnderwearSocksThinThigh: 1 ClothingUnderwearSocksThinThigh: 1
#honk start # Amour start
ClothingBalaclava: 5 ClothingBalaclava: 5
#honk end # Amour end
emaggedInventory: emaggedInventory:
ClothingHandsGlovesCombat: 1 ClothingHandsGlovesCombat: 1
ClothingMaskGasSyndicate: 1 ClothingMaskGasSyndicate: 1

2
Resources/Prototypes/Entities/Mobs/Species/base.yml
View File

@@ -287,7 +287,7 @@
- type: RoleplayInfo - type: RoleplayInfo
- type: Mood # WD - type: Mood # WD
- type: OfferItem # WD-EDIT - type: OfferItem # WD-EDIT
- type: Cuntable #Honk Edit - type: Cuntable # Amour Edit
- type: entity - type: entity
save: false save: false

4
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
View File

@@ -33,7 +33,7 @@
- Biological - Biological
damage: damage:
groups: groups:
Burn: -15 # Honk Burn: -15 # Amour
healingBeginSound: healingBeginSound:
path: "/Audio/Items/Medical/ointment_begin.ogg" path: "/Audio/Items/Medical/ointment_begin.ogg"
healingEndSound: healingEndSound:
@@ -118,7 +118,7 @@
- Biological - Biological
damage: damage:
groups: groups:
Brute: -20 # Honk Brute: -20 # Amour
healingBeginSound: healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg" path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound: healingEndSound:

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View File

@@ -231,7 +231,7 @@
- type: entity - type: entity
name: laser rifle name: laser rifle
parent: BaseWeaponBattery parent: BaseWeaponBattery
id: WeaponLaserCarbineOld #HonkFix id: WeaponLaserCarbineOld # Amour Fix
description: Favoured by Nanotrasen Security for being cheap and easy to use. description: Favoured by Nanotrasen Security for being cheap and easy to use.
components: components:
- type: Sprite - type: Sprite

10
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -119,8 +119,8 @@
- type: Item - type: Item
sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi
- type: Gun - type: Gun
minAngle: 1 # HONK EDIT FROM 11 TO 1 minAngle: 1 # Amour EDIT FROM 11 TO 1
maxAngle: 7 # HONK EDIT FROM 19 TO 7 maxAngle: 7 # Amour EDIT FROM 19 TO 7
shotsPerBurst: 5 shotsPerBurst: 5
availableModes: availableModes:
- SemiAuto - SemiAuto
@@ -217,9 +217,9 @@
- type: Item - type: Item
sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi
- type: Gun - type: Gun
minAngle: 4 # HONK EDIT FROM 21 TO 4 minAngle: 4 # Amour EDIT FROM 21 TO 4
maxAngle: 10 # HONK EDIT FROM 32 TO 10 maxAngle: 10 # Amour EDIT FROM 32 TO 10
fireRate: 5 # HONK EDIT FROM 6 TO 5 fireRate: 5 # Amour EDIT FROM 6 TO 5
selectedMode: FullAuto selectedMode: FullAuto
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg path: /Audio/Weapons/Guns/Gunshots/atreides.ogg

32
Resources/Prototypes/GameRules/events.yml
View File

@@ -75,8 +75,8 @@
- type: StationEvent - type: StationEvent
weight: 5 weight: 5
duration: 1 duration: 1
earliestStart: 30 # Honk edit earliestStart: 30 # Amour edit
minimumPlayers: 30 # Honk from 10 to 30 minimumPlayers: 30 # Amour from 10 to 30
- type: RandomEntityStorageSpawnRule - type: RandomEntityStorageSpawnRule
prototype: MobSkeletonCloset prototype: MobSkeletonCloset
@@ -88,9 +88,9 @@
- type: StationEvent - type: StationEvent
weight: 6.5 weight: 6.5
duration: 1 duration: 1
earliestStart: 60 # Honk from 40 to 60 earliestStart: 60Amour from 40 to 60
reoccurrenceDelay: 20 reoccurrenceDelay: 20
minimumPlayers: 30 # Honk from 20 to 30 minimumPlayers: 30 # Amour from 20 to 30
- type: RandomSpawnRule - type: RandomSpawnRule
prototype: SpawnPointGhostDragon prototype: SpawnPointGhostDragon
@@ -116,7 +116,7 @@
weight: 7.5 weight: 7.5
duration: 1 duration: 1
earliestStart: 45 earliestStart: 45
minimumPlayers: 30 # Honk from 20 to 30 minimumPlayers: 30 # Amour from 20 to 30
- type: RandomSpawnRule - type: RandomSpawnRule
prototype: MobRevenant prototype: MobRevenant
@@ -182,7 +182,7 @@
- id: MobMouse2 - id: MobMouse2
prob: 0.02 prob: 0.02
- id: MobMouseCancer - id: MobMouseCancer
prob: 0.01 # Honk from 0.001 to 0.01 prob: 0.01 # Amour from 0.001 to 0.01
specialEntries: specialEntries:
- id: SpawnPointGhostRatKing - id: SpawnPointGhostRatKing
prob: 0.001 prob: 0.001
@@ -323,7 +323,7 @@
weight: 4 weight: 4
duration: 1 duration: 1
earliestStart: 30 earliestStart: 30
minimumPlayers: 30 # Honk from 20 to 30 minimumPlayers: 30 # Amour from 20 to 30
- type: RandomSpawnRule - type: RandomSpawnRule
prototype: SpawnPointGhostTerminator prototype: SpawnPointGhostTerminator
@@ -353,7 +353,7 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
startDelay: 10 startDelay: 10
earliestStart: 30 # Honk from 20 to 30 earliestStart: 30 # Amour from 20 to 30
minimumPlayers: 15 minimumPlayers: 15
weight: 3 weight: 3
duration: 60 duration: 60
@@ -376,7 +376,7 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
startDelay: 10 startDelay: 10
earliestStart: 30 # Honk from 20 to 30 earliestStart: 30 # Amour from 20 to 30
minimumPlayers: 15 minimumPlayers: 15
weight: 3 weight: 3
duration: 60 duration: 60
@@ -414,8 +414,8 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
startDelay: 10 startDelay: 10
earliestStart: 30 # Honk from 20 to 30 earliestStart: 30 # Amour from 20 to 30
minimumPlayers: 30 # Honk from 20 to 30 minimumPlayers: 30 # Amour from 20 to 30
weight: 1.5 weight: 1.5
duration: 60 duration: 60
- type: VentCrittersRule - type: VentCrittersRule
@@ -463,7 +463,7 @@
noSpawn: true noSpawn: true
components: components:
- type: StationEvent - type: StationEvent
earliestStart: 45 # Honk from 35 to 45 earliestStart: 45 # Amour from 35 to 45
weight: 4.5 weight: 4.5
minimumPlayers: 20 minimumPlayers: 20
duration: 1 duration: 1
@@ -499,8 +499,8 @@
- type: StationEvent - type: StationEvent
earliestStart: 30 earliestStart: 30
weight: 8 weight: 8
minimumPlayers: 20 # Honk from 15 to 20 minimumPlayers: 20 # Amour from 15 to 20
maxOccurrences: 2 # Honk from 1 to 2 maxOccurrences: 2 # Amour from 1 to 2
startAnnouncement: station-event-communication-interception startAnnouncement: station-event-communication-interception
startAudio: startAudio:
path: /Audio/Announcements/intercept.ogg path: /Audio/Announcements/intercept.ogg
@@ -545,7 +545,7 @@
weight: 3.5 weight: 3.5
duration: 1 duration: 1
earliestStart: 30 earliestStart: 30
minimumPlayers: 30 # Honk from 20 to 30 minimumPlayers: 30 # Amour from 20 to 30
- type: ImmovableRodRule - type: ImmovableRodRule
rodPrototypes: rodPrototypes:
- id: ImmovableRodKeepTilesStill - id: ImmovableRodKeepTilesStill
@@ -596,7 +596,7 @@
weight: 5 weight: 5
- type: MobReplacementRule - type: MobReplacementRule
# Honk # Amour
- type: entity - type: entity
id: SpaceLawChange id: SpaceLawChange
parent: BaseGameRule parent: BaseGameRule

8
Resources/Prototypes/GameRules/roundstart.yml
View File

@@ -69,7 +69,7 @@
noSpawn: true noSpawn: true
components: components:
- type: GameRule - type: GameRule
minPlayers: 20 # Honk minPlayers: 20 # Amour
- type: RandomMetadata #this generates the random operation name cuz it's cool. - type: RandomMetadata #this generates the random operation name cuz it's cool.
nameSegments: nameSegments:
- operationPrefix - operationPrefix
@@ -226,7 +226,7 @@
noSpawn: true noSpawn: true
components: components:
- type: GameRule - type: GameRule
minPlayers: 20 # Honk minPlayers: 20 # Amour
delay: delay:
min: 600 min: 600
max: 900 max: 900
@@ -274,7 +274,7 @@
noSpawn: true noSpawn: true
components: components:
- type: GameRule - type: GameRule
minPlayers: 30 # Honk minPlayers: 30 # Amour
- type: CultRule - type: CultRule
- type: AntagSelection - type: AntagSelection
definitions: definitions:
@@ -301,7 +301,7 @@
noSpawn: true noSpawn: true
components: components:
- type: GameRule - type: GameRule
minPlayers: 20 # Honk minPlayers: 20 # Amour
- type: RandomMetadata - type: RandomMetadata
- type: LoadMapRule - type: LoadMapRule
gameMap: WizardShuttle gameMap: WizardShuttle

22
Resources/Prototypes/GameRules/unknown_shuttles.yml
View File

@@ -8,8 +8,8 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 5 weight: 5
# reoccurrenceDelay: 30 # HONK EDIT # reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # HONK EDIT maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: ShuttleCargoLost preloadedGrid: ShuttleCargoLost
@@ -24,8 +24,8 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 5 weight: 5
# reoccurrenceDelay: 30 # HONK EDIT # reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # HONK EDIT maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: TravelingCuisine preloadedGrid: TravelingCuisine
@@ -40,8 +40,8 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 5 weight: 5
# reoccurrenceDelay: 30 # HONK EDIT # reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # HONK EDIT maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: DisasterEvacPod preloadedGrid: DisasterEvacPod
@@ -56,8 +56,8 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 2 weight: 2
# reoccurrenceDelay: 30 # HONK EDIT # reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # HONK EDIT maxOccurrences: 1 # Amour EDIT
duration: 1 duration: 1
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: Honki preloadedGrid: Honki
@@ -72,9 +72,9 @@
startAudio: startAudio:
path: /Audio/Announcements/attention.ogg path: /Audio/Announcements/attention.ogg
weight: 2 weight: 2
# reoccurrenceDelay: 30 # HONK EDIT # reoccurrenceDelay: 30 # Amour EDIT
maxOccurrences: 1 # HONK EDIT maxOccurrences: 1 # Amour EDIT
minimumPlayers: 30 # HONK EDIT minimumPlayers: 30 # Amour EDIT
duration: 1 duration: 1
- type: LoadMapRule - type: LoadMapRule
preloadedGrid: SyndieEvacPod preloadedGrid: SyndieEvacPod

2
Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
View File

@@ -79,7 +79,7 @@
back: ClothingBackpackDuffelFilled back: ClothingBackpackDuffelFilled
# Gloves # Gloves
- type: itemLoadout #Honk - type: itemLoadout # Amour
id: AssistantHandsGlovesColorYellow id: AssistantHandsGlovesColorYellow
equipment: AssistantHandsGlovesColorYellow equipment: AssistantHandsGlovesColorYellow
effects: effects:

2
Resources/Prototypes/Loadouts/Jobs/Security/common.yml
View File

@@ -26,7 +26,7 @@
# Mask # Mask
- type: itemLoadout # Honk - type: itemLoadout # Amour
id: SecurityMaskBalaclava id: SecurityMaskBalaclava
equipment: SecurityMaskBalaclava equipment: SecurityMaskBalaclava
- type: startingGear - type: startingGear

6
Resources/Prototypes/Loadouts/loadout_groups.yml
View File

@@ -745,7 +745,7 @@
- GlovesColorBlack - GlovesColorBlack
- GlovesFingerless - GlovesFingerless
- type: loadoutGroup #Honk - type: loadoutGroup # Amour
id: AssistentGloves id: AssistentGloves
name: loadout-group-gloves name: loadout-group-gloves
minLimit: 0 minLimit: 0
@@ -1642,7 +1642,7 @@
name: loadout-group-mask name: loadout-group-mask
minLimit: 0 minLimit: 0
loadouts: loadouts:
- SecurityMaskBalaclava #Honk - SecurityMaskBalaclava # Amour
- SecurityMaskStandard - SecurityMaskStandard
- type: loadoutGroup # WD - type: loadoutGroup # WD
@@ -1652,7 +1652,7 @@
loadouts: loadouts:
- SecurityMaskStandard - SecurityMaskStandard
- SecurityMaskSwat - SecurityMaskSwat
- SecurityMaskBalaclava #Honk - SecurityMaskBalaclava # Amour
- type: loadoutGroup # WD - type: loadoutGroup # WD
id: CommonSecurityNeck id: CommonSecurityNeck

6
Resources/Prototypes/Loadouts/role_loadouts.yml
View File

@@ -68,7 +68,7 @@
- AssistantJumpsuit - AssistantJumpsuit
- CommonBottom # WD - CommonBottom # WD
- CommonBackpack - CommonBackpack
- AssistentGloves # Honk - AssistentGloves # Amour
- AssistantOuterClothing - AssistantOuterClothing
- CommonShoes # WD - CommonShoes # WD
- AssistantPDA # WD - AssistantPDA # WD
@@ -616,14 +616,14 @@
- CommonUnderwearBottom - CommonUnderwearBottom
- CommonUnderwearBra - CommonUnderwearBra
- CommonUnderwearSocks - CommonUnderwearSocks
- CommonSecurityMask #honk - CommonSecurityMask # Amour
- type: roleLoadout - type: roleLoadout
id: JobSecurityCadet id: JobSecurityCadet
groups: groups:
- CommonSecurityHead - CommonSecurityHead
- CommonSecurityHeadsetFull # WD - CommonSecurityHeadsetFull # WD
- CommonSecurityMask #honk - CommonSecurityMask # Amour
- CommonSecurityNeck - CommonSecurityNeck
- SecurityCadetJumpsuit - SecurityCadetJumpsuit
- CommonBottom # WD - CommonBottom # WD

2
Resources/Prototypes/Procedural/salvage_rewards.yml
View File

@@ -64,7 +64,7 @@
CrateArmoryLaser: 1.0 CrateArmoryLaser: 1.0
CrateArmoryShotgun: 1.0 CrateArmoryShotgun: 1.0
CrateArmoryPistols: 1.0 CrateArmoryPistols: 1.0
CrateArmoryKLMG: 1.0 # HONK EDIT CrateArmoryKLMG: 1.0 # AMOUR EDIT
# rare armor # rare armor
ClothingOuterArmorRiot: 1.0 ClothingOuterArmorRiot: 1.0
# rare chemicals # rare chemicals

4
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
View File

@@ -7,7 +7,7 @@
- to: gauze - to: gauze
steps: steps:
- material: Cloth - material: Cloth
amount: 1 # Honk Edit due to different balance of the item amount: 1 # Amour Edit due to different balance of the item
doAfter: 3 # Honk Edit Ahead of everyone doAfter: 3 # Amour Edit Ahead of everyone
- node: gauze - node: gauze
entity: Gauze1 entity: Gauze1

2
Resources/Prototypes/Recipes/Lathes/medical.yml
View File

@@ -75,7 +75,7 @@
result: Gauze1 result: Gauze1
completetime: 1 completetime: 1
materials: materials:
Cloth: 50 # Honk Edit due to different balance of the item Cloth: 50 # Amour Edit due to different balance of the item
- type: latheRecipe - type: latheRecipe
id: HandheldCrewMonitor id: HandheldCrewMonitor

2
Resources/Prototypes/_White/Aspects/Aspects.yml
View File

@@ -365,7 +365,7 @@
# path: /Audio/White/Aspects/accent.ogg # path: /Audio/White/Aspects/accent.ogg
# - type: SkeletonAspect # - type: SkeletonAspect
#Honk Start # Amour Start
- type: entity - type: entity
id: DeleteVendingMachineAspect id: DeleteVendingMachineAspect
parent: BaseGameRule parent: BaseGameRule

48
Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml
View File

@@ -157,7 +157,7 @@
path: path:
path: /Audio/Ambience/voyage_neverending.ogg path: /Audio/Ambience/voyage_neverending.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: CosmicTemperance id: CosmicTemperance
name: "Music - Cosmic Temperance" name: "Music - Cosmic Temperance"
path: path:
@@ -175,139 +175,139 @@
path: path:
path: /Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg path: /Audio/White/Music/Lobby/Music/Its_just_a_burning_memory.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: AnamnesisoftheworldsSin id: AnamnesisoftheworldsSin
name: "Music - Anamnesis of the world's Sin" name: "Music - Anamnesis of the world's Sin"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg path: /Audio/_Honk/Jukebox/blinch_Anamnesis_of_the worlds_Sin.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: DarkMatterMoon id: DarkMatterMoon
name: "Music - Dark Matter Moon" name: "Music - Dark Matter Moon"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg path: /Audio/_Honk/Jukebox/blinch_Dark_Matter_Moon.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: EmptyOcean id: EmptyOcean
name: "Music - Empty Ocean" name: "Music - Empty Ocean"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg path: /Audio/_Honk/Jukebox/blinch_Empty_Ocean.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: GoldenWinPiano id: GoldenWinPiano
name: "Music - Golden Win Piano" name: "Music - Golden Win Piano"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg path: /Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: KillerXChase id: KillerXChase
name: "Music - Killer X Chase" name: "Music - Killer X Chase"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg path: /Audio/_Honk/Jukebox/blinch_Killer_X_Chase.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: PathLootCrusaders id: PathLootCrusaders
name: "Music - PathLoot Crusaders" name: "Music - PathLoot Crusaders"
path: path:
path: /Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg path: /Audio/_Honk/Jukebox/blinch_PathLoot_Crusaders.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: PristintheMirror id: PristintheMirror
name: "Music - Prist in the Mirror" name: "Music - Prist in the Mirror"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg path: /Audio/_Honk/Jukebox/blinch_Prist_in_the_Mirror.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: StarJudgment id: StarJudgment
name: "Music - Star Judgment" name: "Music - Star Judgment"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg path: /Audio/_Honk/Jukebox/blinch_Star_Judgment.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: WheelofFaith id: WheelofFaith
name: "Music - Wheel of Faith" name: "Music - Wheel of Faith"
path: path:
path: /Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg path: /Audio/_Honk/Jukebox/blinch_Wheel_of_Faith.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: TheUnknown id: TheUnknown
name: "Music - The Unknown" name: "Music - The Unknown"
path: path:
path: /Audio/_Honk/Jukebox/The_Unknown.ogg path: /Audio/_Honk/Jukebox/The_Unknown.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: EscapeintheNight id: EscapeintheNight
name: "Music - Escape in the Night" name: "Music - Escape in the Night"
path: path:
path: /Audio/_Honk/Jukebox/Escape_in_the_Night.ogg path: /Audio/_Honk/Jukebox/Escape_in_the_Night.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: BossTheme id: BossTheme
name: "Music - Boss Theme" name: "Music - Boss Theme"
path: path:
path: /Audio/_Honk/Jukebox/Boss_Theme.ogg path: /Audio/_Honk/Jukebox/Boss_Theme.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: BattleThemeII id: BattleThemeII
name: "Music - Battle Theme II" name: "Music - Battle Theme II"
path: path:
path: /Audio/_Honk/Jukebox/Battle_Theme_II.ogg path: /Audio/_Honk/Jukebox/Battle_Theme_II.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: GameOver id: GameOver
name: "Music - Game_Over..." name: "Music - Game_Over..."
path: path:
path: /Audio/_Honk/Jukebox/Game_Over.ogg path: /Audio/_Honk/Jukebox/Game_Over.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: TryAgain id: TryAgain
name: "Music - Try Again?" name: "Music - Try Again?"
path: path:
path: /Audio/_Honk/Jukebox/Try_Again.ogg path: /Audio/_Honk/Jukebox/Try_Again.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: BeastsandBetrayal id: BeastsandBetrayal
name: "Music - Beasts_and_Betrayal" name: "Music - Beasts_and_Betrayal"
path: path:
path: /Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg path: /Audio/_Honk/Jukebox/Beasts_and_Betrayal.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: BattleThemeI id: BattleThemeI
name: "Music - Battle Theme I" name: "Music - Battle Theme I"
path: path:
path: /Audio/_Honk/Jukebox/Battle_Theme_I.ogg path: /Audio/_Honk/Jukebox/Battle_Theme_I.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: HEAVENSAYSMANDELA id: HEAVENSAYSMANDELA
name: "Music - HEAVEN SAYS MANDELA" name: "Music - HEAVEN SAYS MANDELA"
path: path:
path: /Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg path: /Audio/_Honk/Jukebox/HEAVEN_SAYS_MANDELA.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: CYBERSWORLD id: CYBERSWORLD
name: "Music - CYBERS WORLD?" name: "Music - CYBERS WORLD?"
path: path:
path: /Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg path: /Audio/_Honk/Jukebox/Toby_Fox_A_CYBERS_WORLD.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: BIGSHOT id: BIGSHOT
name: "Music - BIG SHOT" name: "Music - BIG SHOT"
path: path:
path: /Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg path: /Audio/_Honk/Jukebox/Toby_Fox_BIG_SHOT.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: NOWSYOURCHANCETOBEA id: NOWSYOURCHANCETOBEA
name: "Music - NOWS YOUR CHANCE TO BE A" name: "Music - NOWS YOUR CHANCE TO BE A"
path: path:
path: /Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg path: /Audio/_Honk/Jukebox/Toby_Fox_NOWS_YOUR_CHANCE_TO_BE_A.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: PandoraPalace id: PandoraPalace
name: "Music - Pandora Palace" name: "Music - Pandora Palace"
path: path:
path: /Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg path: /Audio/_Honk/Jukebox/Toby_Fox_Pandora_Palace.ogg
- type: jukebox # HONK - type: jukebox # Amour
id: AttackoftheKillerQueen id: AttackoftheKillerQueen
name: "Music - Attack of the Killer Queen" name: "Music - Attack of the Killer Queen"
path: path:

4
Resources/Prototypes/game_presets.yml
View File

@@ -33,7 +33,7 @@
- extended - extended
- shittersafari - shittersafari
name: extended-title name: extended-title
showInVote: true # HONK EDIT showInVote: true # Amour EDIT
description: extended-description description: extended-description
rules: rules:
- BasicStationEventScheduler - BasicStationEventScheduler
@@ -46,7 +46,7 @@
- greenshift - greenshift
- shittersafarideluxeedition - shittersafarideluxeedition
name: greenshift-title name: greenshift-title
showInVote: true # HONK EDIT showInVote: true # Amour EDIT
description: greenshift-description description: greenshift-description
rules: rules:
- BasicRoundstartVariation - BasicRoundstartVariation