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

17642 Commits

Author SHA1 Message Date
Ed
8c477a67c1 Update centcomm.yml 2024-07-23 21:50:00 +03:00
Ed
3b5e0003c3 Create centcomm.yml 2024-07-23 21:45:41 +03:00
Ed
526238bac5 fix 2024-07-23 14:04:13 +03:00
Ed
f348213750 Update arenas.yml 2024-07-23 13:46:57 +03:00
Ed
ed3e896cb8 Update debug.yml 2024-07-23 13:40:19 +03:00
Ed
0190e366a3 maps fix 2024-07-23 13:27:58 +03:00
Ed
9826b9ff38 Update goblin.yml 2024-07-23 13:16:49 +03:00
Ed
17d0e6326e Create cp14-ignoredPrototypes.yml 2024-07-23 12:51:48 +03:00
Ed
f71dffb746 update displacements 2024-07-23 12:30:49 +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
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
PJBot
629cd432b9 Automatic changelog update 2024-07-23 08:14:25 +00: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
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
PJBot
046aa54d0d Automatic changelog update 2024-07-23 06:37:13 +00: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
PJBot
99c3341dc9 Automatic changelog update 2024-07-23 03:24:10 +00:00
PJBot
d65c78746e Automatic changelog update 2024-07-23 02:34:47 +00: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
PJBot
768aeb28ec Automatic changelog update 2024-07-23 02:19:39 +00: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
PJBot
064b52a5ed Automatic changelog update 2024-07-22 22:25:32 +00:00
PJBot
6bd1604194 Automatic changelog update 2024-07-22 21:42:48 +00: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
PJBot
65f9cc3155 Automatic changelog update 2024-07-22 19:33:36 +00:00
MerrytheManokit
61fd8167e0 Istg, rq, and dw (#30216) 
* Update word_replacements.yml

* Update speech-chatsan.ftl
 2024-07-22 19:53:34 +01: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
PJBot
b6f3545c8c Automatic changelog update 2024-07-22 10:21:42 +00: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
PJBot
1c43f85ffe Automatic changelog update 2024-07-22 09:55:21 +00:00
PJBot
183d26f001 Automatic changelog update 2024-07-22 09:34:08 +00:00
IProduceWidgets
9bc9b6b696 Amend spacelaw to allow zookeepers to have tranq shotguns. (#30237) 
In loving memory of Harambe May 27, 1999 – May 28, 2016
 2024-07-22 04:33:02 -05:00
PJBot
28c8eba330 Automatic changelog update 2024-07-22 09:19:03 +00: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
PJBot
4e34fb66ec Automatic changelog update 2024-07-22 05:40:03 +00:00
LankLTE
395b296d68 Darts can now pop balloons. (#30088) 
Basic implementation.
 2024-07-21 22:38:56 -07:00
PJBot
1fa91e2785 Automatic changelog update 2024-07-22 03:56:42 +00: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
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
PJBot
73024fc69f Automatic changelog update 2024-07-21 17:18:04 +00: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