Commit Graph

9329 Commits

Author SHA1 Message Date
ScarKy0
cfbf620e3f Condensed gases can now be metabolized. (#31648)
* Condensed gasses can now be metabolized.

* Made condensed frezon weaker

* Liquid frezon nerf
2025-04-13 17:21:55 +02:00
K-Dynamic
701f480051 Neutralised anomaly infections drop inert cores (#36503)
adds inert core prototypes
2025-04-13 17:24:11 +03:00
Nemanja
12b75beeab Departmental Economy (#36445)
* Cargo Accounts, Request Consoles, and lock boxes

* Funding Allocation Computer

* final changes

* test fix

* remove dumb code

* ScarKy0 review

* first cour

* second cour

* Update machines.yml

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-13 15:22:36 +02:00
KingFroozy
736a51962e Skirt of Life resprite + white shoes to paramedic loadout (#32227)
* skirt rises

* white shoes

* remove from loadout
2025-04-13 12:35:28 +02:00
Emisse
0b48cbe5e4 Increase Bagel's secoff job slots to 6 (#36434) 2025-04-12 01:37:50 -06:00
Pieter-Jan Briers
e6e60dead4 Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-11 23:30:52 +02:00
TakoDragon
dc37ab7c6d RD Windoor (#36377)
rd-windoor
2025-04-11 15:13:17 +02:00
Damn Feds
edb5dd0b30 fixes removed annotations 2025-04-11 22:43:11 +12:00
Damn Feds
d66c59d38d Merge branch 'master' into bagel-sec-count 2025-04-11 22:41:46 +12:00
Nox
680544a53a Descriptions for .45 magnum (#36383)
* Initial commit: added descriptions to revolvers, N1984, speedloaders, cartridges, and ammo boxes.

* Updated descriptions in accordance with Slarti and Roomba's suggestions.

* Oops, did a misclick!

* Updated Mateba description slightly

* Slightly updated pirate revolver description

* Updated Mateba description

* Updated Mateba description again

* Fixed a last occurence of restricted in AP bullets
2025-04-10 21:58:33 -07:00
Nox
4006914e35 Descriptions for .25 caseless (#36385)
* Initial commit: added descriptions to ammo boxes, cartridges, and magazines, and modified the cobra pistol's description.

* Updated magazine descriptions slightly

* Updated descriptions according to Roomba's feedback

* Minor updates

* Minor fixes

* Minor touch-up

* I should stop making tiny changes.

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-11 04:15:26 +02:00
Dinner
3f0ca9b786 Fix gas mixers and pneumatic valves being hidden by floor tiles (#36428)
fix gas mixers and pneumatics valves being hidden by floor tiles
2025-04-11 04:10:03 +02:00
YoungThug
97e8c4d506 Wizard added in all at once! (#36408)
SpeedMergePlease
2025-04-10 19:06:47 -07:00
lzk
262e7ae904 fix cargo products (#36447) 2025-04-11 03:15:20 +02:00
RedBookcase
05785e7d45 Made the mosin major contraband, fixed uplink name. (#36446)
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-11 02:57:41 +02:00
Nemanja
2769de7b5d Add Aluminum Source (Cans) (#36449)
* aluminium cans

* shhhhh
2025-04-11 02:54:24 +02:00
SlamBamActionman
5975853447 Decrease Syndicate raid suit size, add bundle backpack (#35890)
Decreased Syndicate raid suit size, add bundle backpack
2025-04-10 15:22:17 -07:00
Kirby
ee90926ccd Changes the name of the Detectives suitskirts from "... suit" to "... suitskirt" (#36436)
* Changes the name of the detectives skirts

* Whoops. Didn't mean to delete that
2025-04-10 12:34:48 -07:00
Emisse
418b931ab8 Job count annotation for each map yml file (#36433) 2025-04-10 11:43:52 -06:00
SlamBamActionman
7f6756135b Add cooked dragon steak and cutlets (#36273)
* Add cooked dragon steak and cutlets

* If it's worse for you it's even more of a delicacy

* Attribution
2025-04-10 08:59:18 -07:00
chromiumboy
00ab7775d0 Holopad fixtures bugfix (#36341)
Initial commit
2025-04-10 16:18:36 +02:00
ArtisticRoomba
c6581e655c Fix power cells/cages counting for laser weapon bounties (#36431)
fix cargo bounty bug
2025-04-10 15:55:13 +02:00
slarticodefast
f6bfce38da remove mind roles from EntityWhitelist (#36089)
* remove mind roles from EntityWhitelist

* remove redundant dependency
2025-04-10 20:45:12 +10:00
RedBookcase
dc6ed30ec8 Fixed the empty mass scanner still being a normal item, whoops. (#36340)
* Fixed the empty mass scanner still being a normal item, whoops.

* Fixed parenting duplication and issues with item state.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-10 20:44:06 +10:00
Fildrance
56710697a9 Feature/shader radial menu (#35152)
* it works! kinda

* so it works now

* minor cleanup

* central button now is useful too

* more cleanup

* minor cleanup

* more cleanup

* refactor: migrated code from toolbox (as it was rejected as too specific)

* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame

* refactor: major reworks!

* renamed DrawBagleSector to DrawAnnulusSector

* Remove strange indexing

* Regularize math

* refactor: re-orienting segment elements to be Y-mirrored

* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button

* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.

* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters

* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly

* fix: enabled any functional keys pressed when pushing radial menu buttons

* fix: radial menu sector now scales with UIScale

* fix: accept only one event when clicking on radial menu ContextualButton

* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always

* feat: simple radial menu prototype for easier creation

* refactor: cleanup, restored emote filtering, button models now have class hierarchy

* refactor: remove usage of closure from 'outside code'

* refactor: remove non existing type from UiControlTest

* refactor: remove unused using

* refactor: revert ability to declare radial menu layers in xaml, scale 32px sprites using scale in radial menu

* refactor: whitespaces

* refactor: subscribe for dispose on existing radial menus

* feat: now simple radial menu button models can have custom color for each sector background (and hover background color). Also added OpenOverMouseScreenPosition inside SimpleRadialMenu

* fix: AI door menu now can be closed by verb if it gets unpowered

* overlay and its registration

* radial menu shader but it requires wierd offset

* remove unused file

* smol cleanup

* remove unused code

* neat internal subsctors in radial menu shaders

* refactor finalize visual style

* comments, simplify, extract variable and other minor refactors on radial-menu shader

* refactor: extract more data from radial menu with sector to radial container for shader drawing

* replaced DrawSeparators for RadialMenuTextureButtonWithSector with DrawBorder (no reason to make them separate), also now colors are properly applied

* refactor: simplify hiding border, extended xml-doc for simple radial menu settings

* refactor: remove duplication of radial menu shaders, use ValueList to collect ClearExistingChildrenRadialButtons buttons to remove

* refactor: remove linq

* fix: fix AI radial action serialization using invalid type

* refactor: fix duplicate ShowDeviceNotRespondingPopup for AI by properly checking if it can interact

* refactor: removed *if* blocks from shader, replaced with branchless logic

* refactor: whitespaces, changed list to array in simple radial button preparing methods

* fix: merge duplicated code

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2025-04-10 20:42:53 +10:00
beck-thompson
149c42f385 Predict inflatable barriers verb (#32420)
* First commit

* evil

* Made it not do weird things

* address review!
2025-04-10 20:39:13 +10:00
Damn Feds
a8e347c606 increase sec count to 6 2025-04-10 22:17:38 +12:00
Damn Feds
e2296f6d58 remove duplicate CE entry 2025-04-10 22:06:10 +12:00
Damn Feds
829f8199e0 job counts for each map 2025-04-10 21:55:45 +12:00
Alex Parrill
74ca51dac8 Mark the spider clan explosive as major contraband (#36421)
Even though it's an unsanctioned explosive device, it's currently
not considered contraband. This patch adds BaseMajorContraband to it.
2025-04-10 00:32:57 +02:00
TheBlueYowie
517aeb6486 Replaced Sterile Swabs in NutriMax with a Swab Dispenser (#36399)
Replaced Sterile Swabs with Swab Dispenser in NutriMax
2025-04-08 17:54:04 -04:00
Tiniest Shark
bfac77b53f Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)
* Add inhands for Holoprojectors, labelers, cone, brb sign, whoopie cushion

* Update Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-08 23:27:07 +02:00
beck-thompson
3135b2ab3e Fix matchstick prediction issues (#31418)
* First commit

* Minor fixes please ymal error begone

* If this fixes it

* Last chance

* How

* Forgot

* First fixes

* Added correct component tags

* Minor cleanup

* Address review!

* Namespace change

* Fix yaml yelling

* Changes

* Update namespace

* Removed the unneeded files
2025-04-08 23:00:57 +02:00
Nyxilath
8d3b89ca9b Printable vials (#36380)
* add vial recipe

* adding vial to lathe recipes

* adjusted vial production cost

* Reduced glass cost for vials
2025-04-08 11:37:11 +02:00
K-Dynamic
5b4e3b46a6 New security box fills, renamed and replaced sechud box icon (#35057)
* secglasses and sechud icons, new box fills

* sunglasses box

* fixes indentation
2025-04-08 10:23:12 +02:00
Tayrtahn
8d8c1e4dae Make RandomMetadata properly support localization (#36343)
* Make _outputSegments readonly

* Remove mystery character

* Use Fluent instead of string concatenation

* Adjust format

* Convert existing content

* Don't need these anymore

* Docs
2025-04-06 11:12:39 -07:00
ScarKy0
9e299a1053 Allow Aghosts to load biomes. (#36325)
* init

* review
2025-04-06 14:10:17 +02:00
Minemoder5000
7c84ff1a93 Make Health Analyzer scan range nullable and adjust admin PDA (#36347)
* Modify .cs and admin pda

* enhance comment
2025-04-06 10:31:06 +02:00
RedBookcase
b5616d22a9 Salvage melee weapon tweaks (#35914)
* Minor salvage melee tweaks.

* Minor salvage melee tweaks.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-05 23:48:18 -07:00
Phil
f7b32d9226 Remove toxins from the chemical synthesis kit description (#36323)
Alter the description of the chemical synthesis kit to no longer include any false hopes of toxins
2025-04-05 22:21:10 +02:00
UpAndLeaves
d083842f1f Centcomm death rattle implant (#36113)
* behold!

* minor name change 👍

* Remove fields 👍

* Changes it to parent off DeathRattleImplant

* Adds implants round start and fixes hypothetical bug

* Update Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

As per slarticodefast's suggestion

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-05 09:21:10 -07:00
deltanedas
67a9809a5e remove evil shitcode from randommetadata (#36324)
* remove evil

* fix non-localizeddataset uses

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-04-05 17:56:22 +02:00
ScarKy0
890d4339d1 Add additional Biome Markers. (#36300)
* init

* slight value tweaks

* few more
2025-04-05 14:03:19 +02:00
SlamBamActionman
cb03ea3d0b Reduce storage implant to a 2x L shape/6 slots (#36272)
Change subdermal implant
2025-04-05 11:38:58 +02:00
KamTheSythe
0a229f5abf Remove "SHUTTLES" from the allergy list in ion_storm.yml (#36317)
with accordance pull 35751, removes the "SHUTTLES" as a possible allergy to prevent possible round stall
2025-04-05 11:00:19 +02:00
āda
f66fd152cf Add 10u of plasma to SyndieJuice (#36280)
Gift for the agent
2025-04-04 20:22:12 -07:00
BWTCK
6ed0644fc0 Fix shutter construction ghost rotation (#36082)
* Fixed shutter construction frame not aligning with construction ghost

* removed metadata change that should be in a different PR
2025-04-04 20:00:47 -07:00
ScarKy0
9993cf8227 Antagonist roles now require 1h playtime. (#36276)
* init

* whitespace
2025-04-04 22:24:04 +02:00
TheBlueYowie
21bad6ade1 Rotate Adv Mineral Scanner in Inventory (#36294) 2025-04-04 08:56:30 -07:00
lzk
4e33a288d2 fix implanting borgs and bots (#36218)
* fix implanting borgs

* fix
2025-04-04 17:36:28 +02:00