Commit graph

56 commits

Author SHA1 Message Date
Dmitry
b1861ffb69 merge remote wizden/master 2026-09-30 12:42:28 +07:00
SlamBamActionman
19bc31aef7
Add "new player label" over the head of players joining the game for the first time (#44709)
* Initial commit

* RMC? I 'ardly know 'er

* Sprout

* Rework it to use job icons

* Revert the one change

* Always the one yaml

* Easy review changes

* We do a little salami

* Review changes

* NIGHTMARE NIGHTMARE NIGHTMARE

* Update to use StatusIconPrototype only

* Remove async

* Aaaand remove the comment, bah

* Review fixes

* Update master

* Add the ability for ghosts to see

* Byte backing

* Review fix + comment

* Update to 90 min

* Add todo message
2026-09-24 15:34:37 +00:00
Hitlinemoss
98d7c338ca
Split ERT/CBURN/DeathSquad off into their own department (#45699)
* Split ERT/CBURN/DeathSquad off into their own department

* Rename CentComm Quarantine Officer to CBURN Officer

* rename 'Death Squad' (the job title) to 'Death Squad Officer'

* EmergencyResponse -> Specialist

* Specialist -> Task Force

* Death Squad Officer -> Death Squad Commando

* rename it here too

* fixing weird merge-conflict bug

* fixing weird merge-conflict bug

* minor desc change

* Fix deathsquad description typo

* Whoops, merge squashed departments a bit
2026-09-22 19:51:47 +00:00
Hitlinemoss
499f1e48c6
Reorganized icons in the Agent ID UI + add Tram Driver (#45861)
* Organized icons in the Agent ID UI

* SeniorOfficer in wrong spot

* Added tram driver to ServiceIconGroup

* Fixed tram driver locale string

* minor locale resort
2026-09-22 14:13:03 +00:00
Dmitry
73ffef2ac0 merge remote wizden/master 2026-09-17 23:33:06 +07:00
Whatstone
a023e5784c
Cleanup: Remove byte order markers from most files (#45796) 2026-09-17 23:23:54 +10:00
Dmitry
bf22949b5b merge remote wizden/master 2026-09-06 14:40:48 +07:00
Hitlinemoss
49b9dedd5b
Properly split "Service" and "Civilian" into separate departments (#45511)
* Properly split 'Service' and 'Civilian' into separate departments

* Fixed Service department color

* minor highlight sorting

* minor highlight sorting

* Renamed assistant.yml to passenger.yml
2026-09-04 01:32:48 +00:00
Zekins
5681a91bfe
МиниФикс отображения иконки (#3696) 2026-08-11 01:10:12 +07:00
Dmitry
97381081b9 id mentorrole 2026-08-04 22:05:46 +07:00
Dmitry
9bf158f936 merge remote wizden/master 2026-08-04 18:46:40 +07:00
jckspjf
37414922f4
Cluwne Agent ID UI Fix (#45024)
* Cluwne Agent ID

* Remove from admin group
2026-07-29 23:02:31 -04:00
KeTuFaisPiKiNut
b2db76f07c
Tram Driver (#44412)
* tram-stub

* tram driving away

* spriting hell

* it will be our year took a long time to come

* polish

* more

* fixes

* onceagainmorefixed

* e

* fix real

* Update Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update play_time_trackers.yml

* resprite

* additional spriting things

---------

Co-authored-by: nomdéraisonnablementlong <you@example.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
2026-07-29 15:25:19 -06:00
Rami
df6738a6b9
Add custom sus icon in cham outfit change implanter (#44797)
* Add custom sus icon in cham outfit change implanter

* update sprites to request

* sus

* add it to the agent card threats job icon

* may as well fix docs

---------

Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-07-29 04:32:29 +00:00
Dmitry
816b7825ba merge remote wizden/master 2026-07-19 16:10:56 +07:00
āda
d33e63a5a2
New Agent Id UI (#39769)
* icon group prototype

* prototype v2

* agent id uses groups

* working UI using groups

* UI work, new header

* formatting and misc work

* fix some texture scaling

* aesthetics

* tabs, scrollbar, MinSize

* commit

* commit

* commit

* commit

* Revert "commit"

This reverts commit 8f29ae30c69670c6dc8d5fba3dd6bd98f574830d.

* we're back

* well enough

* Final visuals for the Id (for now)

* code cleaning

* minor cleanup

* self review

* id card system changes

* try index -> resolve

* DisposeAllChildren -> RemoveAllChildren

* fix the id cards

* all pretty

* unneeded

* merge

* Review by Fildrance

* Review by Pok

* fix

* cleanup

* refactor: revert icon setsize changes back to good old '32', made container button be resizable for localization reasons

* jobIconGroup

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
Co-authored-by: Fildrance <fildrance@gmail.com>
2026-07-18 19:51:36 +00:00
Dmitry
62509a35b8 merge remote wizden/stable 2026-02-02 01:08:11 +07:00
SlamBamActionman
407664a536
Add Cyborg crew indicator (#37038)
* Initial commit

* Include uncertain crew and make it work for AI

* Add new definition to Silicon Rules 8

* Update based on review

* Remove Cluwne from job list

* ProtoIdify

* Update and also make monkey/corgi show IDs

* Remove unnecessary property

* Remove redundant code

* Carrrrd

* cleanup

* Nicer code

* Update to fix the spawn bug + agent ID

* Fix new icons

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-01-29 06:59:06 +00:00
Dmitry
f501ebec66 merge remote master wizden 2026-01-16 14:30:48 +07:00
ThatGuyUSA
f92ed8418b
[FEATURE] More icons (#42200)
* innit bruv, but also done!

* added comment to signify why it's like that

* init, but done

* init commit

* you think you got everythin, until you didn't

* credits and one last touch up

* i fucking hate git

* KILL OLD COMMITS

This reverts commit 6f834a51de611f215ede02f291a9d834777884a5.

* KILLING OLD COMMITS

This reverts commit 36e1f4a476b873f2326723740eccf455060520d8.

* I am going to become the joker

* one day i'll learn how to delete old commits properly

* god fucking damn it

* capitalization!
2026-01-06 10:28:04 +00:00
Dmitry
c682eb80b4 merge remote master, upstream 2025-10-26 22:31:58 +07:00
B_Kirill
e3880a3c43
Criminal console status expansion (#36244)
* Criminal console update and new icons sprites

* Change Hostile and Paroled sprites

* Change Hostile sprite

* Return the 8x8 scale, redraw new icons

* Some changes

Redraw eliminated icon and change icons scaling in pda

* Update Resources/Textures/Interface/Misc/security_icons.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-10-21 08:44:50 +00:00
Dmitry
133e2e6228 remote merge upstream 2025-09-23 01:32:33 +07:00
āda
09eee5074d
Use an alias in job icons yml (#40415)
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-17 12:29:08 +02:00
Dmitry
f01a60f5c7 upstream 9.1 2025-09-17 06:41:33 +07:00
āda
12e8697648
Organize JobIconPrototype yml (#39774)
grouped

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-04 20:58:17 +02:00
Dmitry
0f4b1717e0 upstream 2025-06-08 00:04:48 +07:00
Professor Renderer Grizzleton
94fba22eee
Give cluwnes job icons (#37834)
* Add Weh-pet

* Add Weh-pet (again)

* Change weh-pet size to Medium

* Change weh-pet size to Medium (again)

Probably should've looked into what "medium" meant in yaml

* I may be stupid and misread how MIDIs worked.

* Finish weh-pet sprites

Weh!

* Add weh-pet to rare maints loot table

* Give cluwne sechud icon

* Remove weh-pet related content from cluwne-id

Why was it still THERE?

* Revert "Add Weh-pet (again)"

This reverts commit 8e135e520859ef94e693e27a86af1eed9576f9ab.

* Fix whitespace issues in residual files

* Update Resources/Textures/Interface/Misc/job_icons.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* More whitespace fixing and credit adding

* Resolve conflict in job_icons.rsi/meta.json

* Fixing whitespace *again*

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-27 18:39:52 +02:00
psykana
5e8db16660
Zombies can see Initial Infected (#33665)
* Zombies can see Initial Infected

* Update zombie character info text
2024-12-16 14:53:13 +03:00
Halches
e0e46d21a0
Zombies able to see infection. 2024-11-12 00:45:59 +03: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
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
b17425f653
Maybe fix mindshield icon (#2493) 2024-08-16 14:17:53 +03: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
slarticodefast
e0d30aff4e
Add tooltips to the agent ID job icons and improve status icon prototypes (#28575)
* add tooltips to agentid job icons

* forgot to stage this

* make StatusIconPrototype abstract

* minor visual improvements

* cleanup

* use currentculture to sort job names

* review
2024-08-09 16:14:07 +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
Brandon Hu
4e1fe975ec
tweak(StatusIcons): Hide revolutionary icons in the dark. (#30367)
Wilma? eye harley no er
2024-07-25 23:25:33 -06: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
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-03 12:12:21 -04: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
Golinth
5146853484
Fix Mindshield positioning (#27120)
fixed-ops

Im sure there is a more elegant way of fixing this, but this way requires no code changes. So I guess it works.
2024-04-19 15:27:18 +10:00
Morb0
782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusEffects/job.yml
#	Resources/Prototypes/StatusEffects/security.yml
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
2024-04-12 02:17:14 +03:00
lzk
6c3448da73
Invert status icon side (#2023) 2024-04-08 11:24:03 +03:00
Golinth
26f41e9fd5
Let Mindshields be effected by statusIcon shading (#26754)
Phone Webedit Ops

Original PR author forgot about mindshields for making status icons shaded. 

This can be done with other antag icons as well, I remember people mentioning revs being able to see each other in the dark was lame.
2024-04-05 22:35:32 +02:00
Morb0
8daf4b3f32 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
#	Resources/Textures/Structures/stairs.rsi/meta.json
2024-03-21 01:15:13 +03:00
Killerqu00
45d6c03407
Initial Infected can see each other (#25934)
initial infected icon
2024-03-18 15:57:36 -06:00
Golinth
21de5e9a08
Criminal Record Icons below Job Icons (#26203)
SS13 Criminal Record Icon Location REAL

Adds a new Offset DataField to the StatusIcon Prototype. It effects status icon location on a per-pixel level. Not sure what else it could be used for, but hey, nothing wrong with generalizing. Also moves the mindshield icon priority to one, to fix an unreported bug with them covering non-job icons.
2024-03-17 21:37:00 -04:00
Morb0
4ee0df9498 Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Structures/stairs.rsi/meta.json
#	Resources/Textures/Structures/stairs.rsi/stairs.png
#	Resources/Textures/Structures/stairs.rsi/stairs_stage.png
2024-02-22 13:19:02 +03:00
Golinth
79dc4e4d6f
Mindshield outline flashes, (#25409)
* Add animation support to status icons

Animated like any other entity. Change the png to have all frames, add delays in meta.json, and you're good to go.

* Dirty "fix" for the crashing.

Still have no idea why files cannot be read without changing their path in the yaml.

* Sloth review ig

I still have no idea why it wont work with /Textures/ missing as a prefix.
2024-02-20 17:26:48 -05:00
Morb0
92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Locale/en-US/chat/sanitizer-replacements.ftl
#	Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00