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

4775 Commits

Author SHA1 Message Date
Ed
22bb0ae283 Energy pilons WIP (#326) 
* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-29 21:01:36 +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
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
Plykiya
1d55a439ff Make NoSlip component networked (#30425) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-27 23:17:06 -07:00
metalgearsloth
404743f073 Fix examine threading issues (#30160) 2024-07-28 13:43:59 +10:00
Plykiya
7f9e06501f Update SharedDoorSystem.cs to not use Component.Owner (#29963) 
* Update SharedDoorSystem.cs

* comment

* empty space

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-28 13:18:12 +10:00
metalgearsloth
8f250581be Fix VGRoid grid spam (#29946) 
Specifically if a grid splits under the cvar size it doesn't get a label. This also stops stuff like shuttles splitting in half creating new entries for the new grids. Splitting code leaves the largest grid as the existing one so this will always prefer to keep it large (but if there's multiple splits it won't adjust).
 2024-07-27 11:54:38 +10:00
themias
7c7f4a9f25 Fix zombie uncuffing (#30321) 
* Fix zombie uncuffing

* PlaceNextTo() and rename vars
 2024-07-26 14:48:03 -04:00
Plykiya
2a7883b92e Update vomit organ smite to not use Component.owner (#29926) 
* Update vomit organ smite to not use Component.owner

* is this what you want...?

* am I winning, dad?

* update the comment

* we love entity<t>

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-25 05:24:40 -07:00
deltanedas
8f6326c3e0 prevent borgs unlocking eachother and robotics console (#27888) 
* prevent borgs from using locks

* e

* bru

* a

* blacklist borgs and robotics console

* frogro

* add IsAllowed to EntityWhitelistSystem

* use IsAllowed

* move thing to new LockingWhitelistSystem

* :trollface:

* review

* use renamed CheckBoth in locking whitelist

* remove unused stuff and add more to doc

* Use target entity instead to remove self check

* Rename to _whitelistSystem

* Add deny lock toggle popup

* Prevent duplicate checks and popups

* Fix wrong entity in popup when toggling another borg

* Make new event

* Update comment to user for new event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-25 13:54:51 +10:00
Cojoke
620aed5939 Fix QSI Link Range (#30332) 2024-07-24 13:57:45 -07:00
osjarw
aa886ca494 Make NeedHand modifiable for injectorSystem (#29870) 
* Get needhand from yml

* MovementThreshold modifiable + inheritdoc
 2024-07-24 12:26:52 -07:00
Brandon Hu
c4dcc90972 tweak(GunRequiresWield): State the requirement for gun wielding in the description. (#30301) 
* https://en.wikipedia.org/wiki/List_of_LASD_deputy_gangs

* https://knock-la.com/tradition-of-violence-lasd-gang-history/

* https://coc.lacounty.gov/deputy-gangs/
 2024-07-24 08:33:14 -04: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
ab8655040b Update InventoryComponent.cs 2024-07-23 12:34:48 +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
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
3ab6d5daff Makes the QSI Popup Nicer (#30265) 2024-07-22 20:23:04 -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
e039e92016 Fix Freezing on throwing jetpack (#30223) 
* Fix Freezing on throwing jetpack

* bweep(requested stuff)
 2024-07-22 18:24:26 -04:00
Jezithyr
99492e3e3f Added fixedpoint 4 (#29834) 
* Added fixedpoint 4, which is basically just fixedpoint2 but with 4 points of precision and using a long instead of an int to store values.
 2024-07-22 14:07:31 -07:00
Errant
bf1450fdc8 Fix replayghost spawning location (#30252) 
Fix replayghost spawn
 2024-07-22 20:32:30 +01:00
osjarw
d8433a8f86 Make delay incurred from additional syringe contents modifiable + tiny syringe buff/fix (#29825) 
* Make delay incurred by transfer amount modifiable

* No unintentional negative delay please

* Use more fixedpoint, hope I didn't break anything

* merge review suggestion

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-22 03:20:36 -07:00
Plykiya
edd9bb6e74 Quieter bag sounds (#30225) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-22 12:54:15 +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
slarticodefast
4eed2fd973 fix borgs being unable to state laws with an active flashlight (#30183) 
fix borg laws
 2024-07-22 13:55:34 +10: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
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
chavonadelal
c89186a26f Localization of encryption keys (#30172) 
* Localization of encryption keys

* Localization of encryption keys update
 2024-07-20 19:14:41 +03:00
DrSmugleaf
297baaca23 Add user to AttemptMeleeEvent, add ThrowItemAttemptEvent (#30193) 
* Add user to AttemptMeleeEvent, add ThrowItemAttemptEvent

* Add xmldoc
 2024-07-20 18:06:52 +10:00
lzk
8d5792efd7 Remove HighImpassable from TableTopLayer (#29455) 
* uhmm

* Update CollisionGroup.cs
 2024-07-20 15:56:21 +10:00
deltanedas
8be13bf495 fix fish petting misprediction (#30175) 
* make fish petting ignore use delay

* m

* troll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-20 13:23:46 +10:00
DrSmugleaf
78f3ffc2a4 Make ActionsSystem.UpdateAction public (#30056) 2024-07-19 23:03:43 -04:00
slarticodefast
eaace152ae Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112) 
* fix embeddable offset with throwing angle

* number
 2024-07-19 19:42:58 +10: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
c8a90a74c0 Update ContentLocalizationManager.cs 2024-07-19 11:20:34 +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
metalgearsloth
6005a9f4cb Fix door access in mapping mode (#30030) 
Fix shouldn't break anythingTM.
 2024-07-19 16:19:15 +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
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
Plykiya
961a553fa2 Fix stun batons using excess charges when thrown (#30136) 
Fix stun batons

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-18 10:48:08 +10:00
slarticodefast
3f014e84eb minor SharedInteractionSystem cleanup (#30139) 
cleanup SharedInteractionSystem
 2024-07-18 10:41:15 +10: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
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
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