Commit Graph

9345 Commits

Author SHA1 Message Date
Tayrtahn
110ed2736f Convert spam letters to a LocalizedDataset (#36393)
* Convert spam letters to a LocalizedDataset

* Error -> warning

* Comments

* Add migrations for old spam mail entities
2025-04-14 19:38:21 +02:00
SlamBamActionman
18bedfec0a Add implant names to implanters (#36555)
* Initial commit

* Add tips!
2025-04-14 18:50:42 +02:00
SlamBamActionman
69f9d531f9 Add SolutionContainerVisuals to the hypospray (#30703)
* Hypovisuals

* Syndie hypo

* Include attribution
2025-04-14 08:58:55 -07:00
BramvanZijp
cf14cb3eb5 The long overdue downfall of stun meta - Stamina resists on Nukie & ERT Suits. (#35580)
* Add stamina damage resistance

* Probably starting a civil war within the community.

* Tweak some values, my chart was outdated.

* Tone down the values

* Allow a way to bypass the resistances, which forks downstream can use.

* Apply suggestions from code review

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

* Comment out the changes to non-deathsquad suits.

* minor text fix e

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-14 17:27:26 +02:00
slarticodefast
8700d10f98 Stable merge (#36557) 2025-04-14 17:06:45 +02:00
metalgearsloth
dfa5ccf625 Fix shuttle arrival visualizer (#35772)
* Fix shuttle arrival visualizer

It was at a fixed spot but if the target is rotating it wasn't handled.

* hew

* Fixes
2025-04-15 00:34:18 +10:00
Pieter-Jan Briers
843d79be5f Fire extinguishers can now extinguish items, including when held/worn (#36267)
* Fire extinguishers now put out candles

This did not actually require any changes to flammable or extinguishers directly, the only necessary changes were to make the collision actually work.

Vapor entities (also used for fire extinguishers) now have a collision layer, so they can hit items.

Added a new FlammableSetCollisionWake component to actually enable collision on candles while they are lit, because otherwise CollisionWake on entities gets in the way too.

* Extinguishing items is now relayed to held/worn items

This means held candles get extinguished too.

Involved moving the core logic of ExtinguishReaction into an event so that it can be relayed via the existing hand/inventory relay logic.

* Add helper functions for subscribing to relayed events.

Use these in FlammableSystem

* Make extinguishers work on cigarettes too

A bunch of renaming to make the rest of my code work with SmokableComponent

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-04-14 19:00:47 +10:00
K-Dynamic
25902b5dd0 Change colour tone of blue and green crayons (#36532)
* change crayon lightblue to blue

* recolour both green and blue to match crayons
2025-04-14 18:58:41 +10:00
YoungThug
dc41bd33f3 Binocular Neck Slots! (#35759)
* binoculartweaks

* WhoNeedsArtApprovalQuestionMark

* Roomba Can You Merge Now?
2025-04-13 23:34:20 -07:00
K-Dynamic
ae3918c268 Adds 10% slowdown to syndicate commander hardsuit (#35805)
commander hardsuit slowdown
2025-04-13 22:37:51 -07:00
chromiumboy
87b6eb55e5 Hotfix for water/fuel tank fixtures (#36527)
Sharing the same fixture layer as walls causes dragged water/fuel tanks to be blocked by things that they really shouldn't be, such as lights and holopads

Being PRed as a hotfix in order to fully finalize #36341
2025-04-13 22:02:29 -07:00
TeenSarlacc
1be56fedf2 Added a crate of shark plushies to cargo (#36338)
* shark time

* cargo

* unfucked a typo maybe

* unfucked a fuckup

---------

Co-authored-by: TeenSarlacc <baddiepro123@gmail.com>
2025-04-14 03:33:04 +02:00
Unisol
021ad0f8e0 New deathmatch map: DM01 Entryway (#31533)
* added plastitanium walls and windows

* Added DM01 Entryway to pool of deathmatch arenas

* replaced non-occluding walls with occluding ones

* added more details and fluff to empty rooms and hallways; added floor drains around the map

* Fixed failing integration test

* fixed YML syntax error causing test failures. What kind of retard thought that using whitespace as structural syntax is a good idea?

* minor map changes

---------

Co-authored-by: Unisol <pavelyakushevich@gmail.com>
2025-04-13 18:21:53 -07:00
Pieter-Jan Briers
7bb35889ce Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-13 23:55:27 +02:00
K-Dynamic
232ade99a9 Remove flash payload from stinger grenades (#36394)
Remove flash payload from stinger
2025-04-13 19:23:35 +02:00
beck-thompson
05f9e6d28e ID card computer bug fixed (And made it more fun!) (#32308)
* First commit

* More feature yay

* comments

* good

* silly me

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-13 17:51:35 +02:00
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