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