Commit Graph

8965 Commits

Author SHA1 Message Date
Ed
47ea85ba21 back to ru + fix (#1021) 2025-03-13 13:30:52 +03:00
Ed
dcacd8f8da bugfixes and ENG OBT preparation (#1015)
* bugfixes and OBT preparation

* Update CP14CargoSystem.cs
2025-03-12 20:14:50 +03:00
Ed
93ed28d34c Trading content (#1010)
* reroll positions

* more trading content

* bugfixes

* more content

* guidebook uodate

* Update buy.yml
2025-03-12 00:51:58 +03:00
Ed
66058ffc49 Auto CBT (#997)
* auto doggy

* fix

* fix
2025-03-09 23:29:20 +03:00
Ed
759260c2ba unique loot rework 2025-03-09 18:48:48 +03:00
Ed
c06323374f fix sun inside storage 2025-03-08 14:55:37 +03:00
Ed
0b5712ce97 Vampire antag (#988)
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
2025-03-07 14:52:43 +03:00
Tornado Tech
4a11cf9c53 Merge pull request #977 from crystallpunk-14/skill-remaster
Knowledge refactor
2025-03-06 22:29:36 +10:00
Tornado Tech
1265355260 fix: CP14AddKnowledgeSpecial usings 2025-03-06 19:48:20 +10:00
Tornado Tech
ce0ec78e8d fix: CP14AddKnowledgeSpecial namespace 2025-03-06 19:43:04 +10:00
Tornado Tech
e6a28307a4 refactor: server CP14KnowledgeSystem 2025-03-06 19:42:20 +10:00
Ed
c1acf81541 NewTrade (#969)
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
2025-03-06 12:01:43 +03:00
Tornado Tech
7b5283b35b fix: Knowledge events usings (I hate Rider) 2025-03-06 18:56:06 +10:00
Tornado Tech
44f4c17266 refactor: Orthographic and obsolete in Knowledge 2025-03-06 18:22:01 +10:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
Ed
81b9cdfff7 Alchemy integration test (#967)
* Update TryAllReactionsTest.cs

* test drive

* fix traveling ship roundremove

* Update CP14RoundRemoveShuttleSystem.cs

* Dev map update
2025-03-03 23:15:40 +03:00
Ed
719ee50c96 CP14AreaEffectBehavior 2025-03-03 16:07:19 +03:00
Ed
bef78c62c0 Alchemical bomb (#965)
* smoke bomb system

* collector fixes

* bomb integration

* fix

* tweak
2025-03-03 14:06:50 +03:00
SlamBamActionman
08cb26dbf0 Hotfix: Fix uplinks allowing buying conditionally restricted items (#35334)
* Initial commit

* I just compressed the code

* Actually address review
2025-03-02 20:40:57 +01:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
2025-03-02 13:28:13 +03:00
Ed
3fd47443ae Essence collector (#952)
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
2025-02-28 15:55:47 +03:00
SlamBamActionman
41c51e2905 Implanter draw rework (#32136)
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting
2025-02-27 18:57:28 +01:00
SlamBamActionman
c7b9a76342 Prevent crates, pet carriers and other things from going into disposals (#35557)
* Initial commit

* Solve underlying bug, readd to disposals

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-27 18:43:56 +01:00
deltanedas
7520d8a2c8 add button to print logprobe logs (#32255)
* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-27 14:47:16 +01:00
slarticodefast
0c6081fe10 Fix egg cooking and make microwave code a little less bad (#35459) 2025-02-27 23:39:06 +11:00
Dora
53dc27cb1e Adding sorting to chem master (#34763)
* Adding sorting to chem master

* Chem Master can now sort based on following categories
 - Alphabetical
 - Quantity
 - Time Added to Machine

* Sorting is disabled by default and persist in the machine for everyone

* Removed some pointless code from Chem Master's UI

* Changed None and Time Added's text to reflect what they do better

* Minor adjustments to the code requested by maintainers
2025-02-27 12:19:52 +01:00
Ed
5524e029f4 Essence splitter (#948)
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
2025-02-27 13:48:38 +03:00
SpeltIncorrectyl
e86770f5a0 Mime can no longer write on paper without breaking their vow (#35043)
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
2025-02-26 10:11:59 +01:00
keronshb
68de58eb66 THE WIZARD (#35406)
* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-25 22:34:07 -07:00
Ed
ba901d5e0e Crystals Update (#925)
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
2025-02-25 23:37:05 +03:00
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
lzk
237df1c9a1 fix ion storm code readability (#35337)
fix ion storm readability
2025-02-25 08:36:56 +11:00
Schrödinger
2958706e04 [ADMIN minor update] Add Autocompletion for Player Usernames in SetMind Command (#35477)
* add(src): Add getCompletion player for setmind command

* tweak(src): Fulfilling review requirements. used CompletionHelper.SessionNames()

* tweak(loc): Add localization

* fix(srs): smail
2025-02-24 22:29:05 +01:00
Winkarst
004e54af51 Cleanup: Use `SoundCollectionSpecifier instead of string literals in BibleSystem` (#35448)
* Cleanup

* Update
2025-02-25 08:23:50 +11:00
Winkarst
ebc1bff4cb Cleanup: Use `SoundCollectionSpecifier instead of string literals in PowerGridCheckRule` (#35449)
* Cleanup

* Update

* .

* Volume
2025-02-25 08:16:10 +11:00
Winkarst
c899ae7649 Cleanup: Use `MapSystem.DeleteMap instead of IMapManager.DeleteMap in SalvageSystem.Magnet` (#35475)
Cleanup
2025-02-24 21:29:12 +01:00
ScarKy0
51104a7316 TryGetRandomRecord in StationRecordsSystem (#35452)
* init

* requested changes

* stuff
2025-02-24 19:05:32 +01:00
Winkarst
45e7891706 Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside ImmovableRodRule` (#35462)
Cleanup
2025-02-24 18:57:39 +01:00
Winkarst
0148c441e6 Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside EventManagerSystem` (#35460)
Cleanup
2025-02-24 18:45:00 +01:00
Winkarst
615d548021 Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside MaterialStorageSystem` (#35458)
* Cleanup

* Update
2025-02-24 18:38:40 +01:00
ScarKy0
88308356db Move FingerprintComponent and FingerprintMaskComponent to shared (#35451)
* init

* review

* whoopsie
2025-02-24 17:23:11 +01:00
metalgearsloth
ac9c8b8275 Fix arrivals (#35439) 2025-02-24 20:43:43 +11:00
metalgearsloth
5385683b7e Fix admin test arena (#35444)
* Fix admin test arena

* Add to GridsLoadableTest

* QueueDel map, remove nullable

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2025-02-24 17:05:59 +11:00
Tayrtahn
6f925dd610 Fix prototypes so they pass analyzer checks (#35435) 2025-02-24 15:21:59 +11:00
Ed
37ff029956 return black roofs 2025-02-24 01:07:03 +03:00
Winkarst
fa73217b52 Cleanup: Use `SoundSpecifier instead of string literals in VomitSystem` (#35426)
* Cleanup

* Update

* Update
2025-02-23 22:53:04 +01:00
Winkarst
91f2c46f56 Fix: Admin-only messages still show "(S)" on Discord (#35431)
Fix
2025-02-23 22:43:14 +01:00
Ed
c60f65c901 Update CP14DemiplaneSystem.Echoes.cs 2025-02-24 00:09:19 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
No Elka
9fb5517afa Make holoparasite's damage transfer ignore the host's armor (#35418)
Change stuff
2025-02-23 21:03:11 +01:00