Timfa
4c7ae415a4
Fillbot ( #1958 )
...
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
The humble fillbot! Takes items from the ground and inserts them into a
lathe, silo or disposal unit it's linked to!
---
# TODO
<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->
- [x] Make the robot pick up items
- [x] Make the robot insert items
- [x] Make the robot differentiate between trash inputs
- [ ] Make the robot only linkable to the correct ports
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/f0cd26c0-36fb-43e2-8bdb-c100f033668b
https://github.com/user-attachments/assets/3809b033-01a6-4b4f-96e0-f4730dd2e92d
https://github.com/user-attachments/assets/ccf325f3-ee60-42f8-9e68-75fafe596a7b
</p>
</details>
---
# Changelog
<!--
You can add an author after the `🆑 ` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- add: Added Fillbot. Link it to a lathe, material silo, ore processor
or disposal unit with a multitool and watch it gather stuff!
---------
Signed-off-by: Timfa <timfalken@hotmail.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com >
(cherry picked from commit a71192bdf05a3b7a40323bb16983c25be432bfc4)
2025-03-21 18:28:52 +03:00
Spatison
35dd522f28
Material Silo ( #1488 )
...
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Port from [Goob](https://github.com/Goob-Station/Goob-Station/pull/989 )
---
# Changelog
<!--
You can add an author after the `🆑 ` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑 Aviu00, Spatison
- add: Added material silo
---------
Signed-off-by: Spatison <137375981+Spatison@users.noreply.github.com >
Signed-off-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
(cherry picked from commit 9897094a3c873ddca79ece3a5cdbb7d30252edfd)
2025-01-14 02:15:25 +03:00
DEATHB4DEFEAT
47b10a01b0
Catch-Up Cherry Pick 2 ( #944 )
...
# Description
Picked 400 commits (and skipped many, many more) from WizDen since #540 .
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby
Refactor).
---
# TODO
- [x] Pick
- [x] Compile
- [x] Fix runtime errors
- [ ] Fix up humanoid profile editor
- [ ] Test everything
---
# Changelog
🆑
- add: Merged 400 WizDen PRs. Happy testing!
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com >
Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com >
Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com >
Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com >
Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com >
Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@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: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com >
Co-authored-by: ShadowCommander <shadowjjt@gmail.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com >
Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Jezithyr <jezithyr@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Ciac32 <aknoxlor@gmail.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com >
Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com >
Co-authored-by: Vasilis <vasilis@pikachu.systems >
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com >
Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com >
Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com >
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com >
Co-authored-by: exincore <me@exin.xyz >
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com >
Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com >
Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com >
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com >
Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com >
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com >
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com >
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com >
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com >
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: ike709 <ike709@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com >
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com >
# Conflicts:
# Content.Client/Input/ContentContexts.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Input/ContentKeyFunctions.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
# Resources/ConfigPresets/EinsteinEngines/default.toml
# Resources/Prototypes/Alerts/alerts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/keybinds.yml
2024-10-19 14:53:37 +07:00
Ed
971a2670bb
Anomalies behaviours ( #24683 )
...
* Added new anomaly particle
* Add basic anomaly behaviour
* +2 parametres
* add functional to new particle
* add components to behaviours
* big content
* add shuffle, moved thing to server
* clean up
* fixes
* random pick redo
* bonjour behavioUr
* fix AJCM
* fix
* add some new behaviours
* power modifier behaviour
* rmeove timer
* new event for update ui fix
* refactor!
* fixes
* enum
* Fix mapinit
* Minor touches
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-07-11 21:19:09 -07:00
deltanedas
747716666f
add power sensor ( #20400 )
...
* clean up logic gate / edge detector components
* logic gate usedelay support
* new codersprite
* PowerSensor component and system
* add power sensor
* port locale
* fix
* minecraft
* fixy
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-22 22:44:18 +01:00
Ed
ff0526efe0
Anomaly Synchronizer ( #20945 )
...
* added textures and basic prototype without functionality
* add full functional
* finish work
* fix naming
* reduce random anomaly spawner offset
* Update AnomalySystem.Vessel.cs
* Update SharedAnomalySystem.cs
* Update SharedAnomalySystem.cs
* Update production.yml
* fix errors
* fix?
* Update anomaly_sync.yml
* deltanedas code fixes. Thx, deltanedas!
* git what
* fix yml
* fix yml 2
* meh, try again
* work, work, work
* fix powered checking. now component work also without ApcPowerReceiving
* now supercrit port invoke on start growing, not after explosion
fix errors
* deltanedas fix pack 1
* Update AnomalySynchronizerComponent.cs
2023-11-12 20:45:19 +01:00
deltanedas
e837f2fd85
air alarm signal ports and other stuff ( #18642 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-21 14:18:30 -07:00
deltanedas
7cbf08ea9e
logic gate momentary pulse, switch status port ( #17198 )
...
* logic gate momentary is now pulse
* switch status, minor refactor
* filescope namespace
* switch
* fix ci probably
* add auto linking for edge detector and logic gate
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-12 15:43:59 -07:00
deltanedas
07d2430840
logic gate stuff ( #16943 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 16:48:42 -07:00
0x6273
7a5a64ffb4
Add device linking to emitter and APE ( #16805 )
2023-05-28 16:44:28 +10:00
Julian Giebel
5e0a96dfc7
Blast door/shutter, timer and or gate device linking fixes ( #16347 )
2023-05-11 18:16:02 -04:00
Julian Giebel
5c86778fff
Fix network configurator verbs and misc fixes ( #16210 )
2023-05-07 20:58:12 +10:00
Kevin Zheng
4e5adc2b86
Add interlocking airlocks ( #14177 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-05-07 16:49:11 +10:00
Julian Giebel
6ebd784cb6
Device Linking and better linking ui ( #13645 )
...
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com >
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com >
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-05-07 16:07:24 +10:00
