Commit Graph

2773 Commits

Author SHA1 Message Date
TakoDragon
056b25d01a Salvage Airlock (#36375)
* Salvage

* atmos a

* more muted colours

* Mapping Related to AI

* Fixed small naming inconsistency

* Revert "Fixed small naming inconsistency"

This reverts commit 985e1fd46a09e521c11dc345f470228e7907fbb9.

* Revert "Mapping Related to AI"

This reverts commit 5d5ae4feb819396c5c2a7413399ab5ce34f8683b.

* Revert "atmos a"

This reverts commit 529831e2584df27fa102ee1c970948fa3b6bab56.

* indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-20 14:03:46 +02:00
Pgriha
097aff5e58 Heterochromia for Moth (#36061)
* 1

* Fix local

* formatting

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-20 14:03:37 +02:00
Cass
39bf2469ad Plurality pin addition (now not on master branch) (#36744) 2025-04-20 00:00:33 -07:00
Alzore
d7c244293c Aquatic tail and back fin markings for lizards (#33219)
* shark tail and back fin for lizards

* credit me
2025-04-20 15:57:01 +10:00
SeamLesss
511467f94a Scarf Resprite (#35446)
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* all of em

* better scarfs
2025-04-19 20:17:38 -04:00
Ps3Moira
d984259db6 Removed Interior Shuttle Walls (#34261)
* Removed Interior Shuttle Walls

* Update migration.yml

* Update walls.yml

* Update girder.yml

* Fix Migration

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-19 10:41:35 -04:00
GrownSamoyedDog
36999e5a06 Gave Bartender Pineapple Juice Cartons (#34769)
pineapple juice core pina colada maxxed
2025-04-19 10:25:09 -04:00
Southbridge
aa5d344a57 ERT Janitor Weapon - Hydra (#34416)
* checkpointing work

* Got this fully working and all sprites done

* Exchanged my sprites with the ones made by AugustSun

* Changed the name to Hydra Launcher, and adjusted it to function like a revolver instead.

* Modified the hydra to be a revolver

* fixed container issue

* Swapped in even newer sprites

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-19 16:03:05 +02:00
Ko4ergaPunk
34cc49c175 Add new color turtlenecks in WinterDrobe (#32920) 2025-04-18 22:14:50 -07:00
SharkSnake98
9599f582f3 New Drinks (#36287)
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
2025-04-18 22:12:10 -07:00
August Sun
d0c2a64436 Resprited the Chief Engineer's mantle/manica (#36697)
* Swapped sprites, updated JSON and name/description of item

* Change RSI meta.json spacing

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-19 02:26:23 +02:00
Nemanja
f8ff7aee92 Local Material Silo (#36492)
* Material Silo

* fix board, fix copyright

* a bit of review.... for the vibe....

* a tiny bit of review

* 4 spaced

* sloths no good very tiny nitpick

* fix ui flickers

* oops

* slightly lower range

* Sloth Review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-04-19 09:43:17 +10:00
ScarKy0
3957bbb97d Updated air scrubber and air vent sprites. (#34223)
* vents

* slower animation

* formatting fix

* scrubber
2025-04-18 19:34:59 -04:00
YoungThug
44b8b3e5ce New Speech Indicators for species that don't have any. (#36126)
* DionaAndGingerbread

* DionaSpeechTweaks

* FixGingerbread

* IfYourReadingThisYouMatter
2025-04-19 09:19:04 +10:00
Minemoder5000
dd35318a87 Fix slime hand gradient not showing on the opposite side of the body (#36543)
fix gradient color not showing on other side of body
2025-04-18 17:41:30 -04:00
Centronias
98f9149883 Add inhand sprites for the drink shaker (#36382)
* Add inhand sprites for the drink shaker

* Update Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json

oop that's not actually their discord name

* Co-Authored-By: Failed <158702813+failed5@users.noreply.github.com>
2025-04-18 10:12:37 -07:00
Ciarán Walsh
ab1bcfe391 Implement client-side theming for OutputPanel scroll-down button. (#35913)
* Implement client-side theming for OutputPanel scroll-down button.

* Use OutputPanel constant for button class name

* Remove unused string

* Enable scroll button for ChatBox

* Update RobustToolbox

* Update to merged RT version
2025-04-18 17:42:59 +10:00
T-Stalker
4d457db9e9 Add Experiment plushie (#36663)
* Plushie

* Add to fills and fix license

* minor spelling issue
2025-04-18 12:38:34 +10:00
Killerqu00
e0308d0913 Contraband examine changes (again) (#36032)
* g

* no one caught it in review, damn
2025-04-18 11:23:02 +10:00
Alexandre Courtin
6c1b350c12 Banjo can now be worn on your back. (#34057)
* Banjo can now be worn on your back

* Added banjo backpack sprite

* Reduced banjo backpack sprite size

* Added my username to copyright

* 2nd try banjo backpack sprite

* 3rd banjo backpack sprite

* EmoGarbage Review - Adjust Strap Color

---------

Co-authored-by: Hoodie <hoodie>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-17 16:05:27 +02:00
Jacktastic09
e16365d1bf Add Solid Headband (#36650)
* Added The Solid Headband, avaliable from hacked clothesmates

* Added The Solid Headband, avaliable from hacked clothesmates
2025-04-17 09:43:44 -04:00
ScarKy0
bfe739e0af Hydroponic trays can now be bought (#36630) 2025-04-16 16:51:00 -07:00
SpaceRox1244
6ef5f8e2f1 Adds handheld artifact container to cargo orders (#33327)
* Adds handheld artifact container

* Adds inhands and missing details

* Reduces use delay on unlocking and opening hand arti container

* Adds handheld arti container to cargo orders

* Fixes build error i think

* Removes extra whitespace

* Adds static price to handheld arti container
2025-04-16 19:35:57 -04:00
Mercer Bray
31185fbff3 Added Junkeys (#34121)
* Added Junkeys

Monkeys can now tote the syndicate Juggernaut suit! With a nifty little sprite.

Update meta.json

Update Equipped-HELMET-monkey.png

Delete Equipped-HELMET-monkey.png

Create equipped-HELMET-monkey.png

* Update meta.json

Credit attributed.

* Update meta.json

Credited edit.
2025-04-16 19:14:28 -04:00
SeamLesss
557e5b3a10 Standardize In-hand Sprites for Gloves (#35997)
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* glove inhands

* wrong side

* attribution hell

* slight tweaks

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-04-17 00:15:37 +02:00
mubururu_
2b845c70c7 space adder sprite cleanup (#36584) 2025-04-16 15:14:48 -07:00
Linkbro
0d70d6bfdf New Sprites for cables (#34955)
* initial textures

* Makes it have layers because Milon wanted it

* Makes it have layers because Milon wanted it

* in do NOT understand github

* tested, works

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* remove extra newline

* EmoGarbage Review - Adjust MV cables to use orange stripes

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-16 16:26:25 -04:00
ScarKy0
56412d4b4e Basic Resources Crate (#36419)
* init

* 1660

* I never webedit

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-04-16 15:20:36 -04:00
ArtisticRoomba
a94f64d942 New Arsenal T3: Temperature Gun Revitalization (#35447)
* tempgun real

* fixin shit

* Warios Couch

* fix tests. i hope

* add to lathes

* tests begone

* RIP svalinn

* maintainer for the project btw

---------

Co-authored-by: Flareguy <woaj9999@outlook.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
2025-04-16 13:58:35 -04:00
RedBookcase
ca1e5e0942 Blueprint tweaks. (#36609)
* Blueprint tweaks.

* Inhand fixes.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-16 12:12:22 +02:00
Flareguy
92b0f62500 New Experimental Science T3: Desynchronizer (#35752)
* desynchronizer real

* yaml stuff from slarti branch

* C# stuff

* oops

* review

* improve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-16 11:33:39 +10:00
Minemoder5000
28e3660e37 Remove elite and juggernaut hardsuits from traitor uplink, add elite webvest (#36225) 2025-04-15 14:39:18 -07:00
TheProNoob678
f611b6ea5e Inhand sprites for figurines (#36017)
* figurine sprite update

* Updated meta.json to credit inhand sprites

* Update meta.json to credit inhand sprites

* Updated meta.json because crlf check

* potentially fixing CRLF issues in meta.json + consistent spacing

* Fix CRLF, maybe?

* properly credited myself for all my amazing work in the community

* Reformat meta.json as per the newly merged "fix as you go" procedure.

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-14 21:15:49 -07:00
Fildrance
d38042a0c0 3mo xeno archeology (first phase) (#33370)
* DAG Adjacency Matrix & Tests

* Fix sandbox type errors

* First pass on procgen

* Procgen adjustments

* Networking

* Cruft and god and beauty and analysis console

* convert to data types that dont make me want to kill myself

* starting work on console UI

* drawing nodes n shit

* damn that ui FUCKS

* XAT

* Add a bunch of basic triggers

* Fix trigger gen

* Add node info into the analysis console UI

* Add node unlocking

* more trigger cuz thats pretty cool

* final triggers + incorporate gnostic faith

* some ui changes, mostly

* Fix orphaned procgen segments

* its not random dipshit

* yeah... this one will make pjb happy....

* we call it a day for the UI

* imagine... shared power code...

* extraction WIP but we gotta sidequest momentarily

* oh hey would you look at that its the actual functionality

* distrotrased

* Small departure for randomness.

* ok yep yep indeed that is an effect very cool.

* thanos snap oldcode

* fuck it we ball

* feat: node scanner now displays triggered nodes. Removed unused old artifact systems and related code (most of it). xml-doc and minor fixups.

* refactor: most of preparations, cleanup and groundwork. also segment-related tests

* feature: all basic effects returning

* feat: finished effects lits, created weight lists for struct and handheld artifacts, fixed throw trigger and music ApplyComponent artifact effects not working

* feat: prevent non-first-time-predicted calls in shared artifact effect systems

* fix: remove gun effect from artifact effects - as it interferes with 'activate artefact' action

* fix: foam reagent selection, neat ApplyComponents art effect scenarios, handheld art is RadiationReceiver again

* fix: moved spawn/ pry&throw effect systems back to server part of code - entity duplication bugs were not quite fun

* refactor: fix protos

* refactor: fix linter

* fix: fix old artifact component names in yml

* fix: no more throwing error on artifact spawn with empty XAEFoamComponent.Reagents

* fix: removed old component usage in maps

* fix: remove more deleted components from map

* fix: ContainerContainer is now part of initial artifact entity, it won't be affecting UninitializedSaveTest

* refactor: fix tests, add loc description to toolshed commands

* Changed node scanner to tell the whole story about current artifact state

* refactor: remove excessive get of EntityCoordinates in XAE systems, removed Value access in NodeScannerDisplay

* fix: turned off TriggerInteraction, removed XAESpawn usage and system, EmpSystem now can use EntityCoordinates,

* fix: moved SharedXenoArtifactSystem.CancelUnlockingOnGraphStructureChange into RebuildXenoArtifactMetaData to lessen code coupling

* fix: XenoArtifactEffectJunkSpawn moved invalid rolls declaration

* refactor: set default value for XenoArtifactComponent.EffectsTable for tests

* fix: now explosions XAE can be activated for effect

* refactor: added some usedelay so artifactuse would'nt be spammed

* refactor: artifact-related hints improvements

* fix: artifact no longer spawns fauna into itself

* refactor: xml-doc and minor refactoring

* refactor: xml-doc for Xeno Artifact systems, renaming of questionable XAT systems

* map for playtest, TODO REVERT THIS

* fix: magboots trigger art from a mile

* refactor: bind artifact animation to unlocking state

* feat: radiation dmg now have reference to source (and artifacts won't irradiate themselves)

* fix: random artifact node durability now is rolled for max and not current value

* refactor: gas effects are more rare, hand-held artifact effects are filtered properly now, rad dmg trigger now requires only 20 dmg for activation

* feat: animations and sound effects for artifact force-use and failed finish of unlocking phase

* use only 1 file with art use animation

* refactor: minor artifact dmg triggers tuning

* feat: now nodes that CAN be unlocked are displayed with specific color in console.

* feat: now unlocking stage time is dynamic and it depends on amount of triggers player activated correctly. Failed one stops incrementing

* feat: now non-active unlocked nodes return more points if durability was not wasted

* feat: now puddle/foam effects change description of node

* fix: fix test failure

* refactor: renamed phasing effect, fixed failing test for elkridge

* minor balance changes

* refactor: split rare materials into separate effects

* feat: unlocked nodes without successor wont listen to unlocks, node unlock is not activating node

* fix: removed OnIrradiatedEvent duplicate c-tor

* revert changes of reach for playtest

* revert last row empty line removal on reach.yml

* fix: fix PVS bug, born from attempt to relay event to art nodes that were not synced yet to the client

* fix: fix elkridge for tests (again)

* refactor: xml-doc, more stuff predicted, allocation optimization in XAE/XAT systems

* refactor: naming

* refactor: extract variable refactor for XAEApplyComponentsSystem.OnActivated insides

* fix: duplicate xeno artifact unlocking sound fixed

* feat: CreatePuddle xeno artifact effect now can have min and max borders for chamicals to be drafted, minor XAECreatePuddleSystem refactor

* feat: networking for shared XAE components + xml-doc leftovers

* refactor: more xml-doc, fix XAEApplyComponentsComponent.Components not being serializable but trying to be

* refactor: xml-docs and XAEThrowThingsAroundSystem now uses circle and not box for prying tiles

* refactor: xml-docs, minor refactors

* revert XenoArtifactCommand.ArtifactPrototype being PrototId

* refactor: simplify the way ExtractionResearchLabel works

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-04-15 10:34:53 +10:00
Will-Oliver-Br
1a95418e94 Now you can see if there's a beaker in the chemmaster (#36472)
* fix

* fix

* Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-14 16:27:46 -07:00
Southbridge
1947b47d92 Amber Station - Small Improvements (#36335) 2025-04-14 11:58:21 -07:00
SlamBamActionman
69f9d531f9 Add SolutionContainerVisuals to the hypospray (#30703)
* Hypovisuals

* Syndie hypo

* Include attribution
2025-04-14 08:58:55 -07:00
YoungThug
dc41bd33f3 Binocular Neck Slots! (#35759)
* binoculartweaks

* WhoNeedsArtApprovalQuestionMark

* Roomba Can You Merge Now?
2025-04-13 23:34:20 -07: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
Pieter-Jan Briers
e6e60dead4 Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-11 23:30:52 +02:00
Tiniest Shark
d50703d7a4 Hypospray Inhand Fix (#36452)
* fixed the cmo hypospray inhands

* whoops it was the gorlex one too
2025-04-11 02:53:31 +02: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
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
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
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
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
MisterImp
899d318f01 New food recipe: World Peazza (#35191)
* added world peazza

* fixed a comma in the pizza sprite json

* changed attribution comment on ArtisticRoomba's suggestion

* restored accidentally deleted line, thanks Tayrtahn
2025-04-01 16:26:53 -07:00
ScarKy0
115313dded Undetermined thieving satchel (#36201)
* yippee!

* no toolboxes allowed

* sprite, descriptions
2025-03-31 15:32:31 -07:00
UBlueberry
489f91dafd "I'm Weh-cellent" Cap (#28573)
* copy pasted fishcap.rsi

* added the sprites

* credited myself

* added it to the hats.yml list

* meh, make the spites look nicer

* hopefully this fixes that

* yeah that makes sense

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

* that too

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

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-03-29 12:59:43 +01:00