Commit Graph

35 Commits

Author SHA1 Message Date
Ed
f8564b3661 Agaric shroom! (#172)
* agaric shrooms!

* add agaric reagents

* add agaric into worldgen
2024-05-25 13:30:33 +03:00
Ed
2e91620630 Wall lantern + floor water (PLaceholders) (#167)
* fix lamp sprite

* Update wallmount_torch.yml

* add water test sprite

* add simple water entity

* add reversed crystall sprites

* add sand tile
2024-05-22 23:18:18 +03:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161)
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
2024-05-21 00:07:51 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158)
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
2024-05-19 15:40:28 +03:00
Ed
9690077532 Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154)
* added 4 basic reagent effects

* entrance bugfixes

* add bloodgrass world sprites

* preuso cherry pick

* add planet bloodgrass and sickle gathering

* +1 gather sound
2024-05-18 15:16:20 +03:00
Ed
50c4fd3a58 Content stitching (#147)
* upgrade loadouts and gamemode

* fixes

* fix lobby images, add localization to loadouts

* fix clothing layers

* fix checks

* Update base.yml

* Update base.yml

* fuckthis, secret weights
2024-05-08 22:41:34 +03:00
Ed
547e15a158 hair update (#139) 2024-05-07 01:10:12 +03:00
Ed
2b6e12898b Corvax ctrl+c ctrl+v Russian localization (#135)
* Corvax ru localization

* remove Corvax stuff

* adventurer
2024-05-05 00:44:03 +03:00
Nim
f411126191 rifle (#134) 2024-05-05 00:43:56 +03:00
Ed
72b8fcf99c Tiles rework (#131)
* tile restruct

* filter tiles

* Update ContentTileDefinition.cs

* oopsie

* Update migration.yml

* Update cave-arena.yml

* floors fix
2024-05-04 16:35:59 +03:00
Agoichi
ba009f34fa Crystal/ punk-update (#129)
* Crystalpunk-update

* Crystalpunk-update

* Update Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml

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

* Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

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

* Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

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

* clean up

* Update crystal.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-05-04 13:39:32 +03:00
Ed
ba05b56d51 Fence fix + Navy revolver (#130)
* Update fence_wood.yml

* added revolver navy

* Update guns.yml

* Update wooden_fence.yml
2024-05-04 13:20:21 +03:00
Ed
dd84d48fed Refactors, bugfixs + Crystals (#127)
* fix dwarf displacement map

* Big Fireplace update

* add crystalls placeholder

* bonfire update

* displaccement update

* Update wallmount_torch.yml
2024-05-03 20:40:31 +03:00
Ed
4c692d7d4a Alchemy + Guidebook initialization (#124)
* remove Guidebook

* water and blood

* localization things

* added vital extract

* some fixes

* added bloodgrass

* guidebook localization

* fixes icons and remove unnecesary fields

* added inhand cauldron

* fix wallmount board

* Update bonfire.yml

* Update bonfire.yml

* alchemy furnace + mist

* fixes

* Guidebook localization

* Update drinks.yml

* Revert "remove Guidebook"

This reverts commit 7924cf235f.

* fix filtering guidebook

* test fix

* Update heater.yml
2024-05-02 20:41:11 +03:00
Ed
2c34befbcb Fireplace (#123)
* bonfire!

* fix

* update torch

* docs

* add audio, fix errors

* loc string + fix errors
2024-05-01 19:55:48 +03:00
Ed
6cb97502aa KBAS5 clothing + Jaraten Structures (#120)
* add barbarian clothes

* add jaraten floors and wall

* locale

* add stonebrick walls and gold\silver ore cave walls

* fix brick black, update cave arena

* Update roundstart.yml

* Update cave-arena.yml
2024-04-28 22:47:01 +03:00
Ed
33d04ef35b Dwarf species (#119)
* add dworf sprites

* dwarf prototypes

* add shoes displacement. FUCK! its doesnt work

* spaces

* footfix

* final dwarf!

* fixes
2024-04-28 01:44:43 +03:00
Agoichi
353fcd9cfe Magic Flashlight (#116)
* fucking flaslight

* flaslight

* Update objects.ftl
2024-04-28 00:56:02 +03:00
Nim
64218bfcab Coffin (#118)
* coffin

* eng
2024-04-27 22:04:52 +03:00
Ed
1f9f88883c Content (#110)
* Add many test walls

* minor bug fix

* fix torch

* add wallmount variation

* final wood wall!

* great sprite clearing + locales

* fixes

* Update bonfire.yml

* Update wallmount_torch.yml

* Update cave-arena.yml
2024-04-26 11:09:38 +03:00
Ed
8f135d9745 localize human names 2024-04-21 15:43:26 +03:00
Ed
d342db3d65 Merge branch 'master' into 21-04-2024-species-naming 2024-04-21 15:26:41 +03:00
Ed
b2226cbe16 localized tiefling name 2024-04-21 15:25:22 +03:00
Ed
966a54fbc6 add torch 2024-04-20 16:54:03 +03:00
Ed
f271c8cff0 add aristocratic set 2024-04-20 15:59:15 +03:00
Ed
e98a6e17a3 Update structures.ftl 2024-04-20 14:18:22 +03:00
Ed
4763bffeac locale update 2 2024-04-20 14:16:11 +03:00
Ed
d74a33d46b locale update 2024-04-20 14:10:10 +03:00
Ed
ca01030da1 Fucking big refactor 2024-04-20 11:51:04 +03:00
Agoichi
040497805f Adding the sinner's mask (#97)
* adding sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask
2024-04-16 17:51:11 +03:00
Ed
76afac43f9 minutiae grinding (#96)
* add floor crafting, add crafting lcoalization

* add chest construction

* add chest localization

* Update chests.yml
2024-04-14 22:02:04 +03:00
Ed
f6a28d4afc Добавлены деньги. Добавлена локализация на англ для всех прототипов. (#86)
* add coins, start ftl

* localization patch

* fixes

* localization patch

* tiefling

* Update structures.ftl
2024-04-13 18:00:14 +03:00
Ed
0f3ec01281 Content pack (#83)
* content pack

* d

* update

* Update meta.json

* +2 clothing update

* +more clothings

* remove canvas

* blacksmith arpon

* +hairs and marking localization
2024-04-13 01:05:58 +03:00
Ed
485873839b Работа для кузнеца (#80)
* add content

* Update CPSharpenedComponent.cs

* Update twoHandedSword.yml

* update
2024-04-12 21:09:54 +03:00
Ed
80958e4d71 Hairs init + move textures to _CP14 folder (#43)
* move textures to _CP14 folder

* hairs

* maps update
2024-04-06 10:01:45 +03:00