cee8ded8c3
Rebalance of Lobbying bundle ( #24303 )
...
* Rebalance of Lobbying bundle
- More money, mickey (5000 -> 30000)
- Added trader`s rubberstump for high iq players
- Phone to call upper managment
- Some fancy and absolutely unsuspicious clothings
- Patriotic Flag for the most valuable lobist of Syndicate
* Thief problem fix
Thief now have have separate lobbying bundle, now it calls bribing bundle
* Fixing
Money count, suffix
* Hi
Fixing money
(cherry picked from commit 559ff13a121ee1a79bf6d59e427d9c0fc93ec9a1)
2024-01-26 23:13:23 +01:00
997ee75d14
Revert "Adds more grindables ( #24267 )" ( #24311 )
...
This reverts commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db.
(cherry picked from commit 34806400bd3fd3cf4ef30333eb3eb64770026982)
2024-01-26 23:13:21 +01:00
f7561b4c51
Toolboxes ( #24305 )
...
* Added animations for opening toolboxes
* Fix cow toolbox
(cherry picked from commit f71df97b5eebbe1224c9a4d203e0a6b3bbeca3c7)
2024-01-26 23:13:13 +01:00
830ae5579f
Unrevivable trait ( #24226 )
...
* unrevivable trait + remove unclonable remnants
* cleanup
* change to hascomp
(cherry picked from commit 7a2e500f689738b64abc24929e8d4a387749ba64)
2024-01-26 23:13:01 +01:00
40f7e0b53e
Lathe Categories ( #24247 )
...
* Lathe Categories
* serilog my beloathed
(cherry picked from commit 73e94dfa92e0afe3ad0decd1d7248d13fa4f208c)
2024-01-26 23:12:38 +01:00
d511f31243
Mustard, ketchup and mayonnaise now tastes distinct ( #24297 )
...
add
(cherry picked from commit a6e16d99610120d086105de867d7e82712964109)
2024-01-26 23:11:15 +01:00
4e1d2e2f24
Fix reagents obtained from grinding iron ore. ( #24215 )
...
add
(cherry picked from commit 08c7386074b2da46ace4e4f12cdf65782f37089d)
2024-01-26 23:11:14 +01:00
b89a6d7f26
Adds more grindables ( #24267 )
...
* Adds more grindables
* fuc
* A
(cherry picked from commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db)
2024-01-26 23:11:12 +01:00
6ca85e719b
Destruction & impact sound rework pass 1 ( #24282 )
...
* Various sounds ported
* Replace wall_bonk.ogg
* Metal/metalglass break sound pass
* Replace metalbreak.ogg
* Replace woodhit
* Replcae tap.ogg n some smack uses
* Fix lint
* Replace bang.ogg and some instances of hit_kick.ogg
* couple more
* fix wood sound
* i may be stupid
* le attributing
* bro what
* standardize more destruction sounds
* fix melee hit sound cutting off
* window threshold sounds and remove `destroySound` it literally doesnt exist
(cherry picked from commit 818b07ecf82bdd72dc5524f6bc093067b2ef6472)
2024-01-26 23:10:41 +01:00
3d7d4eed5f
Actually fix carrot oculine this time ( #24290 )
...
SEEDS MAN
(cherry picked from commit bdb1399ada20dfe7638ce7af1727192e6d9de17f)
2024-01-26 23:10:03 +01:00
b51b6f65b5
Add ability to put spesos into cargo console ( #24263 )
...
I thought we had it already but maybe it was an unfinished pr or something.
(cherry picked from commit ad23facb7a9670bcc10e2f9e89d2e22db2052697)
2024-01-26 23:08:06 +01:00
c3e95f02a0
Make super bite burger easier to craft ( #24231 )
...
* add
* needs space for salt
(cherry picked from commit 8cc24c9a5d6de080067fe35a46d7d69d54b20a28)
2024-01-26 23:07:24 +01:00
831427e90e
Rework wheelchairbound ( #24173 )
...
* Rework wheelchairbound
Fixes the save/load bug and fixes it being a singleton.
* weh
(cherry picked from commit 243491dd596ffad3698d1d00a645195f2224386f)
2024-01-26 23:07:23 +01:00
2edc8151d7
Adjust produce ( #24220 )
...
(cherry picked from commit f0b21e2edc9bfa2c82aba007ac3d96f4a660a7af)
2024-01-26 23:07:21 +01:00
c6ee831dba
fix gas canister names ( #24252 )
...
fix canister names
(cherry picked from commit f69f3e0f410cde280dfedd5570f39d6b7728c439)
2024-01-26 23:05:55 +01:00
6e088d4782
Spawn guidebooks on random bookshelves ( #24036 )
...
(cherry picked from commit 21b7b112a2ab5ae5078f4a2cf9565b05c8ed6dfc)
2024-01-26 23:05:53 +01:00
de7c8de5ac
More sprite movement states ( #24237 )
...
* More sprite movement states
* what
(cherry picked from commit 0c944ed81ee8f96769f77e0d535629d90abf40f5)
2024-01-26 23:05:40 +01:00
043f6205d8
Add fill visuals and inhand sprites to water bottle ( #24240 )
...
* Add fill visuals and inhand sprites to water bottle
* adjust sprite
(cherry picked from commit 6931848f1d875b22a1529e0868bff72f5dde663d)
2024-01-26 23:05:34 +01:00
c07e3f340b
make terminator immune to rev and zombie ( #24239 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 4315531a3ff2bdf681da8acbc9d19e8bcafaddbf)
2024-01-26 23:05:33 +01:00
9fa4e84c65
Add pacifism description and clean up traits a little ( #24216 )
...
add
(cherry picked from commit da7ed4b27bf596015e2d37bfea102771911ce9c5)
2024-01-26 23:05:32 +01:00
17cd8a16cd
Carrots now properly contain Oculine ( #24228 )
...
* carrot
* add
* quantity
(cherry picked from commit 882e27795567623a3b942ab354b16bf5e71a2aa2)
2024-01-26 23:05:29 +01:00
2c2ff50a6f
Paramedic void suit is now a soft suit. ( #24229 )
...
add
(cherry picked from commit 08c2cac96d95acb513b7e7a14ee8a7e91adb5a0a)
2024-01-26 23:05:14 +01:00
b10c9e9ed2
Golden honker glow ( #24230 )
...
add
(cherry picked from commit 9968cc178be97c21bae7b8f779ca17145aa26fbc)
2024-01-26 23:04:40 +01:00
ebcdca5dfa
Use old reagent dispenser beaker slot ID ( #24209 )
...
Change the slot ID back to what it was to keep old map saves with an item in the slot loading correctly.
This also fixes the "You can't put this in the dispenser!" message not appearing when inserting an item without FitsInDispenserComponent because the whitelisted slot name wasn't changed.
(cherry picked from commit 7a7d0017b504dec4b1d390b941af9791d9677287)
2024-01-26 23:04:27 +01:00
049e65f253
fix flippo not igniting plasma ( #24207 )
...
Add welder component to FlippoLighter
(cherry picked from commit a61e24a254a2ba0ed6b804a7e481393518604f8b)
2024-01-26 23:04:25 +01:00
129249015b
Repairable shuttles ( #24193 )
...
* fixable shuttle
* nukie not repairable
* fix
(cherry picked from commit 2c0e1fcfb97ba401029a122fbdeef0eae5ae979e)
2024-01-26 23:04:21 +01:00
92876cddbe
Chicken sprite movement states ( #24205 )
...
(cherry picked from commit ab42c4d51c5e83842e77c46894a8986990c0a304)
2024-01-26 23:04:19 +01:00
9cc361921b
Add limited-reagent dispensers ( #23907 )
...
* Add limited-reagent dispensers
* Add empty versions for all dispensers
* Fix lint
* Set initial window size so all buttons are visible
* Simplify logic, add parenthesis
* Use localized name for initial labels
* Adjust button style
* Avoid touching items before MapInit
* Remove pre-labeling
* Reduce diff
* Clean up YAML
* Fix test
* Really fix test
* Document
* Adjust based on review
* Add labels for obnoxiously long bottles
---------
Co-authored-by: AWF <you@example.com>
(cherry picked from commit 9394a262458df76d9c4156f147bed902e3feac75)
2024-01-26 23:03:30 +01:00
b61d9d7a6a
Mouse sprite movement states ( #24202 )
...
(cherry picked from commit 47159d1c235aa8b8e79fe8ee6d36b76a92e78fb5)
2024-01-26 23:03:29 +01:00
8b73edaa6c
Significantly less annoying eating sounds ( #24195 )
...
(cherry picked from commit fd3222993e6c5b0f0ec6296934fad6438b1e260a)
2024-01-26 23:03:26 +01:00
78460d4433
Xenoarch scanning time halved ( #24188 )
...
* SALVATION
* Update ArtifactAnalyzerComponent.cs
* Update artifact_analyzer.yml
(cherry picked from commit 0c78c3465390e169ef99637d5ed6bc64d20717bb)
2024-01-26 23:03:11 +01:00
8b649cf5df
Change default lights on devmap to non-LED ones ( #24192 )
...
(cherry picked from commit 1fe2dda345428bff81f55c5de574571266edca52)
2024-01-26 23:01:12 +01:00
0bee27dee0
Grindable ores ( #24185 )
...
add
(cherry picked from commit 6846bcd2140459377a289589ab06b20c18f21a91)
2024-01-26 23:01:09 +01:00
bc4aaf978c
WelderRefinable light tubes bulbs and broken bottle ( #24184 )
...
s
(cherry picked from commit 8239e593885dc1087622a14d9e6977dad2c4965e)
2024-01-26 23:01:06 +01:00
72b41b7251
Robohands glove sprite ( #24182 )
...
add
(cherry picked from commit b6f0c35e7236801da1193a92eef5687884bb551b)
2024-01-26 23:01:04 +01:00
37c32f5776
Add Mothroach Burger ( #24156 )
...
* Add Mothroach Burger
* append copyright
* fix whitespace and metajson ordering
(cherry picked from commit c32d19cf5ca49bf583054a72eb229f93dfc5b303)
2024-01-26 23:01:01 +01:00
94c664e956
Add 6 new small salvage wrecks ( #24179 )
...
* add
* updat
(cherry picked from commit b293bf4fd868c47112d6d1a822b2dca7414fcdaa)
2024-01-26 22:58:23 +01:00
f0c8fd1143
Fix water gun and spray nozzle projectile collision ( #24175 )
...
fix water gun and spray nozzle collision
(cherry picked from commit f4727f2cf8d481037c21ee39febeb1e042490364)
2024-01-26 22:58:20 +01:00
fd30703d24
Remove prototypes locale ( #24159 )
...
(cherry picked from commit 1db42e048b8f05100f820c9728a0753681ef9cd0)
2024-01-26 22:57:41 +01:00
be014dc5da
Hauling shuttle wreck ( #24152 )
...
add
(cherry picked from commit eaee9b6896dc3cd3fd56d7738d12e9ad7fcd8035)
2024-01-26 22:56:53 +01:00
e5edd0f790
Fix some closets being not deconstructable ( #23054 )
...
* sss
* price change
(cherry picked from commit a2c3ec6c4707c54969f03935ebcd26ab388de184)
2024-01-26 22:56:46 +01:00
5efaaa6b39
Fix flare shell not applying firestacks and makes it embed ( #23648 )
...
* Fix flare gun not igniting and small firestack increase.
* Flare shells now embed
(cherry picked from commit 495956a7fa3f5b78dd7a902ea340e06f5698ba38)
2024-01-26 22:56:44 +01:00
b9bf8342d7
medal case sprite ( #24147 )
...
medal case no longer cigar case lmao
(cherry picked from commit f33307e76660637949d6b9654729fb96c818de85)
2024-01-26 22:55:50 +01:00
04d5a09774
fix cryosleepers deleting the station ( #24143 )
...
* fix cryogenic units deleting the station
* ship it
(cherry picked from commit 017450ef17ed19f24fee3375cd35967e974ab119)
2024-01-26 22:55:45 +01:00
328d7a604d
Reinforced glass reacting fix ( #24135 )
...
* takeitouttakeitout
* Delete error.glsl
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 24aeec237354a9e6c0977a579ad960bd81054978)
2024-01-26 22:55:30 +01:00
b438a04fba
more objective logging + maybe fix the no objective bug ( #24139 )
...
* more objective log
* remove hijack from group!!!!
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 0a1b3ba601ccaf6827253bc9f824fba853e34fa8)
2024-01-26 22:55:14 +01:00
ec60f854dc
Flatcaps ( #24134 )
...
* Brown and Grey flatcaps added
What it says on the tin is what it is
* Fixed Copyright Jazz, oops
What it says on the tin
(cherry picked from commit 87b88fb93fc2f0ebf48805c6ac15e7f76d7362b9)
2024-01-26 22:54:13 +01:00
5a66bd3bdf
fix damage type for arachnid melee ( #24137 )
...
fix damage type
(cherry picked from commit 9fe7cdd2d52ffb7223dedf88dcb8e24855c7b20b)
2024-01-26 22:53:27 +01:00
cb9d6be362
Tropico pet added to thief objective pool ( #24119 )
...
* git it's the same stop gaslighting yourself
* tropico added to thief objective pool
(cherry picked from commit 49057ace7ee61609e96f25b1a1e92f24cd07c67d)
2024-01-26 22:53:26 +01:00
061432debd
Construction Blast door ( #24050 )
...
* construction blast door
* fix
* price
* fix2
* hem
* xif
* Static
(cherry picked from commit efb424834add46f88b8c404a93683f5a83abf21f)
2024-01-26 22:53:00 +01:00
Agoichi
metalgearsloth
Drayff
Scribbles0
Nemanja
Ubaser
Flareguy
Kara
lapatison
themias
deltanedas
0x6273
Volodius
Ed
Kevin Zheng
Boaz1111
lzk
TurboTrackerss14
Arendian
Emisse
Hanz
CrigCrag
reverie collection
Nim