Commit Graph

9480 Commits

Author SHA1 Message Date
Winkarst
3ac8bc71f1 Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-22 23:31:42 -07:00
Smith
82bc2a728c Four new food crates for the ATS (#33286)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-22 22:37:09 -07:00
kosticia
2076e8b02d Moth-pockets (#34517)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-22 22:36:54 -07:00
lzk
638ee7aa2c elemental.yml & asteroid.yml cleanup (#36448) 2025-04-22 21:42:08 -07:00
Vladislav Suchkov
00af8f96f6 Fix construction orientation being ignored for some objects (#36488)
* fixes

* removed empty "SnapToGrid"s and parent "completed"s
2025-04-22 21:58:42 -04:00
Princess Cheeseballs
db922024be Give Admins "Tails" (#36842)
One line yaml change
2025-04-22 21:25:12 -04:00
poklj
7e63b397cf Nerf Firelock electronic prices (#33469)
* Nerf Firelock electronic prices

- make firelock electronics price half of the input cost to make one
(27) rounded up

* Why does firelock make glass?

- remove the Physical composition of glass from
FirelockElectronics as the input does not contain glass
and the output cannot contain half a steel and plastic

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-22 19:53:42 -04:00
Hanz
6cc53e3e1c Ashtray staticPack fix (#36835)
Ashes to Ashes

God I love staticPacks
2025-04-22 13:34:29 -07:00
Southbridge
1e794a30d0 Cherry Pick Round-start Solar Variation (#36825)
* Roundstart Variation for Solar Panels (#86)

* Added roundstart variation for solar panels

* Removed HV cable spawner since i don't want to bother with mapping them

* Solar Panel Variation Pass Fix (#96)

Added a second variation pass for regular solar assemblies, since otherwise they would spawn both it and the broken variety

* Reorganized everything to no longer be in the _Moffstation subdirectory

* Removed a forgotten tag for Moffstation

* Removed the moffstation namespace settings

* Update Content.Server/GameTicking/Rules/VariationPass/Components/SolarPanelReplaceVariationPassComponent.cs

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

* Update Content.Server/GameTicking/Rules/VariationPass/Components/ReplacementMarkers/SolarPanelReplacementMarkerComponent.cs

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

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-04-22 15:46:38 -04:00
Hanz
bd1f2af691 Ashtray Resprite and Fix (#31643)
* The meat and potatoes

Yup

* Stupid recycler

bruh

* guh

guh
2025-04-22 15:34:39 -04:00
Zachary Yona
063bbfa77c Ashen hud item status slot fix (#31411)
* new patchMargin variable added, horizontals fixed

* All sides now work, system is fully integarated

---------

Co-authored-by: Zachary Yona <magicalusf@gmail.com>
2025-04-22 14:40:58 -04:00
Ilya246
2f8809c74c downprice many cargo orders (#32375)
* atmos repricing

* emitter crate

* materials

* lasers

* revert gun prices
2025-04-22 14:38:32 -04:00
Golden Can
106a31410f Command uniform (#32103)
* Added generic command jumpskirt, jumpsuit and cap, and made them available in the HoP's clothing printer.

* fixed generic command jumpskirt and jumpsuit.

* Updated generic command jumpskirt/-suit textures, added generic command beret.

* Fixed game-breaking bug in previous commit relating to the command beret.

* altered generic command soft cap/baseball cap sprites.

* Update Resources/Prototypes/Entities/Clothing/Head/hats.yml

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

* review

* whoopsie

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-22 14:35:43 -04:00
mubururu_
1e3f73a0e0 dragons can now pry doors (#36811) 2025-04-21 23:32:59 -07:00
K-Dynamic
43451f82c5 Metal foam grenade rework, small tweaks to grenade timers (#34579) 2025-04-21 22:51:21 -07:00
Michael
1707037964 Tweak Security protection values (#30212)
* Tweak Hardsuits

* HoS/Ward Coats change

* Whoopsie wrong number

god why am i doing this its 1:33 AM and i made a silly mistake...

* Adress Review

Revert Warden hardsuit slowdown to 30% again
Decreased Security hardsuit heat protection down to 20%
2025-04-21 23:22:56 -04:00
Nemanja
fa6c97bf50 Fix vox hair (#36816)
* Fix vox hair

* remove CL
2025-04-21 21:24:37 -04:00
lzk
00cd08231a Fix bots parenting, emotes (#29949)
* Bots overhaul

* fix

* change speech sound to pai

* purge a lot

* i forgor :trollface:

* adjust

* that aswell
2025-04-21 18:49:43 -04:00
ShadowCommander
1bfa303f36 Firelock temperature and pressure warning lights (#28339)
* Add temperature and pressure lights to firelocks

* Replace sprites with new pressure and temperature light versions

* Remove obsolete deny and locked sprites

* Add SpriteSync for warning light animation synchronization

* Teal lights

* Partial animation implementation

* fixup! Teal lights

* Temperature lights

* Adjusted firelock light heights and added final warning light sprites

* Fix colors

* Testing colors

* Update light sprites

* updated sprites

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-21 18:39:28 -04:00
Verm
dd308c6d2d Makes EventRole Ids properly set ID names. (#28958)
* Add id binding system

* Change so it activates when added too

* Add to eventhumanoid

* Add PDA binding, try to fix some things

* Still not fixed, PDA is working right

* Move to server, add on mind instead

* Implement suggestions

* Fix things

* Finish review stuff

* Messed up cluwne

* Remove after only changing id too

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-21 14:25:22 -04:00
ScarKy0
13e546a0a6 Station AI Name Identifier (#36801)
init
2025-04-21 19:54:51 +02:00
T
cc80f8d782 Added a semi-functional genderfluid pin. (#35854)
* Added a semi-function GenderfluidPin

* Update pins.yml

fix bug

* Fix meta.json under the newly merged "fix as you go" policy

* Update pin description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-21 13:46:33 -04:00
K-Dynamic
b3725ef855 Increase thief to player ratio (#36531)
* reduce max number of traitors, increase thief to player ratio

* revert traitor max back to 8
2025-04-21 19:24:28 +02:00
Hrosts
ae8b5c6097 Add rehydratable mop bucket cube, refactor the rehydratable yml (#34586)
* Refactor rehydratable items

* Finish main refactor

* Add mop bucket cube

* Move cube sprite and item size to RehydratableAnimalCube

* Fix sprite attribution

* Make it follow the conventions

* Refactor wrapped cube, leave MonkeyCube tag only on the cube and the Syndie Sponge

* Fix DehydratedSpaceCarp inheritance overwriting needed components

* no need for this comment

* remove whitespace

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

* indentation

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

* Restore lost description

* reorder stuff

* line

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-21 13:16:25 -04:00
āda
4acb92791a hotplate, kitcken grille bugfixes (#34776)
* commit

* cleanup
2025-04-21 17:38:23 +02:00
Phooooooooooooooooooooooooooooooosphate
a83402f382 Add the medical HUDs to medical's loadouts (except chem) (#32847)
Added the medical HUD and eyepatch to the medical (CMO, doctor, paramed and intern) loadout to let them choose between. Also gives the option for the regular glasses.
2025-04-21 14:07:33 +02:00
ScarKy0
2fdfb4b14a Reworked Mail Spawning (#36774)
* init

* stuff
2025-04-21 11:32:18 +02:00
āda
f52445ec4e Reorder electronics recipe file, add filter categories (#35713)
* electronics split

* split base recipe and category

* all but machines

* machine shuffle

* reorder

* delete unused recipes

* rename cargo to supply

* git weirdness

* git weirdness 2
2025-04-20 18:27:49 -04:00
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