metalgearsloth
444801f137
Fix gun cycling ammo count update ( #25635 )
...
Doesn't update correctly when cycling.
(cherry picked from commit fc0ff8fb31 )
2024-03-07 01:04:01 +01:00
Debug
c6bd89ce76
Revert "Fix chat bubbles ( #25643 )"
...
This reverts commit a074c30a52 .
2024-03-07 01:03:46 +01:00
metalgearsloth
0c65749187
Fix projectiles ( #25636 )
...
(cherry picked from commit d204896bf5 )
2024-03-07 01:03:19 +01:00
PJBot
89378dcbb5
Automatic changelog update
...
(cherry picked from commit 2e0d22bc90 )
2024-03-07 01:03:16 +01:00
metalgearsloth
a074c30a52
Fix chat bubbles ( #25643 )
...
Dependencies got misused
(cherry picked from commit 23d2c4d924 )
2024-03-07 01:02:59 +01:00
Krunklehorn
1456ed8c0b
Revert "Fix ItemSlots prediction" ( #25610 )
...
Revert "Fix ItemSlots prediction (#25552 )"
This reverts commit ad29dbe302 .
(cherry picked from commit 6485dd4f4d )
2024-03-07 01:02:33 +01:00
PJBot
fda7e7f506
Automatic changelog update
...
(cherry picked from commit 6343eb5759 )
2024-03-07 01:02:30 +01:00
rosieposie
13bb2e7dd7
Lockable Buttons & Button Frames ( #25631 )
...
initial commit
(cherry picked from commit 8dd1748cec )
2024-03-07 01:02:29 +01:00
PJBot
39ef7f942e
Automatic changelog update
...
(cherry picked from commit a411810171 )
2024-03-07 01:02:27 +01:00
Julian Giebel
c9f4910cb9
News UI overhaul and PDA notifications ( #19610 )
...
(cherry picked from commit 0752acdc2c )
2024-03-07 01:02:24 +01:00
PJBot
0fb295010c
Automatic changelog update
...
(cherry picked from commit 5ad5739706 )
2024-03-07 00:59:57 +01:00
Zadeon
a48c9cc1e2
Adds minable salt "ore" ( #25324 )
...
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.
* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json
* Added chlorine to the list of solutions salt gives when used in the grinder.
* Gave salt ore and salt rock overlay unique sprites.
* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition
* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
(cherry picked from commit 133bd0353a )
2024-03-07 00:59:54 +01:00
PJBot
d7ba8396d1
Automatic changelog update
...
(cherry picked from commit 8e951f3582 )
2024-03-07 00:59:53 +01:00
LankLTE
b5e4b7049f
Zombie Diona Fixes ( #25404 )
...
No reform, zombie nymphs
(cherry picked from commit cc865c547b )
2024-03-07 00:59:50 +01:00
PJBot
8fe428617e
Automatic changelog update
...
(cherry picked from commit bd99c0dcdb )
2024-03-07 00:59:48 +01:00
metalgearsloth
fa2747425a
Minor test fixes ( #25423 )
...
* Minor test fixes
c
* fix?
(cherry picked from commit 0889d6b0b0 )
2024-03-07 00:59:45 +01:00
Velcroboy
e3a171a215
Adjusts wallmount arcs and partially fix nanomed issues ( #25451 )
...
* Adjusts wallmount arcs and partially fix nanomed issues
* wall closets
* Guess it wants this
* Adjust arc to 175
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 32a440b487 )
2024-03-07 00:59:42 +01:00
PJBot
0e25e1226b
Automatic changelog update
...
(cherry picked from commit a6f2146885 )
2024-03-07 00:59:38 +01:00
PJBot
dce5088878
Automatic changelog update
...
(cherry picked from commit acc7927d94 )
2024-03-07 00:59:37 +01:00
Whisper
e0d84f2db2
Whisper bleed update v3 ( #25434 )
...
* Whisper bleed update v3
* missed a few
* Add bleeding message to health analyzer.
* Fix bleed notification not updating.
* Apparently this either doesnt exist
(cherry picked from commit ff65cb7b0c )
2024-03-07 00:59:34 +01:00
Sphiral
f699a98bd0
More windoors (starring directional window) ( #25501 )
...
* Added Plasma and Uranium Windoors, plus uranium directional windows
* I forgor the locked proto's too ;-;
* Skill issue, forgot to remove something that was a test
* Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist)
* No more static prices for windows/windoors
* I wish I knew how to run the tests locally ;-;
(cherry picked from commit 88ae71715b )
2024-03-07 00:59:33 +01:00
PJBot
eed6cc5ca3
Automatic changelog update
...
(cherry picked from commit 9015573a49 )
2024-03-07 00:59:26 +01:00
Ed
64ccfc1afb
Handheld Mass Scanner ( #25526 )
...
* handheld
* Update meta.json
* Update meta.json
* Update cargo.yml
* research
* add to borg
* bruh
* borg to T2
* fix
(cherry picked from commit 7a5f81ddb4 )
2024-03-07 00:59:22 +01:00
PJBot
5be0e599bc
Automatic changelog update
...
(cherry picked from commit 79df39ed94 )
2024-03-07 00:59:20 +01:00
MACMAN2003
7eb03410a4
add NanoTrasen balloon ( #25543 )
...
nt balloon
surprised one didn't exist already
(cherry picked from commit 0536ce6f95 )
2024-03-07 00:59:19 +01:00
SlamBamActionman
ecdef48ce4
Add nose customization to humans & dwarves ( #25557 )
...
Initial commit
(cherry picked from commit 3af2928a25 )
2024-03-07 00:59:12 +01:00
PJBot
3daae49ee0
Automatic changelog update
...
(cherry picked from commit a0b0579d2e )
2024-03-07 00:59:09 +01:00
Ed
40fabb5bed
Fancy table ( #25562 )
...
* blue
* others
* add white table
* add crafting carpets
* finish carpets
* tags
* crafting
* pip
* finish
(cherry picked from commit 84cbcb93ca )
2024-03-07 00:59:07 +01:00
PJBot
57e52661e5
Automatic changelog update
...
(cherry picked from commit 7fc75f7541 )
2024-03-07 00:59:06 +01:00
GNF54
22e1551dcf
Added several cosmetic items to the Medidrobe ( #25582 )
...
Update medidrobe.yml
(cherry picked from commit b7b6f61f2a )
2024-03-07 00:59:03 +01:00
Whisper
da5b4ee627
handcuff replacements are faster to escape from ( #25601 )
...
makeshift handcuffs are easier to escape from
(cherry picked from commit 74232f9831 )
2024-03-07 00:58:59 +01:00
Ilya246
230076025d
macrobomb 20->13 TC ( #25585 )
...
Update uplink_catalog.yml
(cherry picked from commit 849dc43365 )
2024-03-07 00:58:47 +01:00
PJBot
4439741e81
Automatic changelog update
...
(cherry picked from commit 7593a2e958 )
2024-03-07 00:58:42 +01:00
Brandon Hu
68c7e17089
fix(cooktime): mushroom pizza are set to the proper cook time of 30 seconds ( #25614 )
...
(cherry picked from commit 5367d99545 )
2024-03-07 00:58:39 +01:00
Hanz
260c61d263
ERT PDA Fixup ( #25606 )
...
meat and potatoes
ayup
(cherry picked from commit 6b00f592b6 )
2024-03-07 00:58:38 +01:00
PJBot
56f9d8574d
Automatic changelog update
...
(cherry picked from commit 2faf7433c0 )
2024-03-07 00:58:37 +01:00
CyberDuck
02a1d0b033
Buff/Nerf Gases Cost ( #25608 )
...
* Nerf/Buff Gases cost
* Nerf/Buff Gases cost
* Nerf/Buff Gases cost
---------
Co-authored-by: CyberDuck <tsyaslovscky.dima@yandex.by>
(cherry picked from commit c0290d18f2 )
2024-03-07 00:58:31 +01:00
Whisper
3bbb3c0081
Add weh to: Anomalies, Artifacts, random puddles ( #25611 )
...
* Add weh to: Anomalies, Artifacts, random puddles
* also change weh to wehs!
(cherry picked from commit 30e09af2a4 )
2024-03-07 00:58:05 +01:00
botanySupremist
579da289da
Fixed a few small typos in ghost role information. ( #25613 )
...
Co-authored-by: botanySupremist <definitelyrealBotSupremist@gmail.com>
(cherry picked from commit c6bfb657ad )
2024-03-07 00:58:01 +01:00
Flareguy
da76efaaf1
fixes the old ai sat ruin's lights ( #25615 )
...
(cherry picked from commit 4bf2364f5f )
2024-03-07 00:57:43 +01:00
MACMAN2003
5a74cffe09
Lathe-able LED light tubes and LED bulbs ( #25616 )
...
let there be (led) light
(cherry picked from commit 89c8226380 )
2024-03-07 00:57:39 +01:00
Velcroboy
5453c1c6ba
fixes arcade tile position ( #25620 )
...
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 918eb1fe87 )
2024-03-07 00:57:38 +01:00
Velcroboy
2f73214300
Fix inconsistency in onions ( #25619 )
...
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 19ce9edf10 )
2024-03-07 00:57:37 +01:00
Velcroboy
9a0611b8cb
Cleans up base crates for mapping clarity ( #25618 )
...
* Cleans up base crates for mapping clarity
* migration
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 2efad4f3c5 )
2024-03-07 00:57:33 +01:00
Boaz1111
964405fbf4
swapped icons for RCD crates ( #25600 )
...
swapped icons for crates
(cherry picked from commit 76823cc522 )
2024-03-07 00:57:15 +01:00
Plykiya
9adf84fb89
Syringe UI cached updates ( #25581 )
...
Injector status UI cached values
Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit dffd02adb1 )
2024-03-07 00:57:12 +01:00
PJBot
535828ba4c
Automatic changelog update
...
(cherry picked from commit c02c8c2319 )
2024-03-07 00:57:11 +01:00
deltanedas
8a863666f0
add crew monitor as traitor steal objective ( #25563 )
...
(cherry picked from commit 002b8d8871 )
2024-03-07 00:57:10 +01:00
Pieter-Jan Briers
e7a3b82a8d
Use new ComponentPauseGenerator ( #25183 )
...
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
(cherry picked from commit e00f74505c )
2024-03-07 00:57:05 +01:00
PJBot
8bcd90fa6a
Automatic changelog update
...
(cherry picked from commit 2a2324ecaf )
2024-03-07 00:56:29 +01:00