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

2570 Commits

Author SHA1 Message Date
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03:00
Ed
918709cb47 Displacement maps big update (#30093) 
* split logic into own system

* add support for different size displacement maps

* some clothes may not use displacement maps

* displacement maps spport hand sprites

* Update DisplacementMapSystem.cs

* rename things

* fuck stencilmask

* fix bugs

* no masks

* Update jumpsuits.yml

* fix species specific sprites

* Update ClothingSystem.cs

* shoes + ears displacement, some bugfix

* Update DisplacementMapSystem.cs
 2024-07-23 12:04:09 +03:00
Tornado Tech
e806655c9d Wave shader WIP (#288) 
* Created wave shader

* more to _CP14 folders

* add to tree

* fix

* pipiipi

* Provided shader uniform to component fields

* Fixed wave shader shit

* goodies

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-07-23 11:27:09 +03:00
Ed
9f1b4fc51c Melting molds (#347) 
* temp tweak

* add metall bars

* melting molds

* add sawing molds table

* sawing sounds

* fix
 2024-07-23 10:29:41 +03:00
Flareguy
8376881cdf Minor vox headwear update (#30150) 
* vox sprites minor updates

* the tax

* kid named paper sack
 2024-07-23 12:18:32 +10:00
GrandApothecary19
fee5cc25ce Deleting all CP14 guns proto (#346) 
* Deleting all CP14 guns proto

* sprites deleting to
 2024-07-22 19:11:07 +03:00
Ed
a81465f0d9 Rock and stone mini update (#344) 
* ore resprite

* tools restruct, ore repath, add pickaxr

* fixes

* localizattion sync

* fixes

* Update migration.yml
 2024-07-22 18:46:26 +03:00
Ed
f91a642428 Workbench (#341) 
* craft prototype

* comp + empty system

* simple crafting

* 2 crafts!

* craft dound + delay

* ingredient waste

* verb message

* stack support

* sprite + collision + real crafts

* workbench craft

* fuck

* Update CP14WorkbenchSystem.cs

* fuck ItemPlacer, _lookup lets go
 2024-07-22 12:16:32 +03:00
Pelemonk
f8428d636d irondog 2024-07-21 20:59:34 +03:00
Pelemonk
177112b216 Заменен Walter на Doggi 2024-07-21 20:43:14 +03:00
Sphiral
1e89c07573 The Shelfs Update (#27858) 
* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
 2024-07-21 11:16:58 -06:00
IProduceWidgets
ac53e1d0a0 add an arabian lamp. (#27270) 
* add an arabian lamp

* yoink solutionitemstatus since it already displays fuel remaining.

* add comments

* fix containerception?

* Yeah sure, pray- I mean rubable.

* fix one flame frame

* Fixed emag behavior

* me when lexidysia.

* limit capacity of entitystorage and add some more comments about why it be the way it do.

* test fake?

* Holy fuck its a bug fix now? Based.
 2024-07-21 01:24:28 -06:00
Alzore
c8725825be Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper (#26947) 
* no more lasers for you, borg.

* downgrade

* echis

* echis

* itemtoggleupdate

* daggerparenting

* fixtypo

* more bullet per bullet
 2024-07-21 17:04:33 +10:00
Nemanja
0b5fe2a9ac PA ui cleanup + bugfixes (#28750) 
* ui and visual aspect + radio

* finish jank ui shit and finish radio

* remove radio

* send it

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-07-21 15:27:18 +10:00
SlamBamActionman
6972bc26a7 Directional Fans (#27772) 
* Initial commit

* Description update

* Updated texture
 2024-07-20 13:18:34 +10:00
Alzore
93dc22b67d Add the Syndicate Raid Suit (#29845) 
* Syndicate Raid Suit

* Raid suit speed and whitelist

* Fix copyright for the syndicate raid helmet
 2024-07-19 12:38:26 +03:00
Ed
ca843bd84a Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
 2024-07-19 11:23:38 +03:00
Ed
d6e0114126 randomize iconSmoothing (#28158) 
* randomize iconSmoothing

* Revert "randomize iconSmoothing"

This reverts commit 094356f975737c0af24ce39d849aec7852b9af6e.

* try 2

* trying work with client-server communication

* still dont work

* Tayrtahn good suggestion

* remove outdated code

* Fix!

* move data to Appearance

* Update RandomIconSmoothComponent.cs
 2024-07-19 18:13:35 +10:00
Ed
2bf17fdc35 Content pack (#337) 
* added rope

* black shirt replace

* Update migration.yml

* more berets

* loadout update

* captain role and jacket

* bruhh captain cap

* add one-handed sword

* shield!

* Update entities.ftl
 2024-07-19 00:03:08 +03:00
Jaraten
77b1113d5d Walls upd (#333) 
* wewe

* oops

* oooopsss 2
 2024-07-18 16:11:59 +03:00
Ed
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +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
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
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
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
SlamBamActionman
4f479b6c85 Fix RGB toys color when worn/in-hand (#30023) 
rgbeeeeeeee
 2024-07-14 20:26:34 +10: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
Nemanja
49096cf14f Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +10:00
Jonathan Argo
2e694f109d Centered hard hat sprites (#29953) 2024-07-12 18:00:40 +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
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
Boaz1111
d3495fc51c made the guitars be able to be worn on suitstorage (#29048) 
* made the guitars be able to be worn on suitstorage

* minor fix
 2024-07-10 09:28:10 +10:00
Jaraten
82f1ed1493 upd cliffs (#320) 
* upd cliffs

* localize

* Update marker_base.yml

* Update entities.ftl

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-09 21:31:36 +03:00
ravage
451d04d759 Add beards (#312) 
* :neckbeard:

borodi

* :neckbeard: v2

a
 2024-07-08 14:21:56 +03:00
Nemanja
21d0f85cc2 metal foam grenades (#29428) 
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
 2024-07-08 00:26:58 +10:00
Nemanja
0e9ed36b85 Intercom buffs and fixes (#29580) 
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
 2024-07-08 00:19:10 +10:00
lzk
c9c721be16 Add supplybot moving states (#29795) 
* Add supplybot moving states

* forgor
 2024-07-07 23:05:09 +10:00
Ed
8e1547e616 Update attributions.yml 2024-07-07 14:06:48 +03:00
Ed
20d6ccffdb Scythe (#311) 
* Scythe

* Update entities.ftl
 2024-07-07 12:55:03 +03:00
Errant
b418338af7 Phoronman 1984 (#29747) 
No more.
 2024-07-06 14:17:32 +10:00
AndreyCamper
24c47c805d Fire Axe resprite 45 degrees v3 (#28866) 
Rotating Fire Axe 45 deg
 2024-07-06 00:37:29 +03:00
Ed
01f97a8aaa +3 berets (#306) 2024-07-05 08:56:38 +03:00
Ed
3182447fbf Grass update v2 (#303) 
* high bush

* update worldgen
 2024-07-04 23:25:22 +03:00
Ed
9280ca8830 Merge pull request #301 from crystallpunk-14/ed-05-07-2024-upstream 
Upstream sync
 2024-07-04 19:46:27 +03:00
Jaraten
b7e2d66557 wood&paper walls (#299) 2024-07-04 19:46:10 +03:00
Jaraten
a9cb687899 resprite decals (#302) 2024-07-04 19:45:24 +03:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
 2024-07-04 18:14:21 +03:00
Errant
223ade9b3f Starting gear for vox crewmembers (#29685) 
* tank harness

* weh

* Suit Storage Whitelist

* Revert "Suit Storage Whitelist"

This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79.

* suit storage filter

* vox spawn gear

* weh
 2024-07-04 12:01:03 +10:00
Ed
7477b7c869 Cloud shadows (#298) 
* not worked

* fix

* Update CP14CloudShadowsComponent.cs

* more params in component
 2024-07-03 17:33:38 +03:00
Ed
074ec3e17d Goblin species (#295) 
* Create CP14HandDisplacementMapComponent.cs

* idk if it works, we need goblin first

* some clean up

* add goblin species sprites

* basic goblic species prototype

* hairs, ears

* typo

* hand displacement maps

* shoes displacement

* shirt displacement

* head displacement. Add support different size maps

* +dummy

* eyes displacement

* pants displacement

* gloves displacements

* cloak and mask displacement (final)

* belt displacement!

* add nose customization

* +2 ears customization
 2024-07-03 01:09:57 +03:00