4 Commits

Author	SHA1	Message	Date
Nemanja	7646e0d1d2	Cursed Mask (#29659) ... * Cursed Mask * extra expressions * block ingestion * mind returning * okay fix the removal shit	2024-08-11 14:44:20 +01:00
lzk	73f02aaa0b	Add ability to add additional friendly and hostile factions in prototypes (#29636) ... * Make friendly and hostile factions in NpcFactionMemberComponent datafiels * :trollface: * :trollface:	2024-08-09 17:22:38 +01:00
Ed	0016a29544	Killer tomatoes (#26053) ... * make tomatoes * many friends! many mommies * finish * renaming system * fix * Update miscellaneous.yml * Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> * N * deleete exception? * merge conflict fix * fix? * fuck you * sloth fixes * fixess? * fix --------- Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit f3a97fc0c53e0db2875d02839eb60599e53245e8)	2024-04-21 22:56:29 +02:00
deltanedas	e948115f9f	Move faction exception and everything it needs to shared (#25154) ... * move faction prototype to shared * move faction exception and member stuff to shared * fix breaking changes for random stuff * move pettable friend stuff to shared * mostly fix * final fixy * dragonops * final fixy II * use querys and fix warpspeed fish (probably) * fixer * Rrrr! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit 7561bef6a7aee65149381e155da53abc65a6a4e7)	2024-03-23 23:55:48 +01:00