juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,784 Commits 57 Branches 0 Tags
655cba76746584537d3937231865c5ebfc849664
Commit Graph

31784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
metalgearsloth
0c98ad8b38 Fix 1x1 storage windows (#35985) 2025-03-29 19:57:28 +01:00
ScarKy0
89ea21bc31 Fix admeme hand teleproter. (#36147) 
* init

* changes
 2025-03-29 17:51:46 +03:00
ArZarLordOfMango
f81f7a836e mana-fix (#1082) 2025-03-29 16:57:13 +03:00
F8ctor
03e0d66083 No life mobs (#1072) 
* Slimeeeee!

* SimpleSpaceMobNoLifeBase

* No-no-no mr. Skeletik, you not alive

* Delete "bug"

* Revert "Delete "bug""

This reverts commit 4ce64f1cbc.

* Revert "No-no-no mr. Skeletik, you not alive"

This reverts commit f0c878c6a3.

* return, I'll see what's wrong

* Fix

* [ ] Work complete
 2025-03-29 16:53:34 +03:00
Ed
fddbb010cf Skill requirements (#1085) 
* prerequites refactor

* tiefling only spells

* metamagic update

* sort trying

* goblin speed port
 2025-03-29 16:50:14 +03:00
ScarKy0
87be2dde27 Fix codermins appearing as red in-game OOC (#36148) 
init
 2025-03-29 12:33:25 +01:00
Ed
2248e2ad5c Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-03-29 14:24:31 +03:00
Ed
6706a14163 secret polymorph spell 2025-03-29 14:22:53 +03:00
Deserty0
baa48eb0e5 the aer attack (#1081) 2025-03-28 20:15:36 +03:00
Ed
d3f70aee7e Minor Skill Tree rebalance (#1080) 
* save: no for visual effect

* some tweaks

* Update healing.yml
 2025-03-28 17:45:19 +03:00
ArZarLordOfMango
f337fde3d9 paper fix (#1079) 2025-03-28 16:14:12 +03:00
Link
b9fad6cbd4 Mana no longer regenerates after death (#1027) 
* Update CP14MagicEnergySystem.Draw.cs

* :nerd:

* Update CP14MagicEnergySystem.Draw.cs

* Update CP14MagicEnergySystem.Draw.cs

* oops...

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-28 11:10:42 +03:00
Nim
532f44eb3c coloured chainmail (#1077) 2025-03-28 11:09:39 +03:00
PJBot
e98df217e2 Automatic changelog update 2025-03-27 17:44:04 +00:00
lzk
8f049f174d make admin interacts with storages silent (#35417) 
* make admin interacts with storages silent

* review

* silent insert and transfer

* i love code

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-03-27 18:42:57 +01:00
PJBot
f9320aacd7 Automatic changelog update 2025-03-27 17:20:43 +00:00
SlamBamActionman
5c505958a7 Add a new poster (#36104) 
* Poster

* THAT tortilla...

* roombareview
 2025-03-27 18:19:36 +01:00
Chaoticaa
db65e3241e Updates to Hydroponic sprites (#35004) 
* changes to some hydroponics plant sprites

* tomato changes

* added tomatoes and further changes

* added tomatoes and adjustments

* added tomatoes and adjustments

* added apples and meatwheat

* watermelon + adjustments

* sugarcane

* blood tomatoes & pumpkin harvest

* final changes for a while

* poppy harvest repaint

* smoller melon + holy melon stages

* final changes + attributions added to json files

* oops

* changes

* changes x2

* egg success + tree changes and additions

* bagel mistake

* lemon lime garlic fly

* grapes and stuff

* Potate

* peas and attributes

* more veg while my monitor flashbangs me repeatedly trying to find source links

* soyyyyyyy

* eggplant and berries yuuumm

* corn life

* grape disaster

* my computer is slow

* Pray

---------

Co-authored-by: Your Name <[you@example.com])>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
 2025-03-27 10:11:02 -07:00
PJBot
56e0cb642a Automatic changelog update 2025-03-27 17:05:33 +00:00
slarticodefast
7c44038f63 Add paradox clone to admin antag control (#36105) 
* make paradox clone receive the original's objectives

* antag control verb

* rename verb
 2025-03-27 10:04:25 -07:00
Ed
2a524b4b4b Update CP14ClientSkillSystem.cs 2025-03-27 18:24:26 +03:00
Ed
735b4f5c7b Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-03-27 17:59:30 +03:00
Ed
4b13d876e8 Update skill_tree.yml 2025-03-27 17:53:25 +03:00
Nim
afea64252b Wrench sprite and fix mask (#1075) 
* wrench

* stored

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-27 16:37:11 +02:00
Ed
1e36a61339 Skill progression system [Draft] (#1056) 
* fuck all

* clean up

* remove knowledge books

* Update base.yml

* cl

* fix #991

* fix

* Update subgamemodes.yml

* manual migration + recipes fix

* Update comoss.yml

* setup data

* setup skills systems

* more blacksmithing skills

* Update base.yml

* Create CP14SkillEffectAction.cs

* skill button returns

* base graph UI window

* skill tree drawing

* UI improve

* pyro setup

* skill trees selection, dragging control

* refactor skill system: rename Skills to LearnedSkills, add experience tracking and learning logic

* Create available.png

* skill description generation setup

* auto parsing skill names and descriptions

* Hydrosophistry

* water light fire and metamagic ported to skill tre

* ice dagger spell returns

* Update ice_dagger.yml

* delete old files

* Update modular_garde.yml

* ice arrow spell

* link graph with parallax

* show experience counter

* polish

* puf

* p

* pipap

* finally ready to merg?

* fix

* fix 2
 2025-03-27 17:20:20 +03:00
creamybag
6a6350a827 Blacksmith's gloves (#1045) 
* gloves

* fix
 2025-03-27 17:02:52 +03:00
creamybag
9271500fe4 mime (#1074) 2025-03-27 17:02:35 +03:00
PJBot
f4adb0bdb3 Automatic changelog update 2025-03-27 06:27:21 +00:00
Centronias
f45794002b Raw meatball cooks into cooked meatball (#36003) 
meatballs can be cooked on their own
 2025-03-26 23:26:13 -07:00
metalgearsloth
da2c9510b2 Update submodule to v250.0.0 (#36108) 2025-03-27 15:29:14 +11:00
Errant
e4a5043d4e Overlay stack sorting fix (#36103) 
* round float before sorting

* weh
 2025-03-26 21:40:13 +01:00
ScarKy0
5bedf1761a 1984 the unsafe gift from smuggler stashes (#36102) 
1984
 2025-03-26 20:42:08 +01:00
Tayrtahn
bf17f85ced Cleanup AdminVerbSystem (#36099) 
* Fix 3 warnings in AdminVerbSystem.Tools

* Fix 3 warnings in AdminVerbSystem.Smites

* Use SetMapCoordinates directly
 2025-03-26 19:36:29 +01:00
PJBot
18cc899897 Automatic changelog update 2025-03-26 16:14:09 +00:00
slarticodefast
c8494dd5c9 Improve paradox clone item copying (#35993) 
* even better item copying for the paradox clone

* copy paper

* fix

* blacklist implanter

* string.Empty

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-03-26 17:13:02 +01:00