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

17556 Commits

Author SHA1 Message Date
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
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
Gagarinten-Noverdo
cb3c6b555a Selfdamage for melee (#85) (#342) 
* Selfdamage for melee.

* Update base.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-22 12:18:08 +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
05e676fb98 Update pets.yml 2024-07-21 20:53:39 +03:00
Pelemonk
5cef8ca104 Revert "Update dwarf.yml" 
This reverts commit fda3af5030.
 2024-07-21 20:52:02 +03:00
Pelemonk
faeb3f1b91 Revert "Update dwarf.yml" 
This reverts commit 88b6b457df.
 2024-07-21 20:51:41 +03:00
Pelemonk
177112b216 Заменен Walter на Doggi 2024-07-21 20:43:14 +03:00
Pelemonk
88b6b457df Update dwarf.yml 2024-07-21 19:44:36 +03:00
Pelemonk
fda3af5030 Update dwarf.yml 2024-07-21 19:32:53 +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
PJBot
56ee4da535 Automatic changelog update 2024-07-19 01:10:01 +00:00
PJBot
d30b45f23f Automatic changelog update 2024-07-18 22:37:59 +00:00
portfiend
3ef5f521e2 fix: give reptilians species mask sprites in lobby (#30095) 2024-07-19 01:36:53 +03:00
PJBot
0c2b569622 Automatic changelog update 2024-07-18 22:35:26 +00: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
Ed
dec6a1c2ca Ru localization update (#335) 
* Update entities.ftl

* Update ContentLocalizationManager.cs

* Update ContentLocalizationManager.cs

* Update entities.ftl
 2024-07-18 23:40:06 +03:00
Jaraten
77b1113d5d Walls upd (#333) 
* wewe

* oops

* oooopsss 2
 2024-07-18 16:11:59 +03:00
Brandon Hu
73111b5170 fix(dev_map): resave dev map (#30098) 
fix(dev_map): Resave devmap

Co-authored-by: 4llv07e <igor@c4llv07e.xyz>
 2024-07-18 10:17:57 +03:00
PJBot
58a2a4c932 Automatic changelog update 2024-07-18 00:49:15 +00:00
PJBot
d7b2e72882 Automatic changelog update 2024-07-18 00:42:02 +00:00
Cojoke
95b56ad4ce Prevent Quantum Spin Inverter from Teleporting Things into Microwaves (#29200) 
* Prevent Quantum Spin Inverter from Teleporting Things into Microwaves

* Simplifies code, GetTeleportingEntity instead of TryGet, adds failed teleport message

* remove using Linguini.Syntax.Ast;

* capital...

* re-add CanInsert and Fixes microwave issue

* beb

* beeb
 2024-07-18 10:40:54 +10:00
kbailey-git
c7ea0490a6 Updated slime storage capacity text in guidebook (#30121) 2024-07-17 15:54:08 -07:00
PJBot
2d5bb92f46 Automatic changelog update 2024-07-17 22:05:58 +00:00
Errant
ef02f8c18c Temporarily remove Vox from space ninja and Unknown Shuttle ghostroles (#30099) 
* no vox ninjas

* blacklist vox from UnknownShuttleEvent
 2024-07-18 01:04:51 +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
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
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
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
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
PJBot
09a05955d7 Automatic changelog update 2024-07-15 19:19:40 +00:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00