Zekins
8efe46213e
Рост ( #266 )
...
* height
* big the biggest
2025-12-11 01:01:24 +03:00
Zekins3366
c8fca5f092
Merge remote-tracking branch 'upstream/master'
2025-10-31 14:03:21 +03:00
Dmitry
c682eb80b4
merge remote master, upstream
2025-10-26 22:31:58 +07:00
Pok
dca80238f0
Attempt to fix all unlocalized lines ( #40284 )
...
* missing-localization
* cmd
* fix: fixed patron page throwing exception due to unexpected patron tier in yaml
* Revert "fix: fixed patron page throwing exception due to unexpected patron tier in yaml"
This reverts commit 28458c78b1f2eed30fda898ec26059b27f1766f1.
* review and update
* no cmd
* fix
* fix 99
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
2025-10-10 21:57:38 +00:00
Zekins3366
64b65430a6
Merge remote-tracking branch 'upstream/master'
2025-10-02 22:47:17 +03:00
Dmitry
58eaa4b3be
upstream remote merge
2025-10-02 04:36:42 +07:00
LordCarve
a3ddba6f42
Cleanup - Use RemoveAllChildren() over DisposeAllChildren() ( #39848 )
...
* Content - change the (should-be-obsolete) DisposeAllChildren into the more robust RemoveAllChildren.
* Remove duplicate calls.
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
2025-09-23 15:40:48 +12:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
Zekins3366
2ebf22f2ae
Merge remote-tracking branch 'upstream/master'
2025-09-07 21:56:10 +03:00
Krosus777
9ebd1f6048
Sponsor suffix ( #3367 )
2025-09-08 00:13:34 +07:00
Hannah Giovanna Dawson
a699639834
Allow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus ( #40171 )
...
* Revert "Disable vulpkanin human hair (#40144 )"
This reverts commit d02aa1a4e2
2025-09-07 16:36:38 +02:00
Zekins3366
8676603e2b
Merge branch 'master' of https://github.com/corvax-team/ss14-wega
2025-07-21 20:48:14 +03:00
Dmitry
4948a136f1
stable upstream syns
2025-07-17 14:36:21 +07:00
Mora
752957a819
Switch HSV to the default colorspace for character customization ( #38434 )
...
* Made HSV default for character editor
* Adds/fixes comments to HSV defaulting
* Added dropbox fix, potentially cursed
* Revert "Added dropbox fix, potentially cursed"
This reverts commit a709883366fbee813e839742125e70844672af29.
---------
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com >
2025-07-02 21:08:06 -04:00
Tayrtahn
75db49f9c0
Clean up all missing EntitySystem proxy method uses ( #38353 )
2025-06-26 16:50:49 -07:00
Zekins3366
6d7108ea17
Merge remote-tracking branch 'upstream/master'
2025-06-01 20:30:23 +03:00
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
Dmitry
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Partmedia <kevinz5000@gmail.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: Stomf <5dorkydorks@gmail.com >
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com >
Co-authored-by: PraxisMapper <praxismapper@gmail.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com >
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com >
Co-authored-by: kosticia <kosticia46@gmail.com >
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com >
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com >
Co-authored-by: Myra <vasilis@pikachu.systems >
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: BIGZi0348 <svalker0348@gmail.com >
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com >
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com >
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com >
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com >
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: eoineoineoin <helloworld@eoinrul.es >
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com >
Co-authored-by: nikitosych <boriszyn@gmail.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
Co-authored-by: YoungThug <ramialanbagy@gmail.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com >
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com >
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com >
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: J <billsmith116@gmail.com >
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com >
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com >
Co-authored-by: Spanky <scott@wearejacob.com >
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com >
Co-authored-by: Deerstop <edainturner@gmail.com >
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com >
Co-authored-by: archee1 <archee3@hotmail.co.uk >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com >
Co-authored-by: poklj <compgeek223@gmail.com >
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com >
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com >
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: ScarKy0 <scarky0@onet.eu >
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com >
2025-05-24 11:00:17 +03:00
Tayrtahn
d72939ba4b
Cleanup TryAddDisplacement warnings ( #37545 )
...
Cleanup TryAddDisplacement warnings
2025-05-17 11:28:39 -04:00
Tayrtahn
022bc5c0a0
Cleanup warnings in HumanoidAppearanceSystem ( #37381 )
...
* Cleanup warnings in HumanoidAppearanceSystem
* entity -> entity.Owner
* Revert LayerMapReserve logic
* Try again without requires
2025-05-14 19:30:20 +02:00
Zekins3366
8fc429adbf
fixslimesgradient
2025-04-29 11:44:49 +03:00
Zekins
15494015eb
upstream
2025-04-26 21:56:19 +03:00
lzk228
a0ab19ee4a
Merge remote-tracking branch 'wizards/stable' into 04-21-upstream-sync
...
# Conflicts:
# Content.Client/Humanoid/MarkingPicker.xaml.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/elkridge.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/loop.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/Prototypes/Maps/relic.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
2025-04-22 11:02:12 +02:00
Ed
f6a29e24a2
Markings overhaul ( #35938 )
...
* markings displacement setup
* ok i got it!
* fix map updating
* remove trackingLayers
* markings clean up and modernizize
* marking disabling displacements
* markings restriction
* dehihienize
* dehihiniezize 2
* aa
* nice
2025-04-20 17:01:50 -04:00
J
3c307f3b36
Various UI warnings cleanup ( #36169 )
...
* Various UI warnings cleanup
* Revert unnecessary change
* Redoing SpriteSystem as it's non-injectable
* Missed one
* Better entity instantiation
* General cleanup of warnings changes
* Wrong class name!
2025-04-10 20:47:05 +10:00
Zekins
f78e8d8457
Merge remote-tracking branch 'upstream/master'
2025-03-31 22:26:25 +03:00
JerryImMouse
f76d1edf27
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
# Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2025-03-27 23:01:47 +05:00
Zekins
4448faf35f
Merge remote-tracking branch 'upstream/master'
2025-03-23 02:07:10 +03:00
Tayrtahn
b780b74bbd
Validate some SpeciesPrototype fields ( #35965 )
...
* Convert SpeciesPrototype strings to ProtoIds
* Simplify protoman indexing calls
2025-03-20 21:15:30 +01:00
paige404
2e7f01b99e
Fix broken layer hiding on clothes with multiple equipment slots ( #34080 )
...
* Fix broken layer hiding on clothes with multiple equipment slots
* Refactor ToggleVisualLayers, HideLayerClothingComponent, and ClothingComponent to allow more
precise layer hide behavior and more CPU efficient layer toggling.
* Adjust HumanoidAppearaceSystem to track which slots are hiding a given layer (e.g. gas mask and welding mask)
Add documentation
Change gas masks to use the new HideLayerClothingComponent structure as an example of its usage
* Fix the delayed snout bug
* Misc cleanup
* Make `bool permanent` implicit from SlotFlags
any non-permanent visibility toggle with `SlotFlags.None` isn't supported with how its set up. And similarly, the slot flags argument does nothing if permanent = true. So IMO it makes more sense to infer it from a nullable arg.
* Split into separate system
Too much pasta
* Remove (hopefully unnecessary) refresh
* Fisk mask networking
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
* Keep old behaviour, use clearer names?
I'm just guessing at what this was meant to do
* english
* Separate slot name & flag
* dirty = true
* fix comment
* Improved SetLayerVisibility with dirtying logic suggested by @ElectroJr
* Only set mask toggled if DisableOnFold is true
* FoldableClothingSystem fixes
* fix bandana state
* Better comment
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
2025-03-21 00:30:47 +11:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
SlamBamActionman
27cfc0939c
Add undergarments & "Censor Nudity" toggle to options ( #33185 )
...
* Initial commit
* Attribution
* Review changes
* Added comment for upstream
2025-03-05 10:14:01 +01:00
metalgearsloth
634c4a7780
Fix window positions not saving ( #35055 )
...
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
2025-02-23 23:57:57 +11:00
Zekins
7dba69b114
update
2025-02-07 00:36:01 +03:00
Zekins
9858c0dbce
ERP release ( #1 )
...
* ERP release
* fixes
2024-11-09 11:00:33 +03:00
Morb0
a0bce916fb
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
to4no_fix
b48ac8439d
Localization of the slot ( #31008 )
...
localization of the slot
2024-08-14 20:06:32 -04:00
Morb0
e853272357
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
2024-07-21 12:48:56 +03:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" ( #30214 ) ( #30219 )
...
* Reapply "Remove some BUI boilerplate" (#30214 )
This reverts commit cb0ba66be3
2024-07-21 14:48:13 +10:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" ( #30214 )
...
Revert "Remove some BUI boilerplate (#28399 )"
This reverts commit cbf329a82d
2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate ( #28399 )
...
* Remove some BUI boilerplate
- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.
* More
* moar
* weh
* done
* More BUIs
* More updates
* weh
* moar
* look who it is
* weh
* merge
* weh
* fixes
2024-07-20 15:40:16 +10:00
Morb0
80c6ccf4d2
Use shared sponsors manager
2024-05-13 17:45:23 +03:00
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
Nemanja
161fd6c83c
Mega Antag Refactor ( #25786 )
...
* Mega Antag Refactor
* last minute delta save
* more workshopping
* more shit
* ok tested this for once
* okkkkk sure
* generic delays for starting rules
* well darn
* nukies partially
* ouagh
* ballin' faded and smonkin wed
* obliterated the diff
* Spread my arms and soak up congratulations
* I've got plenty of love, but nothing to show for it
* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity
* ok this junk
* OOK!
* fubar
* most of sloth's review
* oh boy
* eek
* hell yea!
* ASDFJASDJFvsakcvjkzjnhhhyh
2024-04-25 11:31:45 +10:00
Morb0
6fc8c1cd54
Merge remote-tracking branch 'upstream/master' into master-syndicate
...
# Conflicts:
# Content.Packaging/ServerPackaging.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Holo/holofan.rsi/meta.json
# Resources/Textures/Structures/Holo/wetfloor.rsi/meta.json
2024-03-27 01:12:55 +03:00
DrSmugleaf
4790ccba19
Hide empty marking categories in the markings picker ( #26377 )
...
Hide empty marking categories
2024-03-24 15:01:51 +11:00
Morb0
b70efe1fa8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
metalgearsloth
c5486873db
Shuttle console + FTL rework ( #24430 )
...
* Add shuttle interior drawing back
Just do it per-tile she'll be right, at least it's done with 1 draw call.
* Revamp shuttle console
* Bunch of cleanup work
* Lables sortito
* dok
* Pixel alignment and colours
* Fix a bunch of drawing bugs
* Shuttle map drawing
* Drawing fixes
* Map parallax working finally
* weh
* Commit all my stuff
* mic
* deez
* Update everything
* Xamlify everything
* uh
* Rudimentary blocker range
* My enemies have succeeded
* Bunch of changes to FTL
* Heaps of cleanup
* Fix FTL bugs
* FTL
* weewoo
* FTL fallback
* wew
* weh
* Basic FTL working
* FTL working
* FTL destination fixes
* a
* Exclusion zones
* Fix drawing / FTL
* Beacons working
* Coordinates drawing
* Fix unknown map names
* Dorks beginning
* State + docking cleanup start
* Basic dock drawing
* Bunch of drawing fixes
* Batching / color fixes
* Cleanup and beacons support
* weh
* weh
* Begin pings
* First draft at map objects
* Map fixup
* Faster drawing
* Fix perf + FTL
* Cached drawing
* Fix drawing
* Best I got
* strips
* Back to lists but with caching
* Final optimisation
* Fix dock bounds
* Docking work
* stinker
* kobolds
* Btns
* Docking vis working
* Fix docking pre-vis
* canasses
* Helldivers 2
* a
* Array life
* Fix
* Fix TODOs
* liltenhead feature club
* dorking
* Merge artifacts
* Last-minute touchup
2024-03-03 18:39:19 +11:00
Morb
a5504424c4
Update sposnors system ( #1475 )
2023-10-02 19:06:17 +03:00
Morb0
34a8740819
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
