iDesmond
d781e0f166
Консоль радио и доступы ( #2203 )
...
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:52:43 +03:00
Vigers Ray
b378fdc706
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/PAI/SharedPAISystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Locale/en-US/_strings/access/components/genpop.ftl
# Resources/Locale/en-US/_strings/doors/components/turnstile.ftl
# Resources/Locale/en-US/_strings/power/battery.ftl
# Resources/Locale/en-US/_strings/store/pai-catalog.ftl
# Resources/Locale/en-US/_strings/tools/simple-tool-usage.ftl
# Resources/Locale/en-US/_strings/ui/controls.ftl
# Resources/Locale/en-US/_strings/weapons/ranged/upgrades.ftl
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
# Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png
# Resources/migration.yml
2025-04-28 01:29:55 +03:00
pathetic meowmeow
b7d020570f
Truncate lathe announcement lists ( #36945 )
2025-04-26 17:45:53 -04:00
Vigers Ray
f71f04558f
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
# Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
2025-04-17 23:48:59 +03:00
Leon Friedrich
f46bb301fb
Fix lathe arbitrage test ( #34449 )
...
* Fix lathe arbitrage test
* Add refinables
* nullable
* nullable2
* Fix merge
* Ignore failures
2025-04-17 21:07:51 +10:00
Vigers Ray
6020a6fd5b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Zombies/SharedZombieSystem.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Resources/Locale/en-US/_strings/research/technologies.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
# Resources/Prototypes/Polymorphs/polymorph.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/Prototypes/Research/experimental.yml
2025-04-17 00:07:59 +03:00
pathetic meowmeow
5d38ae56de
Add chatty lathes ( #34959 )
2025-04-16 21:29:25 +02:00
Vigers Ray
3355febe9b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
2025-02-09 22:17:22 +03:00
deltanedas
1f5fab5761
move lathe recipes into packs (easier for forks and maintaining) ( #33095 )
...
* add LatheRecipePackPrototype
* change Lathe and EmagLathe to use packs
* add AddRecipesFromPacks helper to SharedLatheSystem
* update lathe logic to work with packs and clean up some stuff
* migrate individual recipes to recipe packs
* update client
* remove node/artifact scanner from techs
* :trollface:
* fix test and make it include emag recipes
* add test that every dynamic recipe must be researched
* pro
* fix
* fix
* fix all tests, genuinely good test i wonder who made it
* add unused uranium and incendiary drozd mags to tech and lathe
* add recipes
* add incendiary prototype
* undo some changes
* troll
* :trollface:
* true
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
* shitmed real
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
* update funny test
* :trollface:
* :trollface:
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-02-07 19:22:49 +01:00
Vigers Ray
cef39bc293
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Controls/RadialContainer.cs
# Content.Server/Lathe/LatheSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.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/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/migration.yml
2025-01-30 11:33:49 +03:00
ScarKy0
253a9fbdf1
Seperate EMAG into EMAG and Authentication Disruptor ( #34337 )
2025-01-29 23:05:47 -05:00
Vigers Ray
864c12bac2
Фикс упаковщика
2025-01-04 08:26:08 +03:00
Vigers Ray
4309b24a76
Фикс абуза автолатов
2024-12-11 05:00:09 +03:00
metalgearsloth
a89d4c750b
Power stuff ( #31314 )
...
* Power stuff
- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.
* big update
* boing
2024-08-25 22:18:42 +10:00
Nemanja
85b7d183bd
Blueprints ( #31138 )
...
* Blueprints
* Update tables_loot.yml
* doink
* mark as required
2024-08-25 22:06:50 +10:00
Nemanja
ada6455b17
Make printing from ore procecssors slightly more bearable ( #31074 )
...
* Make printing from ore procecssors slightly more bearable
* Update sheet.yml
2024-08-17 15:12:55 +10:00
Nemanja
2c26be606f
Add support for printing reagents in lathes ( #30476 )
...
* Add support for reagents in lathes
* missing locale
2024-08-01 14:15:05 +10:00
deltanedas
262b9698cf
make lube speed up lathes ( #25515 )
...
* add LatheGetSpeedEvent
* add LatheLube system
* make typical lathes accept lube
* spill
* :trollface:
* rework to generic ReagentSpeedSystem
* hyperlathe ops
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-07 14:20:43 -04:00
Jezithyr
6869adfa78
Move GasMixture to shared ( #27480 )
...
* Moved GasMixture to shared
* Temp Fix for sandbox violation, idk why Array.Resize isn't working properly. It's already sandboxed.
* The most powerful webedit in history
2024-04-30 14:31:05 -07: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
Leon Friedrich
77e029d4ca
Remove atmos method events ( #26402 )
...
* Remove HasAtmosphereMethodEvent
* Remove GetTileMixturesMethodEvent
* Remove GetTileMixtureMethodEvent
* Remove GetAdjacentTilesMethodEvent
* Add TileMixtureEnumerator
* Remove GetAdjacentTileMixturesMethodEvent
* Remove IsTileSpaceMethodEvent
* Remove HotspotExposeMethodEvent
* Remove pipe net method events
* Remove device method events
* Use Entity<T>
* Misc fixes
* A
* Theres probably a few more of these
* Fix other resolve errors
2024-03-28 13:22:19 +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
Ilya246
49dbbc5721
fix emagged lathes ( #23318 )
...
* implement
* pass uid
* fix
* fix dementia
* event implementation
* fix
2024-01-02 02:11:13 -05:00
Hannah Giovanna Dawson
f850047341
Migrate Lathe Material Ejection Code to MaterialStorage ( #23199 )
...
* SS14-23184 Migrate Lathe Material Ejection Code to MaterialStorage
The lathe material ejection code acts as a do-nothing
man-in-the-middle system that does work that would be
reasonable for any MaterialStorage-using machine to
use. This has been fixed by migrating the ejection
code to MaterialStorage, allowing anything that uses
the system to eject mats it is storing.
* Fix some YAML references. Science!!
2023-12-30 20:08:33 -05:00
Nemanja
c3f81bfe03
Hyper convection lathes and industrial ore processor ( #23202 )
...
* Hyper-convection lathes and industrial ore processor
* balance
* gold... why not?
* review
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-31 03:18:58 +11:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
DrSmugleaf
a44fa86b68
Update trivial components to use auto comp states ( #20539 )
2023-09-28 16:20:29 -07:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
Nemanja
6695ac2ad6
Show materials as sheets, tweak lathe ui ( #19709 )
2023-08-31 22:28:08 -07:00
chromiumboy
a39fa80d58
Add lathe material ejection ( #19218 )
...
This completes PilgrimViis' (now closed) PR 16398. It addresses issue 10896, by allowing materials to be ejected from most lathes (except the ore processor and sheet-meister 2000)
* - Refinements to the material ejection UI
- Made the lathe UI default to a slightly larger size
- Fixed an offset issue with the label of the item currently being printed in the build queue UI
* Allow the materiel reclamation UI to pop if there is material left in the lathe, but not enough to print any sheets
---------
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-17 09:22:01 -08:00
ubis1
e203423665
Emaggable protolathe ( #18456 )
2023-08-08 00:21:04 +10:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
Nemanja
a01f26d3a6
fix lathe syncing and tweak ui ( #17489 )
2023-06-20 00:39:35 -06:00
Nemanja
910c2da9bb
fix-lathe-recipe-dupes ( #17473 )
2023-06-19 11:43:20 -06:00
Nemanja
8411739e00
Fix secfab being able to print protolathe items ( #17443 )
2023-06-18 16:35:19 -06:00
Moony
e2b5651fc3
Make sure lathes don't waste time trying to print when out of mats. ( #16617 )
2023-05-19 10:25:22 -05:00
Nemanja
9efc727fe1
RND Rework [Death to Techweb] ( #16370 )
...
* Techweb rework
* more ui work
* finishing ui
* Finish all the C# logic
* the techs + lathes
* remove old-tech
* mirror-review
2023-05-15 15:17:30 -05:00
Nemanja
d506311985
make printed items from lathes automatically stack ( #13603 )
...
Closes https://github.com/space-wizards/space-station-14/issues/10402
2023-01-20 15:06:02 +11:00
Nemanja
26786b5839
decouple material insertion visualization from lathes ( #13242 )
2023-01-08 13:36:50 +11:00
Leon Friedrich
1f5bae751f
MaterialComponent cleanup ( #13326 )
2023-01-07 14:36:32 -08:00
Chief-Engineer
2a8e5d9096
Add machine logs ( #13185 )
...
* add material insert logs
* add lathe queue logs
* add grav gen power logs
* fix count
* replace SharedStackComponent with StackComponent and rm unused imports
* use TryComp
* fix import
2022-12-27 18:01:36 +01:00
Nemanja
4eee1ee9b2
clean up infinite researchsystem shitcode ( #13136 )
...
* clean up infinite researchsystem shitcode
* fml some more shit
* make syncing work logically
* naming naming naming
2022-12-25 15:22:23 -06:00
Nemanja
050e157005
Technology Disks ( #13077 )
...
* clean up a bunch of R&D code
* don't store components
* brug
* speedrun some sloth review
* technology disks
* expand functionality, begin work on printer
* disk printer ui
* file
* fix the rebase
* disk console is finito
* Update DiskConsoleSystem.cs
2022-12-20 16:39:57 -06:00
Nemanja
0549b22cbc
clean up a bunch of R&D code ( #13071 )
...
* clean up a bunch of R&D code
* don't store components
* brug
* speedrun some sloth review
2022-12-19 15:14:02 -06:00
0x6273
a201d777bc
Machine upgrade examine verb ( #12119 )
2022-11-04 14:27:47 +11:00
Paul Ritter
c5e5729bd4
removes beforeserialization hook ( #12319 )
2022-11-03 12:41:12 +11:00
Nemanja
6fd083af0b
fix infinite lathe printing bug ( #12343 )
2022-11-01 18:05:00 -05:00
Nemanja
3ab98e320a
lathe machine upgrading ( #12032 )
2022-10-30 18:12:11 +11:00
