VigersRay
0a91b468b4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Client/Voting/UI/VotePopup.xaml.cs
# Content.Client/Voting/VoteManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/BatterySystem.cs
# Content.Server/Radio/EntitySystems/RadioSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Voting/Managers/VoteManager.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Voting/MsgVoteData.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Recipes/Crafting/crates.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
BramvanZijp
548973bc1f
Fix Doctors Delight metabolism Rate ( #32297 )
...
* Fix Doctors Delight metabolism Rate
* Combine Drink and Medicine instead of halving their motabolism rate.
* Removed unintentional newline.
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Remove metabolismRate since it is setting it to the default.
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-25 19:39:49 +02:00
VigersRay
47cdabdaed
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/StatusEffect/StatusEffectsSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 16:09:00 +03:00
deltanedas
2c9a3020ab
make epinephrine adrenaline ( #32076 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-19 01:00:48 +02:00
VigersRay
209f68f0c9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Objectives/Systems/StealConditionSystem.cs
# Resources/Locale/en-US/_strings/objectives/conditions/steal-target-groups.ftl
# Resources/Prototypes/Objectives/stealTargetGroups.yml
2024-09-16 16:20:10 +03:00
MissKay1994
4abb6a7dd1
Lizards now metabolize chocolate ( #32147 )
...
* Eat the chocolate
* Update toxins.yml
* fully delete threshold lines
* Update snacks.yml
* Fix tags
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 14:45:15 +02:00
VigersRay
3bbae85466
фиксы апстрима
2024-09-16 13:13:35 +03:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
RaMbUtAn1337
0df7229ff1
Desoantizyne/Дезоантизин - наркота. ( #342 )
...
* Новый реагент - Обдолбоссий, даёт 1.5х к ускорению и глюки на экране, передоз - 10 юнитов!
* Дезоантизин - новый наркотик.
* Дезоантизин - новый наркотик.
* Дезоантизин - 3.0
---------
Co-authored-by: unknown <RaMbUtAn1337>
2024-09-16 12:13:46 +03:00
Alpha-Two
f04de87ec4
Fix that space ( #32149 )
...
Fixed the GODDAMN SPACE
Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>
2024-09-14 14:28:35 +03:00
Nemanja
e510504596
Hivelord mob ( #31322 )
...
* Hivelord
* make it longah
2024-09-11 09:52:27 -04:00
pacable
76b872956e
Перцовка ( #319 )
...
* pepper_spray.yml
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* linterfix
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* revert https://github.com/space-sunrise/space-station-14/pull/326
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* перцовка сбшникам
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* wizards
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* amend
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* linterfix
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* только для сб
Signed-off-by: pacable <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-08-30 21:26:01 +03:00
VigersRay
c705713fb0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
2024-08-29 16:01:10 +03:00
RumiTiger
d9b1369dae
Cherry ( #28962 )
...
* Add files via upload
* Update produce.yml
* Update produce.yml
* Update seeds.yml
* Update flavor-profiles.ftl
* Update flavors.yml
* Update meal_recipes.yml
* Update food_produce.yml
* Update meta.json
* Update seeds.yml
* Update botany.yml
* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
* Create meta.json
* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
* Create meta.json
* Update produce.yml
* Update produce.yml
* Update produce.yml
* Update food_produce.yml
* Update food_produce.yml
* Update produce.yml
* Apply suggestions from code review
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update seeds.yml
* Update juice.yml
* Update juice.ftl
* Update seeds.ftl
* Update seeds.yml
* Update cargo_botany.yml
* Update cargo_botany.yml
* Update cargo_botany.yml
* Update cargo_vending.yml
* Update cargo_vending.yml
* Update seeds.yml
* Update seeds.yml
* Update meta.json
* Update produce.yml
* Cherry Tree
* Alphabetical order
* Update food_produce.yml
* Update food-sequence.ftl
* Update food-sequence.ftl
* Update produce.yml
* Update produce.yml
* Update food-sequence.ftl
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-08-29 11:30:58 +10:00
pacable
ccbf640760
бипски наносит удар ( #316 )
...
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-08-28 18:20:33 +03:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
Cojoke
5327708b9b
Ichor Now Clots Blood ( #29661 )
...
Ichor now Clots Blood
2024-08-20 12:57:06 +02:00
Nemanja
18c146cc7f
increase material prices ( #30869 )
...
* increase material prices
* ack
2024-08-18 21:28:46 -06:00
potato1234_x
1952618203
Tea Plant and Blue Pumpkin ( #25092 )
...
* tea plant, blumpkin
* fix linter
* fix tests pls
* bloompkin
* forgor rsi
* work please
* WORK PLEASE
* migration of the blumpkins
* it is now glumpkin
* lowercase
* uppercase
* adjust values and fix blorbo
wtf when did blumpkin donut turn into blorbo donut what
* fix test
* update
* fix stupid mistake
* Update meta.json
* totally not a webedit
* not a webedit 2
* nitpicks
2024-08-18 16:28:18 -06:00
VigersRay
012be1afc2
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
# Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
2024-08-17 17:27:37 +03:00
Boaz1111
969f17a960
phlog now ignites when consumed as well ( #30955 )
2024-08-17 12:49:11 +10:00
VigersRay
913fb7ab7a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
2024-08-15 05:02:48 +03:00
Eris
e5d2738a26
Sedin ( #27110 )
...
* Sedin
* almost forgot this.
* what
* Did a few fixes, tried to readd popup
* Fix popup, ready for merge
* minor change
* Generalize seed removal/destruction system, add popups in general.
* fix
* fix (again)
* deadcode is no more
* Sedin buff (nerfing the recipe soon)
* godont
* webedit moment
ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit
* CRIKEY
* Revert "CRIKEY"
This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.
I was not supposed to commit that >:/
* Alright, it should be good now but I havent tested it
* ready for merge/review
* prob -> probability
* Requested changes nodoc
* Review nodoc
* documento
* thumb up emoji
2024-08-15 10:38:21 +10:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Alzore
bcd7085a3e
Add diamond mining drills, buff regular mining drills ( #30814 )
...
* why do I have to change so much just to add drills
* diamon
2024-08-12 11:49:09 +10:00
Token
ad71d8cb2f
Pax now refresh instead of stacking pacified forever ( #30778 )
...
Pax refreshes instead of stacking pacified forever
2024-08-11 19:19:00 +10:00
Vigers Ray
bcb9508552
Говнокрад ( #268 )
...
* real?
* ok
* real 2
* one more thing that i forgot to port part 2
* i am dumb
* mofo og
* waaaagh
* some rework placeholders
* porting part 2
* bruh.
* bruh 2
* bruh 3.
* Update ChangelingRuleSystem.cs
* Update AdminVerbSystem.Antags.cs
* говнокрад это SubGamemode
* тяжело...
* пу-пу-пу
---------
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com>
2024-08-08 09:28:44 +03:00
slarticodefast
577f30fb13
Add haloperidol, potassium iodide ( #27454 )
...
* add haloperidol, potassium iodide
* review fixes
* review and tuning
* shader review
* use timespan and AutoPausedField
2024-08-03 03:12:08 +10:00
K-Dynamic
8db252e7dc
Nerf & standardised slip times ( #27879 )
...
* standardised slip times
* puddle and gib soap
* banana peels
* cleaned yaml by shifting to component
* error slip
* error slip intersect
* intersect ratio return
* error and omega soap changes
* SlipocalypseClusterSoap 2 tc cost
2024-07-17 09:26:02 +10:00
Ed
1b0c434a9f
Shiny Diamonds ( #25750 )
...
* shiny
* add
* reresprite
* rereresprite
* Add files via upload
* Update ore.yml
2024-07-13 15:15:57 +03:00
Plykiya
04249e8682
Removes max damage threshold on healing for hyperzine ( #29712 )
...
* Removes max damage threshold for hyperzine
* the description...
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-08 00:28:13 +10:00
lzk
a540d1ab17
Make blood less satiate hunger ( #29433 )
2024-06-25 22:27:11 -04:00
deltanedas
f730d120c7
give spiders unique venom reagent ( #29066 )
...
* add mechanotoxin
* make tarantulas use mechanotoxin
* trolled
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-16 21:26:59 +10:00
Verm
2ae5c953de
Humans can no longer honk on command ( #28566 )
...
* Humans can no longer honk on command
* Undo change it emote file
* I hate tabs
* Some comments
2024-06-04 01:45:00 +02:00
Brandon Li
114a99eb8d
Chem colors ( #28367 )
...
* chem colors
* lithium & sodium colors
* update oxygen color
* update fluorine color
2024-05-31 12:44:22 -07:00
Flesh
e145a666c9
Use existing probability field ( #28422 )
...
Remove the PlantAdjustAttribute "Prob" field and use the existing probability field from ReagentEffects instead.
2024-05-31 09:56:41 -08:00
slarticodefast
938c3104e7
Remove THC oil ( #27889 )
...
remove THC oil
2024-05-10 19:56:48 -04:00
Hanz
a8bf2689a4
Red bool update ( #27597 )
...
* the meat and potatoes
yuh yuh yuh
* what the hell is a copyright?
am I right?
2024-05-03 08:57:37 +02:00
Gotimanga
eb41f1da5f
Adding new Cryogenics Reagent - Opporozidone (Attempt 2) ( #24074 )
...
* Fixing mistakes
* How did I make the same mistake twice
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-28 21:13:14 -07:00
RumiTiger
f5b8b5fbdc
Sprites for drinks without sprite (attempt 2) ( #27227 )
...
* A beer can and a wine can
* fix wrong file locations
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 14:43:45 +10:00
Errant
a62e8701cb
vox oxygen toxicity, respiration changes ( #26705 )
...
* vox oxygen toxicity and related stuff
* Review
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-27 20:33:35 +10:00
IlyaElDunaev
3847a298c1
Treatment of blood loss in the Rat King ( #26887 )
...
Bloodloss-RatKing
2024-04-26 17:47:01 +10:00
potato1234_x
e2b260d894
Psicodine, Mannitol, Lipolicide and Happiness ( #27134 )
...
* reagents
* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-22 01:45:38 -07:00
Tayrtahn
299da35c87
Make YAML Linter validate server/client-only components ( #26809 )
...
* YAML Linter now validates invalid fields in server-only and client-only components
* Update to change in engine PR
* Use reflection manager to get the lists of client/server assemblies.
Also made it use a hashset on type instead of the previous code.
* I'm dumb my bad.
* Fix 2 errors that snuck through, showing why we need this.
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-04-19 13:28:33 -04:00
Tayrtahn
cfa94be4c2
Add ability to shake fizzy drinks so they spray in peoples' faces ( #25574 )
...
* Implemented Shakeable
* Prevent shaking open Openables
* Prevent shaking empty drinks. Moved part of DrinkSystem to Shared.
* DrinkSystem can have a little more prediction, as a treat
* Cleanup
* Overhauled PressurizedDrink
* Make soda cans/bottles and champagne shakeable. The drink shaker too, for fun.
* We do a little refactoring.
PressurizedDrink is now PressurizedSolution, and fizziness now only works on solutions containing a reagent marked as fizzy.
* Documentation, cleanup, and tweaks.
* Changed fizziness calculation to use a cubic-out easing curve.
* Removed broken YAML that has avoid the linter's wrath for far too long
* Changed reagent fizzy bool to fizziness float.
Solution fizzability now scales with reagent proportion.
* Rename file to match changed class name
* DoAfter improvements. Cancel if the user moves away; block if no hands.
* Match these filenames too
* And this one
* guh
* Updated to use Shared puddle methods
* Various fixes and improvements.
* Made AttemptShakeEvent a struct
* AttemptAddFizzinessEvent too
2024-04-18 11:49:58 +10:00
Ghagliiarghii
40d90ddcb3
Make Holy Water more like Water ( #27068 )
...
holy water can now be used to satiate thirst, water plants, and extinguish fires.
2024-04-17 21:04:56 -04:00
Vasilis
a49a576b03
Uncooked animal proteins is safe for animal stomachs only ( #26906 )
...
Uncooked animal proteins is safe for animal stomachs
2024-04-13 12:36:28 +10:00
Tayrtahn
a0de0ab1f8
Server-only component YAML cleanup ( #26836 )
...
* First pass cleaning up server-only YAML errors.
* Second pass
2024-04-09 00:20:49 -04:00
Alzore
5523e016f4
Dionae now bleed sap, and this can be used to make syrup. ( #25748 )
...
* SapAndSyrup
* centrifug
* morewatervapor
* whyisitnotpushing
* nymphs
* lessrealmorefun
2024-04-05 14:06:12 -07:00
Firewatch
ea3e98e120
Bartender "Essentials" ( #25367 )
...
* drinks round 1
saving my progress before my hard drive explodes
* test 2
please work
* name fixes
whoops
* Update drinks.yml
* various fixes
am dumb
* add sol dry to vends
more fixes and changes, yippee!
* more fixes & ingame testing
shrimple tests
* last fixes :trollface:
should be ready for pr now
* Update soda.yml
sate thirst
2024-04-01 17:41:14 +11:00
