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

8279 Commits

Author SHA1 Message Date
Ed
9011aab26b Add 3 roles (without gameplay, alas) (#356) 
* add role icons

* add roles prototype

* Update job.yml
 2024-07-28 18:22:50 +03:00
Jaraten
cf6b42d20c Stone-brick wall crushed (#336) 2024-07-28 17:27:24 +03:00
Ed
655b32b720 Magic spells backend (#358) 
* add EntityEffect aability support

* delayed actions

* renaming

* delayed projectile spells

* spawn on self + entityEffect on self spells

* spawn on point spell

* rename

* clean up base species components

* magic alert

* move magic energy to Shared, add manacost to spells

* magic recoil

* improve magic recoil

* verbal aspect

* somatic aspect

* add simple vfx proto and sprites

* add casting VFX

* add TODO
 2024-07-28 17:26:47 +03:00
Ed
50e042011d direct 2024-07-25 00:09:58 +03:00
Ed
08f1aa9fa1 Crew goals update (#355) 
* randomization goals support

* maps update
 2024-07-24 20:52:05 +03:00
Nim
bb20f3a1bc fix Mannequin (#354) 2024-07-24 19:14:18 +03: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
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
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
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
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
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
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
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
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
Ed
c407f7c473 Train map fix (#30145) 
* train fix

* Update train.yml

* Update train.yml

* Add files via upload

* Revert "Add files via upload"

This reverts commit 9c6c2caae32899e7bef9c45db1ff4317a0dae529.

* Update train.yml
 2024-07-21 01:44:18 -06:00
osjarw
644736b382 NPCs no longer consider anchored pipes as weapons (#30061) 
* Anchored pipes are no longer considered weapons

* Switch to overload utilizing a TransformQuery
 2024-07-21 17:28:37 +10:00
IProduceWidgets
c7ff647cb3 Nukie Outpost is no longer a station map (#30090) 
* I dunno, break shit I guess.

* Actually fix some shit for once.

* test flakey or me flakey?

* Test were not flakey, they just didnt make any sense anymore.

* more stationy tests

* undo abuncha shit I can set in yml instead

* forgor an assert

* unneeded usings

* 1984

* I made github angy

* yoink

* the end is never the end is never the end is never the end is never the end is never the end is never the

* Im going to commit sudoku
 2024-07-21 01:26:30 -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
metalgearsloth
56de41e8a7 Hide escape pods on shuttle map (#29758) 2024-07-21 17:23:44 +10:00
Pissachu
0cb86d7aae Fixing Botanist role numbers in various stations - V2 (#29581) 2024-07-21 01:23:27 -06: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