Commit Graph

127 Commits

Author SHA1 Message Date
Rane
a527658f6d Miasma update (#8943) 2022-06-18 22:51:55 -07:00
EmoGarbage404
39d439795f Rat King Tweaks (#8940)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-06-18 16:21:07 -07:00
Rane
1dc78ec88a Port miasma from nyano (#8926)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-06-17 00:00:23 -07:00
Emisse
aafd7dc3a4 Basic Medication Overdoses (Chemistry 1984) (#8844)
* 1984 george orwell

* Update medicine.yml

* Update medicine.yml

* Update medicine.yml
2022-06-16 19:29:11 +10:00
CrudeWax
c210239f45 Fishy swarmers: Carp content and Space Dragon! (#7395)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-16 14:14:06 +10:00
EmoGarbage404
63fd01f3bb Zombie Rework & Polymorph Expansion (#8413)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-12 15:53:13 +10:00
Rane
008348e40c Muted status effect + 2 reagent sources of it (#8673) 2022-06-06 01:35:24 -07:00
Moony
fada213a22 Implements item pricing, and piracy. (#8548)
* Start implementing item pricing.

* Flesh out prices a bit, add the appraisal tool.

* Add prices to more things.

* YARRRRRRR

* gives pirates an appraisal tool in their pocket.

* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.

* Address reviews.

* Address reviews.
2022-06-03 10:56:11 -05:00
keronshb
def4473ed2 Fixes some high speed item issues (#8361) 2022-05-23 16:11:17 -07:00
Rane
b210df0d03 Port vomit from Nyano (#8349) 2022-05-23 16:03:27 -07:00
Rane
a05abd106c Merge sugar and glucose, touch up how some drinks metabolize. (#7398) 2022-05-22 01:25:38 -07:00
Ripmorld
b7d1d0ea46 Adjusted the medical chem inside the spacemidipen (#8192) 2022-05-20 13:25:54 -07:00
Alex Evgrashin
860db943e1 Reagents localization (#7916)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 21:06:01 +10:00
Ripmorld
4bec937c1f Buffed Dex+ and Stellibinin (#8090) 2022-05-11 13:47:45 -07:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754)
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-11 00:17:24 -07:00
Julian Giebel
1d0bf979fb Adds the pressure medipen and adds the emergency suit to emergency lockers (#7880)
* Implement pressure medipen
Add the emergency suit to emergency lockers
Increase leporazine temperature change

* Fix typo in translation file

* Fix ignored component name

* Address reviews

* Revert changes to submodule commit
2022-05-06 14:44:29 -07:00
Absolute-Potato
856df8921a Slip Nerfs (#7733)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-06 14:36:03 +10:00
EmoGarbage404
e74e9ced72 Zombie Nerf + Syndicate Bundle (#7846) 2022-04-30 14:21:39 -07:00
20kdc
f651bbf1f0 Cleanup of Vox + make them breathe nitrogen (#7853) 2022-04-30 14:15:51 -07:00
Chris V
94a0bc92b7 Salvage mining, ore processing, and material clean-up (#7406)
* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

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

* Update Content.Server/Lathe/LatheSystem.cs

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

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-28 20:41:04 +10:00
EmoGarbage404
db56d5ef60 Zombies!!! (#7509)
* wip

* heal on bite

* more fixes and additions

* don't crash

* Update medicine.yml

* zombie claw item and damage resist

* ignoredcomponents.cs

* Add zombie claw, fix infection, add immunities

* fix

* razzle dazzle

* yaml fix

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* sdasadsadsadasd

* Generalize DiseaseProgression.cs

* final final final final final final cope seethe

* Update medicine.yml

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

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

* Update BloodstreamSystem.cs

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

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

* Update Content.Server/Disease/DiseaseZombieSystem.cs

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

* fixing until i die

* folder + zombietransfer fix

* smol fixe

* the smallest of fixes

* aaaa

* Infection timer buff

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-04-18 17:30:22 -05:00
Rane
93cdca4f82 Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238)
* Prototype that's mostly borked rather than completely borked

* ECS inserting mats

* Partial ECS mostly done, needs cleanup and visualizer

* Replace timers

* Power visualizes at least

* First ""working"" version

* Clean up all lathes

* Colors

* Fix animation timing

* Fixes greyscale, adds a bunch of colors

* Give every (used) material a color

* Made most lathes take long enough you can at least see there's some sort of animation

* Insertion feedback popup

* Sound for circuit printer and uniform printer

* Fix queueing, optimize update

* Remove mono crash

* cleanup

* Fix test failure

* Techfab inserting sprite

* Cleanup and commenting

* Fix bug in CanProduce check

* Fix UI resolves

* Mirror review stuff
2022-04-17 17:34:14 +10:00
Veritius
b880dd5770 Fix various misspellings and grammatical errors (#7397)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-04-08 14:05:53 -07:00
areit
356186c33f Adds a stun chemical (uplink only) (#7258) 2022-03-28 13:53:27 -07:00
mirrorcult
a1155b3c72 Fix mercury/uranium groups (#7308) 2022-03-28 19:33:07 +11:00
Rane
1759bf509b Disease Tweaks (#7136) 2022-03-20 15:29:12 -07:00
router
6c5f22d4f2 Buff meth (#7106) 2022-03-13 23:04:02 -07:00
Rane
bb9ad4259c Diseases (#7057)
* Disease system first pass

* Renamed HealthChange

* First working version of diseases (wtf???)

* Fix the cursed yaml initialization

* Pop-Up effect

* Generic status effect

* Create copy of prototype

* CureDiseaseEffect

* Disease resistance

* Spaceacillin

* Nerf spaceacillin now that we know it works

* Sneezing, Coughing, Snoughing

* Fix queuing, prevent future issues

* Disease protection

* Disease outbreak event

* Disease Reagent Cure

* Chem cause disease effect

* Disease artifacts

* Try infect when interacting with diseased

* Diseases don't have to be infectious

* Talking without a mask does a snough

* Temperature cure

* Bedrest

* DiseaseAdjustReagent

* Tweak how disease statuses work to be a bit less shit

* A few more diseases

* Natural immunity (can't get the same disease twice)

* Polished up some diseases, touched up spaceacillin production

* Rebalanced transmission

* Edit a few diseases, make disease cures support a minimum value

* Nitrile gloves, more disease protection sources

* Health scanner shows diseased status

* Clean up disease system

* Traitor item

* Mouth swabs

* Disease diagnoser machine

* Support for clean samples

* Vaccines + fixes

* Pass on disease resistant clothes

* More work on non-infectious diseases & vaccines

* Handle dead bodies

* Added the relatively CBT visualizer

* Pass over diseases and their populators

* Comment stuff

* Readability cleanup

* Add printing sound to diagnoser, fix printing bug

* vaccinator sound, seal up some classes

* Make disease protection equip detection not shit (thanks whoever wrote addaccentcomponent)

* Mirror review

* More review stuff

* More mirror review stuff

* Refactor snoughing

* Redid report creator

* Fix snough messages, new vaccinator sound

* Mirror review naming

* Woops, forgot the artifact

* Add recipes and fills

* Rebalance space cold and robovirus

* Give lizarb disease interaction stuff

* Tweak some stuff and move things around

* Add diseases to mice (since animal vectors are interesting and can be used to make vaccines)

* Remove unused reagent
2022-03-13 20:02:55 -05:00
Moony
bb7ae16ad9 Remove lean. (#7110) 2022-03-13 15:46:26 -05:00
ZeroDayDaemon
05f3fcff28 I LOVE LEAN (Makes Lean Craftable and gives it wacky effects) (#7059) 2022-03-12 15:07:07 -07:00
mirrorcult
2a422c0af8 Physical desc fixes (#7093) 2022-03-12 15:41:55 -06:00
Rane
fa3283ffff Uniform Printers (#6968) 2022-03-09 10:58:49 +11:00
Moony
e869d2e91f Removes almost all of the unused chems (#7025) 2022-03-08 13:51:34 +11:00
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