Commit Graph

19503 Commits

Author SHA1 Message Date
PJBot
9efa5de340 Automatic changelog update 2024-06-14 16:54:55 +00:00
dffdff2423
05cc7541dd Rename generic drugs (#28989)
* Rename generic drugs

Space Drugs and Stimulents cause quite a bit of confusion.

* Ensure everything is updated to the new names.
2024-06-14 12:53:48 -04: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
PJBot
795196c964 Automatic changelog update 2024-06-14 15:25:46 +00:00
Verm
24e7653c98 Resprite rodent inhands + add hamlet inhands (#28955)
* Resprite rodent inhands + add hamlet inhands

* Small ham adjustment
2024-06-14 09:45:01 -04:00
Ubaser
e70131e5b4 Lighten throwing knive's border (#28977)
add
2024-06-14 10:55:30 +03:00
PJBot
0d869a317f Automatic changelog update 2024-06-14 06:25:24 +00:00
Moomoobeef
adad6b2b04 cargo can now order fax machines (#28968)
* cargo can now order fax machines

* removed fax manual
2024-06-14 16:24:18 +10:00
PJBot
e7a3fd5285 Automatic changelog update 2024-06-14 06:20:53 +00:00
Killerqu00
4c182298cc uncuffCooldown *= 5 (#28095) 2024-06-14 16:19:47 +10:00
IProduceWidgets
df2c3ec844 Evac shuttle for Oasis (#27998)
* Add robo control comp, also de-reinforce a lot of walls.

* Add Accordia Evac shuttle for Oasis.

* Revert "Add robo control comp, also de-reinforce a lot of walls."

This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.
2024-06-13 23:26:39 -06:00
PJBot
39d7afec2b Automatic changelog update 2024-06-14 02:44:08 +00:00
Tabitha
c52073f542 Add chicken speech sound (#28948) 2024-06-13 19:43:02 -07:00
PJBot
bcf8594431 Automatic changelog update 2024-06-14 02:41:29 +00:00
Boaz1111
8059028015 makes PKA able to mine rocks in one hit (#27476)
gives it gatheringprojectile
2024-06-14 12:40:23 +10:00
crasg
c79849ae29 Remove Rat King from MouseMigration and add it to it's own Event (#28872) 2024-06-14 12:12:24 +10:00
PJBot
af11bc3f51 Automatic changelog update 2024-06-14 02:05:51 +00:00
PJBot
e481925ea4 Automatic changelog update 2024-06-14 02:02:39 +00:00
osjarw
ad3f1f77b7 Nodescanner now works with right click (#26873) 2024-06-13 22:01:32 -04:00
Ghagliiarghii
47bf64b883 Fix no combat knives in sec techfab (#28086) 2024-06-14 11:10:17 +10:00
MjrLandWhale
222d3b532d Override under-pressure lock-out in air alarm "Fill" mode (#28909) 2024-06-13 15:25:02 -08:00
Emisse
4e8375e5f9 bagel update (#28946) 2024-06-13 16:03:01 -06:00
lzk
ccd402d8d1 Adjust softdrink restock crate name (#28934)
These contain restocks for multiple vendors, so change the name and description to reflect this.
2024-06-13 12:21:24 -08: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
PJBot
29fa18418e Automatic changelog update 2024-06-13 18:37:44 +00:00
lzk
c3720f9fd9 Add order quantity to cargo invoice label (#28821) 2024-06-13 10:36:38 -08:00
PJBot
1559b080e4 Automatic changelog update 2024-06-13 18:22:55 +00:00
PJBot
1bffa2aee7 Automatic changelog update 2024-06-13 18:12:03 +00:00
Doomsdrayk
7f5476b555 Fix Drozd and C-20r unwielding on use-in-hand (#28728)
Make Drozd and C-20r not unwield on use
2024-06-13 10:10:56 -08: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