juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,819 Commits 57 Branches 0 Tags
ed-08-04-2025-master-fix-2
Commit Graph

31819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
b957f777fd disabled weather 2025-04-08 18:53:16 +03:00
creamybag
d201dc0695 Beards (#1153) 
* beards

* fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-08 17:40:01 +03:00
Ed
5b3688fc89 deep Comoss ocean (#1150) 
* deep Comoss ocean

* Update migration.yml
 2025-04-08 17:39:23 +03:00
Ed
f7b5e40f23 fix master (#1152) 2025-04-08 17:24:56 +03:00
Viator-MV
d0a185cca0 Empties (#1151) 
добавлены пустые пресеты карт 2 биомов со всеми нужными компонентами
 2025-04-08 16:04:45 +03:00
Ed
f7f7feb837 Marble update (#1146) 
* all marble resprite

* Update meta.json

* marble table

* marble natural wall

* marble cave floor

* marble material

* marble small floor bricks

* marble in demiplanes
 2025-04-07 21:27:20 +03:00
creamybag
06863d9986 StrawHat (#1132) 2025-04-07 17:15:56 +03:00
creamybag
d5ce5d9f37 Syurko update (#1148) 
* Syurko\

* Translation editsЭ

* fix
 2025-04-07 17:15:21 +03:00
Ed
56299c62d6 fix 2025-04-07 01:36:55 +03:00
Ed
e77645d9d6 old tiles YES (#1144) 2025-04-07 01:34:45 +03:00
Ed
d81dbe4c20 Update tiefling.yml 2025-04-06 20:32:52 +03:00
Nim
d3be599ccb carcat tail (#1141) 2025-04-06 17:26:36 +03:00
Ed
4efbb6f307 Update sell.yml 2025-04-06 15:04:18 +03:00
Ed
b4ab1a714c Update CP14SharedFarmingSystem.Interactions.cs 2025-04-06 14:05:04 +03:00
Ed
b04b95cae4 farm buff 2025-04-06 13:59:50 +03:00
Viator-MV
32b077af63 update (#1137) 2025-04-05 14:42:51 +03:00
Ed
52c06249ea f (#1136) 2025-04-05 13:46:23 +03:00
Ed
bb2fbd1baf Update secret_weights.yml 2025-04-05 12:43:46 +03:00
Ed
e308eec703 Hoe dirt preparing (#1135) 
* seedbed returns

* modular hoe!

* hoe gameplay

* remove onion seeds
 2025-04-05 01:00:39 +03:00
Nim
d5e54ce744 minor edits (#1130) 2025-04-04 17:30:41 +03:00
Nim
c91a6c3f59 Adapted watchers (#1129) 
* watcher

* co

* sadly
 2025-04-04 17:30:26 +03:00
Ed
b66ee390a6 Dynamic demiplane weather + farming hotfix (#1131) 
* dynamic demiplane weather

* add skeleton sprite

* hotfix farming

* Update wheat.yml
 2025-04-04 10:35:48 +03:00
Nim
e125605f25 fix constructions (#1125) 2025-04-03 17:13:39 +03:00
creamybag
dd9aea718c The guildmaster's rapier was not given out in the round. (#1123) 
* fix

* fix2
 2025-04-03 15:34:35 +03:00
Ed
48831380b4 Give some love to farming (#1124) 
* give some love to farming

* Queryptimization

* Fuck soil!!!

* fuck soil in prototypes!

* seeds improve

* partial merge wild and farm

* some strange fix

* plant kills refactor, add compost

* fix compost

* Update migration.yml

* rain can watering plants

* sage update

* Update seeds.yml

* sage smoking update

* Update seeds.yml
 2025-04-03 15:29:08 +03:00
creamybag
16c4f8be53 Furcoat carcat (#1122) 
* FurcoatCat

* fix
 2025-04-03 10:00:27 +03:00
Nim
879792be09 Fix mana damage (#1106) 
* fix mana damage

* mana potion

* fix rev

* ehh

* hmm

* nop

* Update target_effect_creation_on_water.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-02 16:11:48 +03:00
Ed
fa7aacc103 Update Dev.toml 2025-04-01 23:08:46 +03:00
Ed
937851a72c Update Dev.toml 2025-04-01 21:50:20 +03:00
Ed
504adb6738 Fools day end (#1115) 
* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "Update secret_weights.yml"

This reverts commit 256476b576.

* Update Dev.toml
 2025-04-01 21:40:43 +03:00
Nim
b9d191c7e4 Fix bandage (#1112) 
* CP14Biological

* storePositionBuy
 2025-04-01 11:26:17 +03:00
Ed
1573d1ee81 ru 2025-04-01 11:16:33 +03:00
Deserty0
e2dec03cbb April fools fix (#1113) 
* fix

* fuck

* фы
 2025-04-01 08:41:35 +03:00
Ed
6e96943df5 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-04-01 00:11:16 +03:00
Ed
256476b576 Update secret_weights.yml 2025-04-01 00:10:51 +03:00
Ed
655cba7674 April 2025 fool (#1109) 
* Новый геймплей кузнеца и алхимика (#1084)

* anvilvat

Vat is now anvil

* deleted layers

* я даун

* тесты скажите что не так

* fuck documentation

* finally ok

* Alloys

* test not give up

* fix tests mk2 and anvil rename

* anvilgril

* FUCK TABS

* cattle

* meow

* the чистка

* armor

* fuck

* Update tags.yml

* ДА КАК ЭТО Я ВООБЩЕ БЛЯТЬ МОГ СДЕЛАТЬ НАХУЙ

* garde

* yes

* сохранить забыл

* голова потекла

* упс

* b

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Viator's april fools (#1091)

* uno reverse

* comos!

* desery special

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* [April Fools] Mob Pumpkin King!!! (#1092)

* MobPumpkinKing

* generation

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* asdsasdd (#1110)

* wait what???

* some fixes

* Поправка локализации на завтра (#1108)

* локаль

* упс

* Create TOPSECRET.xml

* Update entry.yml

* Update TOPSECRET.xml

* ч

---------

Co-authored-by: Deserty0 <86846189+Deserty0@users.noreply.github.com>
Co-authored-by: Viator-MV <egor44148@gmail.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
 2025-04-01 00:05:46 +03:00
Ed
edc67dd280 Storm nerf (#1107) 
* weather lightning nerf

* port storm weather to gamerule events

* fix
 2025-03-31 23:46:21 +03:00
creamybag
05de87e9e9 Merge pull request #1090 from creamybag/toadslippers 
Frogerge
 2025-03-31 23:01:14 +03:00
github-actions[bot]
e4bd418c45 @kvant8 has signed the CLA in crystallpunk-14/crystall-punk-14#1105 2025-03-31 17:52:57 +00:00
Ed
d6943c762c Merge pull request #1102 from ArZarLordOfMango/water 
[Fix]CP14FloorWaterOptimized fix
 2025-03-31 15:48:31 +03:00
ArZarLordOfMango
6ac00528e9 fix 2025-03-31 14:05:17 +02:00
ArZarLordOfMango
5ae9df1f0b water 2025-03-31 13:36:48 +02:00
Ed
41433d1414 Merge pull request #1100 from crystallpunk-14/ed-311-03-2025-upstream-2 
Stable upstream sync
 2025-03-31 13:15:22 +03:00
creamybag
4d1094cd6b scars (#1094) 2025-03-31 13:05:03 +03:00
Nim
2e85ac0263 Magic damage (#1047) 
* magic damage

* mana-healing potion

* slimes

* ManaDepletion

* Examinable

* color
 2025-03-31 13:03:42 +03:00
Ed
9d6e023bd0 Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2 
# Conflicts:
#	Content.Client/Administration/AdminNameOverlay.cs
#	Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
#	Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
#	Content.Client/SubFloor/SubFloorHideSystem.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Cloning/CloningSystem.cs
#	Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
#	Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
#	Content.Server/Roles/ParadoxCloneRoleComponent.cs
#	Content.Shared.Database/LogType.cs
#	Content.Shared/CCVar/CCVars.Interface.cs
#	Content.Shared/Cloning/CloningEvents.cs
#	Content.Shared/Cloning/CloningSettingsPrototype.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Changelog/Admin.yml
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Locale/en-US/paradox-clone/role.ftl
#	Resources/Maps/bagel.yml
#	Resources/Maps/loop.yml
#	Resources/Prototypes/Chemistry/mixing_types.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Effects/puddle.yml
#	Resources/Prototypes/Entities/Mobs/Player/clone.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
#	Resources/Prototypes/Entities/Objects/Devices/pda.yml
#	Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Objectives/paradoxClone.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
#	Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
 2025-03-31 12:41:37 +03:00
Ed
987f00a493 s (#1096) 2025-03-30 20:31:37 +03:00
Ed
8a479c4e5e Update weather.yml 2025-03-30 18:43:07 +03:00
Ed
011e90a5d1 Weather gameplay effects (#1089) 
* pipa

* Weather effects

* Weather in demiplanes!

* demiplane enter roofs

* Demiplane ruins

* Update weather.yml

* Update paper.yml

* Update paper.yml
 2025-03-30 17:27:05 +03:00
Ed
abdd46c7d5 Random bugfixes and balance (#1088) 
* shared magic energy examine

* fix #1067

* fix #984

* nerf slimes

* fireSpread nerf

* slimes demiplane examine + remove whistler
 2025-03-29 22:08:58 +03:00