Commit Graph

94 Commits

Author SHA1 Message Date
Leon Friedrich
ff7d4ed9f6 Patched Actions Rework (#6899)
* Rejig Actions

* fix merge errors

* lambda-b-gon

* fix PAI, add innate actions

* Revert "fix PAI, add innate actions"

This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.

* Just fix by making nullable.

if only require: true actually did something somehow.

* Make AddActions() ensure an actions component

and misc comments

* misc cleanup

* Limit range even when not checking for obstructions

* remove old guardian code

* rename function and make EntityUid nullable

* fix magboot bug

* fix action search menu

* make targeting toggle all equivalent actions

* fix combat popups (enabling <-> disabling)

* fix networking

* Allow action locking

* prevent telepathy
2022-02-25 23:24:08 -06:00
Leon Friedrich
49ae383f06 Revert "Actions Rework" (#6888) 2022-02-25 16:55:18 +11:00
Leon Friedrich
5ac5dd6a64 Actions Rework (#6791)
* Rejig Actions

* fix merge errors

* lambda-b-gon

* fix PAI, add innate actions

* Revert "fix PAI, add innate actions"

This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.

* Just fix by making nullable.

if only require: true actually did something somehow.

* Make AddActions() ensure an actions component

and misc comments

* misc cleanup

* Limit range even when not checking for obstructions

* remove old guardian code

* rename function and make EntityUid nullable

* fix magboot bug

* fix action search menu

* make targeting toggle all equivalent actions

* fix combat popups (enabling <-> disabling)
2022-02-24 22:12:29 -06:00
mirrorcult
e85bdc2d87 More blood tweaks (#6811) 2022-02-20 17:18:24 -07:00
Rane
0d8e9795f6 Chem adjustments, pulped banana peels (#6792) 2022-02-19 16:56:07 -07:00
Peptide90
21b4e4ca28 Adds fills to first aid kits (#6707) 2022-02-19 15:22:21 -07:00
mirrorcult
94c56980cb Blood tweaks (#6767) 2022-02-17 19:42:47 -07:00
Rane
8f860157f7 Vitamins, Protein, new reagents for almost every food, new recipes (#6607) 2022-02-17 18:27:57 -07:00
mirrorcult
a57d78a3f2 Basic bleeding mechanics (#6710) 2022-02-17 15:00:41 -07:00
Jack Fox
d241636818 update tricord description (#6667) 2022-02-12 15:09:04 -07:00
mirrorcult
2738b46362 Lung tweaks (#6634) 2022-02-10 14:58:41 -07:00
Leon Friedrich
706ac6af40 Revert "Revert "epic Respiration Rework"" (#6527) 2022-02-09 21:53:10 -07:00
Rane
113957df6c Removes Airloss and Radiation from Tricord (#6573) 2022-02-08 17:46:49 -07:00
Rane
5a1e4807cf Added Fly Amanita and Galaxythistle (#6538) 2022-02-08 14:54:28 -07:00
Rane
aeb1df98b9 Added Lingzhi and Ambrosia Vulgaris (#6464) 2022-02-07 12:43:21 -07:00
Leon Friedrich
6e8c92d13e Revert "epic Respiration Rework" (#6524) 2022-02-07 18:13:14 +11:00
mirrorcult
4ae1c4e332 epic Respiration Rework (#6022) 2022-02-06 21:48:15 -07:00
Peptide90
7e1c79ba13 Adds goats milk (#6378) 2022-02-04 14:14:47 -07:00
Veritius
07fbc257d3 Add Pilk (#6429) 2022-02-01 23:20:54 -07:00
Fishfish458
d0b37c0872 Add cup ramen and sinks (#6403)
Co-authored-by: fishfish458 <fishfish458>
2022-01-31 23:16:49 -07:00
Peptide90
7de1953c4c replaced nuka cola with nuclear cola (#6379) 2022-01-30 18:10:15 +11:00
Plasmaguy
cee179d078 Root beer, ice cream, and root beer floats (#6334) 2022-01-27 18:33:27 +11:00
Sam Weaver
adddd2fac6 FIXED: Chemistry JSON dump tool and companion GitHub Action (#6222)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-18 14:44:22 -07:00
Moony
5fd45fc82a Revert "Chemistry JSON dump tool and companion GitHub Action (#6134)" (#6217)
This reverts commit 40e2e78e0f.
2022-01-17 16:06:19 -06:00
Sam Weaver
40e2e78e0f Chemistry JSON dump tool and companion GitHub Action (#6134)
* fuck

* oh boy

* Sorted every chem into guide groups

* WHY ARE YOU NOT ABSTRACT

* removes the target thing in favor of simply generating everything.

* eee

* Add group for med

* Update wiki JSON generation to use System.Text.Json

* Fix error on shutdown during wiki JSON generation

* First pass at automatic wiki workflow

* Add a temporary workaround while the build is continuing to give errors

* Update workflow to reference correct API url, track dependency.

* Compile wiki actions into one job rather than two

* Update page name to reference editable page

* Add other JSON file and parameterize root page path

* A few steps closer to using `System.Text.Json` to serialize properly

* Revert System.Text.Json and return to Newtonsoft.Json.

* Revert the revert. Return to System.Text.Json.

This reverts commit a5ea98dfdcfab3f605ac4d82d3b110f099324308.

* Add and register UniversalJsonConverter class.

* Narrow triggers for update-wiki GitHub action.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-17 13:50:02 -06:00
Peptide90
a5839e5ae8 Added toxin damage to ingesting welder fuel (#6061) 2022-01-07 19:44:14 -07:00
Michael Phillips
b36c9395d6 Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
Elijahrane
0906400e85 Ultravasculine, a new advanced antitoxin. (#5877)
* Adds ultravasculine, a new advanced antitoxin

* Reduced yield in ultravasc. reaction
2021-12-27 13:45:16 +01:00
mirrorcult
9cce58a70b The Pyro Update (#5575) 2021-11-28 19:25:51 -07:00
mirrorcult
bf30f82ff5 Acid effects (#5466)
* acid

* balance

* nerf area effects
2021-11-27 00:31:49 -07:00
Leon Friedrich
61423be24e Add cheese & dough reactions (#5547)
* git mv

* rename CreateEntityReaction -> CreateEntityTileReaction

* cheese

* change microwave recipes

* remove unnecessary test

* TryGet->Get
2021-11-26 15:50:14 -07:00
Moony
3447956088 bees are now beeasier to make. (#5526) 2021-11-25 20:55:28 -07:00
Moony
d5c5cbeaf4 buzz buzz (#5490)
* buzz buzz

* Darn now i'm all out of periods   thanks mirror
fix toy issue

* desc edits.

* rng and alphabee

* adds some missed parens
2021-11-24 23:06:13 -07:00
mirrorcult
e2205e418b Epinephrine + epipen (#5444)
* add sprite and basic entity, no reagent or testing

* actually implement epinephrine and add it to the box

* allow creating it

* add it to nanomed

* fig
2021-11-22 23:51:51 -07:00
metalgearsloth
ae396e11a2 Add desoxyephedrine (#5468) 2021-11-23 15:39:58 +11:00
mirrorcult
6fc397f801 carpet (#5464)
* carpet

* reviews

* why tf i gotta fix integration tests in the carpet pr
2021-11-22 18:01:51 -07:00
mirrorcult
e40c9bc427 Reactive 3.0 (#5443)
* probably scrapping this

* reimpl old behavior

* misc fixes and initial yaml

* works basically first try
2021-11-22 10:17:35 +01:00
mirrorcult
181fd055ce Adds metabolism effects to pretty much every chem already in the game (#5349)
* pass 1

* a little more reagent effect for breakfast

* move lots of stuff around

* implements all medicines

* implement all cleaning & elements

* implement toxins/pyrotechnic

* p

* linter fixies

* fixes + narcotic balancing

* fix and standardize

* reviews

* things
2021-11-20 16:47:53 -07:00
FoLoKe
5f3ae602ed Add some animals basic mechanics (#5132)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-11-13 12:48:05 +11:00
Vera Aguilera Puerto
e8232af00e Fix arithrazine damage specifier. 2021-11-12 11:37:26 +01:00
xRiriq
c5b26bcc80 add metabolic effect for Hyronalin and make Arithrazine stronger (#5274)
Co-authored-by: xRiriq <xRiriq.git@gmail.com>
2021-11-11 21:22:29 -07:00
mirrorcult
31d622f941 Metabolism 3.0 (#5157)
* basic system + convert all plantmetabolism

* stragglers

* convert all old metabolisms over

* fix YAML errors + dumb serialization issue

* remove unused thingy

* reimplement

* add organ type condition

* organtype condition but real

* cleanups + test fix

* metabolismtype -> metabolizertype

* solution resilience

* fixes

* serializer + use entityuid + hashset

* this is apparently an entirely different thing

* turns out it just works

* oops
2021-11-08 15:33:45 -07:00
ZeroDayDaemon
b8f12f4424 Small bug fixes and tweaks on reagents and food/drinks content (#5146)
* Update Can Sizes, Fill cans with correct reagents, rename brownstar reagent to its can name starkist

* Update drinks.yml

* add energy drink

* Update soda.yml

* Potato Juice

* Fix Yaml

* Add energy drink to vending
2021-11-03 21:31:21 -07:00
ZeroDayDaemon
293186b563 Bartending Content & Bug Fixes (#5038) 2021-10-31 14:57:05 +01:00
Bingo Johnson
c2e9893419 Fix spelling in elements.yml (#4924)
Fixes spelling
2021-10-17 16:02:04 +02:00
20kdc
6d7b037dd6 More injectable food, condiment fixes, migrate Salt to TableSalt (#4846) 2021-10-13 10:03:12 +02:00
ScalyChimp
bf43141c96 Meth (#4186)
* adds an overdose metabolism with sensible default settings

* adds the compoenents for the run fast part of meth

* not sure what I changed here but I trust my past self to not fuck up for once

* adds basic meth recipe

* correctly names comething

* I really should've checked my spelling before making this pr

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* adds suggestion from the maintaner, who managed to get to this pr suprisingly fast

* Revert "adds suggestion from the maintaner, who managed to get to this pr suprisingly fast"

This reverts commit 9b0f07402e35ed5890b3af805691b690671b950c.

* tweak

* tweak

* git's gitting on my nerves

* some small tweaks

* don't need these anymore

* makes some stuff required

* changes the meth recipe to arbitary bullshit to get the yaml thingy to leave me alone goddamnit

* extremely minor change

* removes overdose, because however it's gonna be done, it's definitely not my way

* i should really double check every key I press

* hm

* sigh, I should be more thorough with looking at error messages.

* beenus

* gay sex is gay

* this one goes out to bingo

* reviews

* not sure why status lifetime description wasn't being commited

* Update MovespeedModifierMetabolism.cs

Co-authored-by: mirrorcult <notzombiedude@gmail.com>

* adds VV to component variables

* rebalances meth, and makes the completely unrealistic recipe properly work now

* meth effects should go away now or something do you think I test these changes before pushing??

* ah yes, orginization

* adds proper recipe and prequisite chemicals

* fixes linter hopefully

* Update chemicals.yml

* a

* starts working on prediction

* thing

* predmiction??

* changes thing

* does it properly

* uses timespan instead of timer

* uses dif timers and adds a system

* updates robust and tweaks a small thing

* Fixes

* "Fix" prediction

* starts changing the timer to timespans to avoid icky on timer end

* okay fixes the check thing but now meth is broken and I don't know why

* fixes predicition (partially)

* Delete ContentNetIDs.cs

whoops

* some changes advised by sloth

* certified scalycode fix right here

* moves resettimer to the metabolism to make it less oop stinky

* moves resettimer to the metabolism to make it less oop stinky

* gamin

* when the  is

* updates mth colour to be accurate because I forgot

* abc hard ok

* everything should be up to date now

* makes MovespeedModifierMetabolism ECS and cleans up some other stuff

* does a fixy wixy

* fix thing

* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth"

This reverts commit 62886561098be02f9adb6352f4e858a8269d5bd5, reversing
changes made to ca34fffb5b7a40f19aec7b9e4bc37bdeab914bc1.

* Revert "Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth""

This reverts commit 4f550da19656abfd0be05f818fc6b7100252d5b8.

* fix hopefully

* updates metabolism to works with mirror's fancy new system

* updates yaml + tweaks

* bruh

* yaml moment

* :yaml moment

* Revert " :yaml moment"

This reverts commit 8cb51573c64db76d989de22acdbb9c50b2c6d052.

* 99th commit yay, also I need to not do this

* removes something that I don't need

* makes system work with this and gets rid of unnesescary check

* make the update only work on active components

* oops

* Cleanup

* alphabetise this shit

* Touchup

* Woops stupid alloc by me

* Nerf nyoom for now

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: mirrorcult <notzombiedude@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-08-03 13:32:08 +10:00
mirrorcult
8aa4f998de Metabolism refactor (#4395)
* metabolism -> respirator, add reageanteffect and reagenteffectcondition, start on metabolizercomp/system

* move LiverBehavior metabolism logic to Metabolizer

* minor tweaks and update all YAML

* how about actually taking conditions into account

* off by one

* removals

* reviews
2021-07-31 13:50:32 +02:00
DmitriyRubetskoy
d10885742b Omnizine and donk-pockets (#4250)
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-07-03 01:16:21 +00:00
DmitriyRubetskoy
579f3c1103 Thirteen Loko causes toxin damage (#4249) 2021-06-30 14:35:19 +00:00