Spatison
f4fc4a908b
fix: test
2025-07-20 22:12:08 +10:00
ElectroJr
ad6b81233d
Refactor map loading & saving ( #34020 )
2025-07-20 20:34:12 +10:00
Eris
75a463cf5d
Saving changes 1
2025-07-20 14:37:13 +10:00
Eris
110e22aa2f
a
2025-07-20 14:25:39 +10:00
Spatison
a2557f75a6
Upstream ( #129 )
2024-11-21 17:49:04 +07: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
blueDev2
8ae9449feb
Allow cargo bounties to be sold off-station ( #26469 )
...
* Ported over code for delta-v to fix bounties
* Added requested changes
* Removed the station arg from "IsBountyComplete". It is unneeded and all calls just use a null value for it anyways
2024-07-11 19:45:34 -07:00
SimpleStation14
825ca8772d
Mirror: Trading Outpost now has half buy-only and half sell-only pallets ( #191 )
...
## Mirror of PR #25955 : [Trading Outpost now has half buy-only and half
sell-only
pallets](https://github.com/space-wizards/space-station-14/pull/25955 )
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4 "
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards )/[space-station-14](https://github.com/space-wizards/space-station-14 )
###### `c0bbbc33c19eafcc8defaa7f1ec2df42e485b435`
PR opened by <img
src="https://avatars.githubusercontent.com/u/1471082?v=4 " width="16"/><a
href="https://github.com/wafehling "> wafehling</a> at 2024-03-10
02:47:02 UTC
---
PR changed 8 files with 226 additions and 123 deletions.
The PR had the following labels:
- Changes: Sprites
- Status: Needs Review
---
<details open="true"><summary><h1>Original Body</h1></summary>
> ## About the PR
> I added two new entity types, a buy and sell only cargo pallet, and
added them to the trading outpost in place of the old pallets.
>
> ## Why / Balance
> Since the day this was added, every single shift, at some point I'll
hear someone in cargo yelling about how **"You sold stuff I just
bought!"**
>
> This seemed like the easiest way to fix the problem.
>
> ## Technical details
> Added a variable to the cargo pallet component for labeling which type
it is, added two new varieties of the cargo pallet to the yml, and
adjusted all the calls for GetCargoPallets() to have boolean variables
for buyOnly and sellOnly to tell the function what kind of call you're
looking for.
>
> If you don't give it any specifics it'll still treat any pallet as a
two-way one, but this function is only called 2 or 3 times and I've
adjusted them all and commented the function itself for anyone looking
to change/add it in the future.
>
> The old pallet is still in the game and is set to "both" by default,
so it should work just fine for backwards compatibility.
>
> ## Media
>
>
>
>
>
>
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
>
> Shouldn't break anything, I've left the old pallets fully in, and
updated them to work with the new GetCargoPallets() function just like
they used to. Not sure if/where you'd still need them, but better safe
than sorry.
>
> **Changelog**
> 🆑
> - tweak: The trading outpost now has dedicated buy-only and sell-only
pallets. No more accidentally selling orders you just bought. Cargonians
rejoice!
>
</details>
Co-authored-by: SimpleStation14 <Unknown>
2024-06-16 11:39:17 -04:00
VMSolidus
42145993f8
Fix Double Trade Station Bug ( #351 )
...
# Description
This fixes a bug introduced inadvertently by
https://github.com/Simple-Station/Einstein-Engines/pull/344 by adding a
CVar that makes it a choice to be made by our downstreams. Also, welcome
to our new CVar standard where they should be included in other systems.
---------
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com >
2024-05-12 06:22:03 +01:00
Debug
6bd5092853
Fix some trading post oopsies ( #956 )
...
Fix 2 oopsies
2024-03-11 19:57:03 +00:00
Flesh
44613e6544
Made ordering multiple crates at cargo order multiple crates ( #25518 )
...
* please tell me this is empty
* it wasn't empty, fixing that
* This should fix it
* fix for the fix
* address changes
* fix
* Added some comments, hoping that failed test was a fluke.
(cherry picked from commit aa4e7c061939fbe314be97a2e7f559477b941c07)
2024-03-08 12:54:53 +01:00
Debug
76d06416ab
Modify trade station for Delta
2024-03-08 12:54:50 +01:00
metalgearsloth
fa61952f51
Add trade stations ( #23863 )
2024-03-08 09:52:50 +01:00
Nemanja
30fccbbc8d
Chill bounties + fixes ( #23411 )
...
* Chill bounties + fixes
* localize
* fix arbitage
(cherry picked from commit 4662d463b8f5cbef5d93ca00b67bae6d8bf5db47)
2024-01-26 21:30:40 +01:00
Leon Friedrich
b87fcdb622
Remove uses of TransformComponent.ChildEntities ( #22442 )
...
* Make output of ChildEnumerator non-nullable
* Remove uses of ChildEntities
* poke tests
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-12-16 20:38:06 +01:00
Debug
ea39152f39
Reimplement pallet selling ( #66 )
2023-09-30 01:24:04 +02:00
metalgearsloth
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
metalgearsloth
d1236ff995
Fix cargo trading post ( #19656 )
2023-08-30 21:02:58 +10:00
Leon Friedrich
9c2af43af6
Deduplicate & fix prediction reconciliation test ( #18635 )
2023-08-04 12:21:44 +10:00
metalgearsloth
68b56878bc
Cargo selling fixes ( #17876 )
...
- Prevent selling dead mobs (getting used as easy corpse disposal).
- Fix a broadcast event being raised O(n) times instead of O(1)
2023-07-09 13:24:48 -06:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
Nemanja
7ab5127286
Cargo Bounties ( #17344 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2023-06-22 21:49:33 +10:00
deltanedas
b9f24b2681
expedition rewards ( #16972 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-06-16 15:19:02 +10:00
metalgearsloth
7d178555e1
Cargo shuttle fixes ( #17118 )
2023-06-05 13:37:00 +10:00
metalgearsloth
57858f802f
Shuttle drone improvements ( #16931 )
2023-05-31 11:13:02 +10:00
Tom Leys
db81e59013
NanoTrasen might send Gifts to the station via Cargo ( #16556 )
...
* Rebase Cargo Gifts
* Remove Chaos values from gifts (for now)
* Translate CargoGifts, rename fields
* Fix gift errors, detect missing products
* Fix order Id, some crate IDs
* Fix get Station. Gifts for Sec, Med, Fire, spacing
* Minimum players for various gifts
# Conflicts:
# Resources/Prototypes/GameRules/cargo_gifts.yml
2023-05-22 15:55:27 -06:00
metalgearsloth
e75d9d7e33
Fix accidentally selling mobs ( #15578 )
2023-04-20 22:09:48 +10:00
metalgearsloth
b65bfd1fcf
Don't sell non-dead mobs on cargo ( #15228 )
2023-04-09 11:59:41 +10:00
metalgearsloth
92dff4a630
Fix cargo (again) ( #14800 )
2023-03-23 19:21:12 +11:00
metalgearsloth
569f30b721
Cargo shuttle changes ( #14363 )
2023-03-23 16:10:49 +11:00
Checkraze
b329abc9ee
Cargo Pallet Sale Console ( #14422 )
2023-03-13 16:36:35 -04:00
metalgearsloth
86895f9735
Don't preload content maps in tests ( #14577 )
2023-03-11 12:45:48 +11:00
eoineoineoin
6722adcd83
Cleanup cargo shuttle/telepad order code ( #13591 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es >
2023-03-05 15:27:30 +11:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
eoineoineoin
bda5f8248f
Improve Paper UI, allow an to entity configure how it's UI looks ( #13494 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es >
2023-01-17 19:32:46 +11:00
eoineoineoin
cd10d6fb5e
Minor changes to display of cargo order manifests ( #12618 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es >
2023-01-14 21:49:00 -04:00
Jezithyr
eeb5b17b34
Mobstate Refactor ( #13389 )
...
Refactors mobstate and moves mob health thresholds to their own component
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2023-01-13 16:57:10 -08:00
Checkraze
66a01ccbf2
cargo system cleanup ( #13396 )
2023-01-10 20:55:59 +11:00
Checkraze
1edd00e50c
makes GetDocks and FoundOrganics public ( #13260 )
2023-01-01 17:44:30 +11:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Pieter-Jan Briers
55c61b9c35
Config presets system. ( #12824 )
2022-12-16 23:26:24 +01:00
metalgearsloth
3b3963083b
Replace GridEntityId with Owner ( #12743 )
2022-12-12 14:59:02 +11:00
metalgearsloth
6c76061887
Content changes for mapgrid kill ( #12567 )
2022-11-22 13:12:04 +11:00
metalgearsloth
6ab864fcda
Update content to mapsystem ( #12387 )
2022-11-13 17:47:48 +11:00
metalgearsloth
c0abea8047
Content side for removing IMap / IMapGrid comps ( #12357 )
2022-11-04 10:12:25 +11:00
metalgearsloth
c9a2ab1cee
Remove transform methods from mapgrid ( #12233 )
2022-11-01 11:27:18 +11:00
Leon Friedrich
12503e57a5
Fix construction/crafting and maybe cargo selling ( #12306 )
2022-10-31 13:26:05 +11:00
metalgearsloth
fae8b0173b
Fix cargo order amounts ( #12070 )
2022-10-22 14:55:13 -07:00
metalgearsloth
434da2df36
Use query for cargo sell blacklist ( #11887 )
2022-10-15 13:17:03 -07:00
metalgearsloth
ed442a7d3b
Cargo price tweaks 2 ( #11307 )
...
* Cargo price tweaks 2
* Allow cargo selling dead organics
2022-09-15 12:29:07 -05:00
