rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32212 commits 1 branch 0 tags 1.2 GiB
Commit graph

34 commits

Author SHA1 Message Date
Vigers Ray
389ed704e1 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Traitor/Uplink/UplinkSystem.cs
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
#	Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
#	Resources/Locale/en-US/_strings/shuttles/commands.ftl
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	RobustToolbox
 2024-10-30 13:26:32 +03:00
scrivoy
b3c61530bf
Enhance Vending Machine UI: Adjust Minimum Height for better User Experience (#32851) 
set FancyWindow MinHeight to 210
 2024-10-16 23:34:31 -05:00
VigersRay
aa38c32b65 upstream 2024-09-16 12:40:23 +03:00
Plykiya
dba10a1c80
Reduce vertical margin on vending machine UI (#32074) 
Smaller vending machine UI
 2024-09-11 16:45:52 +02:00
VigersRay
9328f4d9cb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/UserInterface/ActivatableUIComponent.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	SpaceStation14.sln
 2024-08-28 19:12:01 +03:00
Pieter-Jan Briers
d15869f600
Fix ChemVend jugs again (#31398) 
This re-introduces the dummy entity naming code, originally introduced in #29178 and randomly removed by #30064 with no technical justification given.

Fixes #31373
 2024-08-25 12:02:33 +10:00
Winkarst
588661465a
Make vending machine use EntityPrototypeView (#30064) 
* Make vendor machines use EntityPrototypeView

* Update

* 1

* Kill me

* For the love of god!!!
 2024-08-22 10:40:39 -04:00
VigersRay
d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
 2024-07-22 04:16:05 +03:00
Cojoke
b57174007c
Remove all Assigned Values that are Never Used (#30110) 
Remove all Assigned Values that are never used
 2024-07-18 20:22:23 -04:00
VigersRay
8fedc6f64a Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/migration.yml
 2024-06-23 21:07:25 +03:00
Tayrtahn
ac1bdd2c84
Fix unlabeled jugs in ChemVend (#29178) 
* Spawn dummy entities on client for vending machine UI

* Asked sloth, and we kinda need this pr

---------

Co-authored-by: Vasilis <vasilis@pikachu.systems>
 2024-06-23 19:31:34 +02:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2) 
* commit
 2024-05-31 02:16:18 +03:00
James Simonson
99aa72e30d
Vending UI facelift (#25377) 
* Convert to fancy window + added footer + add list spacing

* margin add
 2024-02-19 15:18:26 -07:00
themias
cf6eb200be
Remove need to toggle vending machine button (#21543) 2023-11-08 18:42:07 -07:00
Nemanja
0253270a9a
fix searching on vending machines (#21233) 2023-10-26 00:01:16 +11:00
ike709
3ee729f3fd
Adds a search bar to vending machines (#20326) 
* Adds a search bar to vending machines

* fix indentation

* whitespace again

---------

Co-authored-by: ike709 <ike709@github.com>
 2023-09-20 15:40:41 -04:00
metalgearsloth
99b77bc2d3
Remove lights compref (#19531) 2023-09-11 19:18:06 +10:00
metalgearsloth
68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth
600c0e3255
Fix a few warnings (#11576) 2022-10-04 14:24:19 +11:00
Andreas Kämper
42f3155c85
Clean up vending machines and port their visualizer (#10465) 2022-08-31 05:12:09 -07:00
Visne
58769634c7
Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07:00
Leon Friedrich
5449e7875e
Vending visualizer update (#9962) 2022-07-26 10:35:36 +10:00
Flipp Syder
8f223586d4
Vending machine changes (#8060) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-05-10 12:22:58 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Fishfish458
b837b186a5
Attempted Small Vending Machine Refactor (#6157) 
Co-authored-by: fishfish458 <fishfish458>
 2022-01-31 15:16:41 +11:00
wrexbe
cea1b21832
Fixing some warnings (#6250) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2022-01-21 10:38:35 +01:00
Vera Aguilera Puerto
2699540526 Remove useless resolves from a buncha tests. 2021-12-08 12:46:30 +01:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
5cd42c9ad6 Inline UID 2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
0feebbff00 Inline HasComponent entirely 2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
b835bea086 Inline GetComponent 2021-12-03 11:55:25 +01:00
Vera Aguilera Puerto
f64df117be Inline AddComponent 2021-12-03 11:33:40 +01:00
Swept
8e802b4305
Refactors Vending Menu to XAML-UI (#4614) 
* Initial

* Some web-edit reviews

* Keep VV

* Applied Reviews
 2021-09-19 17:21:05 +00:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00