Commit graph

27 commits

Author SHA1 Message Date
KaiserMaus
11cca765b8
Fix "ыыыы" prototype edition (#3514)
Co-authored-by: iertis <kanopus952@gmail.com>
Co-authored-by: Daniel | Orvex07 <d.b.orvex@gmail.com>
2025-12-27 18:23:10 +00:00
iertis
a700c7628e
Fix "ыыыы" (#3516) 2025-12-26 17:44:36 +03:00
Vigers Ray
0818c7bf40 фикс анализатора 2025-04-12 04:11:55 +03:00
Vigers Ray
2c1db3ffdf
Анализатор растений (#1755)
Co-authored-by: Ignaz Kraft <ignaz.k@live.de>
2025-04-12 04:05:07 +03:00
Vigers Ray
b66ec242b6 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-SUITSTORAGE.png
#	Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png
2025-04-06 12:22:49 +03:00
Minemoder5000
7c84ff1a93
Make Health Analyzer scan range nullable and adjust admin PDA (#36347)
* Modify .cs and admin pda

* enhance comment
2025-04-06 10:31:06 +02:00
VigersRay
940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03:00
ArchRBX
dd12ac1f8a
MedTek Cartridge (#32450)
* initial commit

* adds cartridge to cmo's locker

* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too

* fixes ert medic pda not having it preinstalled

* adds attribution

* removes redundant dependencies

* fix agent pda

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2024-10-01 23:17:57 -07:00
VigersRay
0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Launcher/LauncherConnecting.cs
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Launcher/LauncherConnectingGui.xaml.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Medical/Components/HealthAnalyzerComponent.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Content.Server/StationEvents/Events/RandomSentienceRule.cs
#	Content.Shared/Interaction/Components/BlockMovementComponent.cs
#	Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Objectives/objectiveGroups.yml
#	Resources/Prototypes/Objectives/stealTargetGroups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/migration.yml
2024-08-22 06:50:04 +03:00
Milon
3e15e00af5
fix admin pda health analyzer popup (#31097)
* damn it

* whoopsie

* no more fucky wucky fucky wuckies are GONE
2024-08-18 21:02:18 -06:00
VigersRay
bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/chemistry/components/mixing-component.ftl
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/ServerInfo/Guidebook/Mobs/Diona.xml
#	Resources/ServerInfo/Guidebook/Mobs/Species.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Technologies.xml
#	Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/migration.yml
2024-07-11 14:05:37 +03:00
deltanedas
02636386b5
item toggling giga rework + full ninja refactor (#28039)
* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-11 15:55:56 +10:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2)
* commit
2024-05-31 02:16:18 +03:00
Pieter-Jan Briers
e00f74505c
Use new ComponentPauseGenerator (#25183)
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
2024-02-26 14:36:19 +11:00
Fildrance
ef849a0156
fix: #25102 cryo pod now uses health-analyzer system to update body state in UI (#25109)
* fix: cryo pod now uses health-analyzer system to update body state in UI

* refactor: use EntityEventRefHandler instead ComponentEventRefHandler in CryoPodComponent subscribe on EntRemovedFromContainerMessage

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2024-02-21 17:47:23 +03:00
Rainfey
4129c77a5b
Make Health Analysers UI continuously update (#22449) 2024-02-06 09:20:09 -04:00
Kara
14dac914ce
Kill UserInterfaceHelpers (#20912) 2023-10-11 20:17:59 +11:00
metalgearsloth
d5bd1c6f86
Predict StorageComponent (#19682) 2023-09-11 21:20:46 +10:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
metalgearsloth
0e81cb4319
Remove diseases (#15684) 2023-05-07 17:50:37 +10:00
DrSmugleaf
f474171451
Remove health analyzer component references (#15322) 2023-04-11 17:11:02 -07:00
keronshb
9ebb452a3c
DoAfter Refactor (#13225)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-02-25 01:01:25 +01:00
nmajask
a0086b5184
Adds a sound effect to health analyzers (#13425) 2023-01-11 23:38:39 -07:00
DrSmugleaf
7fbc2608e8
Remove redundant read-only VV from datafields (#12626) 2022-11-16 20:22:11 +01:00
metalgearsloth
84225dde3d
Fix sloth's disease shit (#7123) 2022-03-14 13:51:42 -07:00
Rane
bb9ad4259c
Diseases (#7057)
* Disease system first pass

* Renamed HealthChange

* First working version of diseases (wtf???)

* Fix the cursed yaml initialization

* Pop-Up effect

* Generic status effect

* Create copy of prototype

* CureDiseaseEffect

* Disease resistance

* Spaceacillin

* Nerf spaceacillin now that we know it works

* Sneezing, Coughing, Snoughing

* Fix queuing, prevent future issues

* Disease protection

* Disease outbreak event

* Disease Reagent Cure

* Chem cause disease effect

* Disease artifacts

* Try infect when interacting with diseased

* Diseases don't have to be infectious

* Talking without a mask does a snough

* Temperature cure

* Bedrest

* DiseaseAdjustReagent

* Tweak how disease statuses work to be a bit less shit

* A few more diseases

* Natural immunity (can't get the same disease twice)

* Polished up some diseases, touched up spaceacillin production

* Rebalanced transmission

* Edit a few diseases, make disease cures support a minimum value

* Nitrile gloves, more disease protection sources

* Health scanner shows diseased status

* Clean up disease system

* Traitor item

* Mouth swabs

* Disease diagnoser machine

* Support for clean samples

* Vaccines + fixes

* Pass on disease resistant clothes

* More work on non-infectious diseases & vaccines

* Handle dead bodies

* Added the relatively CBT visualizer

* Pass over diseases and their populators

* Comment stuff

* Readability cleanup

* Add printing sound to diagnoser, fix printing bug

* vaccinator sound, seal up some classes

* Make disease protection equip detection not shit (thanks whoever wrote addaccentcomponent)

* Mirror review

* More review stuff

* More mirror review stuff

* Refactor snoughing

* Redid report creator

* Fix snough messages, new vaccinator sound

* Mirror review naming

* Woops, forgot the artifact

* Add recipes and fills

* Rebalance space cold and robovirus

* Give lizarb disease interaction stuff

* Tweak some stuff and move things around

* Add diseases to mice (since animal vectors are interesting and can be used to make vaccines)

* Remove unused reagent
2022-03-13 20:02:55 -05:00
Fishfish458
7f43f38cc7
Add health analyzer and medical scanner ECS (#6907)
Co-authored-by: fishfish458 <fishfish458>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-08 14:45:52 +11:00