Commit graph

21 commits

Author SHA1 Message Date
Vigers Ray
10888fd269 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/GameTicking/Managers/ClientGameTicker.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
#	Content.Server/StationEvents/Events/PowerGridCheckRule.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Shared/CCVar/CCVars.Game.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
#	Resources/Locale/en-US/_strings/guidebook/cooking.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/antagonist.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/migration.yml
2025-02-26 22:01:48 +03:00
Winkarst
004e54af51
Cleanup: Use `SoundCollectionSpecifier instead of string literals in BibleSystem` (#35448)
* Cleanup

* Update
2025-02-25 08:23:50 +11: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
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
DrSmugleaf
7fbc2608e8
Remove redundant read-only VV from datafields (#12626) 2022-11-16 20:22:11 +01:00
metalgearsloth
4df4238c4c
Nerf bible (#10023) 2022-09-16 07:27:05 -07:00
wrexbe
b3f75f9ffe
More minor UI refactor changes (#11213) 2022-09-11 21:30:11 -07:00
wrexbe
c55a015b77
Small UI refactor pieces (#11026)
* ActionType rename Name to DisplayName

* Gameplay State rename+move
2022-09-04 17:21:14 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
wrexbe
bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Rane
6054c5bc53
Familiars respawn (#7640) 2022-04-23 19:27:19 -07:00
Rane
05af8776ea
Familiar QOL changes (#7614) 2022-04-17 14:43:00 -07:00
Rane
7a6d3e69a8
Emaggable vendors + Familiars for Chaplain (#6961) 2022-04-17 17:16:02 +10:00
Paul Ritter
2ff40d5a1f
Serv3 rework content changes (#7145) 2022-04-03 02:01:22 +02:00
wrexbe
425712adea
Removed extra comp name attributes (#6449) 2022-02-08 19:42:49 +11:00
Rane
35076c4c0a
Make bible less annoying (#6396) 2022-01-30 14:33:45 -07:00
Rane
8070fce5e7
Gives Chaplain their Bible 🙏 (#6269) 2022-01-31 02:20:22 +11:00