Commit graph

18780 commits

Author SHA1 Message Date
Morb0
0cbc431d2f Update locale 2024-04-26 13:49:13 +03:00
Morb0
3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
#	Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
PJBot
fe67634397 Automatic changelog update 2024-04-26 07:49:21 +00:00
FungiFellow
e26662b545
Quiver Crafting Recipe (#27198)
* Update quiver.yml

* Create quiver.yml

* Update clothing.yml

* Update pneumatic_cannon.yml

* Update pneumatic_cannon.yml

* Update pneumatic_cannon.yml

* Update pneumatic_cannon.yml
2024-04-26 17:48:15 +10:00
PJBot
abc46f171c Automatic changelog update 2024-04-26 07:48:07 +00:00
IlyaElDunaev
3847a298c1
Treatment of blood loss in the Rat King (#26887)
Bloodloss-RatKing
2024-04-26 17:47:01 +10:00
PJBot
d578d293df Automatic changelog update 2024-04-26 07:45:46 +00:00
FungiFellow
9b63bb672f
Whitelisted Sec Webbing (#27303)
* Whitelisted Sec / Merc Webbing

* Update belts.yml

* Misplaced Components fixed

* Trying to fix mapped fills

* Update belts.yml

* Update belts.yml

* Removed an Empty line

* Update belts.yml
2024-04-26 17:44:40 +10:00
PJBot
1dca65defd Automatic changelog update 2024-04-26 07:35:26 +00:00
Nemanja
735eeefa03
Migrate out rubber bullets/mags (#27329) 2024-04-26 14:22:49 +10:00
PJBot
de965416bd Automatic changelog update 2024-04-26 02:26:58 +00:00
PJBot
0aee198adf Automatic changelog update 2024-04-26 00:27:03 +00:00
PJBot
281e5fa448 Automatic changelog update 2024-04-25 23:19:46 +00:00
cool dolphin
4f056672f9
Glasses in loadouts (#27286)
* loadouts now have aaall the glasses

* cheap sunglasses dont exist at all

* empty commit to rerun tests, there's no way i fucked something up
2024-04-26 01:18:39 +02:00
PJBot
e450fadbaa Automatic changelog update 2024-04-25 02:20:23 +00:00
beck-thompson
d3b1178428
Radio jammer update! (#25912)
* Added selectable power level to radio jammer

* Cleaned up OnGetVerb

* Settings are now stored in the .yml file. Simplified stuff a lot!

* Minor fixes!

* Small little baby fix :)

* Added the power level switch to the examine menu and also removed the ftl file as it was in the incorrect location.

* Minor code cleanup

* Changed byte -> int

* Update sprite

* Fixed licence

* Added power LED that changes if the jammer is on low power.

* Removed tabs

* Changed github link to the commit

* Changed all the RemComp to RemComDeferred

* Moved NetworkedComponent to shared

* Changed radio jammer textures back with minor edits

* Added a space because it was annoying me

* Jammer now updates range for suit sensors properly! Thanks nikthechampiongr :)

* Removed useless comment

* Cleaned up code that updates the range of tracking devices.

* Fixed client namespace and removed newline

* Cleaned up ChangeLEDState and ChangeChargeLevel.

* Added comments

* Read only

* Fixed another comment

* Locked in

* Made server inherit shared

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* review fixes

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-25 12:19:16 +10:00
Nemanja
161fd6c83c
Mega Antag Refactor (#25786)
* Mega Antag Refactor

* last minute delta save

* more workshopping

* more shit

* ok tested this for once

* okkkkk sure

* generic delays for starting rules

* well darn

* nukies partially

* ouagh

* ballin' faded and smonkin wed

* obliterated the diff

* Spread my arms and soak up congratulations

* I've got plenty of love, but nothing to show for it

* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity

* ok this junk

* OOK!

* fubar

* most of sloth's review

* oh boy

* eek

* hell yea!

* ASDFJASDJFvsakcvjkzjnhhhyh
2024-04-25 11:31:45 +10:00
metalgearsloth
f6ac494ad3
Fix .ftl keys (#27289)
Required for https://github.com/space-wizards/RobustToolbox/pull/4885 to not kill content
2024-04-24 21:19:17 -04:00
PJBot
eb648dd0eb Automatic changelog update 2024-04-24 21:28:40 +00:00
pigeonpeas
ef0a4d64c8
Add a trash bag to the advanced cleaning borg module. (#27226)
add the trash bag

puts the trash bag in the advanced cleaning module
2024-04-25 00:27:34 +03:00
deltanedas
d797e3753f
saltern bar stool (#27263)
saltern stool

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-24 13:40:54 -06:00
Pieter-Jan Briers
7b90c08a2c
Various item status fixes/tweaks (#27267)
* Always display item status panel fully

Initial feedback from the UI changes seems to be that a lot of people go "why is there empty space" so let's fix that.

* Fix item status middle hand being on the wrong side

I think I switched this around when fixing the left/right being inverted in the UI code.

* Minor status panel UI tweaks

Bottom-align contents now that the panel itself doesn't dynamically expand, prevent weird gaps.

Clip contents for panel

* Fix clipping on implanters and network configurators.

Made them take less space. For implanters the name has to be cut off, which I did by adding a new ClipControl to achieve that in rich text.

* Update visibility of item status panels based on whether you have hands at all.

This avoids UI for borgs looking silly.

Added a new "HandUILocation" enum that doesn't have middle hands to avoid confusion in UI code.

* Use BulletRender for laser guns too.

Provides all the benefits like fixing layout overflow and allowing multi-line stuff. Looks great now.

This involved generalizing BulletRender a bit so it can be used for not-just-bullets.

* Fix geiger word wrapping if you're really fucked
2024-04-25 00:01:31 +10:00
PJBot
38f490e5eb Automatic changelog update 2024-04-24 13:45:03 +00:00
FungiFellow
5fa424a43b
Add Truncheon to Secbelt Whitelist (#27281)
* Add Truncheon to Secbelt Whitelist

* Update belts.yml

* Added Truncehon Tag in Tags.yml

* Update security.yml

* Update security.yml
2024-04-24 16:43:56 +03:00
PJBot
7f6f9c1209 Automatic changelog update 2024-04-24 13:22:36 +00:00
Alzore
4290d5f13e
Make the cargo telepad T2 civilian (#26270)
therearetwowaystodothis
2024-04-24 23:21:28 +10:00
PJBot
829b453e3c Automatic changelog update 2024-04-24 02:43:41 +00:00
Flareguy
10ad53df72
Revert "Maints Exit Sign" (#27271)
Revert "Maints Exit Sign (#26831)"

This reverts commit 905102064c.
2024-04-23 20:40:26 +02:00
PJBot
0c851d256d Automatic changelog update 2024-04-23 12:08:18 +00:00
Nemanja
1bfc63c546
fix cargo teleporter (#27255)
* fix cargo teleporter

* don't delete orders

* basado
2024-04-23 22:07:12 +10:00
PJBot
8117131c91 Automatic changelog update 2024-04-23 11:35:15 +00:00
pigeonpeas
c129bb177c
Allow the purchase of emitters from cargo. (#27229)
add emitter crates back to cargo + changes the contents of an emittercrate from emitter to emitterflatpack

👍
2024-04-23 21:34:09 +10:00
PJBot
716cdcbdf8 Automatic changelog update 2024-04-23 11:32:54 +00:00
brainfood1183
905102064c
Maints Exit Sign (#26831)
* Maints Exit Sign

* change description

* id, sprites changed from maints to exit
prototype now has an unshaded layer so it can be seen in the dark.
2024-04-23 21:31:48 +10:00
PJBot
401911b734 Automatic changelog update 2024-04-23 11:31:07 +00:00
Whisper
eee056eaf0
lower max firestacks to 10, refactor flammable (#27159)
* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage
2024-04-23 21:30:01 +10:00
PJBot
2f0c02ef35 Automatic changelog update 2024-04-23 11:26:04 +00:00
Ghagliiarghii
88b56efba1
Increase availibility of combat knives to security (#27224)
* Increase availibility of combat knives to security

* whitelisted combatknife in secbelt for Diona

* Revert SecDrobe change for MGS
2024-04-23 21:24:58 +10:00
PJBot
31b9f98e6d Automatic changelog update 2024-04-23 08:58:15 +00:00
PJBot
c4a6bcca5c Automatic changelog update 2024-04-23 08:49:33 +00:00
Tyzemol
0e2f5d6bf7
Fix slime storage issue (#27260)
fix_slime_storage
2024-04-23 10:48:26 +02:00
PJBot
ee0f63d273 Automatic changelog update 2024-04-22 22:47:28 +00:00
PJBot
8bc2ee81dd Automatic changelog update 2024-04-22 12:19:34 +00:00
FungiFellow
32a90120eb
Syndi-Cat Tweaks (#27222)
* Syndicat Price 10 -> 6

* Update animals.yml

* Update animals.yml

* Update uplink_catalog.yml

* Update uplink_catalog.yml

* Update animals.yml
2024-04-22 15:18:28 +03:00
Kara
85c6383cc0
Minor slime fix (#27237) 2024-04-22 03:18:36 -07:00
PJBot
289bbc70d7 Automatic changelog update 2024-04-22 10:04:08 +00:00
Just-a-Unity-Dev
fd0ca42c58
General slime improvements (#23425)
* General slime improvements

* Finish morphing

* oops 2x2 not 3x3

* actually lets ball - 2x3 inventory

* Last two things on the todo list

* .\RobustToolbox\

* JUST COMPILE

* fix tests 2.0

* fix tests 3.0

* Do reviews

* minor change

* guideboob

* more

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-22 03:03:03 -07:00
PJBot
af516cff61 Automatic changelog update 2024-04-22 09:00:00 +00:00
Terraspark4941
c5ab839b2c
Engineering guidebook update (#26851)
* RTG page update

* old commits from #22272

* Small fixes over most pages

* TEG tweaks

* Fixed a thing in airlock security

* fixed an italics tag

* singularity page now includes tesla

* Added a burn chamber to TEG page

* Prettyprinted TEG page, fixed some more issues with details

* Moved ONE singular comma

* Change Singularity page heading to include tesla

* Singularity page pretty printing + fixes

* TIL its [italic] NOT [italics]

* RTG Prettyprinting

* Access Config Prettyprinting + Netconfig tweak

* Atmospherics prettyprinting

* Construction keybind fix

* Apply suggestions from code review

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-22 01:58:54 -07:00
PJBot
52204dfa35 Automatic changelog update 2024-04-22 08:46:44 +00:00