Ilya246
9e3a023f32
fix emagged lathes ( #23318 )
...
* implement
* pass uid
* fix
* fix dementia
* event implementation
* fix
(cherry picked from commit 49dbbc5721625c1c315c69fa0e4e36b6dd7da65b)
2024-01-23 22:55:31 +01:00
Hannah Giovanna Dawson
0eddbc7595
Migrate Lathe Material Ejection Code to MaterialStorage ( #23199 )
...
* SS14-23184 Migrate Lathe Material Ejection Code to MaterialStorage
The lathe material ejection code acts as a do-nothing
man-in-the-middle system that does work that would be
reasonable for any MaterialStorage-using machine to
use. This has been fixed by migrating the ejection
code to MaterialStorage, allowing anything that uses
the system to eject mats it is storing.
* Fix some YAML references. Science!!
(cherry picked from commit f850047341108b286170197d12f4d13946ee0b40)
2024-01-22 21:08:04 +01:00
Nemanja
150c8cd817
Buff heat and flame damage ( #23238 )
...
(cherry picked from commit cfb129c5a4fcdf996ab16defd35e24ed909ca663)
2024-01-22 21:07:51 +01:00
Nemanja
04f0a8811a
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 >
(cherry picked from commit c3f81bfe033a14922dc6e91de402c56d321f3370)
2024-01-22 21:00:37 +01:00
metalgearsloth
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-12-02 20:16:36 +01:00
Debug
fd2cc8570d
Sync master up to 1/10 ( #74 )
...
* Automatic changelog update
* Make NPC names proper nouns & fix some genders (#20534 )
* Proper names & genders
* Uppercase proper names
* Make Smile female
* fix bingus wrinkly head (#20531 )
* rouny meat and steak (#20526 )
* lost friendship flavor
* add rouny steak
* rouny special meat
* rouny meat textures
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311 )
* Explosive wet floor sign & janitorial suicide vest
* fix attributions
* Remove name & desc from explosive wet floor sign
* Make wet floor sign chameleonable
* Automatic changelog update
* Minor slippery stuff (#20535 )
* Update submodule to 162.2.0 (#20570 )
* Predicted armor (#20560 )
* clean up some lines in smile the slime prototype (#20552 )
* Revert "Use full file path for temp replays (#19002 )" (#20545 )
* Add EyesGlasses into ClothesMate (#20523 )
* Automatic changelog update
* Fix Punpun crew monitor sensor (#20484 )
* Automatic changelog update
* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394 )
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
* Automatic changelog update
* Make arcades hackable again (#20555 )
* Automatic changelog update
* Health alert tweaks (#20557 )
* Automatic changelog update
* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564 )
* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent
* Nukeops todo and cleanup
* Remove Active field
* Add EndedGameRuleComponent
* bartender suit (#20521 )
* give me a drink bartender
* guh
* aARG
* Necropolis and mine walls (#20578 )
* Automatic changelog update
* archaic accent tweaks (#20567 )
* Automatic changelog update
* Add confirmation to kick and respawn in the admin player actions panel (#20542 )
* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540 )
* Change .editorconfig to keep existing attribute arrangement (#20538 )
* Automatic changelog update
* Catch replay start and end errors on round restarts (#20565 )
* Update trivial components to use auto comp states (#20539 )
* Fix role unbans not applying in real time (#20547 )
* Disable AHelp buttons when no player is selected, update button styling (#20568 )
* Automatic changelog update
* Added a toggle fullscreen button (default F11) (#20272 )
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
* Automatic changelog update
* Fix not networking markings (#20588 )
* Automatic changelog update
* Update RobustToolbox to v162.2.1 (#20590 )
* Automatic changelog update
* Glorfcode (force say on damage/stun/crit) (#20562 )
* Automatic changelog update
* Fix AHelp progressively showing more AHelp panels (#20591 )
* Automatic changelog update
* caninsert entitystorage tweaks (#20589 )
* Automatic changelog update
* Fix mapping actions crashing on load (#20592 )
* Fix loading a map with a ThirstComponent crashing the game (#20594 )
* Fix electrocution displaying real name of disguised players (#20603 )
* Organ fixes (#20488 )
* Automatic changelog update
* Kettle medical rework (#20435 )
* Initial try at medical rework for kettle
* Re-add decal decorations to Kettle's medical
* Add more lockers to kettle's med
* Actually upload kettle's map, not its proto
* Automatic changelog update
* Added blocked visuals to volumetric pump (#20610 )
* Automatic changelog update
* Move TimedDespawn to engine (#20515 )
* Update submodule to 163.0.0 (#20616 )
* Remove v0.1 version number from local main menu screen (#20617 )
* Remove cloneData parameter from AutoNetworkedField (#20596 )
* Update submodule to 164.0.0 (#20618 )
* fix cognizine ghost role (#20632 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Move ID layer one pixel to correct alignment (#20630 )
* Update nukie hardsuit descriptions (#20529 )
* Make holofans destructable (#20445 )
* Automatic changelog update
* bowl is open (#20453 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add TestPair.WaitCommand() (#20615 )
* Rename ThreatPrototype and mark fields as required (#20611 )
* Adjust hard bomb shape (#20608 )
* dragon refactor, objectives and use GenericAntag (#20201 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Added generic empty liquids tank (#20563 )
* Move view variables verb to the top of the list with no category and localize it (#20546 )
* saltern update (#20325 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix followers leaking (#20643 )
* Add Winter Boots (#20622 )
* add
* fix prototype
* Add QM mantle (#20621 )
* add
* fix prototype
* Automatic changelog update
* Slime mobs breathe nitrogen and resprite their organs (#20577 )
* Slimes breathe nitrogen and resprite their organs
* ups
* mmm
* Automatic changelog update
* Fix the new lizard horn's consistency + issue (#20620 )
* fix
* add
* Revert "add"
This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.
* Add RandomHumanoidAppearance component to for space ninjas (#20605 )
* Automatic changelog update
* Space cat breathes space (#20550 )
* Space cat breathes space
Made Space Cat lungs ROBUST
* Made Space Cat's lungs ROBUST 2.0
* Automatic changelog update
* Wide anomaly locator (#20581 )
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* add textures
* fix encoding
* fix 2
* Automatic changelog update
* Fixed Telescopic Shield Lighting (#20650 )
* Fixed Telescopic Shield Lighting Bug fix #20199
* no need for these at all
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
* Automatic changelog update
* Add a special hardsuit for nukie medic (#20471 )
* Automatic changelog update
* Carry over other mutations when doing species mutation (#20551 )
* Automatic changelog update
* Add Spanish accent to poncho and sombrero (#20377 )
---------
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com >
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com >
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com >
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com >
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com >
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com >
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com >
2023-10-03 14:15:46 -05:00
metalgearsloth
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
Nemanja
6695ac2ad6
Show materials as sheets, tweak lathe ui ( #19709 )
2023-08-31 22:28:08 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
chromiumboy
a39fa80d58
Add lathe material ejection ( #19218 )
...
This completes PilgrimViis' (now closed) PR 16398. It addresses issue 10896, by allowing materials to be ejected from most lathes (except the ore processor and sheet-meister 2000)
* - Refinements to the material ejection UI
- Made the lathe UI default to a slightly larger size
- Fixed an offset issue with the label of the item currently being printed in the build queue UI
* Allow the materiel reclamation UI to pop if there is material left in the lathe, but not enough to print any sheets
---------
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
2023-08-17 09:22:01 -08:00
ubis1
e203423665
Emaggable protolathe ( #18456 )
2023-08-08 00:21:04 +10:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
Nemanja
a01f26d3a6
fix lathe syncing and tweak ui ( #17489 )
2023-06-20 00:39:35 -06:00
Nemanja
910c2da9bb
fix-lathe-recipe-dupes ( #17473 )
2023-06-19 11:43:20 -06:00
Nemanja
8411739e00
Fix secfab being able to print protolathe items ( #17443 )
2023-06-18 16:35:19 -06:00
Moony
e2b5651fc3
Make sure lathes don't waste time trying to print when out of mats. ( #16617 )
2023-05-19 10:25:22 -05:00
Nemanja
9efc727fe1
RND Rework [Death to Techweb] ( #16370 )
...
* Techweb rework
* more ui work
* finishing ui
* Finish all the C# logic
* the techs + lathes
* remove old-tech
* mirror-review
2023-05-15 15:17:30 -05:00
Nemanja
d506311985
make printed items from lathes automatically stack ( #13603 )
...
Closes https://github.com/space-wizards/space-station-14/issues/10402
2023-01-20 15:06:02 +11:00
Nemanja
26786b5839
decouple material insertion visualization from lathes ( #13242 )
2023-01-08 13:36:50 +11:00
Leon Friedrich
1f5bae751f
MaterialComponent cleanup ( #13326 )
2023-01-07 14:36:32 -08:00
Chief-Engineer
2a8e5d9096
Add machine logs ( #13185 )
...
* add material insert logs
* add lathe queue logs
* add grav gen power logs
* fix count
* replace SharedStackComponent with StackComponent and rm unused imports
* use TryComp
* fix import
2022-12-27 18:01:36 +01:00
Nemanja
4eee1ee9b2
clean up infinite researchsystem shitcode ( #13136 )
...
* clean up infinite researchsystem shitcode
* fml some more shit
* make syncing work logically
* naming naming naming
2022-12-25 15:22:23 -06:00
Nemanja
050e157005
Technology Disks ( #13077 )
...
* clean up a bunch of R&D code
* don't store components
* brug
* speedrun some sloth review
* technology disks
* expand functionality, begin work on printer
* disk printer ui
* file
* fix the rebase
* disk console is finito
* Update DiskConsoleSystem.cs
2022-12-20 16:39:57 -06:00
Nemanja
0549b22cbc
clean up a bunch of R&D code ( #13071 )
...
* clean up a bunch of R&D code
* don't store components
* brug
* speedrun some sloth review
2022-12-19 15:14:02 -06:00
0x6273
a201d777bc
Machine upgrade examine verb ( #12119 )
2022-11-04 14:27:47 +11:00
Paul Ritter
c5e5729bd4
removes beforeserialization hook ( #12319 )
2022-11-03 12:41:12 +11:00
Nemanja
6fd083af0b
fix infinite lathe printing bug ( #12343 )
2022-11-01 18:05:00 -05:00
Nemanja
3ab98e320a
lathe machine upgrading ( #12032 )
2022-10-30 18:12:11 +11:00
metalgearsloth
0b38589728
Raise power events by ref and not broadcast ( #11923 )
...
Also some other minor stuff.
2022-10-14 23:08:15 -05: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
metalgearsloth
ad7a851e27
Cargo economy balance ( #11123 )
...
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com >
2022-09-15 11:53:17 +10: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
Nemanja
5670769435
fix lathe queue interruption bug ( #10533 )
2022-08-11 20:33:32 -05:00
Leon Friedrich
8f445d44fa
Fix stuck lathe queue ( #10311 )
2022-08-04 16:19:31 -07: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
54fcdb70f0
Prevent Glass duplication in lathes ( #9954 )
...
* lathes have been handled ;)
* Update LatheSystem.cs
2022-07-24 21:37:29 +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
metalgearsloth
5dbb3220dd
ECS and bandaid research ( #9251 )
2022-06-28 22:54:08 +10:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. ( #8728 )
2022-06-13 09:45:47 +10:00
metalgearsloth
2d873a2cf2
Add static "IsPowered" method ( #8434 )
...
* Add static "IsPowered" method
* Use IsPowered in more places
Co-authored-by: wrexbe <wrexbe@protonmail.com >
2022-05-26 17:36:12 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Rane
17ba90574d
Fix lathe queue bug ( #7883 )
2022-05-03 19:43:25 -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
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
