Dmitry
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Partmedia <kevinz5000@gmail.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: Stomf <5dorkydorks@gmail.com >
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com >
Co-authored-by: PraxisMapper <praxismapper@gmail.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com >
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com >
Co-authored-by: kosticia <kosticia46@gmail.com >
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com >
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com >
Co-authored-by: Myra <vasilis@pikachu.systems >
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: BIGZi0348 <svalker0348@gmail.com >
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com >
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com >
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com >
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com >
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: eoineoineoin <helloworld@eoinrul.es >
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com >
Co-authored-by: nikitosych <boriszyn@gmail.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
Co-authored-by: YoungThug <ramialanbagy@gmail.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com >
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com >
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com >
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: J <billsmith116@gmail.com >
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com >
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com >
Co-authored-by: Spanky <scott@wearejacob.com >
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com >
Co-authored-by: Deerstop <edainturner@gmail.com >
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com >
Co-authored-by: archee1 <archee3@hotmail.co.uk >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com >
Co-authored-by: poklj <compgeek223@gmail.com >
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com >
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com >
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: ScarKy0 <scarky0@onet.eu >
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com >
2025-05-24 11:00:17 +03:00
Nemanja
cfb129c5a4
Buff heat and flame damage ( #23238 )
2023-12-30 16:28:00 -07:00
Nemanja
c3f81bfe03
Hyper convection lathes and industrial ore processor ( #23202 )
...
* Hyper-convection lathes and industrial ore processor
* balance
* gold... why not?
* review
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-12-31 03:18:58 +11:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Nemanja
26786b5839
decouple material insertion visualization from lathes ( #13242 )
2023-01-08 13:36:50 +11:00
Nemanja
3ab98e320a
lathe machine upgrading ( #12032 )
2022-10-30 18:12:11 +11:00
Nemanja
2e7dcb1ed8
Lathe Refactor and ECS ( #11201 )
...
* lathe and material storage refactor
* materialStorage ECS
it kinda sus tho
* beginning the lathe shitcode dive
* couple lathe visuals and lathe system
* lathe changes and such
* dynamic lathe databases
* rewrote internal logic
on to ui
* da newI
* material display clientside
* misc ui changes
* component state handling and various other things
* moar
* Update Content.Shared/Lathe/LatheComponent.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
* first volley of sloth review
* more fixes
* losin' my mind
* all da changes
* test fix and other review
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2022-09-16 18:49:05 -05:00
Rane
f36d278499
Biomass ( #10313 )
...
* Material
* good prototype
* Fix material storage
* You can insert biomass into the cloner
* ok, basic biomass subtraction works
* amogus
* ok chance works
* Alright, the biomass and genetic stuff works
* feedback for cloning
* more reclaimer polish
* ship it
* starting biomass + fix lathes
* I changed my mind on rat mass and these guys are definitely getting ground up
* Doafter
* clean up, sync the two
* fix naming, fix mass
* technology + construction
* additional logging, stop unanchoring when active
* fix event / logs
* dont gib dead salvage
* auto eject
* fix deconstruction behavior
* make warning message better, temporarily disable cancer scanner
* fix biomass stacks
* add easy mode CVAR
* stack cleanup, make biomass 2x as fast
* bugfix
* new sprite from hyenh
* fix tests
* hello? :smilethink:
* :smilethink:
* medical scanner gets antirotting
* fix cloner and medical scanner
Co-authored-by: Moony <moonheart08@users.noreply.github.com >
2022-08-29 21:31:27 -05:00
Leon Friedrich
bbd6482420
Fix lathe unanchor interaction & general cleanup ( #10156 )
2022-08-03 17:38:56 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
Nemanja
52d2cc1de2
Prevent erroneous materials from being placed in lathes. ( #9454 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2022-07-07 13:44:31 +10:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +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
6054c5bc53
Familiars respawn ( #7640 )
2022-04-23 19:27:19 -07: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
926e36d81d
Convert almost all IActivate instances that open UIs to ActivatableUI ( #7028 )
...
* Chem master
* Drone support for handhelds
* Vending machines, scanners
* Cloners, R&D computers
* make research a little less sussy
* Unfuck wires
* PA control computer
* Unfuck merge
* Clean up git gore for good
* Disposals
* Microwaves
* paper
* Magic mirror
* More vendors for drones
* Solar computer whitelist
* EFR review updates
2022-03-12 11:26:06 -07:00
metalgearsloth
b87806f7ed
Fix some build warnings ( #6832 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com >
2022-02-21 14:41:50 +11:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
wrexbe
17db0775c8
Auto comp ( #6416 )
2022-02-02 14:35:40 +11:00
wrexbe
cea1b21832
Fixing some warnings ( #6250 )
...
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
2022-01-21 10:38:35 +01:00
Vera Aguilera Puerto
684cb76173
Bunch more resolves removed.
2021-12-08 17:17:12 +01:00
DrSmugleaf
2a3b7d809d
Fix 3000 errors
2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
a5b57c8e10
Inline Transform
2021-12-03 14:20:34 +01:00
Vera Aguilera Puerto
69b270017b
Inline TryGetComponent completely, for real
2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
0feebbff00
Inline HasComponent entirely
2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
e3227546b3
Inline Delete
2021-12-03 11:43:03 +01:00
Vera Aguilera Puerto
5e177ae734
Inline EntityManager
2021-12-03 11:18:05 +01:00
Paul Ritter
fbcb53dcc0
pvs content ( #5484 )
...
Co-authored-by: Paul <ritter.paul1+git@googlemail.com >
2021-11-30 15:20:38 +01:00
Visne
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
Pieter-Jan Briers
103bc19508
Pow3r: stage 1 ( #4208 )
...
Co-authored-by: 20kdc <asdd2808@gmail.com >
2021-07-04 18:11:52 +02:00
Acruid
15fb554c28
Engine Entity Anchoring Changes ( #4195 )
...
* Converted all SnapGridPositionChangedEvent subscriptions to AnchorStateChangedEvent.
* Fixes power tests with new anchored requirements.
* Moved AnchorableComponent into construction.
AnchorableComponent now uses Transform.Anchored.
* Fixed bug with nodes, power works again.
* Adds lifetime stages to Component.
* Update Engine to v0.4.70.
2021-06-19 19:41:26 -07:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
