Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 13:37:47 +03:00
Code Issues Packages Projects Releases Wiki Activity
28,752 Commits 1 Branch 0 Tags
e6fa747f95eafc19febed20db080a775d71c53de
Commit Graph

45 Commits

Author SHA1 Message Date
sleepyyapril
a4ab8448b9 Mapping Mini-Wizmerge & New Central Command (#1610) 
# 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]?
-->

Ports https://github.com/space-wizards/space-station-14/pull/32294
Ports https://github.com/ss14-harmony/ss14-harmony/pull/310 (and
everything needed for it to function)
Early-merges
https://github.com/space-wizards/space-station-14/pull/34302

Adds the ability for multiple central command maps that get randomly
selected.
Tested and works.

---

# 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
-->

🆑 Several contributors
- add: Added a new central command map that is randomly picked alongside
the old one (thank you to Spanky from Harmony)
- add: Added Advanced SMES for mappers.
- add: Added the atmospheric network monitor for seeing what the
temperature, moles, and pressure is on every pipe everywhere through a
computer.
- add: Nukie med bundle now contains a compact defibrillator.
- add: Ported a better mapping editor.
- add: Added the throngler plushie.
- remove: Removed the Throngler as a possible loot spawn for gamble
crates.

---------

Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>

(cherry picked from commit 9272f65b64392f66a7cd4fd7c84bb152dc93b65a)
 2025-01-20 21:34:45 +03:00
Spatison
a2557f75a6 Upstream (#129) 2024-11-21 17:49:04 +07:00
VMSolidus
30fa1207b2 Update Submodule to 219.2.0 (#536) 
Uses the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26994
https://github.com/space-wizards/space-station-14/pull/26518
https://github.com/space-wizards/space-station-14/pull/26279
https://github.com/space-wizards/space-station-14/pull/24946
https://github.com/space-wizards/space-station-14/pull/27188

Requires:
https://github.com/Simple-Station/Einstein-Engines/pull/535
https://github.com/Simple-Station/Einstein-Engines/pull/534

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jake Huxell <JakeHuxell@pm.me>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: DEATHB4DEFEAT <zachcaffee@outlook.com>
 2024-07-11 17:40:02 -07:00
metalgearsloth
cd8b5b96b5 Optimise DecalOverlay (#25266) 
ChunkSize is still 32 so doesn't cut down on heaps of decals atm though we avoid passing many decals to drawing with the coordinates bounds check now.

(cherry picked from commit d8e5f5c24b88bf8096ddaec11e80f1af2953637b)
 2024-03-05 09:49:43 +01:00
Pieter-Jan Briers
ccea85136b Random spontaneous cleanup PR (#25131) 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
 2024-02-18 23:02:29 +01:00
metalgearsloth
122d6f01a7 Update content to new ParallelManager (#21813) 2023-12-02 20:27:37 +01:00
Leon Friedrich
2fc7d47a31 Decal fix 2: Electric Boogaloo (#21831) 2023-12-02 19:02:00 +01:00
metalgearsloth
9b845cf9a0 Decal fix (#21761) 
- Don't send stale chunks for deleted grid as client just errors it anyway.
- Store some allocations in fields.
 2023-12-02 19:00:04 +01:00
Leon Friedrich
e66c0b5035 Un-revert IPlayerManager refactor (#21244) 2023-10-31 19:00:44 +01:00
metalgearsloth
4cf7f4f1c9 Predict tile-prying (#21167) 2023-10-23 23:54:01 +02:00
DrSmugleaf
9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
metalgearsloth
c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
Chief-Engineer
1b5ec34a7a add decal logs (#18710) 2023-08-05 16:53:02 -04:00
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
Leon Friedrich
a36a64e6c5 Implicit gas tile & decal states (#15146) 2023-04-05 17:43:12 -06:00
metalgearsloth
6157dfa3c0 Salvage dungeons (#14520) 2023-03-10 16:41:22 +11:00
Leon Friedrich
554ec85069 Add SpawnAndDirtyAllEntities test (#13629) 2023-01-24 11:33:49 +11:00
Leon Friedrich
dbe99f9fa6 Decal system cleanup (#13493) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-01-16 11:46:22 +11:00
Leon Friedrich
5990393e31 Fix decal error (#13471) 
Fixes https://github.com/space-wizards/space-station-14/issues/13466
 2023-01-15 11:56:20 +11:00
metalgearsloth
243fd73db4 Update tilechangedevent to ref structs (#13383) 2023-01-09 13:45:21 +11:00
Pieter-Jan Briers
4fa2920472 Remove IoCManager.InitThread calls from parallel code. (#13070) 2022-12-20 22:52:39 +11:00
Leon Friedrich
8f352f87c2 Decal state handling (#12624) 2022-12-19 06:28:46 +11:00
Pieter-Jan Briers
32908fee67 Fix thread pool IoC context bug in DecalSystem. (#12993) 
Fixes https://github.com/space-wizards/space-station-14/issues/12992
 2022-12-13 09:45:29 +11:00
Leon Friedrich
6917b0fe17 Misc audio and related changes for replays (#12578) 2022-11-22 11:49:48 +11:00
Leon Friedrich
237b842d65 Parallelize gas and decal systems. (#12349) 2022-11-02 18:23:26 +11:00
Leon Friedrich
064112a045 Fix decal system error (#10346) 2022-08-06 13:08:05 +10:00
Leon Friedrich
ed068b166f Gas tile overlay rejig (#9619) 2022-07-24 19:10:18 -07:00
Leon Friedrich
72599e5282 Fix disappearing decals bug (#9608) 2022-07-14 19:33:11 -07:00
Leon Friedrich
fa4c6f63f8 Nullable grid Uid (#8798) 2022-06-20 10:14:35 +10:00
Acruid
4f9be42f40 Remove Explicit GridId References (#8315) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-12 11:54:41 +10:00
metalgearsloth
12681a6a38 Fix decals (for realsies) (#7887) 2022-05-03 15:04:58 +10:00
metalgearsloth
77bd892bbd Fix decals (finally) (#7771) 2022-04-28 20:23:43 +10:00
metalgearsloth
72da2db62d Content changes for grid splitting (#7645) (#7746) 
Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
 2022-04-24 13:54:25 +10:00
metalgearsloth
ecaad9c349 Revert "Update submodule (again)" (#7730) 2022-04-24 02:26:00 +10:00
metalgearsloth
8c7772630c Content changes for grid splitting (#7645) 
Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
 2022-04-24 00:59:38 +10:00
metalgearsloth
67c42ecacd Return another dict to decal pool (#7269) 2022-03-25 18:44:39 +11:00
metalgearsloth
5bbb5aebef Revert "Revert "Reduce decal allocs (#7226)" (#7263)" (#7265) 2022-03-25 13:22:24 +11:00
Moony
021d39be28 Revert "Reduce decal allocs (#7226)" (#7263) 
This reverts commit 09a4870763.
 2022-03-24 18:32:30 -05:00
metalgearsloth
7d91e34d6a Reduce decal allocs 2 (#7229) 2022-03-24 23:52:59 +01:00
metalgearsloth
09a4870763 Reduce decal allocs (#7226) 2022-03-24 23:20:11 +01:00
Kara D
49007d68e7 Fix decal placer crashing when placing/removing in space 2022-02-08 15:29:23 -07:00
Kara D
652f431ef4 Change decal spawn flag to +SPAWN instead of +MAPPING 2022-02-08 14:58:20 -07:00
mirrorcult
31769edf5f Decal Placer + add new decals for mapping (#6548) 
* abomination

* okay its less unabashedly garbage now

* other UI changes

* its britney bitch

* proper greyscale full/half/quarter tiles

* misc cleanup

* rsi

* Add a palette system. It's Kara's problem now.

* oops

* a

* Departmental palette alpha tweaks

* oopy

* so true

* Update Content.Shared/Decals/ColorPalettePrototype.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* fixes for that

* neutral light color and new warning lines

* dirt

* checkerboards

* oop

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-02-08 14:54:41 -06:00
Vera Aguilera Puerto
3f79e3754f Merge branch 'master' into 2021-12-03-remove-IEntity-komm-süsser-todd 
# Conflicts:
#	Content.Client/Crayon/CrayonDecalVisualizer.cs
#	Content.Client/Tabletop/TabletopSystem.cs
#	Content.IntegrationTests/Tests/InventoryHelpersTest.cs
#	Content.Server/AI/EntitySystems/AiSystem.cs
#	Content.Server/AI/Utility/AiLogic/UtilityAI.cs
#	Content.Server/AME/AMENodeGroup.cs
#	Content.Server/Administration/AdminVerbSystem.cs
#	Content.Server/Body/Systems/RespiratorSystem.cs
#	Content.Server/Chemistry/Components/InjectorComponent.cs
#	Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
#	Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
#	Content.Server/Crayon/CrayonComponent.cs
#	Content.Server/Doors/Components/ServerDoorComponent.cs
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
#	Content.Server/Fluids/Components/MopComponent.cs
#	Content.Server/Fluids/Components/SpillExtensions.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Server/Instruments/InstrumentSystem.cs
#	Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
#	Content.Server/Nutrition/EntitySystems/FoodSystem.cs
#	Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
#	Content.Server/Storage/Components/EntityStorageComponent.cs
#	Content.Server/Storage/Components/StorageFillComponent.cs
#	Content.Server/Stunnable/StunbatonSystem.cs
#	Content.Server/Throwing/ThrowHelper.cs
#	Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs
#	Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
#	Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
#	Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
#	Content.Shared/Damage/Components/DamageableComponent.cs
#	Content.Shared/Damage/Systems/DamageableSystem.cs
#	Content.Shared/MobState/Components/MobStateComponent.cs
#	Content.Shared/Slippery/SharedSlipperySystem.cs
 2021-12-07 17:48:49 +01:00
Paul Ritter
219d91c6da decal system & crayons (#5183) 
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
 2021-12-03 15:35:57 +01:00