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

17513 Commits

Author SHA1 Message Date
Ed
f774c62792 remove nesting 2024-07-17 21:20:52 +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
Ed
951e553926 room spawner 2024-07-17 16:33:28 +03: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
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03: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
PJBot
f6d827f5d9 Automatic changelog update 2024-07-14 14:10:48 +00:00
CookieMasterT
b6115b672a Add petting cyborgs (#30037) 
added petting borgs, adjusted interactions
 2024-07-15 00:09:41 +10:00
themias
a0052c5b09 Prevent virtual item storage and popups (#30020) 
* Prevent virtual item storage and popups

* fix typo

* add comment
 2024-07-15 00:08:39 +10:00
PJBot
f90538cca7 Automatic changelog update 2024-07-14 10:28:02 +00:00
Winkarst
07535e8ecf Clumsy proof grappling gun (#29904) 
Make grappling gun clumsy proof
 2024-07-14 20:26:56 +10:00
SlamBamActionman
4f479b6c85 Fix RGB toys color when worn/in-hand (#30023) 
rgbeeeeeeee
 2024-07-14 20:26:34 +10:00
lzk
919b3ac9e6 Change wristwatch meta description (#30036) 2024-07-14 20:25:57 +10:00
lzk
011250f35e Fix AGhostCommand naming (#29945) 2024-07-14 20:25:18 +10:00
PJBot
68982953f3 Automatic changelog update 2024-07-14 03:00:52 +00:00
Luiz Costa
87467a358b Fix lizards losing snouts when equipping a head bandana (#29979) 
* say goodbye to no-snout lizards

* remove snout from plague doctor hat HideLayerClothing component
 2024-07-14 12:59:45 +10:00
github-actions[bot]
a06309b964 Update Credits (#30026) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-07-13 20:26:39 -04:00
Ed
dcb3443b35 Vgroid diamonds hotfix (#29999) 
vgroid diamonds
 2024-07-13 15:45:35 +03:00
PJBot
22a9290c5b Automatic changelog update 2024-07-13 12:17:05 +00:00
Ed
1b0c434a9f Shiny Diamonds (#25750) 
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
 2024-07-13 15:15:57 +03:00
deltanedas
87f7ea8aa9 make cargo balance ui updating its own component (#28295) 
* add BankClientComponent and event

* query BankClient instead of hardcoded CargoOrderConsole for updating

* add BankClient to all ordering consoles

* :trollface:

* add Balance field to BankClient

* forgor

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* m

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-13 16:11:14 +10:00
PJBot
044d84142c Automatic changelog update 2024-07-13 06:10:25 +00:00
Nemanja
49096cf14f Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +10:00
Errant
361ec59412 Dummy vox deserves a proper vox name (#29789) 
SKREEEEEeeeeeeee
 2024-07-13 16:05:57 +10:00
deltanedas
7b590122b6 fire extinguisher using item toggle (#29906) 
* move SprayAttemptEvent to shared

* add SolutionTransferredEvent

* replace FireExtinguisher with SpraySafety

* update fire extinguisher yml

* invert visuals

* always handle event in solution transfer, it makes popups

* instantly fill it

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-13 14:17:10 +10:00
PJBot
87fa6075b6 Automatic changelog update 2024-07-13 04:15:36 +00:00
PJBot
1b360ac914 Automatic changelog update 2024-07-13 04:04:22 +00:00
lzk
55a50d0426 Use reinforced glass damage modifier for secure windoors (#29941) 
* Use Rglass damage modifier for reinforced windoors

* i actually can remove this line since inherited
 2024-07-13 14:03:16 +10:00
PJBot
a1000587cf Automatic changelog update 2024-07-12 15:01:46 +00:00
Jonathan Argo
2e694f109d Centered hard hat sprites (#29953) 2024-07-12 18:00:40 +03:00
PJBot
e3697c6fda Automatic changelog update 2024-07-12 11:40:04 +00:00
themias
a314a967c2 Fix timer deconstruction (#29917) 
Fix deconstruction for timers
 2024-07-12 21:38:58 +10:00
lzk
7ce3a1f27f Fix supplybot movement state (#29944) 
Fix supplybot movement sprite
 2024-07-12 21:36:40 +10:00
PJBot
caf8776d07 Automatic changelog update 2024-07-12 10:33:53 +00:00
Ed
4f24b30b22 Update base.yml 2024-07-12 13:10:02 +03:00
Ed
2ef4402068 Update base.yml 2024-07-12 12:57:02 +03:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +03:00
PJBot
b5e49c9c07 Automatic changelog update 2024-07-12 09:25:44 +00:00
PJBot
00ec83af0f Automatic changelog update 2024-07-12 09:20:31 +00:00
slarticodefast
f125dda677 Make stun batons be thrown like a throwing weapon (#29883) 
* make stun batons be thrown like a throwing weapon

* stun prods too

* pies too
 2024-07-12 19:19:24 +10:00
themias
3a9b1eaa16 Allow notice boards to be built on walls (#29851) 2024-07-12 12:18:32 +03:00
PJBot
cd90b414df Automatic changelog update 2024-07-12 09:17:29 +00:00
Jonathan Argo
00a2c6a234 Made musket wieldable. (#29910) 
* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.
 2024-07-12 12:16:21 +03:00
Ed
e87994ae40 Localization clean up + temp eng switch (#325) 
* Update ContentLocalizationManager.cs

* Update battle_royale_temp.yml

* Update basic-effect-reagent.ftl
 2024-07-12 08:34:08 +03:00
lzk
e3bb2771d6 Update cluster evac (#29885) 
* Update cluster evac

* forgot tiny fans

* the change
 2024-07-11 15:03:51 -06:00
PJBot
8fd35e8e44 Automatic changelog update 2024-07-11 14:04:28 +00:00