juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,608 Commits 57 Branches 0 Tags
3b53c1abbb1a2305bb91f1bc1d3a0d058eb0ea92
Commit Graph

29608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viator-MV
3b53c1abbb map update (#688) 
* Update comoss.yml

* Update comoss_d.yml

* Update comoss_d.yml

* Update comoss_d.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-30 13:58:06 +03:00
Ed
94186c4a6b Update twoHandedStaffs.yml 2024-12-25 09:04:43 +03:00
Nim
868699a219 More beer, wine and ale (#686) 
* more beer

* ru

* comoss fix update, loc change to eng

* Update dwarf.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-18 17:37:06 +03:00
Nim
a248c176ae Crane barrel (#672) 
* crane barrel

* fix

* sprite resize, file rename

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-16 11:43:29 +03:00
Ed
862df73ff2 Demiplane modifiers groups & tiers (#678) 
* data setup

* demiplanes modficators combine refactor

* generationProb

* demiplane tiers setup

* migration, and t2 loots

* t2 balance tweaks

* retags

* weather modifiers group

* maplight modifiers

* more passed checks

* wanderer buy positions localization fix

* fixes
 2024-12-16 00:38:29 +03:00
A.Ne.
57a795261f mithril and lucens modular parts (#682) 
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-15 22:40:05 +03:00
Ed
e102b5011e Merge remote-tracking branch 'origin/map-upate' 2024-12-15 22:17:29 +03:00
Viator-MV
35c45e70f6 Christmas map (#681) 
* Update comoss.yml

* Update comoss_d.yml
 2024-12-15 22:11:38 +03:00
A.Ne.
f655f74b03 mithril and lucens (#660) 
* mithril and manarium

* Rename manarium to Lucens

* pointlight to tree

* lucens tile

* Update trees.yml

* logs sprite

* Update trees.yml

* delete acacia tiles, recolor lucen example

* tiles new palette

* Update ores.yml

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

* tiles update

* Update tiles.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-15 12:53:31 +03:00
Ed
58269bb65e Snowballs (#677) 
* snowballs

* biome update

* fixes
 2024-12-14 14:57:15 +03:00
Ed
d7d0977eb6 New year preparation (#674) 
* garland

* presents filter

* vladimirs weather

* snowed tilebrick
 2024-12-14 01:01:36 +03:00
Ed
4cea96f6eb Garland (#673) 
* garland

* presents filter
 2024-12-13 22:20:00 +03:00
Ed
e30c5848c5 Update crates.yml 2024-12-13 17:55:54 +03:00
Ed
c9d2b8fb2b remove footprints (#670) 2024-12-13 17:33:42 +03:00
Ed
e1f67be2a8 Snowdrifts (#669) 
* snowdrifts

* Update fire.png

* alerts sprite optimize

* Update wooden.png

* stone wall fix
 2024-12-13 16:59:37 +03:00
Ed
3f8757dec9 Update migration.yml 2024-12-13 15:06:10 +03:00
Ed
eb76a9ef6a Ed 12 12 2024 bugfixes (#668) 
* fix #665

* fix #664

* fix #661

* fix #666
 2024-12-12 23:00:16 +03:00
Ed
93a49ca398 Snowy (#659) 
* snow tiles

* snow trees (2\6)

* +1 tree

* third snow layer, and simple snow biome
 2024-12-12 21:51:03 +03:00
A.Ne.
2b3cc9e868 key rings fix (#620) 
* key rings fix

* Update SharedCP14LockKeySystem.cs
 2024-12-12 13:12:58 +03:00
Ed
c42b77d0c9 Merge pull request #658 from crystallpunk-14/ed-11-12-2024-upstream 
Upstream sync
 2024-12-11 21:18:17 +03:00
Ed
6c8b0a07f3 yep 2024-12-11 21:17:43 +03:00
Ed
af918c1253 Update audio_music.yml 2024-12-11 14:53:49 +03:00
Ed
be15a4097c Update cp14-ignoredPrototypes.yml 2024-12-11 14:49:44 +03:00
Ed
cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
 2024-12-11 14:49:02 +03:00
Ed
576bbe91d0 Roofs (#657) 
* simple roo system

* tweaks

* roof sprite update

* transparent roof

* wooden roof sprite

* remove weather: false from all tiles

* stone roof + roofs crafting

* final shtrix, maps update

* fuck

* fix checks

* reagent auto vaporize tweaks

* Update base.yml
 2024-12-11 14:44:16 +03:00
Ed
e4b60b31c0 Ed 10 12 2024 aah (#656) 
* fix ghost zlevel moving

* stairways autorotation

* ladders sprite update

* slow space swimming

* fix wrong wood spawn

* deadly ocean

* Update zLevels.yml
 2024-12-10 21:24:06 +03:00
Ed
99786342fb Comoss sewers (zlevels added) (#655) 
* comoss zlevel sewers

* Update biome_template_caves.yml

* Update GhostSystem.cs

* Update GhostSystem.cs
 2024-12-10 00:43:30 +03:00
Ed
22b0f46890 Roundleave ship clean up (#653) 
* cryo shuttle rework

* Update entities.ftl
 2024-12-09 20:39:56 +03:00
Ed
bec8d7a7d4 Ghost z-levels move actions + mapping z-levels combine command (#654) 
* some setup

* fast ghost zlevels-moving

* zlevel combine command for mapping
 2024-12-09 20:39:46 +03:00
ScarKy0
3844352fee Derelict icon hotfix (#33768) 
whoops
 2024-12-09 13:56:25 +01:00
Ed
5384adb2b3 Blacksmith again (#652) 
* golden and copper sword

* copper sickle

* maces

* shovels

* modular axes

* fixes
 2024-12-09 00:40:27 +03:00
Vasilis The Pikachu
8472603b76 Revert "Simplify separated screen top menu (#33047)" 
This reverts commit f27fa1ed30.
 2024-12-08 21:36:48 +01:00
Ed
c2b7c5146d second blacksmith 2024-12-08 14:43:12 +03:00
Ed
61454e351c Another blacksmith minor update (#648) 
* modular golden sickle

* anvil and furnace resprite

* Update comoss.yml
 2024-12-08 14:17:48 +03:00
Ed
dc5333ee18 localization update 2024-12-08 01:19:57 +03:00
Ed
0662299120 Aftertest tweaks (#647) 
* fix #641

* fix #639

* add copper, bloodflowers and wild sage into comoss island

* remove additional alchemist and blacksmithes roles

* more roundstart resources for alchemist and blacksmith

* disable footprints system

* cryo shuttle mechanic

* update cargo ship

* veryy magical

* tips update

* fix #635

* green cloak

* Update T0_cure_poison.yml
 2024-12-08 00:52:35 +03:00
Ed
80be633aa1 Update ContentLocalizationManager.cs 2024-12-07 20:55:30 +03:00
Ed
264ef809bd Update personal_objectives.yml 2024-12-07 20:49:51 +03:00
Ed
ccc97f0e70 Update CP14SandboxRU.xml 2024-12-07 15:04:28 +03:00
Ed
15017b7c4f personal key loadout 2024-12-07 14:49:02 +03:00
Ed
2d54561a31 Update ContentLocalizationManager.cs 2024-12-07 12:41:51 +03:00
Nim
417668b88b Crayon (#634) 
* crayon

* add crayon into loots

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-07 00:50:54 +03:00
Ed
52a0f44aa1 Bank progression mechanic (#633) 
* bank progression mechanic

* loc fix

* minor random fixes

* minor tweaks

* lighthouse

* Vladimirs Alerts!

* offset alerts

* lighthouse
 2024-12-07 00:39:05 +03:00
deltanedas
3300ff2a06 clean up random lathe recipes (#31525) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-06 16:45:01 +01:00
MilenVolf
b66fd98514 Localize ai dataset names (#33608) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-06 16:38:00 +01:00
K-Dynamic
e244472546 Samurai dogi is now major contraband (#33699) 2024-12-06 16:36:26 +01:00
0tito
de19418126 Add Sprite changes to Logic Gates to show the input/output state (#33277) 2024-12-06 16:35:48 +01:00
beck
6add781c4a Added several variables to make ClumsyComponent more modular for developers. (#33715) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-06 16:31:31 +01:00
Ed
02cbeee6dc Demiplane fixes (#632) 
* limit demiplace wshwooshing by interaction range, fix global gibbing

* Update base.yml

* fix #521
 2024-12-06 17:16:38 +03:00
PJBot
d6d95f1a7a Automatic changelog update 2024-12-06 10:16:30 +00:00