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

6160 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
lzk
4ff34458cf Lowercase some prototypes names (#29990) 
* Lowercase some prototypes names

* huh

* return altar

* apply

* meta map
 2024-07-23 11:16:11 +03:00
TheKittehJesus
1f29a5ad36 Fix: Syndie borg can now wield DEsword (#30229) 
* Syndie borg can now wield DEsword

* Made child of EnergySwordDouble for borgs
* Made ESword borg module use this new borg DESword

* Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu
 2024-07-23 01:13:18 -07:00
Errant
eb861d173f Wrong magazine popup (#29046) 
* wrong magazine

* a single typo

* removed GunSystem solution

* magazine misfit warnings
 2024-07-22 23:36:05 -07:00
Cojoke
2d4aaa414f telescreen and television require vision + Move eye to shared (#30260) 
* telescreen and television require vision

* Move Content.Server.Eye to Shared

* fix popups

* Filthy
 2024-07-22 19:33:41 -07:00
Cojoke
88cc6753ea Adds the Volume of a Gas Tank to its Examine Text (#29771) 
* Adds the Volume of a Gas Tank to its Examine Text

* Put Volume in description

* Put Volume in description

* work please?

* Hit space bar
 2024-07-22 14:41:42 -07:00
3nderall
159a7413a7 Stops foam counting as a connection for walls (#30236) 
Stops walls from connecting to foam

Co-authored-by: 3nderall <3nderall@gmail.com>
 2024-07-22 12:55:44 +03:00
LankLTE
395b296d68 Darts can now pop balloons. (#30088) 
Basic implementation.
 2024-07-21 22:38:56 -07:00
justdie12
290542534a Update water.yml (#29596) 
* Update water.yml

Water should put out the fire. That's why now the water tiles are extinguishing you.

* Update water.yml
 2024-07-22 12:53:10 +10:00
slarticodefast
a0aafdfedd vital clown bugfix PR (#30243) 
vital bugfix
 2024-07-21 19:50:21 -07: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
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
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
metalgearsloth
56de41e8a7 Hide escape pods on shuttle map (#29758) 2024-07-21 17:23:44 +10:00
Winkarst
ee2e94a204 Fix servers ambience sound (#30091) 
* Fix servers ambience

* I'm silly

* Clean up
 2024-07-21 17:22:02 +10: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
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
buntobaggins
6b57cf2020 Spationaut Hardsuit Light buff (#30049) 
Buffed the light on the Spationaut Hardsuit

Co-authored-by: buntobaggins <email.com>
 2024-07-20 20:29:21 -07:00
JIPDawg
1208928564 Added missing builld components to RCD [empty] (#30177) 
* Added missing stuff to rcd[empty]

* do the smart thing

---------

Co-authored-by: JIP <jipdawg93@gmail.com>
 2024-07-20 02:23:07 -04:00
SlamBamActionman
6972bc26a7 Directional Fans (#27772) 
* Initial commit

* Description update

* Updated texture
 2024-07-20 13:18:34 +10:00
Plykiya
7683acab5e Fix Chameleon Scarf menu being blank (#30156) 
fixa the scarfa

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-19 23:00:28 -04:00
Ghagliiarghii
e6b171645c Give NukeOps Reinforcements an ID Card (in a PDA) (#28088) 
* Give NukeOps Reinforcements an ID Card (in a PDA)

* add warning comment

* create syndicateoperativegeatreinforcementnukeops in traitor.yml

* revert fun/misc_startinggear.yml
 2024-07-20 12:59:31 +10:00
slarticodefast
eaace152ae Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112) 
* fix embeddable offset with throwing angle

* number
 2024-07-19 19:42:58 +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
portfiend
3ef5f521e2 fix: give reptilians species mask sprites in lobby (#30095) 2024-07-19 01:36:53 +03: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
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +03: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
lzk
6443c53a8c Little saw debuff (#29995) 2024-07-17 09:26:10 +03: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
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
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
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
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03: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
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
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
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
Ed
dcb3443b35 Vgroid diamonds hotfix (#29999) 
vgroid diamonds
 2024-07-13 15:45:35 +03: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