Remuchi
d2d501dbc0
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Access/AccessOverlay.cs
# Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
# Content.Client/Access/UI/IdCardConsoleWindow.xaml
# Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
# Content.Client/Chemistry/UI/InjectorStatusControl.cs
# Content.Client/StatusIcon/StatusIconOverlay.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/Access/Systems/IdCardConsoleSystem.cs
# Content.Server/Administration/Commands/AGhost.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Resist/EscapeInventorySystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Shared/Access/Components/IdCardConsoleComponent.cs
# Content.Shared/Anomaly/SharedAnomalySystem.cs
# Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/RCD/Systems/RCDSystem.cs
# Content.Shared/Roles/JobPrototype.cs
# Content.Shared/StatusIcon/StatusIconPrototype.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/rcd/components/rcd-component.ftl
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
# Resources/Prototypes/DeviceLinking/sink_ports.yml
# Resources/Prototypes/Entities/Clothing/Back/duffel.yml
# Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
# Resources/Prototypes/Entities/Clothing/Neck/misc.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
# Resources/Prototypes/Entities/Objects/Magic/books.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Misc/tiles.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Decals/bricktile.rsi/white_box.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
# Resources/migration.yml
2024-04-13 11:29:33 +07:00
keronshb
b8363cd82a
Give stores the ability to check for owner only ( #26573 )
...
adds a check if the store belongs to the user
2024-03-30 19:25:36 -04:00
Aviu00
22db173b81
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
keronshb
257909fd97
Adds a refund button & action upgrades for stores ( #24518 )
...
* adds refunds to stores
* Adds method to check for starting map
* comments, datafields, some requested changes
* turns event into ref event
* Adds datafields
* Switches to entity terminating event
* Changes store entity to be nullable and checks if store is terminating to remove reference.
* Tryadd instead of containskey
* Adds a refund disable method, disables refund on bought ent container changes if not an action
* Removes datafield specification
* Readds missing using statement
* Removes unused using statements
* What the heck is listing data
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-02-04 11:48:51 +11:00
Ed
498ad2d5d7
Lock Anomaly generator to research access ( #24464 )
...
* small patch
* fix
* remove garbage
* fix
* moved to shared events
* fix
* LocId
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-02-01 19:45:24 +11:00
Aviu00
1f42f3bd3a
Изменения скидок ( #273 )
...
* Unique sales
* Less sales more limits
2024-01-20 06:09:27 +03:00
Aviu00
b34ade60d8
Uplink sales ( #264 )
2024-01-20 05:54:01 +03:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
Leon Friedrich
677ef07aa2
Misc implant fixes ( #17172 )
2023-06-06 21:53:11 -06:00
deltanedas
44f9c098ec
uplink locking/unlocking, minor pda refactor ( #15842 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-01 16:30:08 +10:00
deltanedas
2eaec2d528
Add uplink implant ( #15728 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-29 19:07:50 +10:00
deltanedas
45be0f8e91
Uplink store has to be open to receive TC ( #14341 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-29 14:41:24 +10:00
Nemanja
3c6e67adee
addcurrency command ( #15000 )
2023-03-30 23:02:39 -04:00
Nemanja
351c53e774
Clean up StoreSystem ( #14027 )
2023-02-12 12:39:14 +00:00
Nemanja
faca40b8d5
more component ref removal + combining server/client comps ( #13178 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
2022-12-25 05:28:21 +01:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Nemanja
e43ee216f6
store system currency rework ( #10893 )
2022-09-10 23:54:16 -07:00
Nemanja
d7e0b70e2c
revenant cleanup ( #10662 )
2022-08-18 17:04:23 -07:00
Nemanja
2152914acc
Generalized Store System ( #10201 )
2022-08-16 21:34:25 -07:00
