Commit Graph

9452 Commits

Author SHA1 Message Date
Entvari
dee1db4113 Wizard Headset (#35732)
* wizardcomms

* wizheadset

* Addressed requested changes and axed wizard channel due to redundancy.

* oops overlooked this, dont tell anyone

* another mistake fixed

* removed wiz encryption key due to redundancy

* accidentally left some punctuation in a now unrelated meta.json
2025-04-20 17:38:30 -04:00
Jackson Langley
256b6b88fb Require traitors to maroon their objective no matter what (#35825)
* jesus

* okay.

* OOPS

* ok

* ok

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

* ok

* Update Resources/Prototypes/Objectives/paradoxClone.yml

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

* Update Resources/Prototypes/Objectives/base_objectives.yml

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

* m

* ok

* ok

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-20 17:34:19 -04:00
uhbg
94b46a9edc The Bartender can now make Eggnog (#34065)
* Preliminary eggnog changes (egg in shaker crashes?)

* Fixed eggnog reagent name and description

* added - to flavor

* deleted a space

* Added eggnog glass sprite

* changed fill levels to match rsi

* Added two more fill levels to eggnog

* Removed fizziness, changed physical description, and fixed rsi

---------

Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-20 17:27:35 -04:00
Princess Cheeseballs
251cfbd8be Puddle Code Slipping Cleanup (#35845)
* Init Commit

* windows yelling at me to update commit

* working commit, need prediciton and more dehardcoding

* Project 0 warnings

* Working Commit (Near Final)

* ryder got confused commit

* I love Merge Conflicts :)

* Working commit, no prediction

* Forgot the yaml changes

* Comments and typos

* Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default

* Fixed an incorrect divisor

* bit of cleanup

* Prediciton fixed, and puddles now affect all entities

* FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS

* Really big I forgor moment

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Fix all test fails

* code cleanup

* Webedit whitespace

* Code cleaup

* whitespace webedit

* whitespace webedit

* whitespace webedit

* whitespace removal

* Comments and cleanup

* Re-Added 20 warnings as per Ork's request

* Cleanups

* Spacing fix

* bugfixes and cleanup

* Small bugfix

* Actually dirty the slipComp for real

* Added Friction field to Reagent Prototype per design discussion

* Sliding system is kill
2025-04-20 17:27:12 -04:00
Banedon
aeb53a302b Santa hat with a foldable beard (#36510)
* Added foldable component to santa hat

* Modified sprites, modified YAML. YAML is cursed

* Changed santa hat description to mention the beard fold

* Removed HideLayerClothing since it doesnt work

* Changed the prefix from "beard" to "nobeard" to match with the fold/unfold verb

* Credits for sprite changes

---------

Co-authored-by: Lanedon <matth.galvez@gmail>
2025-04-20 17:17:12 -04:00
UBlueberry
1220b8c4c7 Adds beanies to the WinterDrobe! (#32946)
* sprites

* messing with the ymls

* new sprites

* that's a lotta yaml

* make the sprites gooder

* color adjustment

* to the winterdrobe with you

* layering fix
2025-04-20 17:15:34 -04:00
Ed
f6a29e24a2 Markings overhaul (#35938)
* markings displacement setup

* ok i got it!

* fix map updating

* remove trackingLayers

* markings clean up and modernizize

* marking disabling displacements

* markings restriction

* dehihienize

* dehihiniezize 2

* aa

* nice
2025-04-20 17:01:50 -04:00
RedBookcase
aea474d4a9 Pirate Gear Tweaks. (#35986)
* Tweaked pirate gear to be in-line with similar items.

* Added attribution for flashlight sprites, made hardsuits Major Contraband

* Added empty versions of the pirate revolver and flintlock.

* Test fail fix hopefully?

* Test fail fix hopefully V2.0

* Test fail fix hopefully V3.0

* Test fail fix hopefully V4.0

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-20 16:55:42 -04:00
Prole
58fb282023 The Beverage Jug Can Now Look Open (#36070)
* GenJug-Changes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Guh

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Support For the Rest

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* New Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Newest Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
2025-04-20 16:36:22 -04:00
K-Dynamic
d11a10d5ea Nonlethal throwables crate (#35808) 2025-04-20 07:08:02 -07:00
Hyper B
cd6130ce22 Fire protection for ERT engineering hardsuit (#34949) 2025-04-20 07:06:14 -07:00
ScarKy0
2d94045995 Decrease amount of mail, increase profits (#36767)
init
2025-04-20 15:55:23 +02:00
Hyper B
09f3d7f5eb Departmental shelves whitelist expansion (Attempt №3) (#34292)
* Expand-Shelves-Whitelist

Made departmental shelves hold a wider variety of items.

* Accidentally included "Packet" twice
2025-04-20 14:19:11 +02:00
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
Alice4267
a8b954fb0c Fix glass duplication with beakers (#34441)
Update chemistry.yml

Fixing glass dupe.
2025-04-20 14:01:08 +02:00
RedBookcase
05d79667bb Makes more items recyclable. (#35800)
* Makes more items recyclable.

* Added newlines

* Fixed material issues which were NOT MY FAULT

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-20 13:53:37 +02:00
Pgriha
8be4abc3fc Fix head markings under some helmets (#36074)
* 1

* 2
2025-04-20 13:52:31 +02:00
Nox
f4e7601dc9 Descriptions for .35 auto (#36085)
* Initial commit.

* added SMG descriptions

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

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

* Updated descriptions to incorporate Roomba's feedback.

* Slightly changed Viper description

* Minor formatting change

* Updated Atreides description

* Fixed a minor convention mistake in magazines

* Slightly changed the Viper's description to not reveal its manufacturer.

* Updated Drozd description.

* Rerun test

* Updated descriptions in accordance with Roomba's suggestions!

* Updated Viper description!

* Shit I forgot to remove the cartridge length, did it now!

* More smart changes by Roomba

* Tests gaslighting me

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

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

* Updated WT550 description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-20 13:51:27 +02:00
Nox
9d4c97701d Fix some SMG magazines fitting 35 rounds (#34782)
All SMG magazines are now 30 round, rather than half being 35 round.
2025-04-20 13:33:31 +02:00
Helm
edc57cab16 Fix soup (#34633)
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
2025-04-20 11:32:02 +02:00
Cass
39bf2469ad Plurality pin addition (now not on master branch) (#36744) 2025-04-20 00:00:33 -07:00
ArtisticRoomba
8d8398e60d kill filing cabinet heisentests (#36757) 2025-04-20 02:01:28 -04: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
ArtisticRoomba
44925b9be7 Fix spray nozzle not cleaning reagents properly (#35950)
* init, god help us all

* further refining

* final round of bugfixes

* whoopsies

* To file scoped namespace

* first review

* oopsie

* oopsie woopsie

* pie is on my face

* persistence

* datafieldn't

* make PreviousTileRef nullable

* change component to file scoped namespace

* Minor tweaks:

- We clamp the reaction amount to a minimum value because when working with percentages and dividing, we approach numbers like 0.01 and never actually properly delete the entity (because we check for zero). This allows us to react with a minimum amount and cleans things up nicely.
- Minor clarification to comments.
- Rebalancing of the spray nozzle projectile.

* the scug lies!!!!

* undo file scoped namespace in system

* kid named warning

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-04-19 22:41:24 -04:00
Velcroboy
a327a59cb2 Smuggler follow up (#36456)
* Fix Overfilling satchels

* Add notes

* Clearer

* remove line :/

* Reduce by 1 cigars/booze

* fix typo

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-04-19 23:07:49 +02:00
ScarKy0
20841d402f Give salvage borgs a tool module. (#33336)
Init
2025-04-19 16:33:54 -04:00
ScarKy0
66b65314d0 Fix silo rotation (#36737)
Update silo.yml
2025-04-19 14:00:31 -04:00
Minemoder5000
5097ae5e6f Rebalance and reduce playtime requirements for most roles. (#36666) 2025-04-19 11:31: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
claustro305
2201eae899 Removed collision from wall mounted lights and security cameras (#35908)
* Removed collision from wall mounted lights and security cameras

* Updated because I'm dumb and didn't realise the collision groups were case sensitive
2025-04-19 16:29:36 +02: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
Milon
6138fcdce9 Predict and cleanup RingerComponent (#35907)
* clean up most stuff

* move to shared

* works

* shuffle shit around

* oops! access

* fixes

* todo: everything

* SUFFERING

* curse you
2025-04-19 15:55:05 +02:00
Zokkie
35fc2013e3 Flippo Engraved Lighter is now in detective locker (#35165)
Makes the Flipp Engraved Lighter from the detective less obscure to find.
2025-04-19 15:28:30 +02:00
Boaz1111
b435d0f2e6 Reduces handheld security radios range for picking people's messages up. (#34878)
weh
2025-04-19 15:10:43 +02:00
metalgearsloth
63dfd21b14 Predict dumping (#32394)
* Predict dumping

- This got soaped really fucking hard.
- Dumping is predicted, this required disposals to be predicte.d
- Disposals required mailing (because it's tightly coupled), and a smidge of other content systems.
- I also had to fix a compnetworkgenerator issue at the same time so it wouldn't mispredict.

* Fix a bunch of stuff

* nasty merge

* Some reviews

* Some more reviews while I stash

* Fix merge

* Fix merge

* Half of review

* Review

* re(h)f

* lizards

* feexes

* feex
2025-04-19 16:20:40 +10: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
metalgearsloth
72372dc77d Predict gas volume pumps (#33835)
* Predict gas volume pumps

* Also this one

* Review
2025-04-19 11:48:41 +10:00
IProduceWidgets
d69738a9f4 Fix two zombie bugs (#34472)
* fix two zombie bugs

* add comment
2025-04-18 20:38:33 -04: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
ScarKy0
d569c3b73c Make artifact module actually useful. (#33338)
Init
2025-04-18 20:25:29 -04:00
Alpaccalypse
07c1a6fd45 Change 'Irish slammer' to 'Grenade Penguin' (#34181)
* Changed irish slammer to grenade penguin.

* changed DrinkGlass suffix to grenade penguin

* Fixed typo

* Added penguin squawk to reaction

* Added comment as ID differs from localisation

* Minor, post merge fix
2025-04-18 20:24:26 -04:00
Jajsha
a6741e42c1 Un-Hardcode water evaporation & mopping behavior (#33399)
* Un-harcode slipperiness

* Make it actually work

* Prettyfy

* Cleanup GetEvaporatingReagents

* Fix mopping with space lube + wrong solutions in absorbance

* Remove LINQ and rename parameters

* Change evaporation speed to fixedpoint2

* Add evaporating speed functionality

* Remove unused imports

* Swap around reagent evaporation speed and puddle evaporation speed.

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-18 20:11:28 -04:00
OneZerooo0
37f16c3abd Modular Grenades now fit in security belts/carriers (#34169)
* Added PayloadCase component to secbelt whitelist

* Replaced PayloadCase type whitelist with a tag

* fucking hell

* Add HandGrenade tag to all grenades
Grenades are so unbelievably cooked right now. I've counted about 4 separate baseitems that they inherit from whenever they feel like it. Why? They're all the same.

---------

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-18 17:04:44 -07: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
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
Nox
5285eac443 Agent -> Corpsman (#34627) 2025-04-18 12:56:57 -07:00
āda
dbf1363195 Increase base amount of egg in egg-plant (#36693) 2025-04-18 12:52:12 -07:00