Commit Graph

36638 Commits

Author SHA1 Message Date
Kara 10e779c24c
Optimize artifact analyzer UI state sending (#22949)
* Remove n rename cruft old shit

* Artifact analyzer UI updating optimization

* Revert "Remove n rename cruft old shit"

This reverts commit 8789338fb20f77d79c5b0e40719896efe0103fcc.

(cherry picked from commit ab6726136f)
2024-01-22 18:37:35 +01:00
metalgearsloth 3f4851b4be
Fix multi-ghosts (#22964)
* Fix multi-ghosts

* Fix mind visits

(cherry picked from commit c326e5d087)
2024-01-22 18:37:08 +01:00
Kara 43ee98ce89
Thief description & grammar fixes (#22951)
* Thief description & grammar fixes

* sad

* cant do that sad

(cherry picked from commit 742fd7420b)
2024-01-22 18:37:07 +01:00
Flareguy 8578f1f645
Adds gingerbread men to the game (#22927)
adds gingerbread men to the game

(cherry picked from commit 450414c8fc)
2024-01-22 18:37:06 +01:00
Emisse b8ddac727a
reduce nuke required floor radius variable (#22947)
Update NukeComponent.cs

(cherry picked from commit 789fd89454)
2024-01-22 18:37:05 +01:00
Emisse 02f676d42f
nukieplanet update (#22946)
(cherry picked from commit 0144bbdf4b)
2024-01-22 18:37:03 +01:00
Emisse 0f936710a4
centcomm update (#22944)
(cherry picked from commit 213eb75912)
2024-01-22 18:37:02 +01:00
LankLTE 2d7b15e070
change the restart vote to have no effect with admins online (#22945)
* Change the vote and cvar

* Only denies successful votes

* Add comments because I'm a good coder, I swear

* I added a space to the first line of ccvars it's so over

(cherry picked from commit 82ddf451e6)
2024-01-22 18:37:01 +01:00
reverie collection d3a264350b
Atmos crab pet: Tropico! (#22773)
* tropico mob fully functional, adjusted base crab mob

* FINALLY YES I GOT THE MAPS COMMITTED

* origin fix hopefully

* removed ghost role

* undid map changes, pulled from current master

* tropico is no longer communist

(cherry picked from commit 4cd4805a01)
2024-01-22 18:36:59 +01:00
metalgearsloth 0da76b64cd
Add sprite movement states (#22940)
* Add sprite movement states

Did it for borgs for reference for future implementations.

* Fix

* Fix prediction issue

* review

(cherry picked from commit 9a40cf81f5)
2024-01-22 18:36:58 +01:00
Leon Friedrich fa9710576a
Fix pulling mispredicts (#22941)
* Fix pulling mispredicts

* Make behaviour consistent

* Good ol terminating entities

(cherry picked from commit 721a445bbd)
2024-01-22 18:36:56 +01:00
Leon Friedrich fb9adfb137
Make cargo arbitrage test ignore gambling crate (#22943)
(cherry picked from commit 9eaa4c3a5d)
2024-01-22 18:36:55 +01:00
LankLTE d336e43278
add round time to the ahelp relay (#22937)
* Basic roundtime implementation

* Forgot to clamp the length checker

(cherry picked from commit e10a314ec2)
2024-01-22 18:36:54 +01:00
Nemanja f4264f6a9c
Automatic holiday sprites (#22929)
(cherry picked from commit 00813171c1)
2024-01-22 18:36:53 +01:00
deltanedas b04c8f4a62
give plasma half of co2 air alarm threshold (#22938)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 2d213b8ab0)
2024-01-22 18:36:52 +01:00
Leon Friedrich 309ca8224c
Fix closet skeletons spawning in nullspace (#22942)
(cherry picked from commit 0baffe3243)
2024-01-22 18:36:51 +01:00
Leon Friedrich 3b8a4316fa
Make some prototypes use frozen collections (#22576)
* Make some prototypes use frozen collections

* poke tests

* Remove frozen dictionary enumeration

(cherry picked from commit 8587c3778a)
2024-01-22 18:36:50 +01:00
Ed 9a8b0a2d61
Thief pacifist (#22932)
* pac

* to settings

* ensuuure me princess

* Update Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update Content.Server/GameTicking/Rules/ThiefRuleSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
(cherry picked from commit 78354052ea)
2024-01-22 18:36:49 +01:00
deltanedas b7ce6cdbd1
exterminator midround minor antag (#19946)
* terminator locale

* terminate objective

* terminator components and shared system

* terminator roles rules and system

* terminator events

* skeleton recolour

* terminator and endoskeleton

* ghost role spawn

* damage modifier sets

* :trollface:

* :trollface:

* add antag prototype

* ghost role locale

* skynet

* :trollface:

* :trollface:

* :trollface:

* add endoskeleton body prototype

* :trollface:

* :trollface:

* smite locale

* implement terminate smite

* :trollface:

* :trollface:

* implement PopupBehavior

* endoskeleton transform popup

* move stuff from shared to server since nothing actually used it

* recolour everything

* update parts

* :trollface:

* :trollface:

* ok fire was using the damage set, back to 1.0

* tweak

* :trollface:

* :trollface:

* simplemob ops

* 1 rule per pro

* :trollface:

* :trollface:

* update some sprites

* structural damage

* :trollface:

* :trollface:

* Revert "update some sprites"

This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc.

* offbrand, add die objective to maybe remove fear of murderbone

* add shut down objective to the list

* fix ghost role

* fix control mob

* :trollface:

* :trollface:

* please

* naming

* code changes for GenericAntag terminator

* yml changes for GenericAntag terminator

* :trollface:

* moved kill objective override to an objective component

* use kill objective override

* fix

* oh

* locale changes

* change burn to heat for skin melting gib

* change some endoskeleton stuff

* pro

* i already did this dementia ops

* objective

* fix

* pro

* swap out full sprite

* update parts

* forgor

* fix mind transfer

* type

* endoskeleton has 500 mass

* evil

* fishops

* warops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 52532e4075)
2024-01-22 18:36:12 +01:00
lzk 3bfd6dd1a3
Make some items goodlooking in inventory (rotate) (#22935)
comit

(cherry picked from commit 2b25e00453)
2024-01-22 18:34:55 +01:00
deltanedas 556288b0de
add limits to steal objectives (#22672)
* add ObjectiveLimit comp/system

* give ian and disk limits

* all

* up limit

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 2ca649edfa)
2024-01-22 18:34:54 +01:00
Arimah Greene 1ce1f33c6f
Add a 'Copy' button to the fax UI (#22027)
* Add a 'Copy' button to the fax UI

* Add ValidatePrototypeId attribute

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit b20fcf5141)
2024-01-22 18:34:53 +01:00
Sirionaut 32d219c0ed
Janibelt whitelist fix and update (#21058)
* Update belts.yml

added LightReplacer and JanicartKeys tags to the Jani belt

* removed LightReplacer from whitelist but added Plunger

adding LightReplacer to the Whitelist doesn't get rid of the error msg.

Now it just adds Plunger & JanicartKeys (both tags already exist)

* added spray to botany belt and syringe to med belt

* fixed things, i hope

* added self tag to LightReplacer

* added LightReplacer to the taglist

* lightreplacer tag does exist now

(cherry picked from commit 28310a131c)
2024-01-22 18:34:52 +01:00
I.K ae1187ce36
fix fireaxe rotation (#22930)
* Update fireaxe.yml

* i am so dumb

(cherry picked from commit 1f0f34632b)
2024-01-22 18:34:51 +01:00
Emisse dd1ae048ff
remove max item size from storage implant (#22928)
(cherry picked from commit 9d37dde714)
2024-01-22 18:34:50 +01:00
deltanedas 1de12d14b0
nukie medic chest rig explosion res buff (#22923)
leave my beaker alone

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 8b781ed84e)
2024-01-22 18:34:49 +01:00
Nairod 050635552d
Central Command Access, Doors, and Locked Vendor (#22924)
* CentComm Acess and Doors

* Central Command Access Windoor

(cherry picked from commit a1210ca691)
2024-01-22 18:34:37 +01:00
Ubaser 20f8058f61
Increase cigarette count in cig packs (#22919)
add

(cherry picked from commit dd2f8deee9)
2024-01-22 18:34:01 +01:00
Warentan 76141474de
Nerfed bloodsuckers- They can no longer tank some incoming damage types by chugging blood (#22880)
Nerfed bloodsuckers- Can no longer tank some damage types by chugging blood

Co-authored-by: Warentan <StogIsAGamer@proton.me>
(cherry picked from commit fd5a1b293a)
2024-01-22 18:34:00 +01:00
lapatison 3e76ca4f49
Janitor equipment slot locale, vehicle slot (Keys) locale (#22859)
* stuff

* fixes

* vehicle locale

(cherry picked from commit beb1a4c4a4)
2024-01-22 18:33:59 +01:00
lapatison de2c6b682d
Minor alert locale (#22926)
locale

(cherry picked from commit 16f4572c57)
2024-01-22 18:33:46 +01:00
Boaz1111 593fed7c68
Adding intermediate industrial chems (#22614)
* added hydroxide, benzene, and changed the phenol recipe

* I forgot to commit a bunch of changes, whoopsie doopsie

* Update chemicals.yml

made an error while resolving conflicts

* Update chemicals.yml

same here

* Update flavor-profiles.ftl

* Update chemicals.yml

* Update chemicals.ftl

* Update chemicals.ftl

* Update chemicals.yml

* Update medicine.yml

* Update chemicals.yml

* Update medicine.yml

* guh

* Revert "guh"

This reverts commit a0e5dfd4182d1a407bffd21d0eaa36355023993c.

* final touches and fixes

* fixed all the issues, for realsies

* thefuck

* Revert " thefuck"

This reverts commit 22068cb73d9902ccf81d065d92d078f423c67aea.

* maybe this fix?

* Revert " maybe this fix?"

This reverts commit 4bfd534f73a956e595c809ce77e52819ed142f2b.

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

Trying to figure out my issue

* Update chemicals.yml

* Update chemicals.yml

* Update chemicals.yml

* Disabled the ethanol breakdown, fixing the issue

* Revert "Update chemicals.yml"

This reverts commit 1239512c0b7df5eab106bf64ec2af38185f2f016.

* Revert "Disabled the ethanol breakdown, fixing the issue"

This reverts commit 96190c967d22b1422d144e4211579f5af7bf9a09.

* Emo suggested I'd do this

* Update chemicals.yml

* made temps needed for the uhh hydroxide and benzene

* Update chemicals.yml

* removed SugarBreakdown

(cherry picked from commit 446b47a4b7)
2024-01-22 18:33:05 +01:00
Hmeister-fake 4024dcf5b2
Adds sound to Smoke Grenades (#22866)
* New smoke grenade sound

Very new to PR's and stuff, sorry

* Adds sound to smoke grenades and tear gas grenades on trigger

* Update attributions.yml

Deltanadas asked for it

* Update grenades.yml

* Change sound to an unlicenced sound

* Update attributions.yml

(cherry picked from commit bd398a6a9a)
2024-01-22 18:32:45 +01:00
deltanedas 8966d1bfe4
add ninja borg laws (#22778)
add ninja laws

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit df2b4c1088)
2024-01-22 18:32:13 +01:00
Ed 8bca049ca7
New Thief minor antagonist (#21520)
* start working

* add right-click thief antagins
some architecture restruct

* add meh thief greeting audio

* add thief subgamemode to Traitors gamemode

* add late join thief (not tested yet)
add briefing

* add pacifism

* add Steal tasks to thief

* fix crash thief+traitor on person

* add new condition: collection steal

* add tracking of succes collection objective

* add stamp collection target
remove some boring steal target
add check pulling entity to collection target

* finalize first 2 group objective

* start merging stealing objective systems

* merging

* finish merging. Now traitor steal objective work better

* we don't check the items of pullable sentient entity

* clear naming, enable thief signle item objective start

* objective pack add

* finish with steal item objectives

* convert string to ProtoId<>

* some clean up

* add thieves to revolution game mode

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

* update pacifism: fix crashing, monkey-thief without pacified

* adaptive animal briefing, cleaning locales

* add structure steal objectives

* remove RCD target

* add thiefs to manifest, but bug with traitor duplications

* add escape objective

* add chat briefing

* setup animal objective group system

* add animal steal objectives

* add animal objectives notroleconditions

* add morty

* now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3

* 6 hours of trying to fix duplicate tasks. Failure

* added thief pinpointer (buggy)

* start thief backpack UI work

* revert pinpointer for scope reason

* UI continue work

* add thief starter kits content

* remove ERP kit :trollface:

* finally! giving starting items to thief. Now it playable, but still need more work

* clean up

* fix

* fox

* add merged items into thief
new Starting Kit (buggy)

* fix YES antag menu

* objection tweaks

* remove hearts objective, working on spawning things from toolbox

* smug

* fixes

* add race specifier objective condition LAMPS

* meh

* fix fix fix

* the alive

* Adding stamps

* Update backpack.ftl

* Revert1

* Revert ftl

* add voice mask to communicator kit

* Update Resources/Locale/en-US/administration/antag.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/objectives/conditions/steal.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/prototypes/roles/antags.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* update

* fix

* more reusable function, add documentation

* fix doc

* faint fixes

---------

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

(cherry picked from commit 144af233c4)
2024-01-22 18:30:44 +01:00
LordCarve ed1813f1dd
Fixed PaperSystem bugs (#22896)
(cherry picked from commit 044f5e7c4e)
2024-01-22 18:29:24 +01:00
Nemanja 1fa68eefb0
Ion law visuals (#22908)
(cherry picked from commit 681f9a2c85)
2024-01-22 18:29:23 +01:00
Darkie 03abecd365
ItemToggle system expansion (#22369)
* Fixed EnergySword and variants having incorrect sound on attacking when in their Off state.

* Removed the unused ItemToggle from the serverside and created a new shared ItemToggleComponent and System, now used for the e-blade family of items. Also added e-blade hum and swing sounds. Thanks Sloth for the initial code!

* Changing Stunbaton system to include the itemToggle system.

* Adapted changes that have come up in the meantime.

* Changed damagespecifier to be serializable and autoNetworked in melee weapon components. Fixes a bug that makes it so client-side, damage values are not updated on toggle.

* Made the ItemToggleSystem have both a shared and a server component. Ported the Stun Baton and Stun Prod to the new toggleable system. Added a failure to activate noise component.

* Ported the welders to the new item toggle system. Set it so deactivated damage and item size default to the item's regular options.

* Removed unnecessary usings.

* Small modification to the stun prod.

* Made the integration test use the new method to turn the welders on.

* Fixed a few testing issues, applied a few changes requested by Delta.

* Updated Stunbaton code for consistentcy when it comes to calling the itemToggle component.

* Removed a redundant return; as per Delta.
Made examining the stun baton for charge rely on the battery component instead.

* Removed the welder visualizer system, now using the generic one. Removed some unused usings. Removed the welder visuals and layers.
Ported lighters to the new system.
Added zippi (sic) lighters.

* Renamed variables used to make them less generic.

* Simplified the light update code.

* Fixed the unit test to use the itemToggle system for welders now.

* Made the name shorter. I can't tell if the welding damage when interacted with actually does anything though. I can't figure out how to trigger it.

* Fixed some YML issues.

* Added a client side item toggle system just to make the shared code run on local UID's too.

* Fixed some more Yaml.

* Made the Zippi lighter have its own parent item, so it doesnt' conflict with the random pattern on the regular lighter.

* Made the zippi lighter its own in-hand sprites.

* Added a summary for the activated property in itemtoggle component.

* Fixed a typo in the itemToggle Component.

* Fixed a typo.

* Added to the remarks for the ItemToggleComponent.

* Fixed up the lighter yaml to make it use a generic term instead of a toggle layer enum for the random skin.

* Fixed a bug I introduced accidentally with the humming sound.

* Removed 2 unnecessary events from the ItemToggleSystem and component.

* Fixed a bug by only making the server run the item activation code, since the client cannot predict whether or not the activation will be cancelled.

* Cleaned up some names and functions getting called.

* Renamed a couple of variables and removed the explicit datafields from the component. Removed "activated: false" from yml since they're already deactivated by default.

* Added an IsActivated function, used it in the welder and stun baton systems code.
Refactored welder code to remove the WelderToggle event, now using the ItemToggleActivatedEvent instead for eye protection check.

* Fixed a typo. Added some comments.

* Split the ItemToggle into smaller components.
Changed the items that used the toggle system to work with the smaller components.
Made the mirror shield reflect energy shots with a 95% chance.

* Fixed the namespaces for the server components and whatnot.

* Fixed a doubled deactivation sound from using activated wieldable items (like the double Esword).
Fixed wrong yml with the e-dagger.
Fixed the disarm malus code.

* Added the zippo lighter to the detective's trench coat.

* Removed the default hit sound for the double e-sword since it was unnecessary.

* Changed e-sword damage numbers to be in line with the changes made by Emisse.

* Made no damage sounds be autoNetworked, so it changes can be changed on activation/deactivation of items.
Made Welders and Eswords sound like themselves but quieter if they hit for 0 damage, instead of taps.
You can choose what sound to play when a weapon does 0 damage when activated now.
Fixed a bug with swing sounds.

* Typo.

* Fixed a bug where the welder would blind you if you used it while it was off.

* Created a single abstract method called when an item has completed its toggle.

* Update Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Fixed a comment.

* Made most component variables readOnly for ItemToggle. There is no need to be able to change them from within the variable viewer.

* Removed trailing white spaces.

* Made the Use a field instead of a property in the itemToggleActivation/Deactivation attempt events.

* Small fixes.

* Removed ForceToggle, just use the toggle method instead.

* Fixed a bug with item sharpness staying even after getting deactivated, if the item gained sharpness that way (esword).

* Used ProtoId in the welder component.

* Made damage NetSerializable as well.

* Added networking and data fields to a couple of components.

* Made component variables autonetworked. Added some comments.

* Moved the events that modify item components on toggle to events, handled (where possible) in the systems linked to said components.

* Made all the component variables readWrite again.

* Added the component get to the WelderStatus.

* Added a predictable bool to the item toggle component.

* Replaced the Activated/Deactivated events with ToggleDone, with an Activated argument. Used that to simplify some systems.

* Added a reflect update raise event.

* Removed the Zippo changes. To add in a later PR.

* Removed the zippo from meta.json too.

* Small fix.

* Another small fix.

* Fixed the wieldable system thing in ItemToggle.

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

(cherry picked from commit a3fbab84e6)
2024-01-22 18:29:05 +01:00
chromiumboy a37bf27456
Power monitoring console overhaul (#20927)
* Prototyping whole station wire map

* More prototyping

* Added icons for the different power distributors and toggleable cable displays

* Power cable layouts are now only sent to the client when the power monitor is open

* UI prototyping

* Power monitors can now see the sprites of distant entities, long entity names are truncated

* Updated how network devices are added to the player's PVS

* More feature prototypes

* Added source / load symbols

* Final prototype! Time to actually code it properly...

* Start of code clean up

* Continuing code clean up

* Fixed UI appearance

* Code clean up complete

* Removed unnecessary changes

* Updated how power values are calculated, added UI warnings for power sinks and power net checks

* Updated how power values are calculated again, added support for portable generators

* Removed unnecessary files

* Map beacons start toggled off, console map now works outside the station, fixed substation icon

* Made some of Sloth's requested changes. Power distributors don't blink anymore, unless selected

* Moved a number of static variables in PowerMonitoringHelper to sensible places in the main files. Added a NavMapTrackableComponent so that you can specify how individual entities appear on the navmap

* Updated the colors/positions of HV cables and SMESes to improve contrast

* Fixed SMES color in map legend

* Partially fixed auto-scrolling on device selection, made sublists alphabetical

* Changed how auto-scroll is handled

* Changed the font color of the console warning messages

* Reduced the font size of beacon labels

* Added the station name to the console

* Organized references

* Removed unwanted changes to RobustToolbox

* Fix merge conflict

* Fix merge conflict, maybe

* Fix merge conflict

* Updated outdated reference

* Fixed portable_generator.yml

* Implemented a number of requested changes, move bit masks to a shared component

* Navigate listings via the navmap

* First attempt at improving efficiency

* Second attempt at optimization, entity grouping added for solar panels

* Finished solar panel entity joining

* Finished major revisions, code clean up needed

* Finializing optimizations

* Made requested changes

* Bug fix, removed obsolete code

* Bug fixes

* Bug fixes

* STarted revisions

* Further revisions

* More revision

* Finalizing revisions. Need to make RT PR

* Code tidying

* More code tidying

* Trying to avoid merge conflicts

* Trying to avoid merge conflicts

* Removed use of PVS

* Improving efficiency

* Addressed a bunch of outstanding issues

* Clear old data on console refresh

* UI adjustments

* Made node comparison more robust. More devices can be combined into one entry

* Added missing component 'dirty'

(cherry picked from commit 1de682e23f)
2024-01-22 18:28:33 +01:00
lzk 7a8c1569e9
Fix nettle seeds inhand sprite (#22891)
fix

(cherry picked from commit e6b52cc294)
2024-01-22 18:28:31 +01:00
StanTheCarpenter aa1e17ca47
Added Santa's hardsuit and helmet. (#22898)
* Added Santa's hardsuit and helmet.

* Fixed missing files

(cherry picked from commit 734da59202)
2024-01-22 18:28:30 +01:00
deathride58 5f2e378236
Adds a vscode launch option for starting the client in the compatibility renderer (#22904)
adds a vscode launch option to start the client with the compatibility renderer

(cherry picked from commit 30ff5fde69)
2024-01-22 18:28:19 +01:00
lzk cc3d38adb9
fix cargo backpack inhand sprite (#22888)
Update inhand-right.png

(cherry picked from commit 5d0624bd34)
2024-01-22 18:28:18 +01:00
deathride58 fd26c9dedb
fixes drug shader in compatibility mode FOR REAL THIS TIME (#22903)
fixes drug shader FOR REAL THIS TIME

(cherry picked from commit 3addd3e32c)
2024-01-22 18:28:09 +01:00
router 1890d1affe
Fix accidental plasma burn nerf (#22894)
(cherry picked from commit f2cb05bc61)
2024-01-22 18:28:08 +01:00
deathride58 a638869729
Fixes GLES2 crashing when compiling the drug shader (#22899)
fixes drug shader not compiling in gles2 and also applies DRY

(cherry picked from commit 9870c7f9eb)
2024-01-22 18:28:07 +01:00
SpaceyLady f5768ce72e
Correct spelling mistakes for daily tips (#22893)
Update tips.yml

(cherry picked from commit 9103061ac0)
2024-01-22 18:27:53 +01:00
Velcroboy 1b1745b41c
Add Chef's Belt (#22868)
* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

(cherry picked from commit dfa71af1f8)
2024-01-22 18:27:05 +01:00
Alzore 9a37f71a37
Add a bottle of water to the survival box (#22881)
* BO'OH'O'WA'ER

* smallbottle

* extendedbox

(cherry picked from commit a09efd47cd)
2024-01-22 18:26:08 +01:00
Nemanja c065f42b4f
Move HUD options to general options tab (#22884)
(cherry picked from commit 06a663d3ab)
2024-01-22 18:24:38 +01:00