Jaraten
f0c3d99706
repsite hammer ( #248 )
2024-06-16 14:40:58 +03:00
Ed
c5a8e96dca
Skills system ( #247 )
...
* init basic skill system
* add skill requirement to advanced melee weapon
* working hard
* more hard work
* shot skill issue
* Now the skills give you the components
* add job special autolearning skills
* traits recreating
* some tweaks
* remove bg and components for now
* sharpening now require skills
* add alchemist role on maps
* pestle skill issue
2024-06-15 16:55:04 +03:00
Ed
39bb249eb3
Alchemy fun mechanics ( #246 )
...
* heating solution refactor
* chromium slime effect refactor
* guidebook hint
* hint chance fix
* убираем ненужное
2024-06-14 19:10:16 +03:00
Ed
186f91f1d2
Merge pull request #241 from crystallpunk-14/ed-13-06-2024-upstream2
...
Ed 13 06 2024 upstream 3
2024-06-13 23:20:26 +03:00
Ed
0211a50581
Energy crystal ( #243 )
...
* init magic container system
* charging and discharging
* add energy regenerator
* thaumaturgy glasses, scanning energy
* add energy quartz prorotypes and sprites
* light power controller
* commit special for _des
* simple normalizer crystal slot
* YEEEEEEE BOIII, examined crystalls inside things
* кристал теперь видно, когда он вставлен в стабилизатор
* TryUseCharge приборами
* hello deserty, how are you doing?
* rename regenerator to EnergyDraw, allow draw from slot
* normalizer жрет magic energy файналли
* Update normalizer.yml
* visual polishing
* Update crystal.yml
2024-06-13 22:55:20 +03:00
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
Deserty0
d1af83c72a
fixed ru emote sound v2 ( #240 )
...
* ultrafixxxxx
* Update speech_emotes.yml
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-06-13 13:39:55 +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
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
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
Cojoke
d865bffff3
Fix .30 ammo listing wrong number of bullets in uplink ( #28919 )
2024-06-13 00:45:52 -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
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
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
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
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
PJBot
a0f709918d
Automatic changelog update
2024-06-12 10:33:18 +00: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
Ed
5e78ac2c22
Revert "Ed 09 06 2024 upstream ( #230 )"
...
This reverts commit 50470c3aaa
2024-06-11 15:20:47 +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
lzk
41a0ffba38
Add reward line in bounty label ( #28853 )
2024-06-11 12:33:36 +03:00
lzk
2b2883005d
Fix some wideswing animations ( #28819 )
...
* Fix some wideswing animations
* 2
2024-06-11 08:55:37 +03:00
PJBot
3c2b1affef
Automatic changelog update
2024-06-11 02:49:30 +00:00
PJBot
d3d8a9e59c
Automatic changelog update
2024-06-10 13:22:04 +00:00
Nemanja
63ad5e0b83
enable search filters on drinks guidebook ( #28815 )
2024-06-10 09:20:58 -04:00
PJBot
b60c9a8fe8
Automatic changelog update
2024-06-10 13:20:31 +00:00
Zonespace
bc5a6279f5
Fixes a typo in the glossary ( #28818 )
...
independance -> independence
Co-authored-by: John Doe <johndoe@gmail.com >
2024-06-10 09:19:24 -04:00
Chief-Engineer
7032c0106a
Fix description of temp servers and add region tags ( #28811 )
...
* Fix description of LRP temp servers
* update regions
2024-06-09 22:13:26 -05:00
nikthechampiongr
e95fb9aa7f
Disable panic bunker for servers ( #28812 )
...
* Disable panic bunker for servers
* Add disabled stuff back in to be reenabled later
2024-06-10 01:41:04 +02:00
Pieter-Jan Briers
0804020410
FUCK ( #28808 )
2024-06-10 00:13:29 +02:00
Leon Friedrich
edd13ad82f
Fix wizardsDenCoreOnly.toml ( #28807 )
...
Fix wizardsDenCoreOnly
2024-06-10 07:48:47 +10:00
