Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

апстрим 19042024 #41

Merged
merged 19 commits into from
Apr 19, 2024
Merged

апстрим 19042024 #41

merged 19 commits into from
Apr 19, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Apr 19, 2024

Всякое от ДСБФ

Leander-0 and others added 19 commits April 15, 2024 18:10
* 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]>
…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]>
@Vonsant Vonsant merged commit 8859986 into master Apr 19, 2024
13 checks passed
@Vonsant Vonsant deleted the апстрим-19042024 branch April 19, 2024 06:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants