juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,692 Commits 57 Branches 0 Tags
0a82d35c0fd39dcf114a210edda9dcad1dd2ee2c
Commit Graph

26692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
0a82d35c0f Merge branch 'ed-17-07-2024-dungenagain' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-17-07-2024-dungenagain 2024-07-17 23:48:34 +03:00
Ed
f94d3d9689 Update xandria.yml 2024-07-17 23:48:15 +03:00
Ed
8c41c9c565 Merge branch 'master' into ed-17-07-2024-dungenagain 2024-07-17 23:46:15 +03:00
Ed
eba7d2de0d Merge pull request #331 from crystallpunk-14/ed-17-07-2024-upstream 
Ed 17 07 2024 upstream
 2024-07-17 23:46:05 +03:00
Ed
fb7ca28b9a update locales 2024-07-17 23:35:22 +03:00
Ed
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +03:00
Ed
d3955a4400 bruh 2024-07-17 23:21:00 +03:00
Ed
66495b368d Update CP14RoomSpawnerComponent.cs 2024-07-17 23:01:42 +03:00
Ed
8df640b693 move ignore tiles to roomProto 2024-07-17 21:29:24 +03:00
Ed
7511c8177b add spawner probability 2024-07-17 21:27:15 +03:00
slarticodefast
6f5077803b Fix formatting warnings (#30122) 2024-07-17 10:25:19 -08:00
Ed
f774c62792 remove nesting 2024-07-17 21:20:52 +03:00
Ed
4049907b7f Update CP14RoomSpawnerSystem.cs 2024-07-17 18:32:43 +03:00
Ed
ef460cb59c mask tile filtering 2024-07-17 18:30:28 +03:00
Ed
5ede8bb0a6 add xandria atlas 2024-07-17 18:11:08 +03:00
Ed
7c0c8c5b33 polishing, bugfixing 2024-07-17 17:38:00 +03:00
PJBot
be9acaea35 Automatic changelog update 2024-07-17 13:51:32 +00:00
Winkarst
ba2c5fcded Make the super door remote to be able to control Syndicate doors (#30033) 
* Make the super door remote to be able to control Syndicate doors

* Fix
 2024-07-17 09:50:24 -04:00
Ed
951e553926 room spawner 2024-07-17 16:33:28 +03:00
Ed
0a42834dbe move biomespawners 2024-07-17 16:32:58 +03:00
Flareguy
b20fd4fbd0 Vox displacement updates (#29824) 
* more vox displacement maps

* A

* remove vox insuls sprites

* sci magboots

* Update vox.yml

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-17 10:43:11 +03:00
PJBot
0e02c50548 Automatic changelog update 2024-07-17 06:27:16 +00:00
lzk
6443c53a8c Little saw debuff (#29995) 2024-07-17 09:26:10 +03:00
PJBot
1ac7739564 Automatic changelog update 2024-07-17 06:20:20 +00:00
lzk
1fd8369a9c Add examine for caustic and cold damage (#29989) 
* Examinable cold damage

* lightblue

* update grammar

* caustic
 2024-07-17 09:19:13 +03:00
Ed
d8ab4982ad Character menu issuer localization (#29840) 
* Update CharacterUIController.cs

* TODO Burn this shit

* huh?

* huh!

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2024-07-17 08:47:50 +03:00
PJBot
11320f4d2c Automatic changelog update 2024-07-17 04:36:25 +00:00
Nemanja
13bec7a0e9 Sign Resprite (#29806) 
* Redone signage

* Signs

* ok this thing now

* alright ig?

* big data

* cryo sign

* new sign
 2024-07-17 14:35:18 +10:00
PJBot
8d99961a00 Automatic changelog update 2024-07-16 23:27:09 +00:00
K-Dynamic
8db252e7dc Nerf & standardised slip times (#27879) 
* standardised slip times

* puddle and gib soap

* banana peels

* cleaned yaml by shifting to component

* error slip

* error slip intersect

* intersect ratio return

* error and omega soap changes

* SlipocalypseClusterSoap 2 tc cost
 2024-07-17 09:26:02 +10:00
PJBot
21d48ca5c4 Automatic changelog update 2024-07-16 22:51:25 +00:00
Jezithyr
93e4bfcfb3 Remove Geras from Slimes to address combat balance (#29731) 
Removed Geras

Removed Geras
 2024-07-16 15:50:17 -07:00
Plykiya
db3f304f4b Replace EntityPrototype.NoSpawn with EntityPrototype.HideSpawnMenu (#30082) 
NoSpawn

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-17 00:29:31 +10:00
Nemanja
2e3d2db97e Revert "Change wristwatch meta description" (#30070) 
Revert "Change wristwatch meta description (#30036)"

This reverts commit 919b3ac9e6.
 2024-07-17 00:27:37 +10:00
Cojoke
927cf7799f Remove uses of AllObjectives (#30077) 
Remove the uses of AllObjectives
 2024-07-16 10:17:18 +03:00
Simon
911a94dba9 Add missing command description to replay_toggleui (#30071) 2024-07-16 11:04:31 +10:00
Ed
8cbd26ae2f Farming WIP (#269) 
* setup planting doafter

* spawn plants after use seed

* some work

* move comps to separate folder

* public check daylight

* daylight plant energy regeneration

* some fixes

* bruh, im thinking

* added ingame soil

* added hoe

* attaching plants

* hoe system

* block plant dublicating

* some planting refactor

* shovel as pant + soil remover

* plant growing visualizer

* soil resprite

* split farming system to second partial class

* update throught event refactor

* tring sync update plant with update visuals

* finish visual sync

* plants growing

* more partial splitting, naming work, clean up

* Update FARMINGTEST.yml

* Update FARMINGTEST.yml

* fix typo

* prototype value validating

* Оно бухает воду!

* solution visualizer in soil

* forgot some fix

* part of Tornado review fix

* destroy RemovePlantComponent

* more fixes

* simple harvesting

* refactor plant component values changing

* harvest redo

* gather on destroyByTool

* sickle resprite

* plant fading

* fading per minute!

* wheat sprites

* YML restruct

* fixes

* auto root plants

* add comments

* move sprites

* split structures from object textures

* wheat farming!

* Update CP14FarmingSystem.Interactions.cs

* seedbed (#297)

seedbed :^)

* a

* Update soil.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-15 23:58:03 +03:00
Ed
2de26baebd Ambient loops (#323) 
* ambient loop systems

* audio content

* Update ContentAudioSystem.CP14AmbientLoop.cs

* Update attributions.yml

* limit frequency

* Update CP14AmbientLoopPrototype.cs

* Create IsDaylight.cs

* fix problem
 2024-07-15 23:18:14 +03:00
Ed
c69fff0bb9 Merge pull request #328 from crystallpunk-14/ed-15-07-2024-upstream 
Ed 15 07 2024 upstream
 2024-07-15 22:21:51 +03:00
PJBot
09a05955d7 Automatic changelog update 2024-07-15 19:19:40 +00:00
Winkarst
33a303236c Make addgamerule command process only valid game rules (#29912) 
* addgamerule command processes only valid rules

* Update

* English moment
 2024-07-15 21:18:33 +02:00
Simon
b35539db4a Fix some markup related obsolete warnings in research and anomaly related systems (#30072) 
Fix some Markup related obsolete warnings in Research and Anomaly related systems
 2024-07-15 22:14:37 +03:00
Ed
dbc8c1b4d7 disable test 2024-07-15 22:10:53 +03:00
Pieter-Jan Briers
c0593fb328 Fix invalid UI hover/click sounds breaking client (#30067) 
fixes #29561
 2024-07-15 16:55:05 +02:00
Pieter-Jan Briers
eb3b2ae01a Update host key for changelog RSS (#30068) 2024-07-15 16:32:12 +02:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
Pieter-Jan Briers
b7d3964c56 Fix AccessLevelControl breaking (#30045) 
#29987 did an oopsie

This broke the ID computer, station records, and maybe some others too.
 2024-07-15 00:07:48 +02:00
PJBot
17c23f11c5 Automatic changelog update 2024-07-14 15:13:31 +00:00
lzk
3b85b1e43e make scarves eatable again (#29959) 2024-07-15 01:12:25 +10:00
deltanedas
35cd013e88 make ninja shoes magboots (#28586) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-15 01:11:40 +10:00