This repository has been archived by the owner on Nov 1, 2024. It is now read-only.
forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 38
апстрим 19042024 #41
Merged
The head ref may contain hidden characters: "\u0430\u043F\u0441\u0442\u0440\u0438\u043C-19042024"
Merged
апстрим 19042024 #41
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Adds Frontier Palette * _NF * Delete Resources/Prototypes/Palettes/frontier.yml * Update frontier.yml --------- Co-authored-by: Dvir <[email protected]>
* NFSD uplink update * stinger cost fix
* Fix some issues with construct * Remove body and butcherable to artifact fragments * Add ShowExamineText for battery components * Add chatter and fix examine text * Add Ability to stop sound when MobState is Dead (#26905) * Add stopsWhenEntityDead to sound components * Convert component * Review * Fix dupe sub --------- Co-authored-by: metalgearsloth <[email protected]> # Conflicts: # Content.Server/Sound/EmitSoundSystem.cs # Content.Shared/Audio/SharedAmbientSoundSystem.cs * Remove deathPenalty
* 04/08/2024 - NFSD Completion. Fixes: Brigmedic Duffle. Added: Whistle NFSD and Sheriff gas masks Eyepatch HUD On-spawn Brigmedic HUD (Medical and Security) Bedsheets (NFSD, Brigmedic and Sheriff) {Wearable] NFSDLite NFSD Survival box containing the same items aside from the new gas mask Circuit Boards for NFSD Fabricator. (Updated Sheriff spawn loadout to include) * Fixed a single file.. Fixed unneeded file. * Update emergency.yml * 04/09/2024 Added regular NFSD doors. * 04/09/2024 - NFSD Radio Chat Color Updated radio chat color to be distinct from other channels. Green #7eac69 -> Beige #fffdd0 * Update radio_channels.yml Fixed conflict * 04/13/2024 Added Holobarrier w/ brand new inhand sprites. Added inhand sprites to whistle. * 04/13/2024 Added four whitelisted slots to the Sheriff's hat to allow for ease of access for cigars and lighters. Fixed HoS backpack spawns and updated door remote colors. Updated NFSDTec to include everything updated in this pr. * 04/13/2024 Updated Sheriffs Headset to include CentComm Channel. Updated Bailiff Headset to include Command Channel. Added NFSD gyroscope (regular and small) Added NFSD Thruster * 04/13/2024 Fix for gyroscope yml * 04/14/2024 Updated filled bag variants to not allow spawning. * Boots * NFSD+ * 04/15/2024 Updated spawner names Updated empress mothership console sprite Updated warden.yml to bailiff.yml in roles * Door * Update detective.yml * 04/16/2024 Fix what was broke... --------- Co-authored-by: Dvir <[email protected]>
* recolor to green * phase 1 * phase 2 * phase 3 * phase 4 - signage * bah * sd * fix conflict maybe * oof * fixed the sheriff meta file for the yaml checker * Update * Update v.2 * error * Job * Update job-description.ftl * Update departments.yml --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
* bag balance * pleasing dvir
…1234) * add breaching charges and fix uplink * fix bailiff name * Update security_uplink_catalog.yml --------- Co-authored-by: rosieposie <[email protected]> Co-authored-by: Dvir <[email protected]>
…-station-14 into апстрим-19042024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Всякое от ДСБФ