Vigers Ray
28484c893c
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Damage/modifier_sets.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
# Resources/migration.yml
2024-12-16 18:50:05 +03: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
Rinary
5a12200942
some fixes
2024-12-12 21:22:45 +02:00
pacable
18143644f5
исправление ( #753 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-02 02:23:21 +03:00
Rinary
977e8baaea
Доработка вампира и мелочи ( #598 )
...
* init
* fix vampire polymorph
* fix vampire metabolizm
* upd
* теперь при бане будет указываться номер раунда, хд
* fix
* fix
* fix locale
* change speed
* new nukeops shuttle
* FULLY FIX EBANY VAMPIRE OBJECTIVES
* fix faction
* fix drank objective
* try fix status icon
* fix changelings
* fix zombie faction
* vampire status icon fix
* upd roadmap
* vampire blood amount alert
* drain objective up
* upd
* upd
2024-11-13 04:02:57 +03:00
Rinary
a85433e877
Новый антагонист: Вампиры ( #560 )
...
* Initial Commit
* Unfinished
* Continuing, more abilities
* Remove necromicon healing
* oops
* Continuing
* Continuing
* Checkpoint incase i need to undo something
* Rewrite to use event per power, working passives
* refactor fixes
* so many fixes
* some fixes
* some fixes
* new textures, status icon
* vampire antag role, mind role
* проверку на дауна вызывали?(если Null, у сервера ступор головного фатала)
* fix 1
* fix 2
* fix fatal, fix build
* breafing audio
* fix icons style, store in action
* clear store things, add gamerule, mid round game rule
* some rework
* clear any store systems
* clear x2
* if you have 150 Blood Essence, you get mutation
* upd
* some changes
* simple mutation menu
* я вот сижу, в 12 ночи, пишу какую-то очередную хуйню, вместо приятного сна...
* upd
* normal mutations menu
* actions translate
* None type, base actions list
* passive abilities
* ability earning
* fix
* translate vampire preset
* translate vampire mutations menu
* mutations menu textures
* disable some
* ДРАНЫЙ БРИФ ФАТАЛКУ ПО ПРИКОЛУ БЕЕМ
* game preset
* mutation can infinity changed
* fix
* fully rework abilities update system
* gargantua info
* update ignore list
* fix gargantua passives
* vampire objectives
* new icons
* balance
* fix
* upd objectives
* fix metabolizer type, balance 2
* fix metabolizer type 2
* fix syntax
* clear translation
* xd
* update
* round end info
* fix
* drain objective fix
* fix
* fix syntax
* fix
* clear
---------
Co-authored-by: Rainfey <rainfey0+github@gmail.com>
2024-10-31 19:06:01 +03:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
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
VigersRay
6f858567f2
фиксы апстрима
2024-08-14 20:30:52 +03:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.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/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# 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/ert.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/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# 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
# Resources/migration.yml
2024-08-14 19:55:44 +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
Vigers Ray
bcb9508552
Говнокрад ( #268 )
...
* real?
* ok
* real 2
* one more thing that i forgot to port part 2
* i am dumb
* mofo og
* waaaagh
* some rework placeholders
* porting part 2
* bruh.
* bruh 2
* bruh 3.
* Update ChangelingRuleSystem.cs
* Update AdminVerbSystem.Antags.cs
* говнокрад это SubGamemode
* тяжело...
* пу-пу-пу
---------
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com>
2024-08-08 09:28: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
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs ( #28270 )
2024-06-03 12:12:21 -04: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
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
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
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
Golinth
bced73f676
Kill Seperated Mindshield Icons ( #25303 )
...
* Unghettoify mindshield icons
Adds support for layers in status icons, through the StatusIconLayer enum and the new "layer" datafield. Defaults to the Base layer where functionally remains unchanged.
* TG icon for shield
probably better than the shitty one I made in paint
* forgor meta.json
I forgor
* Emo review
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-02-16 10:58:28 -05:00
coolmankid12345
0f7189e8b5
Ghetto Mindshield Icon ( #20958 )
...
* Looks like shit frfr
* White for sure
* New icon
---------
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
2023-12-02 12:21:10 -05:00
IntegerTempest
615f15e8a9
Nukeops hud ( #21260 )
...
* a
* a
* a2
* syndi visor
* left icon
* a3
2023-11-05 19:36:08 -07:00
coolmankid12345
9df5ded9ad
Revolutionaries ( #18477 )
...
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2023-10-04 18:47:33 -07:00
Nemanja
044d5f6853
Status Icons ( #17529 )
2023-06-27 20:31:53 -04:00
