Vigers Ray
2e3945004b
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/migration.yml
2025-02-05 04:48:05 +03:00
ActiveMammmoth
6a017ef17b
Mind Swap Fix ( #33553 )
...
* Stores owned by mind instead of body
* Requested changes, traitor uplink fixed
* Store, listings fixed and now use Entity<MindComponent>
* Removed duplicate code
* test change
* test change 2
* back to mind entityuid
* MilonPL requested minor changes
* ScarKy0 requested changes
2025-02-04 17:25:54 +01:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
Leon Friedrich
d806db264a
Fix currency duplication bug ( #32524 )
2024-09-29 22:13:22 +10:00
Vigers Ray
f1aef2edb9
Статистика конца раунда ( #239 )
2024-07-25 02:01:01 +03:00
Zonespace
6d71ec1b14
Non-uplink PDAs no longer can have TC inserted into them ( #28985 )
...
* PDAs no longer can have TC inserted into them
* far better way of doing this
---------
Co-authored-by: John Doe <johndoe@gmail.com>
2024-06-14 11:24:40 -04:00
Nemanja
be6f55a090
Clean up store system ( #28463 )
2024-06-01 11:29:17 -04:00
Plykiya
6e1f0ba390
Make insert telecrystal message only show to player ( #27585 )
...
Restrict message to player and fix grammar
Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-05-01 11:17:47 -04:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10: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
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
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
