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

5245 Commits

Author SHA1 Message Date
comasqw
d1e4501b6f Merge branch 'master' into MagicWands 2024-12-12 00:59:47 +04:00
Ed
c42b77d0c9 Merge pull request #658 from crystallpunk-14/ed-11-12-2024-upstream 
Upstream sync
 2024-12-11 21:18:17 +03:00
Ed
cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
 2024-12-11 14:49:02 +03:00
Ed
576bbe91d0 Roofs (#657) 
* simple roo system

* tweaks

* roof sprite update

* transparent roof

* wooden roof sprite

* remove weather: false from all tiles

* stone roof + roofs crafting

* final shtrix, maps update

* fuck

* fix checks

* reagent auto vaporize tweaks

* Update base.yml
 2024-12-11 14:44:16 +03:00
Ed
e4b60b31c0 Ed 10 12 2024 aah (#656) 
* fix ghost zlevel moving

* stairways autorotation

* ladders sprite update

* slow space swimming

* fix wrong wood spawn

* deadly ocean

* Update zLevels.yml
 2024-12-10 21:24:06 +03:00
Ed
bec8d7a7d4 Ghost z-levels move actions + mapping z-levels combine command (#654) 
* some setup

* fast ghost zlevels-moving

* zlevel combine command for mapping
 2024-12-09 20:39:46 +03:00
comasqw
fc90485838 Merge branch 'master' into MagicWands 2024-12-09 21:35:22 +04:00
Ed
0662299120 Aftertest tweaks (#647) 
* fix #641

* fix #639

* add copper, bloodflowers and wild sage into comoss island

* remove additional alchemist and blacksmithes roles

* more roundstart resources for alchemist and blacksmith

* disable footprints system

* cryo shuttle mechanic

* update cargo ship

* veryy magical

* tips update

* fix #635

* green cloak

* Update T0_cure_poison.yml
 2024-12-08 00:52:35 +03:00
Ed
80be633aa1 Update ContentLocalizationManager.cs 2024-12-07 20:55:30 +03:00
Ed
2d54561a31 Update ContentLocalizationManager.cs 2024-12-07 12:41:51 +03:00
Ed
52a0f44aa1 Bank progression mechanic (#633) 
* bank progression mechanic

* loc fix

* minor random fixes

* minor tweaks

* lighthouse

* Vladimirs Alerts!

* offset alerts

* lighthouse
 2024-12-07 00:39:05 +03:00
MilenVolf
b66fd98514 Localize ai dataset names (#33608) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-06 16:38:00 +01:00
0tito
de19418126 Add Sprite changes to Logic Gates to show the input/output state (#33277) 2024-12-06 16:35:48 +01:00
beck
6add781c4a Added several variables to make ClumsyComponent more modular for developers. (#33715) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-06 16:31:31 +01:00
ScarKy0
274c3ab0b9 Derelict Borg Revival (#33433) 
* Derelictn'tn't Borg!

* Clean *sparkles*

* Removed "S: Awaiting Changes"
 2024-12-06 00:22:38 -06:00
comasqw
a4395f2066 Merge branch 'master' into MagicWands 2024-12-05 00:46:27 +04:00
comasqw
685a9616ab много чего 2024-12-05 00:41:23 +04:00
keronshb
82528dce37 Adds Store on Collide and Wand of the Locker (#33710) 
* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID
 2024-12-04 17:49:54 +01:00
Partmedia
cf202e805d Fix sinks and toilets not draining (#33691) 
* Fix AutoDrain

Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).

However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.

* Update documentation
 2024-12-04 03:42:16 +01:00
Ed
f6630e1ec9 Key distribution system (#625) 
* data restruct

* yay

* Update arenas.yml

* fixes

* auto labeling

* shuffle
 2024-12-03 12:34:07 +03:00
comasqw
86168288a3 Merge branch 'master' into MagicWands 2024-12-02 12:34:39 +04:00
comasqw
81dd06ac2c init 2024-12-02 12:31:07 +04:00
MilenVolf
b3841e8414 Fix BuckleSystem always marking InteractHandEvent as Handled (#33602) 
* Add check before marking event as handled

* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-01 23:09:34 +01:00
Ed
7e6e4709c4 Ed 01 12 2024 rapier (#623) 
* Rapier blade

* file restruct

* golden garde

* iron sharp garde

* copper garde
 2024-12-02 00:08:23 +03:00
MilenVolf
d4067bcaab Fix wrong system usage (#33679) 
Fix wrong system using
 2024-12-01 11:34:18 -08:00
Ed
c6ac192dfb Gold & Copper modular parts 1 (#621) 
* gold & copper daggers

* copper and gold short grip

* gold & copper grips

* golden pickaxe

* copper pickaxe

* Update anvil.yml
 2024-12-01 20:11:59 +03:00
MilenVolf
5fdf03c216 Replace obsolete GetTilesIntersecting methods (#32455) 
* Remove usage of obsolete GetTilesIntersecting round 1

* Oop wrong uids

* Remove usage of obsolete GetLocalTilesIntersecting round 2

* Remove usage of obsolete GetLocalTilesIntersecting final round

* weh

* Fix using `SharedMapSystem` in `StencilOverlay`
 2024-12-01 12:56:47 +11:00
Nikolai Korolev
2d405c9652 Fix formatting IDE0055 warnings in VS Code (#33669) 2024-12-01 12:51:26 +11:00
Plykiya
021c9832ef Fix for handcuffing someone more than once (#33646) 
* Fix for over-cuffing someone

* comment
 2024-11-30 16:58:56 +01:00
lunarcomets
b45c9d5129 fix PermanentBlindnessComponent to be not so permanent (#33292) 
* adjust min blindness back to 0 when PermanentBlindnessComponent is removed

* mapinit changes

* remove OnRemove, move changes to OnShutdown

* goodbye event

* dependency removal

* final adjustment

---------

Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
 2024-11-30 13:56:52 +11:00
Ed
109edeb4b5 Modular weapon crafting WIP (#611) 
* data initalizing

* modular assembling

* grips and blades sprites

* first prototypes

* jewerly decoration

* disassemble modular weapon

* grip start stats

* blade modifiers

* inhand sprites generation

* resprites inhand, add sickle, add attempt modify size

* auto inhand sprite parsing

* icon default parsing

* spear blade

* mace ball

* sword blade

* sharedization + autonetwork hotswipe

* wielding sprite support!

* iron long grip

* wielded sickle, fix ERROR sprite if state not added

* Update grips.yml

* wielded spear + ruby rework

* wielding damage bonus modifier

* modular size fix

* fix storedOffset rotation

* parts offset

* fix inheriting modifiers

* some bugfix and balance tweaks

* DPS Meter

* fix dividing by zero

* rebalance

* replace baseknife to modular knife. Delete ice knife spell

* sickle and mace modular replace

* modular spear & sword replacement. add wielded icons

* Update CP14DPSMeterSystem.cs

* back to serverization

* grip disassemble drop again

* clothing sprite generation code

* back slot long grips and mace

* remove jewerly slot, add more clothing states

* finish clothing states

* shovel modular

* YEEEEE

* anvil modular craft

* bugfixes

* more integration check fixes
 2024-11-29 01:31:42 +03:00
beck-thompson
a790955b76 Light verb is now predicted (#33622) 
Fix
 2024-11-29 00:41:01 +11:00
Myra
1bc65624c8 Merge stable into master: Hotfix the randomly occurring DeleteAllThenGhost test failures (#33593) 2024-11-27 09:05:31 +00:00
slarticodefast
c861c56a69 Fix space ambient music (#33594) 2024-11-27 16:32:39 +11:00
Errant
eb9540364e Hotfix the randomly occurring DeleteAllThenGhost test failures (#33582) 
* clear mindrole on component shutdown

* let it go
 2024-11-27 00:56:35 +01:00
slarticodefast
470c869ce2 Greytide Virus station event (#33547) 
* proof of concept

* full implementation

* I commited a crime

* t

* min players increase
 2024-11-27 00:50:20 +11:00
slarticodefast
e9eca826d8 minor AI cleanup (#33555) 
* minor cleanup

* to
 2024-11-26 09:39:04 +11:00
slarticodefast
3c6c5ab6c9 fix airlocks inconsistently auto-closing after unbolting (#33524) 
fix door auto close timer
 2024-11-25 15:26:54 +11:00
A.Ne.
406f22de3f closed door interact popup, resolve #564 (#600) 
* closed door interact popup, resolve #564

* tweak

* uh

* removed old comment

* Update attributions.yml

* fix

* Update CP14SharedDoorInteractionPopupSystem.cs

* fixes

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-24 15:54:42 +03:00
A.Ne.
dbc2fd689a follow on use inhand (#606) 2024-11-24 14:36:35 +03:00
Winkarst
f706170ee1 Draw muzzle flash below mobs (#33465) 
* Draw muzzle flash below mobs

* Better naming

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
 2024-11-24 15:20:00 +11:00
metalgearsloth
11dbf50ed6 Add delay to AutoOrient (#33479) 
It functions identically to how V1 of orientation worked and it's incredibly annoying.
 2024-11-23 17:52:58 +01:00
metalgearsloth
11dae2ff93 Don't show drag-drop outline if climbing (#33477) 
It won't actually do anything.
 2024-11-23 12:19:59 +01:00
Ed
ae01ebda0e Merge pull request #595 from crystallpunk-14/ed-20-11-2024-upstream-sync 
Upstream sync
 2024-11-23 13:44:10 +03:00
metalgearsloth
c3786a56dc Fix door animations mispredicting if closing is interrupted (#33481) 
* Fix door animations mispredicting if closing is interrupted

On master it will flicker states a little bit partially due to it not being predicted.

Instead we'll just set it straight back to opening (no animation is ever played anyway).

* no log
 2024-11-23 10:31:07 +01:00
MetalSage
a42bacd3a9 Fix startingGear storage (#33394) 
* fix starting gear storage

* removal of unused

---------

Co-authored-by: MetalSage <metalsage.official@gmail.com>
 2024-11-23 17:54:35 +11:00
Ed
fff97fa819 adapt 2024-11-23 03:12:45 +03:00
Ed
677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync 
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml
 2024-11-23 01:48:24 +03:00
slarticodefast
08bfb43feb cleanup 2024-11-22 23:02:59 +01:00
slarticodefast
5a9a2d463b Merge branch 'master' into powerhud 2024-11-22 19:38:55 +01:00