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

4199 Commits

Author SHA1 Message Date
Ed
d4001598d4 workbench ui clean up (#399) 
* workbench ui clean fix

* stack localization
 2024-08-07 09:32:27 +03:00
Tornado Tech
1b0bf2ad18 Added base workbench window (#372) 
* Added base workbench window

* Fixed serialization errors

* Created base UI layout

* Updated ui

* Updated UI after crafting
 2024-08-06 14:25:59 +03:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
themias
e72393df71 Fix arcade machines (#30376) 2024-07-26 10:30:49 -07:00
Errant
a7fa66e956 Replayspawn logic fix (yes, again) (#30273) 
* Fix replayghost spawn

* missed a spot
 2024-07-26 13:59:42 +01:00
themias
b0cc97fb04 Fix Ripley control panel (#30325) 2024-07-24 23:23:52 -06:00
Ed
9c84ce9be0 Currency collect goal (#352) 
* simple currency comp

* stack support + weapon cost dnd port

* add collect currency objective conditions

* clean up
 2024-07-24 13:28:27 +03:00
Ed
bf93349b73 Female bodies support (#350) 
* port female parts

* boobs support!

* tiefling boobs confirmed

* Update female_shirt.png

* Update female_shirt.png
 2024-07-24 09:11:31 +03:00
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
Plykiya
851a0e15a7 fix crayon (#30263) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-23 12:22:59 +10:00
Errant
bf1450fdc8 Fix replayghost spawning location (#30252) 
Fix replayghost spawn
 2024-07-22 20:32:30 +01:00
Plykiya
aded74a88a Syndicate Reinforcement Specializations: Medic, Spy, Thief (#29853) 
* Syndicate thief, spy, medic

* Fixes description for nukies

* update description for uplink

* Implement the radial menu

* forgot these were necessary to push lol

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-21 20:32:25 +10:00
metalgearsloth
e77ebaf325 Fix war declarator (#30221) 2024-07-21 17:17:59 +10:00
metalgearsloth
b41c6a28fe Reset ghost role menu scroll upon search (#30159) 
Quality of life so it doesn't sit on your old spot anymore.
 2024-07-21 02:38:45 -04:00
metalgearsloth
aca878c9f7 Set input coords to invalid if mouse off-screen (#30164) 
This may be a breaking change for some stuff, I only tested basic combat stuff + throwing.

This fixes the coordinates setting an off-screen position to the top-left pixel and blocks throw attempts as a result.
 2024-07-21 02:13:28 -04:00
metalgearsloth
b4ec629b9f Fix muzzle flash tracking (#30163) 
* Fix muzzle flash tracking

User was never set on the networked event but we don't really need it anyway.

* Also this one
 2024-07-21 02:09:16 -04:00
Crude Oil
6c6ae35cf8 Add ability to show stack visuals on closed containers (#29309) 
* add ability to show stack visuals on closed containers

* remove container stack visuals logic from sharedstoragesystem

* improve comments a bit

* move logic for open/closed containers into itemcountersystem

* move behavior to storage component

* remove unused import

* remove old comment

* fix comments

* fix wrong property name

* Update Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

* Rename variable for clarity

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-20 22:49:48 -07: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
metalgearsloth
edb05e36bb Reapply "Remove some BUI boilerplate" (#30214) (#30219) 
* Reapply "Remove some BUI boilerplate" (#30214)

This reverts commit cb0ba66be3.

* Fix gas tank

* Fix PA

* Fix microwave

* Comms console underwrap

* Fix rcd

* log wehs
 2024-07-21 14:48:13 +10:00
Nemanja
cb0ba66be3 Revert "Remove some BUI boilerplate" (#30214) 
Revert "Remove some BUI boilerplate (#28399)"

This reverts commit cbf329a82d.
 2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d Remove some BUI boilerplate (#28399) 
* Remove some BUI boilerplate

- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.

* More

* moar

* weh

* done

* More BUIs

* More updates

* weh

* moar

* look who it is

* weh

* merge

* weh

* fixes
 2024-07-20 15:40:16 +10:00
eoineoineoin
1783e0e4c2 Add a background for OptionsButton popup (#29792) 
Add a reasonable background for OptionsButton popup

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-20 13:54:36 +10:00
CaasGit
b04f98513c fix(FaxVisualsSystem): Fax can Play() when a anim key has been added. (#30013) 
Adds a check to see if a faxecute animation is being played before
playing another animation. The old code can thrown an exception which
I've seen on live while ghosting.
 2024-07-20 13:36:22 +10:00
DrSmugleaf
78f3ffc2a4 Make ActionsSystem.UpdateAction public (#30056) 2024-07-19 23:03:43 -04:00
themias
5dfca4c2dc Fix mailing unit UI (#30174) 2024-07-20 12:31:26 +10:00
DakotaGay
f2b9cd7a25 Fix Markup Tags in Station News (#30169) 
* Fix (hopefully)

* Fixed Spelling Mistake and minor Code Cleanup

* Revert "Fixed Spelling Mistake and minor Code Cleanup" due to Pull Request Guidelines

This reverts commit cee3e0226b349187bd8fd8b639e161fb877e8bdb.
 2024-07-19 10:18:39 -04: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
Cojoke
b57174007c Remove all Assigned Values that are Never Used (#30110) 
Remove all Assigned Values that are never used
 2024-07-18 20:22:23 -04:00
Ed
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +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
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
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
Pieter-Jan Briers
c0593fb328 Fix invalid UI hover/click sounds breaking client (#30067) 
fixes #29561
 2024-07-15 16:55:05 +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
Ed
1c74ffb8e4 Ambient music rules refactor (#29921) 
* refactor

* dutypo
 2024-07-14 23:58:48 +10:00
Winkarst
960cc806cc Update AccessLevelControl.xaml.cs to use ISawmill (#29987) 
* Update AccessLevelControl.xaml.cs to use ISawmill

* Update

* Silly me

* Update
 2024-07-14 20:24:26 +10:00
Winkarst
5d1702d280 Update MainMenu.cs to use ISawmill (#29988) 
* Update MainMenu.cs to use ISawmill

* Update

* Error
 2024-07-14 13:05:39 +10:00
Plykiya
b7aa97e203 Replace obsolete EntityCoordiates.InRange() with TransformSystem.InRange() (#29993) 
* Replace EntityCoordiates.InRange() with TransformSystem.InRange()

* nullspace

* I figured it out

* man I have no clue how client side sutff works

* please have mercy

* remove RadiationPulseOverlay changes

* nullspace

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 23:25:51 +02:00
Plykiya
a03b88979e Replace obsolete xform.ToMap() with xformSystem.ToMapCoordinates() (#30010) 
* Get rid of a bunch of obsolete usages

* position

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 23:05:22 +02:00
Winkarst
bf4ef62ab3 Update RadiationPulseOverlay.cs to have 0 warnings (#30004) 2024-07-13 18:45:34 +02:00
Plykiya
6c1d1057d5 Replace DetachParentToNull() with DetachEntity() (#29992) 
DETACH PARENT TO ENTITY

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 20:59:33 +10:00
CaasGit
ac768fe9f1 fix(SharedGunSystem): Return and debug log on CreateEffect. (#29656) 
Sometimes CreateEffect is called on a Invalid Entity. This now causes
that to check, thus returning out and printing some hopefully helpful
logs to try to track down the real source of this issue.
 2024-07-13 16:12:57 +10:00
slarticodefast
eb4ce85354 Remove imagesharp and StatusEffectAddedEvent from FlashOverlay (#28930) 
remove imagesharp and StatusEffectAddedEvent from FlashOverlay
 2024-07-13 16:10:04 +10:00
Nemanja
49096cf14f Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +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