Rinary
d91fe7fe98
Фикс дерьма ( #289 )
...
* init
* upd
* upd contraband
* upd
* translate my burger
* upd
* ntrep jucket upd
* fix
* upd
* steal objective fix
* upd
* fix
* fix
* fix2
* Я идиот кстати
* ты серьезно? Доебалось до 2х скоб
* upd
2024-08-16 00:40:49 +03:00
VigersRay
279846e1ad
ну най буде
2024-08-15 23:50:42 +03:00
VigersRay
a0fd2e39f2
Merge remote-tracking branch 'origin/master'
2024-08-15 23:48:33 +03:00
VigersRay
83c07de28d
Милость Господняя
2024-08-15 23:48:18 +03:00
Rinary
cf049f550a
Обновление перевода ( #286 )
...
* init
* upd
* upd contraband
* upd
* translate my burger
* upd
* ntrep jucket upd
* fix
* upd
* steal objective fix
* upd
* fix
* fix
* fix2
2024-08-15 23:46:29 +03:00
VigersRay
889b560e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-15 23:43:28 +03:00
Rinary
5c5d97f282
Мусор в текстурках ( #287 )
...
* init
* Лигуб сука, просили же
* ПНТ НАХУЙ
* fix
* Я даун
* ПАКАБЛ ГДЕ ЛИЦЕНЗИЯ
* :<
* guns
* upd
* no unoforms but uniforms
* no SyndieGuns
* fix
* fix
* фиксы говна
---------
Co-authored-by: VigersRay <vigersray@gmail.com>
2024-08-15 23:42:31 +03:00
GayBot
db21a2af8b
Automatic changelog update
2024-08-15 23:28:38 +03:00
pacable
4fc4ced5e4
реворк калибров ( #272 )
...
* калибры
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* изменил калибры, добавил пушки на карты
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* миграция для пушек
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: VigersRay <vigersray@gmail.com>
2024-08-15 23:27:29 +03:00
Emisse
8cdc8d7a0d
fland update ( #31057 )
...
* fland update
* exit button on med
2024-08-15 14:19:00 -06:00
Emisse
53e2dfd496
box update ( #31056 )
2024-08-15 14:18:51 -06:00
Emisse
17b4ede7a7
Marathon Update ( #31054 )
2024-08-15 14:18:36 -06:00
Emisse
cf4f8b630f
bagel update ( #31053 )
2024-08-15 14:18:27 -06:00
Emisse
18259d1d2e
evac lox update ( #31052 )
...
lox update
2024-08-15 14:18:19 -06:00
VigersRay
ff29e78e72
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Chat/Managers/ChatManager.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/Administration/PlayerInfo.cs
2024-08-15 22:54:40 +03:00
VigersRay
d94680aba0
фикс названий роли админов в алехпе
2024-08-15 22:43:03 +03:00
PJBot
8161402e35
Automatic changelog update
2024-08-15 19:34:23 +00:00
IProduceWidgets
0ae5426fe4
Event scheduler setting tweaks ( #31018 )
...
tweaks
2024-08-15 13:33:17 -06:00
PJBot
6c6ee2731f
Automatic changelog update
2024-08-15 19:31:15 +00:00
themias
f06176ac39
Cook-able cutlets for kebabs/tacos ( #31048 )
2024-08-15 13:30:08 -06:00
Brandon Hu
796287d695
fix(box): Make medbay exit button functional ( #31003 )
2024-08-15 13:26:54 -06:00
Nemanja
c41fe93040
Salvage Spawners ( #31020 )
...
* treasure entities and spawners
* no more smiles
2024-08-15 13:26:02 -06:00
PJBot
49fd12a65f
Automatic changelog update
2024-08-15 19:25:06 +00:00
Nim
84af71eb7c
Golden toilet ( #31049 )
...
* golden toilet
* Destructible
* sprite
* fix
* copyright
2024-08-15 13:23:59 -06:00
JustCone
03f9dee244
Packed Engi Solar Controller ( #31042 )
...
* Replace alerts with solar console
* Sci doesn't need two protolathes & engi frontdesk windoors shouldn't be atmos locked
2024-08-15 13:22:31 -06:00
Plykiya
dc66386e5f
Contraband Review Pass - The Threequel ( #30970 )
...
Contraband pass number three
2024-08-15 20:52:46 +02:00
Errant
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
2024-08-15 20:26:57 +02:00
VigersRay
f07eec269d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
2024-08-15 21:11:15 +03:00
VigersRay
e081aa66fd
Фикс открытия ролей спонсоркой
2024-08-15 21:08:28 +03:00
Plykiya
f523df821a
Contra Review Passs - Round 2 ( #30942 )
...
* Contra pass round two
* command too
* Stamps
* oopsied a bracket
2024-08-15 19:35:06 +02:00
VigersRay
605e3f1fd2
фиксы
2024-08-15 18:15:54 +03:00
IgorAnt028
84f9dd0f0b
Fix false and true in player-panel.ftl ( #31043 )
...
Fix false and true in player-panel
Add a new True string
2024-08-15 18:00:56 +03:00
PJBot
5da2b32099
Automatic changelog update
2024-08-15 14:46:20 +00:00
Mervill
2e3365793c
Greatly improve the usability of the Gas Analyzer. ( #30763 )
...
* greatly improve how the gas analyzer behaves
* don't close the analyzer when the object goes out of range
* cleanup
* always switch to the device tab when a new device is analyzed
* modern api part one
* modern api part 2
* modern api part three
* file scope namespace
2024-08-15 10:45:13 -04:00
PJBot
25074d0719
Automatic changelog update
2024-08-15 14:31:47 +00:00
to4no_fix
6567fa36e4
Adding shock collar and electropack ( #30529 )
...
* Adding shock collar with the new ShockOnTrigger
* Cleaning and updating the shock collar
* Add StripDelay datafield to ClothingComponent
* Adding SelfUnremovableClothingComponent
* ShockCollar Update
* Correction of the shock collar
* Correction of the shock collar 2
* Renaming the DamageSpecifier DataField to Damage
* Fixing the damage field in ShockCollar
* Cleaning the ShockCollar
* Renaming ShockCollar to ClothingNeckShockCollar
* Adding ClothingNeckShockCollar as a stealTarget to a thief
* Fixing a typo of the sprite path in ClothingNeckShockCollar
* Cleaning the ShockOnTriggerComponent
* Revision of SelfUnremovableClothing
* Adding a ClothingBackpackElectropack
* Sprite fix
* Code review
* Shock Collar sprite update
* add commit hash
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-15 10:30:39 -04:00
VigersRay
7aed7719b3
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-15 16:59:39 +03:00
PJBot
02eed07e21
Automatic changelog update
2024-08-15 12:35:49 +00:00
FATFSAAM2
b17f1c336b
Figurine voicelines ( #30865 )
...
* initial commit
* tweaks to the new voice lines
capitalizations of I's and the Y on hos 3 voice lines
also changed the captain figuring voice line 2 to something completely different
* capitalized one letter
man i really suck at capitalization
* more capitalization
i never thought this pr would need so many changes
* changed one comma to a dot
* Update Resources/Locale/en-US/datasets/figurines.ftl
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-15 22:34:41 +10:00
Plykiya
af01d8fbff
Correct relay mover entity ( #31040 )
...
* Relay entity
* Server
2024-08-15 22:30:53 +10:00
Emisse
d752702092
meta update ( #31037 )
2024-08-15 02:33:35 -06:00
Emisse
caece1473c
update lox ( #31035 )
...
* lox update
* real
2024-08-15 02:02:43 -06:00
Emisse
19e8c2eb3e
fland update ( #31034 )
2024-08-15 02:02:35 -06:00
Emisse
54d42acec8
bagel update ( #31033 )
2024-08-15 02:02:20 -06:00
Brandon Hu
c1d41267e5
tweak(experiment): Reduce diamond stack from 30 to 1 ( #31025 )
2024-08-15 09:51:22 +03:00
Brandon Hu
b53ed58515
tweak(hospital): Reduce diamond stack from 30 to 1 ( #31027 )
2024-08-15 09:50:09 +03:00
lzk
bc5bc37346
Fix top bun desc ( #31019 )
...
FIX
2024-08-15 09:38:28 +03:00
VigersRay
6f72f71bfc
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-15 06:49:55 +03:00
VigersRay
fd11019b28
фикс GhostThemeComponent
2024-08-15 06:49:35 +03:00
Spessmann
0fd7b69daa
Cog fixes (again) ( #31030 )
...
* more cogmap fixes
* updated cog a bunch
2024-08-14 21:39:24 -06:00
