Commit Graph

36638 Commits

Author SHA1 Message Date
ArchPigeon da32d06584
Add Flammable Touch Reaction for liquid tritium (#25281)
(cherry picked from commit d72254d17f)
2024-02-21 04:03:34 +01:00
veprolet 581cb937c9
Make pills colorful and labeled (#25284)
* Make pills colorful and labeled

* Inherit pill sprites from parent

(cherry picked from commit f5cb9a0901)
2024-02-21 04:03:33 +01:00
PJBot a59323a1bb
Automatic changelog update
(cherry picked from commit 741b9b5062)
2024-02-21 04:03:32 +01:00
marboww cd5ae0ad58
Moths can eat plushies (#25382)
Hope I did this properly, I might've broken the file
2024-02-21 04:03:07 +01:00
Tayrtahn 4bb5cbead6
Make metamorphic glasses use last solution's empty sprite (#25322)
Make metamorphic glasses use empty sprite for the last solution they contained.

(cherry picked from commit c4c98a2f59)
2024-02-21 03:58:09 +01:00
PJBot 66c3a652dc
Automatic changelog update
(cherry picked from commit 49460f39b6)
2024-02-21 03:58:08 +01:00
James Simonson d5c65dd4d6
Vending UI facelift (#25377)
* Convert to fancy window + added footer + add list spacing

* margin add

(cherry picked from commit 99aa72e30d)
2024-02-21 03:58:07 +01:00
Tayrtahn 292b92c039
Add support for metamorphic fill levels (#25022)
* Added support for fill levels to metamorphic glasses

* Fix warnings and cleanup

* Don't break non-metamorphic fills!

(cherry picked from commit e74f3019f7)
2024-02-21 03:58:06 +01:00
PJBot 7149a6388a
Automatic changelog update
(cherry picked from commit 706b0725a6)
2024-02-21 03:57:53 +01:00
PotentiallyTom 7e066f0cca
Adds guidebooks to the 4 learner roles (#25388)
added the books

(cherry picked from commit 7cf424a7bf)
2024-02-21 03:57:34 +01:00
Ioannis Eleftheriou 4e7dc01c24
Bump nixpkgs rev (#25361)
* Bump nixpkgs revision

* Update nix-direnv

* Remove extra nix functionalities

Both nix-direnv and legacy command nix-shell fail. Reverting to
flakes-only commands.

* Pin nixpkgs per suggestion

See https://github.com/space-wizards/space-station-14/pull/25361#discussion_r1494196038

* Revert nix-direnv removal

* Add python3 to shell.nix

(cherry picked from commit 16d18abdcf)
2024-02-21 03:56:47 +01:00
PJBot 4698a4523e
Automatic changelog update
(cherry picked from commit bec96f3016)
2024-02-21 03:56:46 +01:00
LankLTE 903eb06952
Small Nymph Changes (#25363)
* Emote sounds, accent & doorbump

* Oops

* Only non-brains can't talk

(cherry picked from commit 1d7167b95b)
2024-02-21 03:56:45 +01:00
PJBot d64d41a5a0
Automatic changelog update
(cherry picked from commit 429c683f24)
2024-02-21 03:56:43 +01:00
Sybil aea748df17
add icons for drinks in Solar's (#25301)
* add icons for drinks in Solar's

fixed colors of tea

* consistently use capitals for color codes

* don't add extra whitespace

(cherry picked from commit 64cecdde84)
2024-02-21 03:56:42 +01:00
hiucko 06e8a643c4
Increase printing price for neck clothes (#25375)
* Increase printing price

* Update clothing.yml

(cherry picked from commit 65d8228985)
2024-02-21 03:56:20 +01:00
PJBot 6d4d9862f1
Automatic changelog update
(cherry picked from commit f137f1894c)
2024-02-21 03:56:19 +01:00
genderGeometries 66897dcd70
Add bio reactions (#25366)
* added more foodstuff breakdowns

* Calcium doesn't exist; moved phosphorus to protein

* tested reactions- some should be centrifuged

* more testing tweaks

(cherry picked from commit d8e99cc57f)
2024-02-21 03:55:00 +01:00
DeltaV-Bot 865352b2de Automatic Changelog Update (#877) 2024-02-21 01:15:23 +00:00
rosieposie fd9a5d04cc
Temporarily De-list Sub (#877)
de-list
2024-02-20 19:15:08 -06:00
Debug 9af8726a1e
Wait no it was correct
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-21 00:41:06 +01:00
Debug 4e080593aa
Incorrect math resulting in false negative
Webedit ops

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-21 00:34:36 +01:00
Debug 460effb592
Spite update
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-20 23:51:34 +01:00
Adrian16199 dd675b594e
Updates shoukou up to date. (#872)
Again

This time at the least, I noticed that the lights were changed so at the least the map was updated properly before i touched it.

Changes cloning to metem.
Redo captain's quarters to include all his gear.
Added a noticeboard to kitchen.
2024-02-20 16:43:18 -06:00
DeltaV-Bot 7d9dc62788 Automatic Changelog Update (#874) 2024-02-20 19:46:41 +00:00
Debug bc0baa6797
Make periapsis only have 10 non-whitelisted slots, and make whitelist not shit (#874)
Whitelist
2024-02-20 20:46:17 +01:00
Debug df9c2b6720
Update inclination.toml
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-20 05:19:07 +01:00
Debug f744b56845
Create inclination.toml
Alyx came up with the name, dont judge me :>

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-20 03:44:22 +01:00
Colin-Tel 45d867abac
Update Asterisk and Edge (#870)
Added Captain's glass box for the antique laser pistol, added missing captain dresser, named wireless cameras and added cameras to courtrooms, gave Edge hydroponics a free hydro tray board, replaced cloning pods with metempsychotic machines (I hope I did the wiring right, oh well they get multitools anyways).

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-19 19:47:40 -06:00
Debug 101d478660
Adjust publish script location
Deltav is fake anyways

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-20 01:55:21 +01:00
Fluffiest Floofers 594f564458
Uncomments MidRoundAntag (#869)
* uncomment midroundantag gamerule

* Removes rat king from mousemigration
2024-02-19 23:04:36 +00:00
Velcroboy 92d99e5cd5
Map Edits (#866)
* Map Edits

* bad links

* No more soapy water every one dirty now

---------

Co-authored-by: Velcroboy <>
2024-02-19 16:48:04 -06:00
Velcroboy 13e31454ad
Adjust migrations for metempsychotics (#867)
Co-authored-by: Velcroboy <>
2024-02-19 23:27:37 +01:00
Debug 2717706994
Make loadacts more user friendly (#864)
Allow loadacts to take a file
2024-02-19 22:58:14 +01:00
DeltaV-Bot b0c9f56999 Automatic Changelog Update (#857) 2024-02-18 23:06:04 +00:00
Debug cfdc0f03ca
Merge pull request #857 from DebugOk/Wizmerge-18/02
Merge wizden up to 18/02
2024-02-19 00:05:47 +01:00
Debug 438c71cc95
Merge branch 'master' into Wizmerge-18/02 2024-02-18 23:56:39 +01:00
Debug 89383ab646
Fix felinid sprite shit 2024-02-18 23:53:52 +01:00
lzk 61083c268e
Very little cleanup (#25364)
(cherry picked from commit 0dd381ae37)
2024-02-18 23:40:12 +01:00
Vigers Ray 3c1cad5363
Fixed directional window durability (#25259)
shit

(cherry picked from commit 8542c718c0)
2024-02-18 23:40:01 +01:00
Pieter-Jan Briers 074fea218e
Shadow anomaly respects "reduced motion" (#25355)
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues.

(cherry picked from commit 0c8e617572)
2024-02-18 23:40:00 +01:00
PJBot 9980b277fd
Automatic changelog update
(cherry picked from commit 8ea30cae34)
2024-02-18 23:39:59 +01:00
Firewatch 5eac70cd7f
Newton Cradle Fix + Addition to Bureaucracy Crate (#25357)
fixes

makes the newton cradle not able to decimate ears while also adding it to the bureaucracy crate and lowering its volume and range a little bit

(cherry picked from commit 110437cc7f)
2024-02-18 23:39:58 +01:00
PJBot 16a2283e45
Automatic changelog update
(cherry picked from commit a361e6aee5)
2024-02-18 23:39:57 +01:00
Killerqu00 2cc5b2b3ef
EVA suit helmets now have (un)equip sounds (#25349)
add (un)equip sounds to EVA helms

(cherry picked from commit aadf7492f4)
2024-02-18 23:39:56 +01:00
PJBot 4c09d15fc5
Automatic changelog update
(cherry picked from commit fa09f7aaa1)
2024-02-18 23:39:39 +01:00
ArchPigeon 783284ab0f
Stop wagging tails on crit (#25323)
* Add Flammable Touch Reaction for liquid tritium

* Stop tail wagging action on crit

* Revert "Add Flammable Touch Reaction for liquid tritium"

This reverts commit 41be57b058a0cdee0cecfc51eb1c4a25631e62f3.

(cherry picked from commit e8eddf57f6)
2024-02-18 23:39:38 +01:00
Pieter-Jan Briers 094a94d62b
Update engine to v210.1.1 (#25354)
Important fixes from the UI PR

(cherry picked from commit e4930078ab)
2024-02-18 23:39:37 +01:00
Peptide90 e7a5ca84cb
Suffix spelling mistake on seed vendor (#25352)
spelling error

(cherry picked from commit d4c68a9ab9)
2024-02-18 23:39:36 +01:00
Pieter-Jan Briers 5da6086a02
Add new "OptionsVisualizer" (#25128)
This is a visualizer somewhat similar to the Generic. It allows configuring appearance info based on specific CVars the user has set. This allows YAML to easily configure alternatives for accessibility CVars like reduced motion.

(cherry picked from commit 1ce2155315)
2024-02-18 23:39:23 +01:00