rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25642 commits 1 branch 0 tags 1.2 GiB
Commit graph

25642 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vigers Ray
91e021e62b фикс loadaut_group.yml 2024-06-09 01:30:06 +03:00
Vigers Ray
aae01c0023 Полезные спавнеры с корвакса 2024-06-09 01:28:32 +03:00
Jaraten
f93448110f Stairs palette resprite (#2223) 
(cherry picked from commit 468eef79282014b758e71bb4b97b838b082ea474)
 2024-06-09 01:27:10 +03:00
Vigers Ray
6dd8e2c326 фикс ширины названий в окне выбора антагонистов 2024-06-09 01:26:58 +03:00
Vigers Ray
e4a4f6849b Merge remote-tracking branch 'origin/master' 2024-06-09 01:23:09 +03:00
Vigers Ray
6ae451d571 сократил название роли ГСБ в лобби чтобы не вылазил 2024-06-09 01:06:35 +03:00
Vigers Ray
97cb359b72 увеличил требуемое время для бригмеда 2024-06-09 01:05:27 +03:00
Vigers Ray
8679975378 фикс дубликата ClothingBackpackDuffelBrigmedicFilled 2024-06-09 01:05:14 +03:00
Rinary
e7b1402e51
Магистрат и юридический департамент (#44) 
* Vulpkanin Lang Fix

* Blueshield

* Revert "Blueshield"

This reverts commit f4b74911d17037cbb14d28111eabde08b11cdfb8.

* Magistrat Job

* Magistrat Icons, IAA Icons Change

* Changelog

* Law department, Some Fixes, Add Magistrate, Lawyer to all Maps

* ))

* Magistrat Loadout

* Lawyer, Remove Comments from Maps, Adds More Lawyers(from 1 to 3, copyed from comments)

* Law department in Sunrise Maps
 2024-06-09 01:01:53 +03:00
Vigers Ray
709bd5301c Больше аварийных монтировок для Гордона Фримена 2024-06-09 00:55:13 +03:00
Vigers Ray
d7b054c032 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
 2024-06-09 00:50:47 +03:00
Rinary
5c82638cdb
Удаление дублей в файлах локализации (#39) 
* Vulpkanin Lang Fix

* Remove Double Added Strings in Locale(It's bad)

* More

* Food

* Organs

* End

* Merge?
 2024-06-09 00:46:26 +03:00
pacable
840a08031c
Добавил бригмедика (#40) 
* added brigmedic

* added brigmedic to some maps

* added loadout to bm

* changelog

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-06-09 00:44:38 +03:00
GimmyPick
af626ce89b
Revert "Prevent stacking pipes (#28308)" (#43) 
This reverts commit 44b93e68ee.

Co-authored-by: Poopp <poopjimpoop@gmail.com>
 2024-06-09 00:37:14 +03:00
Babaev
68317dc88d
Новые спрайты униформы СБ (#46) 2024-06-09 00:36:19 +03:00
Rinary
986ced835f
Изменение шаблона пулл реквеста (#48) 
* Vulpkanin Lang Fix

* PR TEMPLATE CHANGE

* No more english text

* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
 2024-06-09 00:34:25 +03:00
Rinary
bc328e5eff
Фикс перевода меню эмоций (#49) 
* Vulpkanin Lang Fix

* emote name translate
 2024-06-09 00:28:05 +03:00
VigersRay
101bd74836 фикс бага в конце раунда 2024-06-09 00:27:33 +03:00
VigersRay
46ebf102ce фикс ттса 2024-06-09 00:27:16 +03:00
Tayrtahn
7f686a6ae5
Fix null ref exception in PrayerSystem (#28712) 
* Fix null ref exception in PrayerSystem

* Also check that prayable ent/comp still exist
 2024-06-08 14:50:20 -04:00
PJBot
cce50da170 Automatic changelog update 2024-06-08 18:49:15 +00:00
metalgearsloth
e3c37f6e9b
Maybe fix invalid loadout prototypes (#28734) 
* Maybe fix invalid loadout prototypes

So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout.

Need someone affected to send me their loadout to confirm it's fixed.

* Better fix
 2024-06-08 14:48:09 -04:00
metalgearsloth
1fdbf9403a
Don't use invalid defaults for loadouts (#28729) 
At the time it made more sense but now with species specific stuff it's better to have nothing.
 2024-06-08 14:43:21 -04:00
PJBot
c79384c5fd Automatic changelog update 2024-06-08 14:37:53 +00:00
Nemanja
4089d6a664
fix singulo decay (#28743) 2024-06-09 00:36:47 +10:00
PJBot
33e68dc51f Automatic changelog update 2024-06-08 10:41:39 +00:00
nikthechampiongr
8cf9037273
Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664) 2024-06-08 20:40:33 +10:00
PJBot
511336beb8 Automatic changelog update 2024-06-08 10:39:01 +00:00
Whisper
123dfee3a3
allow ' in character names (#28652) 2024-06-08 20:37:55 +10:00
Vasilis
db6548bc99
Ensure packager creates a release folder (#28426) 
I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.
 2024-06-08 20:33:51 +10:00
PJBot
c4966e5177 Automatic changelog update 2024-06-08 10:28:27 +00:00
Leon Friedrich
7ef7fe6761
Try fix RGBee (#28741) 2024-06-08 20:27:21 +10:00
PJBot
74ed68b2d5 Automatic changelog update 2024-06-08 10:05:00 +00:00
metalgearsloth
45015188cd
Add loadout group check for role proto (#28731) 
MFW same bug twice at 2 layers because I'm stupid.
 2024-06-08 20:03:54 +10:00
MerrytheManokit
b50faffcc3
rn, atp (#28674) 
* Update speech-chatsan.ftl

* Update word_replacements.yml

* Atm-at the moment

* Atm

* Update Resources/Locale/en-US/speech/speech-chatsan.ftl

* Update Resources/Prototypes/Accents/word_replacements.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-08 18:48:49 +10:00
Leon Friedrich
2c7598fd5b
Fix flatpacker (#28736) 
* Fix flatpacker

* a
 2024-06-08 18:48:23 +10:00
Ubaser
c2bbc72cf4
Update Core (#28735) 
add
 2024-06-08 02:35:58 -06:00
DrSmugleaf
a7c7cd74ec
Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690) 2024-06-08 15:53:54 +10:00
Tayrtahn
49496b40e5
Improve grammar of various petting messages (#28715) 
Improve grammar of various petting message
 2024-06-08 15:53:17 +10:00
PJBot
4d10f3523b Automatic changelog update 2024-06-08 05:50:48 +00:00
Lyndomen
1584a50a1d
Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) 
* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-08 15:49:42 +10:00
DrSmugleaf
7f1933169e
Add DoPopup data field to OnUseTimerTrigger (#28691) 2024-06-07 22:36:29 -07:00
DrSmugleaf
0762f9da17
Fix action icons when dragging an active action to another slot (#28692) 2024-06-07 22:34:48 -07:00
Flareguy
f37060fc1b
Ports the singularity's values from vgstation (#28720) 
* ports the singularity values from vgstation

* guidebook fix

* 5000 energy level 6 singulo
 2024-06-07 22:15:13 -04:00
PJBot
b714210e38 Automatic changelog update 2024-06-08 00:58:14 +00:00
Plykiya
d19b430a92
Swap some InRangeUnobstructed for InRangeUnoccluded (#28706) 
Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-06-07 20:57:07 -04:00
lzk
567d6a0888
Add locale support for booze and soda jugs labels (#28708) 2024-06-07 20:56:25 -04:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars (#28655) 
* Fixes client having authority over rules popup cvars

* Delete duplicate migration

* Pre-update

* Post-update
 2024-06-07 21:53:20 +02:00
Ubaser
a1a3a0d131
Tweak chapel salvage wreck (#28703) 
add
 2024-06-07 14:39:22 -04:00
VigersRay
6b7fe5131a фикс правил 2024-06-07 20:19:37 +03:00