test GerritMerge #1

Manually merged

Fenn merged 60 commits from GerritMerge into master 2026-07-30 14:16:34 -07:00

Conversation 2 Commits 60 Files changed 197 +14974 -8528

Drekk commented 2026-07-24 21:58:57 -07:00

Owner

Copy link

About the PR

Why / Balance

Technical details

How to test

Media

Breaking changes

Changelog

## About the PR <!-- What did you change? --> <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> <!-- If your PR closes an open issue put `closes #issuenumber` here so that the accompanying issue is automatically closed--> ## Technical details <!-- Summary of code changes for easier review. --> ## How to test <!-- Describe a procedure to test this feature, along with expected output/behavior. --> ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. --> <!-- :cl: - add: Added fun! - remove: Removed fun! - tweak: Changed fun! - fix: Fixed fun! -->

Drekk added 60 commits 2026-07-24 21:58:57 -07:00

fix: Bumped the priority of vaulting down by 1 ... 8c961eba34

Did this because vaulting was taking priority over actual machine interactions.
Now *most* alt interactionst will beat this out in priority by 1.
Most interactions are priority 0, vaulting is now -1.

Change-Fix: Fixed vaulting on machines taking priority.
Change-Id: I63d16fb7ee28e7ae13a58d95f1bb9d79f9ef7fb4
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/2
Reviewed-by: Lily

Resized throngler plushie to be 4x4 ... 73dc4d74cb

Change-Id: I90069dff542c514bce77f534f55f9622afc7fb7e
Change-Tweak: Resized throngler plushie to be 4x4
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/61
Reviewed-by: Lily

Tweak diphenyl to be less annoying to make ... 66783b3500

Change-Id: Ib772f86895bc9f3f8b0c2ccf9361847908d788fa
Change-Tweak: See https://github.com/ARF-SS13/coyote-frontier/pull/1048
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/63

Kittson II; Bullet fixes; IFF fixes ... 1d63eee06f

Change-Id: If8c02a421b60234cbbc8ee8a139ea96b3f63f0b0
Change-Add: Refreshed the Kittson into the Kittson II.
Change-Tweak: The Kittson II's wiring no longer causes engineers to blow their shit smoove off.
Change-Add: The Kittson II's reactor room has been improved, now coming with a full size reactor!
Change-Remove: The Kittson II no longer comes with reactor fuel rods. Buy them yourself, cheapskate.
Change-Add: The Kittson II now uses an AME as a secondary generator instead of a single superpacman.
Change-Add: Gave the Kittson II back its armoury (that was previously used for the turbine.)
Change-Add: The Kittson II's windows are now electrified with HV wiring.
Change-Tweak: Moved the Kittson II's bluespace stash into the master bedroom.
Change-Tweak: The Kittson II now uses a single air canister instead of mixing O2/N2 to save space.
Change-Add: The Kittson II now comes with an engineering technology fabricator.
Change-Tweak: Changed the Kittson's price to $216,000 spesos.
Change-Tweak: Lowered the Bullet's price to $20,000 spesos. Suck it, Avalon.
Change-Fix: New Bullet, Jabber, Gadfly, and Kittson II units will no longer show up as stations on mass scanners.
Change-Add: The Kittson II now comes with nuclear reactor and gas turbine monitors.
Change-Tweak: Reworked the Kittson II's bridge to be less spread about.
Change-Tweak: The Kittson II's bridge now uses desktop computers (where possible), for style.
Change-Tweak: The Bullet no longer has broken thrusters.
Change-Tweak: The Bullet now has the air canister port recessed, because that was driving me nuts.
Change-Remove: The Bullet however also no longer comes /with/ an air canister. Why are they $3k.
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/64

Add Tape Recorder to the SecVend. ... 94f07f662b

Change-Add: Added Tape Recorder with a Cassette Tape to the Security
Vending Machine

Change-Id: I288e9b427a588f83788058011326929490d14bdc
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/38

fix: fix minilocker construction graph ... 4927f1ce73

Change-Id: I23cbdb73181c8252654252767b493c887f7e47d5
Change-Fix: Minilockers no longer give plasteel
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/33

Tweak: Jerry cans now act as a refueling source ... 29878fab17

Change-Id: If12ac631e2ef8bc76e73f494b7ac43befba5ae59
Change-Tweak: Jerry cans now act as a fuel source for flamethrowers
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/35
Reviewed-by: Lily

Make papers slide under doors ... f38efa6055

Change-Id: Iafaf873966a486b0d95730e0806ff75587bef5cc
Change-Add: Papers and playing cards now slide under the airlocks
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/21

Various cartridge-related additions ... 2aaaf80f58

Change-Id: I60e362dfa61293fae25d004f66a7fb13def1d128
Change-Tweak: Added missing cartridges to some jobs
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/23

Tweak: Renamed RMC ammo chambers to avoid confusion with existing ammo ... 872ac32c6a

Change-Id: I87923522784b61843d670c27cbbd96e7407872f5
Change-Tweak: RMC ammo was renamed to avoid confusion
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/44

Added Untouchable Trait ... 095a25385e

A trait that blocks most physical mechanical interactions such as left-clicking, verbs, and interacts. Hands off!

Change-Add: Untouchable Trait
Co-authored-by: Notarin Steele <424c414e4b@gmail.com>
Change-Id: Ied1808bddb7ddd4e6a542d5dd2447b3983872d6d
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/85

fix rcd ... 7377155acd

Change-Id: Ic0bcd9a34160da98c243e073ca4d22f145dd02d8
Change-Tweak: Diagonal platings now reavailable in the RCD.
Change-Tweak: Moved bare lattice into flooring section.
Change-Fix: Walls and floors no longer use the same name.
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/62

Fix: fixed many gun chambers ... 4a5a1050cc

Change-Id: I4d51ca53abd9d45cc8bc86cf9c16cfd7aab165ec
Change-Fix: Fixed some guns spawning with old calibers
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/22

Standardized all vinyl crates to 1k per disk. ... 13aa147207

Change-Tweak: Standardized Vinyl Crate Prices.

Change-Id: If65f55f39657851fa6a437fd2b74c759790c0f7d
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/89

Increased Hardlight Core Max Player Count ... cf5a8cd7b9

Does exactly what it says- increases Hardlight Core Station's maximum player count from 100 to 150, allowing it to be a selectable option for when there's more than 100 players in the lobby!

Change-Fix: Increased Hardlight Core Max Player Count
Change-Id: I3d40a82bf9ef3c5fb2f232f5b56f816268e4cf32
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/87

Bounties Skippable For Quartermasters ... 3fa3944e45

Reverted the Monolith change and returned Cargonia's power of controlling the flow of money through Cargo's bounty console, allowing Quartermasters to skip bounties! Sadly you can only skip one bounty at a time every 15 mintues, but we'll see how this goes!

Change-Fix: Bounties Skippable For Quartermasters
Change-Id: I80fd7a4f085f20c68b84f62cd824c3aa6aa15954
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/86

Changelog: 63a74b9ce9 ... 56f55754fc

Change-Id: Ie38d435145c41b240b6e9685f0eb6d33abed8674
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/82

fix: Switched the perm for spawning items to use the spawn admin flag ... ef900d64ef

Change-Id: I594eb3a2ec8d7d75ca97f5c102f69167fbcf7d90
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/36
Reviewed-by: Cheep

Update core.yml ... 69dbdb63c8

Change-Tweak: Misc patches to core station
Change-Add: New maints area
Change-Id: I0c86658e9011bd683c388b1a26af1d41df8d3dc7
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/83
Reviewed-by: Cheep

Box Station Cargo Sell Console Fix ... 500d8970db

Fixes Cargo's sell console on Box Station so you can actually profit from sales now!

Previously, Box Station had ComputerPalletConsole mapped to it, but that was replaced with the correct console being PalletConsoleNFNormalMarket, which sells at the market rate and returns money upon sales properly.

Change-Fix: Box Station Sell Console
Change-Id: I8256f4e3809b35c85e4cac35c0df297b512d2de4
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/88

Fixed Drinks not being analyzable by the chem goggles ... 579d57c10c

Change-Tweak: Chem Goggles can now see inside bottles and cans
Change-Id: I67e7ee0518dc2b631f3753f737051418d83346e2
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/41

Fixed chat bubbles all showing at once when you see a player ... cc2b71390d

Change-Fix: Fixed chat bubbles flooding your screen when entering a room!
Change-Id: Ibce167dcfb6565dbb7dd6a39f8b0ba037288ad7c
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/42

Fix Vampirism causing a bunch of client-side lag ... df34b724a5

Change-Fix: Fixed Vampirism trait causing client-side delays.
Change-Id: Iac276b33849645edca195af36d66fcc7a9352bbc
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/43

Fixed trying to stun carps making the UI implode ... 2e18649f32

Change-Fix: Shooting carps with a disabler no longer breaks your screen
Change-Id: I90e71b94c6a256ec5338f12ef77c4b71d84524a3
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/40

Add Stomachs to the Surgery System. ... c85f649ba0

Change-Add: Stomachs can now be replaced via surgery
Change-Id: I870e979ba47b95d2488dac863aabe6c8bc03dcf9
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/39

Removed duplicated changelog entries ... 8f2d22f343

Change-Id: I2d76b1d0e16f85f393d24f411b90c89ab1af1e76
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/102

Changelog: a305bbfebe ... 7a495db499

Change-Id: Ie5116cf7dcf1e5f54099f6851df7415d9eab1b93
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/103

Add Neuroshock Gloves to the MercVend. ... 7391cbe4a1

Change-Add: Added Neuroshock Gloves to the Mercenary Vending Machine.
Change-Id: I1250915f6e100f1c5c01281b4c20ab3fe868d1aa
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/90
Balance-Impact: Cheep

tweak: Some stuff now pierces hardsuits ... 87b9af252a

Change-Id: I35e814f1a2d7b230269b164b99ca3931051dddd0
Change-Tweak: Medipens and some hyposprays can now pierce hardsuits
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/24

Removal of frezon/Tritium from plant mutations ... 8e1eb811dd

Change-Tweak: Removes Frezon,Tritium from Plant Mutations
Change-Id: I0995cb8411b04ab4024411684a2d49b5e1e26313
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/122

Fixed small regression from missing syntax ... bd9bb8a2f5

Change-Id: I5244fa6c02c6bbaf218808d8e9c6e25dc80b436a

Added captain and hydro magboots under magbootrecolors yml ... b66f2e7fda

Change-Add: Added captain's and hydroponics magboots.
Change-Id: I36ce6c7f0044d703bd7b2736a6a2fce6039adfcb
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/108

adding magboots to places ... 6e10713da0

Change-Tweak: Mapped the new magboots.
Change-Id: I1fc7b6fcb1df923e82afd55120db26db2f683a51
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/109

Injector collars can only be worn on the neck ... 5afabfea4f

Change-Remove: Removed the ability to equi injector collars as an accessory.
Change-Fix: Injector collars now can only be worn on the neck, removing the doafter bypass.
Change-Id: I149215e38ba802781103aecef527a9a139e9818e
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/121
Reviewed-by: Cheep

Mechanites metabolism rate sped up ... 217d597f9c

Change-Tweak: Mechanites metabolism rate 0.1 -> 0.5
Change-Id: I0e60a19888d86b0aab16cb18aa746860d2065f2f
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/107
Reviewed-by: Cheep

Changelog: c14ea46d5c ... b1f3dfc6e4

Change-Id: I373bef07bae1bd17d6f9c3b451781e6d4f193229
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/125

Give cyborgs traits ... 04fc098127

Change-Tweak: Cyborgs can now wear collars
Change-Id: Iaeaa40cc78de3d36dbcf6ebbf8057bd6a824da2d
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/141

Cyborgs can now wear governor collar; all borgs can wear medals ... 51356388e1

Change-Add: All cyborgs can now wear governor collars and medals
Change-Id: I8520ee5026b303ebafcf9253690f61bfaf491e08
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/142

Governor collar now slows down the wearer ... 0e6c7ad6b4

Change-Tweak: Governor collar now slows down the wearer
Change-Id: Idef9b4afead41187adbeca600e5656ff4c05fb66
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/143

Fix incorrect collar sprites on quadborgs ... 3606c756e2

Change-Fix: Fix incorrect collar sprites on quadborgs
Change-Id: Ib36c01d9235eec8d94a5b6822a60aa1276d03629
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/144

Fixes governor collar corrupted laws showing placeholder string ... fb68ed5d30

Change-Fix: Fix governor collar corrupted laws showing placeholder string
Change-Id: I5134b18aae7863f8278d7a9469fdaa4735c57fcc
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/145

Added basalt decals ... 2f707db3be

Change-Add: Basalt tile decals
Change-Id: I5f05a44923c8d81a263b23d65e073a5ed5cb7f75
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/211

Changelog: 4f7a060387 ... e93e89b572

Change-Id: Ie87949ba0b4aad7191fa96ba756c44e4251f6893
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/263

Make Synths Not Green ... 563869cfb2

Change-Tweak: Changes synth default skin tone from green to Urist beige.
Change-Id: Ibd1bdad5ef43061a89a734449a850b67056ab1f0
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/213
Reviewed-by: Notarin <424c414e4b@gmail.com>

Fix Synth CCU Languages ... eacfd5e491

Change-Fix: Fixed Synth CCU entities not having the correct languages, Sol Common and EAL.
Change-Id: Ib74fe68c81f52d6de630e16f3f9b742f559823f9
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/262
Reviewed-by: Notarin <424c414e4b@gmail.com>

Added cards ... cc0c07382a

Change-Add: Add Ratvar's rows cards
Change-Id: I658c09a905c9e1c33f508f3d20ad6ce70ca8df8f
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/202
Reviewed-by: Notarin <424c414e4b@gmail.com>

Added card packs and card box ... 2cf8ce6430

Change-Add: ratvar's rows card box
Change-Add: ratvar's rows booster packs
Change-Id: I4b16af3e28248c680d1a5c773860bb06ea57224a
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/203
Reviewed-by: xiv3n <xiven93@gmail.com>

fix(noncon): fix noncon marker showing aggressor when nothing is selected ... 2b4de86233

Change-Fix: fix noncon marker showing aggressor when nothing is selected
Change-Id: I77c4affaabfe8ca1d1a3360380b009798c47f730
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/386
Reviewed-by: xiv3n <xiven93@gmail.com>

Formatted changelog ... 31f2753374

Dependency that generates the changelog updated.
Now it has newer formatting rules.
Will use a project formatter instead
when we get or merge one.

Change-Id: I54e4cee8854b09c239e8c09d19eae9dc32a26eb3
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/409

Changelog: b33454a3fe63fd2a3a53785989bed865c0527f0d ... c580624bb0

Change-Id: I927497d99a1817d7e3f18c42e771640b040ab1f5
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/410

Tweak: Cyan Cephalofrogs ... 2d251bc705

Skrell needed their lore-accurate hemocyanin (copper-based blue blood), and have the organs to go with them now! Don't forgot to use copper pills instead of iron from here on out if you treat their bloodloss orally! Unfortunately, having blue blood won't guarantee you that blue-collar job you've always wanted. But you could probably make a good music video about it! Da ba dee, da ba di.

Change-Tweak: Lore-Accurate Copper-Based Blood for Skrell (Use copper pills for bloodloss!)
Change-Tweak: Lore-Accurate Blue Skrell Organs
Co-authored-by: Notarin Steele <424c414e4b@gmail.com>
Change-Id: Ib232ea454378abff6d68236de95ed1a9fe07ae87
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/413
Reviewed-by: Notarin <424c414e4b@gmail.com>

Add new shadekin sounds ... 8d372955e6

Change-Add: New laugh, cry and speech for shadekin.
Change-Id: Id9d15a7b8a57244c81af7df124d21d7bb7b64daf
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/461
Reviewed-by: Notarin <424c414e4b@gmail.com>

Fix: Untouchable Trait - Hugging Is Legal Again! ... e5e63f3f9f

Fixes the Untouchable trait, allowing those without the trait to hug one another again. The strip UI that pops up when attempting to hug/pet an Untouchable character has also been replaced with a flavor popup to let you know why hugging (and now passive pulling) doesn't work on those with the trait!

Change-Fix: Untouchable Trait Global Hug Fix
Co-authored-by: Kronyxxx
Change-Id: I3e6febd4e168b2ebdf7e44297a1254e397923af1
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/403
Reviewed-by: Notarin <424c414e4b@gmail.com>

added suits to passenger + geneticist shelegs, removed redundant ContractorForcedOuterClothing ... fda127461a

Change-Tweak: Sheleg passengers and geneticists get suits on roundstart.
Change-Id: I8a32ad433d40e9e18fb0a515fe227e4797163666
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/342
Reviewed-by: Notarin <424c414e4b@gmail.com>

Changes the Holy Empire of the Lords Golden Grace to Harpy Defense Systems. ... 5036a9b0b4

Change-Tweak: Changes the company of the "Empire" to "HDS"
Change-Id: Ib82df5759cceff8bd56211e5764d848f62bb7dbb
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/441
Reviewed-by: Notarin <424c414e4b@gmail.com>

fix(localization): add missing localization and fix capitalization ... 889296ccc9

Change-Fix: Add missing localizations and fix Amoxla capitalization
Change-Id: I2401bcdd9a79ab97a0ac972f58fdbe9e87f10078
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/387
Reviewed-by: Notarin <424c414e4b@gmail.com>

fix(localization): add missing nanochat localization ... 384e241f76

Change-Fix: Add missing NanoChat localization
Change-Id: I21070ddb36af845b6d04404a54ae026a847f8771
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/388
Reviewed-by: Notarin <424c414e4b@gmail.com>

Fake Holocigs ... 49b5b7ed81

Change-Add: Added an unobtainable (and fake) lit holo-cigar.
Change-Tweak: Chameleon masks can now be disguised as lit and unlit holo-cigars.
Change-Id: Ie04349282ce03f43b29d2090a2fad3590f221442
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/421
Reviewed-by: Notarin <424c414e4b@gmail.com>

Changelog: ba2ccea88f ... 6cdfdc0f1f

Change-Id: Id26649c7f82cdd677a764a6d157e536569b02dea
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/463

Alteration/fix of fae fox ears, minor cosmetic work to swap a primary and secondary color ... 5795496a58

Change-Add: Fae fox ears color alteration
Change-Id: I354100bdff34b4d2661eb93272e18043b762d1e2
Reviewed-on: https://hl.squishcat.net/c/HardLight/+/407
Reviewed-by: Notarin <424c414e4b@gmail.com>

Drekk added the

bug

label 2026-07-25 00:34:55 -07:00

Drekk commented 2026-07-25 02:12:08 -07:00

Author

Owner

Copy link

Test comment aaaa

Test comment aaaa

Drekk added the

Audio

FTL

Sprites

UI

YML

labels 2026-07-25 07:55:17 -07:00

Drekk force-pushed GerritMerge from 5795496a58 to 01c345db48 2026-07-25 19:07:35 -07:00 Compare

Fenn added 3 commits 2026-07-27 13:32:32 -07:00

CI Test Rework for Forgejo 445514a3c6

Merge pull request 'CI Test Rework for Forgejo' (#4300) from Drekk/HardLight:CITestPorting into master ... 37f5e273b1

Reviewed-on: HardLight/HardLight#4300

Merge branch 'master' into GerritMerge 96d61557ad

forgejo-actions commented 2026-07-27 18:32:26 -07:00

Copy link

RSI Diff Bot; head commit 96d61557ad merging into 7b9dead78a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Floof/Mobs/Customization/skyratears.rsi

State	Old	New	Status
m_ears_faefox_primary			modified
m_ears_faefox_secondary			modified
m_ears_faefox_tertiary			modified

Resources/Textures/_HL/Objects/Fun/ratvar.rsi

State	Old	New	Status
bag-fill-1			added
bag-fill-2			added
bag-fill-3			added
bag-fill-4			added
bag-fill-5			added
booster_pack			added
booster_pack_overlay			added
booster_pack_trash			added
deck_storage_box			added
deck_storage_box_open			added
prize_booster_pack			added
starter_booster_pack			added
syndicate_booster_pack			added
a			added
crystal_background_blue			added
crystal_background_red			added
five			added
four			added
gold_background_blue			added
gold_background_red			added
normal_background_blue			added
normal_background_red			added
one			added
seven			added
six			added
three			added
two			added

Resources/Textures/_HL/Decals/tile-patch.rsi

State	Old	New	Status
floor-basalt			added

Resources/Textures/_HL/Clothing/Shoes/magboots_captain.rsi

State	Old	New	Status
equipped-FEET-vox			added
equipped-FEET			added
icon-on			added
icon			added
inhand-left			added
inhand-right			added
on-equipped-FEET-vox			added
on-equipped-FEET			added
on-inhand-left			added
on-inhand-right			added

Resources/Textures/_HL/Clothing/Shoes/magboots_hydro.rsi

State	Old	New	Status
equipped-FEET-vox			added
equipped-FEET			added
icon-on			added
icon			added
inhand-left			added
inhand-right			added
on-equipped-FEET-vox			added
on-equipped-FEET			added
on-inhand-left			added
on-inhand-right			added

Resources/Textures/Clothing/Hands/Gloves/neuroshockgloves.rsi

State	Old	New	Status
equipped-HAND			added
icon			added
inhand-left			added
inhand-right			added

RSI Diff Bot; head commit 96d61557ad433f5a4172e426f99f6d2afe377f3f merging into 7b9dead78aa487b498801585de632f2e950b3dd7 This PR makes changes to 1 or more RSIs. Here is a summary of all changes:<details><summary>Resources/Textures/_Floof/Mobs/Customization/skyratears.rsi</summary> <p> | State | Old | New | Status | --- | --- | --- | --- | | m_ears_faefox_primary |  |  | modified | m_ears_faefox_secondary |  |  | modified | m_ears_faefox_tertiary |  |  | modified </p> </details><details><summary>Resources/Textures/_HL/Objects/Fun/ratvar.rsi</summary> <p> | State | Old | New | Status | --- | --- | --- | --- | | bag-fill-1 | ![]() |  | added | bag-fill-2 | ![]() |  | added | bag-fill-3 | ![]() |  | added | bag-fill-4 | ![]() |  | added | bag-fill-5 | ![]() |  | added | booster_pack | ![]() |  | added | booster_pack_overlay | ![]() |  | added | booster_pack_trash | ![]() |  | added | deck_storage_box | ![]() |  | added | deck_storage_box_open | ![]() |  | added | prize_booster_pack | ![]() |  | added | starter_booster_pack | ![]() |  | added | syndicate_booster_pack | ![]() |  | added | a | ![]() |  | added | crystal_background_blue | ![]() |  | added | crystal_background_red | ![]() |  | added | five | ![]() |  | added | four | ![]() |  | added | gold_background_blue | ![]() |  | added | gold_background_red | ![]() |  | added | normal_background_blue | ![]() |  | added | normal_background_red | ![]() |  | added | one | ![]() |  | added | seven | ![]() |  | added | six | ![]() |  | added | three | ![]() |  | added | two | ![]() |  | added </p> </details><details><summary>Resources/Textures/_HL/Decals/tile-patch.rsi</summary> <p> | State | Old | New | Status | --- | --- | --- | --- | | floor-basalt | ![]() |  | added </p> </details><details><summary>Resources/Textures/_HL/Clothing/Shoes/magboots_captain.rsi</summary> <p> | State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-vox | ![]() |  | added | equipped-FEET | ![]() |  | added | icon-on | ![]() |  | added | icon | ![]() |  | added | inhand-left | ![]() |  | added | inhand-right | ![]() |  | added | on-equipped-FEET-vox | ![]() |  | added | on-equipped-FEET | ![]() |  | added | on-inhand-left | ![]() |  | added | on-inhand-right | ![]() |  | added </p> </details><details><summary>Resources/Textures/_HL/Clothing/Shoes/magboots_hydro.rsi</summary> <p> | State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-vox | ![]() |  | added | equipped-FEET | ![]() |  | added | icon-on | ![]() |  | added | icon | ![]() |  | added | inhand-left | ![]() |  | added | inhand-right | ![]() |  | added | on-equipped-FEET-vox | ![]() |  | added | on-equipped-FEET | ![]() |  | added | on-inhand-left | ![]() |  | added | on-inhand-right | ![]() |  | added </p> </details><details><summary>Resources/Textures/Clothing/Hands/Gloves/neuroshockgloves.rsi</summary> <p> | State | Old | New | Status | --- | --- | --- | --- | | equipped-HAND | ![]() |  | added | icon | ![]() |  | added | inhand-left | ![]() |  | added | inhand-right | ![]() |  | added </p> </details>

Drekk added 1 commit 2026-07-27 23:26:43 -07:00

Merged the two shadekin files and added a sound source 9696c51189

Fenn manually merged commit ef39d9a228 into master 2026-07-30 14:16:34 -07:00

Drekk referenced this pull request from a commit 2026-08-16 18:01:36 -07:00

Merge pull request 'Add the Drone lewd trait' (#1) from drone-trait into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Audio

  

bug

test 111

  

DB Migration

  

Docs

  

FTL

  

Map-Admin

  

Map-Bluespace

  

Map-Dungeon

  

Map-Outpost

  

Map-POI

  

Map-Shuttle

  

No C#

  

Shaders

  

size

L

  

size

M

  

size

S

  

size

XL

  

size

XS

  

Sprites

  

UI

  

YML

No labels

Audio

bug

DB Migration

Docs

FTL

Map-Admin

Map-Bluespace

Map-Dungeon

Map-Outpost

Map-POI

Map-Shuttle

No C#

Shaders

size

L

size

M

size

S

size

XL

size

XS

Sprites

UI

YML

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

3 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

Drekk/HardLight!1

No description provided.