Commit Graph

5251 Commits

Author SHA1 Message Date
Agoichi 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
metalgearsloth 997ee75d14
Revert "Adds more grindables (#24267)" (#24311)
This reverts commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db.

(cherry picked from commit 34806400bd3fd3cf4ef30333eb3eb64770026982)
2024-01-26 23:13:21 +01:00
Drayff f7561b4c51
Toolboxes (#24305)
* Added animations for opening toolboxes

* Fix cow toolbox

(cherry picked from commit f71df97b5eebbe1224c9a4d203e0a6b3bbeca3c7)
2024-01-26 23:13:13 +01:00
Ubaser 4e1d2e2f24
Fix reagents obtained from grinding iron ore. (#24215)
add

(cherry picked from commit 08c7386074b2da46ace4e4f12cdf65782f37089d)
2024-01-26 23:11:14 +01:00
Flareguy b89a6d7f26
Adds more grindables (#24267)
* Adds more grindables

* fuc

* A

(cherry picked from commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db)
2024-01-26 23:11:12 +01:00
Kara 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
metalgearsloth 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
Ubaser 2edc8151d7
Adjust produce (#24220)
(cherry picked from commit f0b21e2edc9bfa2c82aba007ac3d96f4a660a7af)
2024-01-26 23:07:21 +01:00
Nemanja c6ee831dba
fix gas canister names (#24252)
fix canister names

(cherry picked from commit f69f3e0f410cde280dfedd5570f39d6b7728c439)
2024-01-26 23:05:55 +01:00
themias de7c8de5ac
More sprite movement states (#24237)
* More sprite movement states

* what

(cherry picked from commit 0c944ed81ee8f96769f77e0d535629d90abf40f5)
2024-01-26 23:05:40 +01:00
themias 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
deltanedas 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
Ubaser 17cd8a16cd
Carrots now properly contain Oculine (#24228)
* carrot

* add

* quantity

(cherry picked from commit 882e27795567623a3b942ab354b16bf5e71a2aa2)
2024-01-26 23:05:29 +01:00
Ubaser 2c2ff50a6f
Paramedic void suit is now a soft suit. (#24229)
add

(cherry picked from commit 08c2cac96d95acb513b7e7a14ee8a7e91adb5a0a)
2024-01-26 23:05:14 +01:00
Ubaser b10c9e9ed2
Golden honker glow (#24230)
add

(cherry picked from commit 9968cc178be97c21bae7b8f779ca17145aa26fbc)
2024-01-26 23:04:40 +01:00
0x6273 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
Volodius 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
Ed 129249015b
Repairable shuttles (#24193)
* fixable shuttle

* nukie not repairable

* fix

(cherry picked from commit 2c0e1fcfb97ba401029a122fbdeef0eae5ae979e)
2024-01-26 23:04:21 +01:00
themias 92876cddbe
Chicken sprite movement states (#24205)
(cherry picked from commit ab42c4d51c5e83842e77c46894a8986990c0a304)
2024-01-26 23:04:19 +01:00
Kevin Zheng 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
themias b61d9d7a6a
Mouse sprite movement states (#24202)
(cherry picked from commit 47159d1c235aa8b8e79fe8ee6d36b76a92e78fb5)
2024-01-26 23:03:29 +01:00
Kara 8b73edaa6c
Significantly less annoying eating sounds (#24195)
(cherry picked from commit fd3222993e6c5b0f0ec6296934fad6438b1e260a)
2024-01-26 23:03:26 +01:00
Boaz1111 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
Kara 8b649cf5df
Change default lights on devmap to non-LED ones (#24192)
(cherry picked from commit 1fe2dda345428bff81f55c5de574571266edca52)
2024-01-26 23:01:12 +01:00
Ubaser 0bee27dee0
Grindable ores (#24185)
add

(cherry picked from commit 6846bcd2140459377a289589ab06b20c18f21a91)
2024-01-26 23:01:09 +01:00
lzk bc4aaf978c
WelderRefinable light tubes bulbs and broken bottle (#24184)
s

(cherry picked from commit 8239e593885dc1087622a14d9e6977dad2c4965e)
2024-01-26 23:01:06 +01:00
TurboTrackerss14 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
Arendian 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
lzk fd30703d24
Remove prototypes locale (#24159)
(cherry picked from commit 1db42e048b8f05100f820c9728a0753681ef9cd0)
2024-01-26 22:57:41 +01:00
lzk e5edd0f790
Fix some closets being not deconstructable (#23054)
* sss

* price change

(cherry picked from commit a2c3ec6c4707c54969f03935ebcd26ab388de184)
2024-01-26 22:56:46 +01:00
Arendian 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
Emisse 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
Nemanja 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
Boaz1111 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
Hanz 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
CrigCrag 5a66bd3bdf
fix damage type for arachnid melee (#24137)
fix damage type

(cherry picked from commit 9fe7cdd2d52ffb7223dedf88dcb8e24855c7b20b)
2024-01-26 22:53:27 +01:00
reverie collection 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
Nim 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
Nemanja c5658249cb
fix medhud bounds with 64x64 inhands (#24102)
(cherry picked from commit be8d0e69b60a7d438e200a72b833d1eae31867b2)
2024-01-26 22:51:49 +01:00
Nemanja e624317d37
Cryogenic Sleep Units (#24096)
* Cryogenic sleep units

* pause map support

* no more body deletion

* Cryogenic Storage Units

* boowomp

* no more emag, no more dropping present people

(cherry picked from commit 736b9dd7df6e35f07fed88686c7c863ac61af846)
2024-01-26 22:51:41 +01:00
Flareguy d8c4e4088a
Nerf lava firestacks (#24100)
* nerf lava firestacks

* dode

(cherry picked from commit d3a41ede49cb2bfb6ac93bc8140914cc61df30e9)
2024-01-26 22:51:39 +01:00
Arendian deaeb6dff3
decelerator nerf and projectile penetration mini refactor (#24032)
* decelerator nerf and projectile fix

* datafield name difference

* forgot to add component

* missed datafield styling

* comment made summary

* CanPenetrateComponent and CollisionLayer check.

* Small comment changes

(cherry picked from commit 04a8761bb6c0a12fc8f07ccf3a24615c8bb8b591)
2024-01-26 22:51:16 +01:00
Nairod 06a4a00e41
Nerf and Add More Reagent Slimes (#24087)
* Nerf and Add More Chem Slimes

* Whoops Redundancy

(cherry picked from commit abd0e6dd204512b0e3212415a112e87217f1c67c)
2024-01-26 22:51:14 +01:00
themias a83c773c3c
Grave digging and decomposition (#23646)
* Grave digging and decomposition

* fix

* update based on review comments

* code review

* remove unused field

(cherry picked from commit fd7ff690b1ad7b1cf6cd62deba3076684e3e9282)
2024-01-26 22:50:50 +01:00
Psychpsyo e439d50479
Plates & Cash gridinv visuals (#24075)
(cherry picked from commit a747e6dda407cc93f8184be0712941606b19263e)
2024-01-26 22:50:12 +01:00
Whisper 17f7664e4e
Cerberus has AI (#24028)
(cherry picked from commit 34a9d4d0d55eea5f3f9fa73f15316951625b8ccd)
2024-01-26 22:49:45 +01:00
AJCM-git 9a6fa17e72
Virtual items cleanup (#23912)
* Virtual items cleanup

* Detail

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 108f001731b9394f98d9ef712b9b777e5b3f8abc)
2024-01-26 22:49:14 +01:00
Dakamakat dfb3ff6836
Make throwable star damage stamina (#23527)
* feat(star.yml): make throwable star damage stamina

* feat(Components): add new StaminaTresholdDamageOnEmbedComponent

* feat(SharedProjectileSystem): update system with new events to change
stamins treshold on embeed projectile remove / add

* feat(StaminaSystem): update system with new subscriptions

* feat(throwing_stars): update yml with new component

* feat(StaminaDamageOnEmbed): add stamina damage on embeed

* cleanup unused / ajust numbers

* fix(StaminaSystem / OnEmbedComponent ) apply requested changes

* Rest of the review

* another warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit b80f7eed6ee05c9e4963477369cffaa44dda19e8)
2024-01-26 22:49:12 +01:00
Morb 781657f44d
Tail wagging (#19573)
* MVP

* Uncomment animated prototypes

* Disable wagging on death

* Move component to server

* Looped tail animation

* Apply front tail template

* Disable animated markings globally

* Add emote sending

* Update documentation

* Move locale

* Use static instantAction & remove action on comp del

* Use fluent POSS-ADJ

* Update docs

* Add copyright

* Update copyright

* Update license & copyright

* Move to main directory & format meta.json

* Fix path

* Change namespace

* Remove empty meta.json

* Update

* REMOVE unnecessary IsNullOrWhiteSpace check

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Move animated markings to main file

* Use emotes

* new

* fix

* fix

* Tests, pls

* fix dixel

* Remove networked from wagging comp

* Remove unused import

* Remove unused imports

* Move wagging comp to shared

* Revert the emotes

If we're getting it the action is better.

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 9063cfe454263e2616d4d948648d6c73cbc039f9)
2024-01-26 22:38:24 +01:00
Pieter-Jan Briers 56fb80ad34
BUI bugfixes / improvements (#23881)
* Fix ActivatableUIRequiresPowerCellComponent stopping power draw when one of two people closes the UI.

Also fixes it to check UiKey properly.

* Remove unnecessary CrewManifestViewer on PDAs

This is for a pop-up crew manifest UI, which the PDA doesn't use.

* Fix BoundUIClosedEvents that didn't check UI key/not correctly at least.

Uses the new helper method in engine.

* Fix drone (cargo shuttle) pilot console UI breaking if two people open it and one person closes it.

* Fixes for disposal router/tagger UI.

Code was badly copy pasted without changing identifiers, never worked.

Also cleaned up some of the logic (text trimming, sounds).

Also removed the "refuse to work if you have something in your active hand" check like why.

* Avoid running most ActivatableUIComponent logic when closing a UI via toggle

Activating the UI while it's already open closes it via toggle. Except it still ran 99% of the "attempting to open" logic which makes no sense.

This probably fixes a bug or some other dumb behavior somewhere.

* Bitch

(cherry picked from commit 123a4147dea2945f6c60fe9e4e0a3aa2da75e1dc)
2024-01-26 22:38:21 +01:00