Commit Graph

30 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
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
metalgearsloth
4cf7f4f1c9 Predict tile-prying (#21167) 2023-10-23 23:54:01 +02:00
metalgearsloth
c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02: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
Leon Friedrich
56ef88a913 Prevent possible future game state bugs (#14323) 2023-03-01 09:26:37 -06: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
e5b4b70e4d Fix decals (#13491)
Fixes https://github.com/space-wizards/space-station-14/issues/13479
2023-01-16 07:23:32 +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
Leon Friedrich
8f352f87c2 Decal state handling (#12624) 2022-12-19 06:28:46 +11:00
Visne
58769634c7 Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07: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
metalgearsloth
bf2d72cf42 Make decal gridinit use gridentityid (#8792) 2022-06-12 17:53:11 +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
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
DrSmugleaf
e0c63483c2 Revert "pvsrange vec2 + eyezoom" (#7487)
* Revert "pvsrange vec2 + eyezoom"

* Merge fixes

* Update RobustToolbox
2022-04-09 13:07:40 -05:00
Paul Ritter
4b6ba817c2 pvsrange vec2 + eyezoom (#7392)
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
2022-04-04 20:30:12 +02: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
09a4870763 Reduce decal allocs (#7226) 2022-03-24 23:20:11 +01:00
metalgearsloth
5b53b69191 Decal rendering improvements (#6704)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-02-20 17:39:33 +11: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
Paul Ritter
219d91c6da decal system & crayons (#5183)
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
2021-12-03 15:35:57 +01:00