VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/migration.yml
2024-07-31 03:54:09 +03:00
Plykiya
031eb9606c
Make magic mirror do-after longer, add popups to notify the target ( #30366 )
...
* Make magic mirror do-after longer, add popups to notify the target
* Turns out I do have access to the user
* More detailed popups
* Helmets protecc
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-30 12:17:27 +10:00
pacable
a454597d95
Парикмахер ( #252 )
...
* барбер работает, осталось замаппить его кабинет
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* bruh
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* прототип электробритвы и красителей для волос
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* красители для волос
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* добавил функционал электробритве
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* барбервенд
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* спаунпоинт
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* обрезал механ зеркала
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* грамматическая ошибка
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* до конца убрал костыль
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* до конца убрал костыль2
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* перенос из папки оффов
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* праздник щиткода!
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* коробка
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* продвинутая униформа
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-29 06:26:32 +03:00
Nemanja
a30fb2661f
Fix magic mirror ( #28084 )
...
* Fix magic mirror
* buff magic mirror
2024-05-19 16:35:55 -06:00
metalgearsloth
e1a5247770
Fix magic mirror prediction ( #27356 )
2024-04-26 22:37:09 +10:00
