Commit Graph

230 Commits

Author SHA1 Message Date
Ripmorld
94acf80eb9 Laser gun bugfix & damage adjustment (#8069) 2022-05-12 18:15:24 -07:00
Ripmorld
c672183e21 Powercell adjustment (#7828)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-05-12 16:49:52 -07:00
Ripmorld
2c90d5458f Added the recipes and tech for several non lethal bullet (#8079) 2022-05-12 22:24:01 +10:00
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 19:44:17 +10:00
lapatison
d1dca706dd Kitchen supplies crate (#8022) 2022-05-10 01:03:12 -07:00
Kara
4bf0aac814 Rename Assistant to Passenger (#8007)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-10 13:35:08 +10:00
ShadowCommander
2a3f1d2ae0 Glass airlock construction (#7877)
* Lower indentation

* Add glass airlock construction

* Fix glass airlock wrong name
2022-05-09 15:52:19 +10:00
Rane
465eb66e09 Correct the injustice against margherita pizza (#7906)
* Make margherita pizza margherita pizza

* fix description

* I made a typo in my rage
2022-05-03 19:41:35 -07:00
Peptide90
291ad9c307 Adds screwing step to vent deconstruction (#7896) 2022-05-02 13:49:53 -07:00
Peptide90
a3b8c08210 Adds metal and wood counters (#7688) 2022-04-30 14:28:03 -07:00
August Eymann
4fcaa21c7e Added a microwave machine circuit board. (#7848)
* Added a microwave machine circuit board.

* Moved microwave from bio tech to advanced botany tree
2022-04-28 21:50:23 -07:00
Peptide90
0e93dba20b Crafting for spike rack, signal switches and buttons. (#7420)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-28 22:24:02 +10: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
Rane
a74e6842d9 Medical Techfab + Bed Deconstruction Fix (#7637) 2022-04-23 19:27:12 -07:00
Alex Evgrashin
65a8eb8677 Windoor can be pried by crowbar (#7694) 2022-04-23 16:45:53 -07:00
Snowni
87c618db4b Remote Explosives (#7682)
* Remote Explosives

* Apparently we forgot to push the changed files. Dumb.

We Forgor.#

* Made Requested Changes.

* And more changes.

* Added requested changes and tweaked a few other things.

* Fixed RSI issue (hopefully.) Readded Ensurecomp.
2022-04-22 16:54:39 +10:00
Ripmorld
cef7d336f2 Flash payload (#7587) 2022-04-20 16:08:57 +10:00
CrzyPotato
ff05ec238e Airlock Painter now can be found in vendor, lathe, and closets (#7603) 2022-04-18 15:43:19 -07: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
Leon Friedrich
2457d2c9be Fix lathe completetime (#7628) 2022-04-18 18:08:12 +10: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
Rane
b5b6da018d Fix some bugs and tweak Rane's PRs that were merged yesterday (#7600) 2022-04-16 16:04:16 -07:00
Rane
5376aed6ea Beds, Medical Beds, Stasis Beds (#6695) 2022-04-15 15:53:52 -07:00
Júlio César Ueti
4fa8a2df5a Add extrap Welding steps to reinforced window's deconstruction (#7566) 2022-04-15 14:41:19 -07:00
EmoGarbage404
569085ab5c Recipe for Durathread (#7349) 2022-04-15 14:20:14 -07:00
Rane
1c7658c4c7 Increase all welding times 5x in wall deconstruction (#7497) 2022-04-14 17:41:30 +10:00
Leon Friedrich
56168e592e Explosion refactor (#5230)
* Explosions

* fix yaml typo

and prevent silly UI inputs

* oop

* Use modified contains() checks

And remove IEnumerable

* Buff nuke, nerf meteors

* optimize the entity lookup stuff a bit

* fix tile (0,0) error

forgot to do an initial Enumerator.MoveNext(), so the first tile was always the "null" tile.

* remove celebration

* byte -> int

* remove diag edge tile dict

* fix one bug

but there is another

* fix the other bug

turns out dividing a ushort leads to rounding errors.  Why TF is the grid tile size even a ushort in the first place.

* improve edge map

* fix minor bug

If the initial-explosion tile had an airtight entity on it, the tile was processed twice.

* some reviews (transform queries, eye.mapid, and tilesizes in overlays)

* Apply suggestions from code review

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

* is map paused

* GetAllTiles ignores space by default

* WriteLine -> WriteError

* First -> FirstOrDefault()

* default prototype const string

* entity query

* misc review changes

* grid edge max distance

* fix fire texture defn

bad use of type serializer and ioc-resolves

* Remove ExplosionLaunched

And allow nukes to throw items towards the outer part of an explosion

* no hot-reload disclaimer

* replace prototype id string with int index

* optimise damage a tiiiiny bit.

* entity queries

* comments

* misc mirror comments

* cvars

* admin logs

* move intensity-per-state to prototype

* update tile event to ECS event

* git mv

* Tweak rpg & minibomb

also fix merge bug

* you don't exist anymore go away

* Fix build

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-31 21:39:26 -05:00
Leon Friedrich
e90f7f4330 Give reaction prototypes a priority (nerf ClF3 + smoke) (#7268) 2022-03-31 00:29:01 +11:00
mirrorcult
b8f26c47a7 Space bear (#7311) 2022-03-28 13:53:06 -07:00
Emisse
e65e761920 Winter Coats (#7240)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-03-27 21:16:23 -07:00
Leon Friedrich
1b0e7ae0f5 Add Modular grenades (chemnades). (#7138) 2022-03-25 15:17:29 +11:00
Leon Friedrich
414c03978d fix smokeable crafting (#7242) 2022-03-25 15:01:55 +11:00
mirrorcult
47e4f01857 Remove destroyed machine frame from construction menu (#7149) 2022-03-15 15:54:30 -07:00
Peptide90
5d29c8aa61 New generators and wallmount substation (Shuttle power PR) (#6795) 2022-03-15 12:27:39 +11: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
Peptide90
a1376f5d53 Buffs window resistance and nerfs spears (#7049) 2022-03-12 15:07:27 -07:00
ZeroDayDaemon
05f3fcff28 I LOVE LEAN (Makes Lean Craftable and gives it wacky effects) (#7059) 2022-03-12 15:07:07 -07:00
Rane
fa3283ffff Uniform Printers (#6968) 2022-03-09 10:58:49 +11:00
Fishfish458
7f43f38cc7 Add health analyzer and medical scanner ECS (#6907)
Co-authored-by: fishfish458 <fishfish458>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-08 14:45:52 +11:00
Moony
e869d2e91f Removes almost all of the unused chems (#7025) 2022-03-08 13:51:34 +11:00
ninruB
fd4bf1ab69 White and dark tiles craftable 2: Electric Boogalo! (#6837)
* Uncommented the white and dark tile recipe.

* Added a crafting recipe for white and dark tiles.

* smol fix

* another fix, 6 days late, I wish I wasn't blind

* I can't read, thanks Peptide

* Added construction graphs for white and dark tiles, pascalcased wood and steel tiles

* minor fixes and pascalcase

* Pascalcased wood and steel IDs

* Pascalcase and stuff, also I think fixes?
2022-03-05 14:47:19 -06:00
Leon Friedrich
c95516e5b2 Revert "Explosion refactor TEST MERG (#6995)" (#7005) 2022-03-06 04:02:34 +11:00
Moony
4a466f4927 Explosion refactor TEST MERG (#6995)
* Explosions

* fix yaml typo

and prevent silly UI inputs

* oop

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2022-03-04 13:48:01 -06:00
Vera Aguilera Puerto
5a12a816c9 Fix incorrect toilet Construction Graph.
It didn't specify the entity on the "toilet" node.
2022-03-04 16:54:10 +01:00
Fishfish458
60dccc829a fix railing vaulting (#6857)
Co-authored-by: fishfish458 <fishfish458>
2022-03-01 19:21:14 +11:00
mirrorcult
903dabf0db Jumpsuit butchering and gauze crafting (#6787)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-03-01 14:38:39 +11:00
Peptide90
e7bc138ed5 Board descriptions for computers and machines (#6290)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-02-28 00:46:26 +11:00
Fishfish458
6b7379dad0 Add basic handheld GPS (#6896)
Co-authored-by: fishfish458 <fishfish458>
2022-02-26 16:59:20 +11:00
Jack Fox
af826713e4 Atmos Pipe Crafting (#6737) 2022-02-25 02:05:10 +11:00