Nim
|
e54e8a95ee
|
Sheep (#972)
* sheep
* demi mod
|
2025-03-05 17:30:06 +03:00 |
|
creamybag
|
d9a5869504
|
Merge pull request #973 from creamybag/GuildmasterHat
Guildmaster hat
|
2025-03-05 17:28:41 +03:00 |
|
Nim
|
2855cc906b
|
Мелкий фикс перевода (#966)
* fix
* a
* ehh
* yep
|
2025-03-03 23:17:00 +03:00 |
|
Nim
|
9ea547d8be
|
Перевод на RU (#949)
* translate
* fix
* yee
* qwerty
* fix
* Signal
* Skeleton
* arrow
* fix
|
2025-03-03 09:38:09 +03: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 |
|
Ed
|
3d398e89ab
|
integration whistler poison into alchemy (#950)
|
2025-02-27 15:12:30 +03:00 |
|
Nim
|
15d9657139
|
Invisible whistler (#941)
* invisible whistler
* Parts
* spike
* flavor
* flavor
* filter
* sprite
* demiplan
|
2025-02-27 14:02:30 +03: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 |
|
Ed
|
aed7e0994a
|
pax bard (#943)
|
2025-02-26 12:01:14 +03: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 |
|
creamybag
|
ba6ceac7ef
|
DismasHair (#939)
* DismasHair
* new rsi, new meta, new name
|
2025-02-25 17:32:45 +03:00 |
|
Ed
|
3e26334c53
|
healing bard spell (#938)
|
2025-02-25 15:44:22 +03:00 |
|
Ed
|
1020288d12
|
Epic alchemy buff (#931)
* alchemy update
* damage heat
|
2025-02-22 12:45:55 +03:00 |
|
KittenColony
|
93350c80e8
|
Alchemy Remaster - Foundation (T0 / T1) (#827)
* Ported from broken repo
* Missed something
* Unfucks the port
* RU locale + EN typo fixes
* Simple solvent & Dye temperature / orgnization
* cleansing salt + reactions
* Healing solution stems bleeding
* Removed biological.yml duplicate
* Guidebook updating
* Update dye_brewing.yml
* Single character typos
* missed typos
* Salt dehydrating
* Dye now needs water (catalyst) to form
* Biological > Organic, Archaic > Arcane / Alchemized,+ RU Locale
* Adjusting & patches
* Chromium in Arcane
* Removed 0.1u empty from purification
* Update chromium_slime.yml
* test commenting out
* Uncommenting InverseEffect
* Revert "Uncommenting InverseEffect"
This reverts commit 19aaaa9246.
* Potential solution
* Revert Potential solution
* This might fix it.
* Suffering
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-21 17:58:40 +03:00 |
|
Deserty0
|
b8cc4c8c20
|
Fix (#922)
|
2025-02-20 19:22:29 +03:00 |
|
Nim
|
88462e5a1b
|
Modular arrows (#906)
* arrow
* sprite
* slots
* migration
* fix
* fix2
* del
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-19 22:36:21 +03:00 |
|
Ed
|
224d96bd34
|
Sociopath delete (#917)
* fuck sociopath and grass seel position
* Update PostMapInitTest.cs
* fix
|
2025-02-19 21:56:29 +03:00 |
|
Ed
|
ffa565484c
|
Modular weapon inlay (#903)
* slots lists
* blade inlay
* tadam
|
2025-02-16 11:41:43 +03:00 |
|
Ed
|
a3849c8aa9
|
pressure plate (#902)
|
2025-02-16 00:39:36 +03:00 |
|
Ed
|
02379e37f7
|
Leaf maze demiplane + crayon update (#901)
* crayons update
* Update workbench.yml
* leaf maze demiplane
* Update t2_leaf_maze.yml
|
2025-02-15 17:49:05 +03:00 |
|
Nim
|
249cad63ee
|
fix (#896)
|
2025-02-14 11:51:10 +03:00 |
|
Nim
|
460f438bb2
|
Various meats (#865)
* meat
* color fix
* recipe
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-13 11:29:19 +03:00 |
|
Ed
|
73b4060c65
|
passport (#886)
|
2025-02-12 17:20:50 +03:00 |
|
Арт
|
21592c24bc
|
New construction recipes (#872)
* FilesSort
* NewCrafts
* Locale
* Doors&Tomb
* RemFrames&SmallFixes
* Grilles
* BarrelsBenchPalletCurtains
* EditLocale
* BarrelIconSprite
* Fix_ResDuplicates
* Res_Fix
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-10 22:18:22 +03:00 |
|
Ed
|
4f4d24ac5b
|
Balance bugtweak (#881)
* Update CP14UniqueLootSystem.cs
* some demiplane balance
* rings undepants
* fix #870
* fix #868
* Update CP14ClientWallpaperSystem.cs
|
2025-02-10 22:07:25 +03:00 |
|
Арт
|
c678e96fbc
|
New vests (#862)
* Sprites&Meta
* Add_Vests
* Belt
* Loadouts&Fixes
* Rem_RedVest_FromGuildmaster
|
2025-02-10 17:47:40 +03:00 |
|
Ed
|
72c9cb9014
|
Unstable demiplane update (#866)
* replace heat trigger to unsafe damage trigger
* end demiplane music
* timed demiplane modifier
* unhardcode some values
* demiplane crystal destruction waves
* time limit
* fixes
* Update CP14UniqueLootSystem.cs
* Update unstable_rift.yml
* tweks
* Update unstable_rift.yml
|
2025-02-09 17:18:24 +03:00 |
|
Nim
|
ec6b5b4b93
|
say (#864)
|
2025-02-09 00:06:28 +03:00 |
|
Арт
|
bd45567599
|
Small Fixes (#861)
* Rem_HairHiding_GuardsHelmet
* Rem_electrified_CrystalShardElectro
* Locale_Fix
|
2025-02-08 21:39:17 +03:00 |
|
Ed
|
78e690f38a
|
Unstable demiplanes (#858)
* events
* heartbeat ambient
* Update unstable_rift.yml
|
2025-02-08 01:09:48 +03:00 |
|
Ed
|
cb583d6897
|
Ru localization sync (#854)
* localization sync
* Update entities.ftl
* Update entities.ftl
|
2025-02-07 17:12:54 +03:00 |
|
Ed
|
3fd780bc8e
|
Bank rename (#855)
* job renamings
* Job proto rename to merchant
* loadout renaming
* clothing rename
* Update migration.yml
* catalog
* more folders rename
* fix wood abuse
* add selling ores
* refolder
* fix icons
* herbals selling
|
2025-02-07 15:28:31 +03:00 |
|
Ed
|
558c199a29
|
Fix spells (#853)
* fix kick
* fix some spells
* Update ice_ghost.yml
|
2025-02-07 09:51:22 +03:00 |
|
Ed
|
b5eb3a3dc1
|
Kick stamina spell (#844)
* kick spell
* kick fix
|
2025-02-06 12:38:20 +03:00 |
|
Ed
|
35303d7d80
|
Guildmaster 2 spells (#842)
* merge movement and gate magic types into darkness new
* demiplane infiltration spell
* Update CP14SharedDemiplanSytem.cs
* finish
* locale
|
2025-02-05 22:52:50 +03:00 |
|
Ed
|
d100ed765b
|
Echoes of voices from the demiplanes (#840)
* split lightdarkness type magic to 2
* signal lights
* finish spells
* demiplane voices echoes
* Update closets.yml
* spells impact relay
* sprite fix
|
2025-02-05 14:21:12 +03:00 |
|
creamybag
|
11a4ed5439
|
creamy shyba (#839)
|
2025-02-04 23:35:48 +03:00 |
|
Ed
|
b2234b7c4a
|
Discord authentification (#819)
* Auth setup
* fixes
* messages
* adapt to new auth
* cvar fix
* generating link setup
* new version adapt
* fix
* Update DiscordAuthManager.cs
|
2025-02-04 22:44:22 +03:00 |
|
Ed
|
8e1d310a8e
|
Guildmaster YML implementation + Clothing pack (#832)
* banker clothing resprite
* dinazewwr
* commandant cape resprite
* guildmaster cloak
* Guildmaster loadout
* guildmaster job icon
* key locks work
* map update
* guildmaster keys
* guildmaster stamp
* update guildmaster house
* track demiplanes
* player death track
* localization
* guildmaster objective
* Update empire_orders.yml
* fix
* fix map
|
2025-02-01 17:52:01 +03:00 |
|
Ed
|
3f70d8600c
|
Fixes (#824)
* delete round seed
* delete worldEdge locale
* Update CP14BiomeSpawnerSystem.cs
* nails to 50 max stack
* wood planks stack increase
* flora material stack edit
* Update EntityTest.cs
* Update EntityTest.cs
|
2025-01-31 18:24:54 +03:00 |
|
Ed
|
b3eed32588
|
Workbench Refactor (#826)
* Workbench refactor
* fixes
* update all recipes protos
* scrap resprite
* scrap melting
* scrap weapon drop
* demiplane loot update
* weapon parts melting
* fix
* boilerplate
* material localization
|
2025-01-31 14:47:51 +03:00 |
|
Ed
|
8c42cdbbdf
|
Stackable ore (#820)
* ore stacks
* Update ores.yml
|
2025-01-30 13:48:42 +03:00 |
|
Nim
|
0463798b33
|
fix (#818)
|
2025-01-29 17:17:35 +03:00 |
|
Ed
|
ad9813cace
|
ice caves demiplane (#817)
* ice caves demiplane
* more things can spawn on snow
* Update base.yml
* fix guidebook quartz
* ice island demiplane
* xeno turret demiplane mobs
|
2025-01-29 00:48:11 +03:00 |
|
Ed
|
2bb465cb8b
|
Different crystals type update (#816)
* crystals update
* fixes
* fixes
* hehehe
|
2025-01-28 18:05:15 +03:00 |
|
Ed
|
72279cee6b
|
english OBT
|
2025-01-25 19:51:24 +03:00 |
|
Ed
|
f2bfeefcae
|
Guildmaster + Comoss update (#808)
* setup guildmaster job
* divide artisans and adventurer departments
* comoss tavern update
* Update comoss.yml
|
2025-01-25 17:47:17 +03:00 |
|
Ed
|
3f84a19ff0
|
Elf mana spell rework + magic damage popups (#802)
* fix #793
* safe elf mana. Fix #728
|
2025-01-23 17:20:03 +03:00 |
|
Ed
|
7d26a26547
|
Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# LICENSE.TXT
# Resources/Locale/ru-RU/administration/commands/babyjail.ftl
# Resources/Maps/Shuttles/emergency_elkridge.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Maps/Pools/default.yml
|
2025-01-22 13:46:46 +03:00 |
|