Morb0
0eba25c0eb
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# 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/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
# 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/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
ScarKy0
5be82d2a7f
Cyborg module action icons ( #32505 )
...
* Init
* added jani and medical
* + sci and service modules
* + syndi modules
* fixing up
* geiger counter stuff
2024-10-14 18:05:40 +11:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
pofitlo
2f286afd95
Syndicate business card ( #32162 )
...
* add card
* Update Resources/Locale/en-US/paper/syndicate-business-card.ftl
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
* fix
* Update Resources/Prototypes/Entities/Objects/Misc/business card.yml
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>
* add logo
* swap the "funny 'c'"
* improve logo (a little) and also fight with the funny 'c'
* fix
* oh... i think... mabe i done with this?...
* add
* smaller cards
* fix
* Update synicate_card.png
* fix typo
* fix
* fix
* Update Resources/Prototypes/Entities/Objects/Misc/business_card.yml
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-30 22:44:44 +02:00
Fildrance
4bcf3c3c0e
Station AI ability to electricute doors ( #32012 )
...
* Boom! Emergency access!
* Emergency access sound
* locale
* Updated sounds
* bleh
* Door electrify base
* feat: popups on attempt to activate AI action when wires cut
* refactor: use SharedApcPowerReceiverComponent to check if AI can interact with door
* refactor: added icon and sound for door overcharge
* meta.json should use tabs not spaces
* refactor: extracted sounds for airlock overcharge to static field in system
* refactor: cleanup, ScarKy0 mentions for resources
* refactor: removed unused textures
* feat: now notification is displayed when AI attempting to interact with door which have wire cut
* StationAiWhitelistComponent is properly gating BUI OnMessageAttempt, SharedPowerReceiverSystem.IsPowered is now used to check if device powered
* refactor: use PlayLocal to play electrify sound only for AI player
* refactor: SetBoltsDown now uses TrySetBoltDown, checks for power.
* bolts now check for power using SharedPowerReceiverSystem
* electrify localization and louder electrify sounds
* extracted ShowDeviceNotRespondingPopup, reverted airlocks not opening/closing when ai wire was cut
* refactor: cleanup
* New sprites and fixes
* Copyright
* even more sprite changes
* refactore: cleanup, rename overcharge => electrify
---------
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-09-27 17:22:17 +10:00
goet
24ed1f71f6
Fix medical PDA/health analyzer long range intel bug ( #31879 )
...
* hide spriteview from health analyzer while inactive
* add out of range indicator if analyzer becomes inactive
* hide out of range icon if there is no patient data
2024-09-21 15:54:48 +10:00
Morb0
2b35b9922f
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Objects/Misc/books.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-09-07 08:35:45 +03:00
ScarKy0
ecc38ad782
Fixed AI Actions ( #31823 )
...
* Updated sprites for AI HUD
* Epic test fail
* Merged AGhost actions and AI actions together again.
* Seperate comms and bugfix. Fixed broadcast.
2024-09-05 22:49:20 +10:00
chromiumboy
63ba0f61ea
Atmospheric alerts computer ( #25938 )
...
* Atmospheric alerts computer
* Moved components, restricted access to them
* Minor tweaks
* The screen will now turn off when the computer is not powered
* Bug fix
* Adjusted label
* Updated to latest master version
2024-09-04 21:13:17 -04:00
Morb0
721f7bfecf
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.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
# SpaceStation14.sln
2024-08-28 16:40:36 +03:00
lunarcomets
a02bdd09e4
update AI job icon to 8x8 ( #31565 )
...
icon and meta.json
2024-08-28 02:18:51 -06:00
metalgearsloth
afd0618a60
Station AI ( #30944 )
...
* Station AI overlay
* implement
* Bunch of ports
* Fix a heap of bugs and basic scouting
* helldivers
* Shuffle interactions a bit
* navmap stuff
* Revert "navmap stuff"
This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.
* AI wires implemented
* Fix examines
* Optimise the overlay significantly
* Back to old static
* BUI radial working
* lots of work
* Saving work
* thanks fork
* alright
* pc
* AI upload console
* AI upload
* stuff
* Fix copy-paste shitcode
* AI actions
* navmap work
* Fixes
* first impressions
* a
* reh
* Revert "navmap work"
This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.
# Conflicts:
# Content.Client/Silicons/StationAi/StationAiOverlay.cs
* OD
* radar
* weh
* Fix examines
* scoop mine eyes
* fixes
* reh
* Optimise
* Final round of optimisations
* Fixes
* fixes
2024-08-28 10:57:12 +10:00
lzk
ff3d79797d
Fix-Resprite emote icons ( #31447 )
...
* Fix-Resprite emote icons
* change scream
2024-08-26 12:20:58 +10:00
Morb0
07a34aaaae
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-23 09:38:36 +03:00
Rouge2t7
34a1e2c073
Emote sprites rework and update. ( #30887 )
...
Emoji eye change
2024-08-23 15:08:10 +10:00
Morb0
acf1ff4ec0
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
2024-08-12 13:18:43 +03:00
mhamster
e26e662023
Small json files fixes ( #30907 )
...
Small json fixes
Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
2024-08-11 23:26:45 +10:00
Morb0
7990ca8f46
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
2024-08-08 01:38:43 +03:00
DrSmugleaf
54d5bd266c
Add mapping editor ( #23427 )
...
* Add mapping editor (#757 )
* Remove mapping actions, never again
* Cleanup actions system
* Jarvis, remove all references to CM14
* Fix InventoryUIController crashing when an InventoryGui is not found
* Rename mapping1 to mapping
* Clean up context calls
* Add doc comments
* Add delegate for hiding decals in the mapping screen
* Jarvis mission failed
* a
* Add test
* Fix not flushing save stream in mapping manager
* change
* Fix verbs
* fixes
* localise
---------
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-04 13:31:45 +10:00
Arthur Asimov
b97dcf215a
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# .github/labeler.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-02 11:29:44 +03:00
Repo
a72445c419
aHelp fixes and improvements ( #28639 )
...
* Clear search criteria on loading aHelp window
* Pinning technology.
* Relay to aHelp window and discord if a user disconnect/reconnect
* Fix pinning localization
* Log disconnect, reconnects, bans to relay and admin in aHelp
* Drop to 5min to hold active conversations
* Update Content.Server/Administration/Systems/BwoinkSystem.cs
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* discord text styling if diconnect,reconnect,banned message.
* Pin icons instead of text
* Better Icons
* space
* Move button generation in to its own XAML
* List entry control
* Fix spaces
* Remove from active conversations on banned
* Discord if else block cleanup
* Better pin icons
* Move icons to stylesheet styleclass
* Better field order.
* PR review fixes
* fixes
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-07-30 18:28:32 +10:00
themias
85e36266fa
Add envelopes ( #30298 )
...
* Add envelopes
* oops
* Remove unused loc string
* comments and fixes
2024-07-29 21:49:05 -04:00
Morb0
da333a1972
Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
2024-06-27 13:40:52 +03:00
metalgearsloth
0546c9bf64
Revert "Weapon Reflection Movement Mechanic ( #27219 )" ( #29326 )
...
* Revert "Weapon Reflection Movement Mechanic (#27219 )"
This reverts commit b90373356e
2024-06-22 22:16:08 -04:00
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03:00
lzk
b931dae507
Locale svg icons for paper ( #2240 )
2024-06-13 08:58:55 +03:00
dragonryan06
b091a55d7d
Add new icon for Remove Evidence verb ( #28898 )
2024-06-12 18:05:56 -04:00
Morb0
775cbf088c
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Objects/Misc/books.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2024-05-23 13:06:49 +03:00
TsjipTsjip
daac303783
Admin access configurator ( #28107 )
...
* Port spritework and initial prototypes by @Arimah
Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>
* Make Admin PDA's spawn with a universal ID card
* Add universal access configurator to aghost satchel of holding
* Add Admin suffixes to adminonly items: AdminPDA, UniversalIDCard, AccessConfiguratorUniversal
* Admin jobicon
---------
Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>
2024-05-19 17:04:16 -06:00
Morb0
d97a09543d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
2024-05-15 18:53:52 +03:00
ike709
af4c6373f6
Adds Support for Guidebook Buttons in UIs ( #27891 )
...
* Adds Support for Guidebook Buttons in UIs
* read it from the component
* the code is perfect
* moony review
---------
Co-authored-by: ike709 <ike709@github.com>
2024-05-10 22:21:18 -04:00
Morb0
d6403daf00
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json
2024-05-11 01:41:28 +03:00
lzk
4231efc780
Change minimalist theme empty slot outline ( #27860 )
...
Change minimalist them empty slot outline
2024-05-09 17:17:33 -04:00
Morb0
b704ef0d5e
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
2024-05-09 13:28:43 +03:00
Hannah Giovanna Dawson
b90373356e
Weapon Reflection Movement Mechanic ( #27219 )
...
* Weapon Reflection Movement Mechanic
Adds a movement mechanic to deflection.
Standing still gives you your best chance of deflecting a shot.
Moving lowers this to 2/3rds. Sprinting to 1/3rd.
This allows for robust players to express better and provides
counterplay to someone finding a goober-strong deflection
weapon, giving more design space.
As part of this PR I've also touched the numbers of a few swords,
shields, etc. and modified some descriptions to make them read
better. The balance numbers are not remotely final, but as intent:
1. All the sidearm swords (katana, cutlass, captain's sabre) have the same damage. There's no good reason the "ceremonial" blade the captain has doing more damage than a katana.
2. The Captain's Sabre has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting. This one is controversial due to the recent nerf, I suspect: This could easily be 15->10->5?
3. The Energy Katana has a flat 30% reflect chance.
4. The meme Throngler has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting.
5. The E-Sword has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting.
6. The Double E-Sword has a mighty 75% reflect chance, dropping to 50% and then 25%.
7. Both reflective shields - Mirror and Energy - have a 95% deflect chance, dropping to 63% then 31%.
* Resolve PR comments.
* Weh?
* Reign in double esword a tad
* Shield nerfs no longer real
* Improve Mirror Cult desc
* Simple alert for deflection! No art yet.
* Added a new icon for deflecting
2024-05-07 20:14:58 +02:00
Morb0
43aaffd30b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
# Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
# Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
# Content.Server/Speech/EntitySystems/MothAccentSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Audio/Announcements/attributions.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png
# Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png
2024-05-07 00:43:11 +03:00
Ty Ashley
b8144df7a5
Added new icons for the emote wheel ( #27541 )
...
* Added new icons for the emote wheel
* Corrected weh path
* Changed whistle to better match other vocal emotes. Modified honk icon to match dimensions of box. Corrected chirp and chitter emote icons.
* Cleaned up edges of icons
* Added attributions.yml to emotes folder
2024-05-05 20:12:30 -05:00
Morb0
d9142b3553
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/conflict-labeler.yml
# .github/workflows/labeler-pr.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
2024-04-30 21:12:31 +03:00
Morb
16b3e2233a
Emotes Menu ( #26702 )
...
* Basic emote radial menu
* Move out from corvax
* Move to UI controller & add to top menu bar and key bind
* Make emote play
* Add name localization for emotes
* Localize chat messages
* Fix emote menu
* Add categories localization
* Fixes
* Fix
* Add emotes entity blacklist
* Fix entity whitelist required all logic
* Remove unused wagging emote
* Revert sprite
* Set default texture for emote icon
* Update Resources/keybinds.yml
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-28 21:38:23 -07:00
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.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/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
Pieter-Jan Briers
58f025ba80
THE RETURN OF ITEM STATUS ( #22986 )
...
* THE RETURN OF ITEM STATUS
Item status is now inline with the hands again. You can now see item status for both hands at once.
If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.
The item status for the active hand is also highlighted.
Item status has been given a new look so it looks unique and matches every UI theme.
* Shrink item status to 125px
This is going to require fixing the existing controls. Do that later.
* New bullet item status rendering
sex
* Make gun item status look just a little bit nicer.
Avoid only one or two bullets ending up on a single row of an item status.
* Delete Eris theme files
* More improvements
Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.
Redid how content margins are set from the theme. Less complex and cleaner now.
Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.
* Compact down item status text
Now it fits 3 lines of text on one line. Yay.
This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.
* Add item status sprites for Ashen theme.
* Add status control to show beaker/bucket/jug solution/transfer volumes
Also PollingItemStatusControl I'll be using that more.
* Fix welder item status, clean up welder code
The item status control implementation was ancient and bad. That's why it was buggy.
Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.
Cleanup. The code was doing some really dumb stuff.
* Spray bottles show contents in item status.
* cowtools
* Fix plasmafire and clockwork themes.
Actual git gaslighting wtf.
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-21 23:16:23 +10:00
Nemanja
e5a5196b1f
make filled inventory slots blank ( #27150 )
...
* blank filled slots
* Update InventoryTemplatePrototype.cs
2024-04-20 13:17:29 +10:00
poeMota
11cc48c181
New role - Pilot ( #1978 )
...
Co-authored-by: poeMota <belochuc@gmail.com>
2024-04-08 11:31:11 +03:00
Morb0
860f045b08
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
# Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
# Resources/Textures/Objects/Misc/books.rsi/book0.png
# Resources/Textures/Objects/Misc/books.rsi/book1.png
# Resources/Textures/Objects/Misc/books.rsi/book2.png
# Resources/Textures/Objects/Misc/books.rsi/book3.png
# Resources/Textures/Objects/Misc/books.rsi/book4.png
# Resources/Textures/Objects/Misc/books.rsi/book5.png
# Resources/Textures/Objects/Misc/books.rsi/book6.png
# Resources/Textures/Objects/Misc/books.rsi/book7.png
# Resources/Textures/Objects/Misc/books.rsi/book8.png
# Resources/Textures/Objects/Misc/books.rsi/book_bar.png
# Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
# Resources/Textures/Objects/Misc/books.rsi/book_borg.png
# Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
# Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
# Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
# Resources/Textures/Objects/Misc/books.rsi/book_detective.png
# Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
# Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
# Resources/Textures/Objects/Misc/books.rsi/book_fish.png
# Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
# Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
# Resources/Textures/Objects/Misc/books.rsi/book_infections.png
# Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
# Resources/Textures/Objects/Misc/books.rsi/book_origami.png
# Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
# Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
2024-04-02 11:32:48 +03:00
metalgearsloth
c91ed96853
Revert Paint ( #26593 )
...
* Revert "Fix build (#26258 )"
This reverts commit 6de5fbfafb#23003 )"
This reverts commit e4d5e7f1ae
2024-03-31 16:12:52 +11:00
chromiumboy
02273ca0e7
Improved RCDs ( #22799 )
...
* Initial radial menu prototyping for the RCD
* Radial UI buttons can send messages to the server
* Beginning to update RCDSystem
* RCD building system in progress
* Further updates
* Added extra effects, RCDSystem now reads RCD prototype data
* Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken
* Added extra functionality to RadialContainers plus documentation
* Fixed localization of RCD UI strings
* Menu opens near cursor, added basic RCD
* Avoiding merge conflict
* Implemented atomized construction / deconstruction rules
* Increased RCD ammo base charges
* Moved input context definition to content
* Removed obsoleted code
* Updates to system
* Switch machine and computer frames for electrical cabling
* Added construction ghosts
* Fixed issue with keybind detection code
* Fixed RCD construction ghost mispredications
* Code clean up
* Updated deconstruction effects
* RCDs effects don't rotate
* Code clean up
* Balancing for ammo counts
* Code clean up
* Added missing localized strings
* More clean up
* Made directional window handling more robust
* Added documentation to radial menus and made them no longer dependent on Content
* Made radial containers more robust
* Further robustness to the radial menu
* The RCD submenu buttons are only shown when the destination layer has at least one children
* Expanded upon deconstructing plus construction balance
* Fixed line endings
* Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag
* Bug fixes
* Revert unnecessary change
* Updated RCD strings
* Fixed bug
* More fixes
* Deconstructed tiles/subflooring convert to lattice instead
* Fixed failed tests (Linux doesn't like invalid spritespecifer paths)
* Fixing merge conflict
* Updated airlock assembly
* Fixing merge conflict
* Fixing merge conflict
* More fixing...
* Removed erroneous project file change
* Fixed string handling issue
* Trying to fix merge conflict
* Still fixing merge conflicts
* Balancing
* Hidden RCD construction ghosts when in 'build' mode
* Fixing merge conflict
* Implemented requested changes (Part 1)
* Added more requested changes
* Fix for failed test. Removed sussy null suppression
* Made requested changes - custom construction ghost system was replaced
* Fixing merge conflict
* Fixed merge conflict
* Fixed bug in RCD construction ghost validation
* Fixing merge conflict
* Merge conflict fixed
* Made required update
* Removed lingering RCD deconstruct tag
* Fixing merge conflict
* Merge conflict fixed
* Made requested changes
* Bug fixes and balancing
* Made string names more consistent
* Can no longer stack catwalks
2024-03-30 23:29:47 -05:00
Morb0
c44d509701
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
2024-03-29 11:43:30 +03:00
Nemanja
d576f5cbbb
dynamic alert sprites ( #25452 )
...
* dynamic alert sprite
* fix fat cooldowns
2024-03-28 17:32:56 +11:00
Morb0
6fc8c1cd54
Merge remote-tracking branch 'upstream/master' into master-syndicate
...
# Conflicts:
# Content.Packaging/ServerPackaging.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Holo/holofan.rsi/meta.json
# Resources/Textures/Structures/Holo/wetfloor.rsi/meta.json
2024-03-27 01:12:55 +03:00
DoutorWhite
018832707c
Fix Medical Hud death icon animation and Changes critical icon ( #26391 )
...
Fix Dead Icon animation and changes Critical Icon
2024-03-24 12:38:03 -04:00
