Обновление

[Kotya556]

Описание PR

Медиа

Проверки

• PR полностью завершён и мне не нужна помощь чтобы его закончить.
• Я внимательно просмотрел все свои изменения и багов в них не нашёл.
• Я запускал локальный сервер со своими изменениями и всё протестировал.
• Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑

• add: Добавлено веселье!
• remove: Убрано веселье!
• tweak: Изменено веселье!
• fix: Исправлено веселье!

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[github-actions]

Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation

You can move your current work from the master branch to another branch by doing git branch <branch_name and resetting the master branch.

[github-actions]

RSI Diff Bot; head commit 8cead02 merging into f081ca4
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Misc/job_icons.rsi

State	Old	New	Status
Detective			Modified

Resources/Textures/Objects/Misc/id_cards.rsi

State	Old	New	Status
iddetective			Modified

Resources/Textures/FacetsUniverse/Clothing/Head/BeretOBS.rsi

State	Old	New	Status
equipped-HELMET-hamster			Added
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/FacetsUniverse/Clothing/headsets/NanotrasenPrison.rsi

State	Old	New	Status
alt-equipped-EARS			Added
equipped-EARS			Added
icon			Added
icon_alt			Added

Resources/Textures/FacetsUniverse/Job_icons.rsi

State	Old	New	Status
Anomalist			Added
Bombodel			Added
HoNTP			Added
Magistrate			Added
NTP			Added
NTP_doctor			Added
NTP_engineer			Added
OfficerBlueShield			Added
PilotSB			Added
Xenoarchaeolog			Added

Resources/Textures/FacetsUniverse/Structures/Doors/Airlocks/NTP.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/FacetsUniverse/Structures/Doors/Glass/NTP.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/FacetsUniverse/Toys.rsi

State	Old	New	Status
luis			Added

Resources/Textures/FacetsUniverse/bureaucracy.rsi

State	Old	New	Status
folder-ntp-doc			Added

Resources/Textures/FacetsUniverse/id_cards.rsi

State	Old	New	Status
centcom			Added
default			Added
idanomalist			Added
idbombodel			Added
idhontp			Added
idmagistrate			Added
idntp			Added
idntp_doctor			Added
idntp_engineer			Added
idobs			Added
idpilotsb			Added
idxenoarchaeologist			Added

Resources/Textures/FacetsUniverse/stamps.rsi

State	Old	New	Status
stamp-hontp			Added
stamp-magistrate			Added

Resources/Textures/Objects/Devices/pda.rsi

State	Old	New	Status
pda-HoNTP			Added
pda-NTP			Added
pda-obs			Added

Resources/Textures/Structures/Storage/closet.rsi

State	Old	New	Status
HoNTP_door			Added
NTP			Added
NTP_door			Added
NTP_open			Added
OBS			Added
OBS_door			Added
OBS_open			Added