Ed
791db753fe
fuck this test
2024-06-13 22:50:27 +03:00
Ed
898bf1fa8b
try fix tests
2024-06-13 14:08:51 +03:00
Ed
124f6f3964
Update natural.yml
2024-06-13 13:29:46 +03:00
Ed
720d4ad144
save old grass sprite
2024-06-13 12:59:58 +03:00
Ed
fb7ffc4712
Update arenas.yml
2024-06-13 12:57:19 +03:00
Ed
43d8839f51
Update options-menu.ftl
2024-06-13 12:52:32 +03:00
Ed
d92d75affa
Update ame-controller-component.ftl
2024-06-13 12:46:50 +03:00
Ed
151db2c9cc
fix locale
2024-06-13 12:42:52 +03:00
Ed
db91bab5b1
Update CCVars.cs
2024-06-13 12:35:33 +03:00
Ed
8ff09f552b
Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2
...
# Conflicts:
# Content.Client/Guidebook/GuidebookSystem.cs
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Shared/Guidebook/GuideEntry.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Maps/arenas.yml
# Resources/Prototypes/Maps/atlas.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/debug.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Maps/reach.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Prototypes/lobbyscreens.yml
2024-06-13 12:35:00 +03:00
PJBot
e02ef68259
Automatic changelog update
2024-06-13 06:39:49 +00:00
ShadowCommander
8791f98f0b
Fix playtime on player tab getting set to Unknown ( #28876 )
...
Update play time on admin panel player tab after db loads
2024-06-12 23:38:43 -07:00
Tayrtahn
68dc1fb055
Fix ninja Spider Clan charge not getting a target ( #28871 )
2024-06-12 23:37:31 -07:00
PJBot
99f2e6ffa8
Automatic changelog update
2024-06-13 06:31:45 +00:00
Leon Friedrich
d38ad12262
Fix playtime_addrole command printing the wrong time ( #28783 )
2024-06-12 23:31:21 -07:00
Doomsdrayk
249e4a9c15
Fix guns appearing to cycle bolt when wielded ( #28756 )
...
Adds a check during wielding to see if the code is running clientside, and if so skip the part responsible for creating the virtual items.
This is necessary because TrySpawnVirtualItem is blocked from running clientside, so trying to spawn the virtual items for wielding causes the client to always believe the wield has failed. This erroneous failure leads to the display of incorrect feedback until the server's successful wield attempt makes it to the client. The added check prevents wielding from failing in this way and therefore allows the client to behave as expected.
2024-06-12 23:30:39 -07:00
Cojoke
d865bffff3
Fix .30 ammo listing wrong number of bullets in uplink ( #28919 )
2024-06-13 00:45:52 -04:00
deltanedas
d9bac82402
localize RoleBriefing ( #28824 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-12 22:24:08 -04:00
geraeumig
ab8b3ecec2
Fix magazine sprites after Auto Eject ( #28859 )
...
Co-authored-by: geraeumig <alfenos@proton.me >
2024-06-12 22:23:15 -04:00
Moomoobeef
22b1ec9775
added a new sprite for the super synthesizer. ( #28884 )
2024-06-12 22:20:28 -04:00
PJBot
020b2919ac
Automatic changelog update
2024-06-13 02:20:16 +00:00
Plykiya
1d4d6c3331
Fix gauze stopping if it stops bleeding ( #28844 )
...
delete a line
Co-authored-by: plykiya <plykiya@protonmail.com >
2024-06-12 22:19:10 -04:00
PJBot
7d4586b27b
Automatic changelog update
2024-06-13 02:18:41 +00:00
Cojoke
865810c6e1
New Sprites for Tranq Shells + Add consistancy to printing Tranqs ( #28903 )
...
* New Sprites for Tranq
* Add consistancy to secfab print
2024-06-12 22:17:35 -04:00
Stalen
d322a82bdf
Pets toggle internals fix ( #28904 )
2024-06-12 22:17:07 -04:00
Verm
0e32d632fa
Make automatic gasps not create a chat message ( #28907 )
...
No chat gasp
2024-06-12 22:15:43 -04:00
Partmedia
dc0327c3c0
Update PA admin warnings ( #28911 )
...
With singulo fixed, PA strength 3 and below (level 2) are now safe.
Update the admin logging to reflect this.
2024-06-12 22:15:15 -04:00
bibbly
12911d292f
Reach Fixes ( #28913 )
...
various small changes to Reach
2024-06-12 20:09:10 -06:00
PJBot
1aa5e023d4
Automatic changelog update
2024-06-12 22:57:13 +00:00
Partmedia
35e5a96b7e
Fix queued deletion check (singulo loosing at beyond PA 1 but only on live servers) ( #28906 )
...
Fix queued deletion check
2024-06-12 15:56:07 -07:00
dragonryan06
b091a55d7d
Add new icon for Remove Evidence verb ( #28898 )
2024-06-12 18:05:56 -04:00
PJBot
ca39135c99
Automatic changelog update
2024-06-12 18:12:00 +00:00
deltanedas
8c514b90fd
fix pda ui troll ( #28896 )
...
* fix pda ui troll
* bruh
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-12 20:10:53 +02:00
Ed
d462ce85f8
minor AlchemyTest map update ( #237 )
2024-06-12 18:38:48 +03:00
PJBot
9b40bcc1d9
Automatic changelog update
2024-06-12 13:34:04 +00:00
Robert V
94bf301a8b
Comms Consoles without CanShuttle can no longer recall ( #28803 )
...
Consoles without CanShuttle can no longer recall
2024-06-12 09:32:57 -04:00
PJBot
a0f709918d
Automatic changelog update
2024-06-12 10:33:18 +00:00
Deserty0
90354fa6d3
Fix "no materials loaded" messege in lathes ( #28885 )
...
fix
2024-06-12 13:32:11 +03:00
Flareguy
9a32a1949c
Removes Trials of Mana grassland sprites: Bare Minimum Edition ( #28868 )
...
* replace the grass sprites. again
* Fix dirt
---------
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com >
2024-06-11 23:04:43 -07:00
PJBot
d6399446b6
Automatic changelog update
2024-06-12 01:08:43 +00:00
Boaz1111
3d25893664
Cluster Update ( #28854 )
...
Changes armoury, cargo job slot
2024-06-11 19:07:37 -06:00
PJBot
c5b30a384f
Automatic changelog update
2024-06-11 22:19:37 +00:00
Tayrtahn
bd42c2b56a
Fix nearest beacon messages reporting the opposite direction ( #28869 )
...
* Fix nearest beacon messages reporting the opposite direction
* Lets document that method, shall we?
2024-06-11 18:18:30 -04:00
Ed
f37b6f47f2
Merge pull request #235 from crystallpunk-14/revert-230-ed-09-06-2024-upstream
...
Revert "Ed 09 06 2024 upstream"
2024-06-11 15:20:59 +03:00
Ed
5e78ac2c22
Revert "Ed 09 06 2024 upstream ( #230 )"
...
This reverts commit 50470c3aaa
2024-06-11 15:20:47 +03:00
Ed
b30db3a30f
Merge pull request #234 from crystallpunk-14/revert-233-revert-230-ed-09-06-2024-upstream
...
Revert "Revert "Ed 09 06 2024 upstream""
2024-06-11 15:20:08 +03:00
Ed
bb3c74d557
Revert "Revert "Ed 09 06 2024 upstream ( #230 )" ( #233 )"
...
This reverts commit b89117f8e6
2024-06-11 15:19:52 +03:00
Ed
b89117f8e6
Revert "Ed 09 06 2024 upstream ( #230 )" ( #233 )
...
This reverts commit 50470c3aaa
2024-06-11 15:19:27 +03:00
Ed
36da152d73
Clothing update ( #231 )
...
* added cotton shirts
* pants update
* add new cloaks
* Update misc_startinggear.yml
* glasses update
* Update migration.yml
* remove yellow hoodie helmet
2024-06-11 13:48:01 +03:00
PJBot
b6d7a6a8e2
Automatic changelog update
2024-06-11 09:34:42 +00:00
