Commit Graph

103 Commits

Author SHA1 Message Date
Ephememory
b8d8f48b11 add donk pocket meal recipes (#5229) 2021-11-10 13:34:09 +01: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
mirrorcult
3f51ffbd3c Pneumatic cannons (#4560)
* basics & visuals

* pneumatic cannon works perf

* loc + popups

* gas tank does stuff + queue changes

* updates

* b

* forcefeeding

* inhand

* crafting!

* pie cannon now is a pneumatic cannon

* oopy

* fix for entman + verbs

* pie

* change for tools

* actual

* combat mode + better sounds

* reviews
2021-11-03 14:33:36 -07:00
Vera Aguilera Puerto
5a5006e4cf ConstructionGL2 Part 2: Better guided steps and recipes. (#5103) 2021-11-02 11:24:32 +01:00
20kdc
7220132be3 ChemMaster/Chemistry Dispenser constructability, fixed edition (#5125) 2021-11-02 10:04:07 +01:00
Vera Aguilera Puerto
fea41c539e Add RaiseEvent action to CGL. Machines raise a MachineDeconstructedEvent.
The latter is very useful for any special machine cleanup that needs to happen when a machine is deconstructed.
The former will be useful for so many things!
2021-11-01 17:29:09 +01:00
ZeroDayDaemon
293186b563 Bartending Content & Bug Fixes (#5038) 2021-10-31 14:57:05 +01:00
Vera Aguilera Puerto
d62317b8f6 Fix not being able to construct windows on top of grilles.
Fix #5073
2021-10-28 19:02:07 +02:00
Vera Aguilera Puerto
f12cec3f98 Fix construction DoAfter results not setting current edge index.
Fixes #5061
2021-10-28 11:21:55 +02:00
Julian Giebel
5b74811f28 Add high pressure machine frame rsi (#4950)
Implement Disposal machine construction graph and recepie
Restore eris disposal unit

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-10-27 21:54:12 +11:00
Vera Aguilera Puerto
189a5c7847 ConstructionGL2 Part 1: ECSification, events and steps. (#5017)
- Completely rewrited the `ConstructionComponent` logic to be ECS, *without* looking too much at the original implementation.
    - The original implementation was dirty and unmaintainable, whereas this new implementation is much cleaner, well-organized and maintainable. I've made sure to leave many comments around, explaining what everything does.
- Construction now has a framework for handling events other than `InteractUsing`.
    - This means that you can now have CGL steps for things other than inserting items, using tools...
- Construction no longer uses `async` everywhere for `DoAfter`s. Instead it uses events.
- Construction event handling occurs in the `ConstructionSystem` update tick, instead of on event handlers.
    - This ensures we can delete/modify entities without worrying about "collection modified while enumerating" exceptions.
    - This also means the construction update tick is where all the fun happens, meaning it'll show up on our metrics and give us an idea of how expensive it is/how much tick time is spent in construction.
- `IGraphCondition` and `IGraphAction` have been refactored to take in `EntityUid`, `IEntityManager`, and to not be async.
- Removes nested steps, as they made maintainability significantly worse, and nothing used them yet.
- This fixes #4892 and fixes #4857

Please note, this leaves many things unchanged, as my idea is to split this into multiple PRs. Some unchanged things:
- Initial construction code is the same. In the future, it'll probably use dummy entities.
- Client-side guided steps are the same. In the future, the server will generate the guided steps and send them to clients as needed, caching these in both the server and client to save cycles and bandwidth.
- No new construction graph steps... Yet! 👀
2021-10-26 16:38:03 +02:00
20kdc
632a4bcd95 Apc and light construction partial fix (#5030)
* Fix APC placement type

* Fix wall tags.

* Change wall light placement to match how it actually is now

* Change spawn-entity wall light snap mode

Separate commit so it can be nixed out for JREV

* Default switch placement mode to SnapgridCenter
2021-10-26 16:15:02 +02:00
SethLafuente
2b2211a468 Reinforced Plasma Windows (#4962)
* submodule

* adds reinforced plasma windows

* Fixed some of le issues

* removing the module

* empty

literal nothing

* empty

same empty

* request fixes

* ups forgot to add that

* small change

change do after and camel reinforcedPlasmaWindow

* Update structures.yml

* Update rplasma.yml

* Update meta.json

* Update structures.yml

* Update structures.yml

* Update window.yml

* Update structures.yml

* small fixes

* literary nothing why is this here

* Update window.yml

* Update structures.yml

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-10-24 23:46:38 +11:00
Julian Giebel
45caf25ea9 Apc device network and apc based light switch (#4908)
* Remove WireNet node group from cables
Implement extension cable components and system
Remove connection over distance logic from ApcPower... components

* Add extension cable components to prototypes

* Implement ApcNetwork
Implement ApcNetSwitch

* Fix ignoredComponents.cs

* Add friend attribute to new components

* Add construction graph for a light switch

* Address reviews

* Fix broken test

* Move ConnectionType enum to DeviceNetworkComponent
Change netId data definition to use the ConnectionType enum values

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
2021-10-23 16:23:19 -07:00
Julian Giebel
4897a47ca9 Implement cable terminal construction graph (#4960)
Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
2021-10-20 13:25:02 -07:00
20kdc
c5e7457206 Hydroponics tray machine board (#4889)
* Frame/soil anchored fix

* Ability to build and deconstruct hydroponics trays

* Undo pointless adding of anchoring to soil
2021-10-17 23:12:50 -07:00
Vera Aguilera Puerto
acde1910ce Remove low wall construction recipe. 2021-10-15 12:20:30 +02:00
Vera Aguilera Puerto
dec7e60ca7 Adapt window construction to new sprites and grilles. 2021-10-15 12:20:10 +02:00
Swept
e34888373a Respriting the codebase (#4820)
* Walls

* Airlocks mostly ported

* Disposal Unit

* Tiles

* Lighting

* Catwalk

* Windows

* Some vending machine work

* More Vending Machines

* Rest of vending machine sprites ported

* Fixes to vending machines

* Tables (This took a lot of work)

* Fixes low walls being required for window smoothing
- Also replaces window damage visualization

* Plasma Window

* APC

* SMES + Reorganized parts.yml

* Furniture and Organization and Removed Shelf

* Renamed seats.yml to chairs.yml

* Dispensers

* Lazy-fixed the glass airlocks

* Don't need this no more

* Tilez

* blue circuit my fucking beloved

* Switches lights to cev one

* Conveyors and Switch

* Reorients lights

* !ALERT! MAP CHANGES !ALERT!

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
2021-10-15 11:58:40 +02:00
20kdc
10dc8d78cf Makes the solar control computer accessible by adding the board to the lathe (#4869)
* Makes the solar control computer accessible by adding the board to the lathe

* Adjust solar panel collision to not be insanely big
2021-10-14 17:05:04 -07:00
20kdc
6d7b037dd6 More injectable food, condiment fixes, migrate Salt to TableSalt (#4846) 2021-10-13 10:03:12 +02:00
Vera Aguilera Puerto
09d40b386a Added simple grilles with construction, deconstruction and destruction. (#4801) 2021-10-09 10:54:56 +02:00
SethLafuente
92209aac9a Added Basic Parts Technology (#4440)
* Added parts Technology

* is something they're something

bad grammar

* Update Parts.yml

* Update technologies.yml

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-08-23 03:28:37 +00:00
Swept
9d22869e58 Adds a ton more inhands (#4488)
* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-08-20 05:36:32 +00:00
Vera Aguilera Puerto
13a214e4a0 Fix tests.
Flashlight RSI state names had been changed, and some places weren't updated properly
2021-08-17 09:07:52 +02:00
Ygg01
56ad025c53 Fix sound crash when making foam (#4476) 2021-08-15 19:44:35 -07:00
ShadowCommander
730c137778 Merge branch 'master' of github.com:space-wizards/space-station-14 into replace-sounds-with-sound-specifier 2021-08-10 15:17:58 -07:00
ShadowCommander
a1db43ab34 Merge branch 'master' into replace-sounds-with-sound-specifier 2021-08-10 15:05:49 -07:00
Swept
b16a044a2b Added restrictions for what can be inserted into most belts (#4367)
* Belts now restrict what can be inserted into them

* Bandolier now only holds shotgun shells

* Tiny typo

* Another tiny typo
2021-08-10 13:36:00 -07:00
SethLafuente
04bbaa820f Made the cloning pod and medical scanner constructible (#4439)
* Made the cloning machine pod constructable

* Added everything like I did but with the Medical Scanner

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-08-08 20:21:18 +00:00
Kara D
9354abb024 reviews + test 2021-08-05 22:01:02 -07:00
Kara D
5af4c06231 construction 2021-08-05 21:10:06 -07: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
Galactic Chimp
b2e40d540f Inserted SoundSpecifier where appropiate 2021-07-31 15:17:16 +02:00
SethLafuente
e7eb3068a0 Added Makeshift Handcuffs as a craftable item (#4294)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-07-25 17:30:41 +02:00
SethLafuente
43241267d3 Made the baseball bat craft able (#4336)
* Added the baseball bat into craftable items

* Added a space

* Update baseball_bat.yml

* Update bat.yml

* Update bat.yml

* Update baseball_bat.yml

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-07-24 23:51:17 +00:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Pieter-Jan Briers
103bc19508 Pow3r: stage 1 (#4208)
Co-authored-by: 20kdc <asdd2808@gmail.com>
2021-07-04 18:11:52 +02:00
SethLafuente
b76998b735 Added oil with functionality (#4120)
* Changed the submodule Issues

* Added oil with functionality

* submodule

* submodule 2

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-06-06 03:53:17 +10:00
SethLafuente
3069bef30c Added HV and MV cables into the protolathe (#4095)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-05-28 03:41:03 +00:00
SethLafuente
6b1d582cf9 Protolathe Printing (#4094)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-05-27 22:43:10 +00:00
SethLafuente
48cd4a76c2 Protolathe Printing and R&D technology (#4039)
Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
2021-05-24 00:38:26 +00:00
mirrorcult
ce70e8a38d Fix incorrect shard protoype being spawned when computers are destroyed (#4060) 2021-05-23 03:44:05 +00:00
Vera Aguilera Puerto
bbfc0c320a Fixes materials in lathe recipes 2021-05-22 11:30:11 +02:00
SweptWasTaken
b667f8168a Fixes flash lathe recipe 2021-05-18 22:15:09 -07:00
SweptWasTaken
8ea9e7a068 Removes all uses of chem. 2021-05-07 23:09:06 -07:00
Swept
6376e60b78 Massive Food PR (#3436)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-05-03 13:17:22 +02:00
Swept
682b36ae23 Wall YAML cleanup (#3864)
* Code Quality

* IDs and mapping

* Construction Recipes
2021-04-16 06:47:18 +00:00
Vera Aguilera Puerto
c28f22ebff Removes chem. and react. from every prototype ID (#3767)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-04-08 23:48:02 +10:00
Alex Evgrashin
cfe427eb8c Light replacer (#3701)
* Add graphics

* Barebone light replacer

* Now light replacer stores bulbs

* More interactions

* Added text messages

* Better light refil

* Add light replacer to locker and lathe

* Added sound

* Fixed ignore error

* Better inhand

* You don't like this commas?

* Fixed typo

* Deferring spawning

* Moved interaction logic to system

Co-authored-by: Alex Evgrashin <evgrashin.adl@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-04-08 22:28:06 +10:00