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

8654 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
99786342fb Comoss sewers (zlevels added) (#655) 
* comoss zlevel sewers

* Update biome_template_caves.yml

* Update GhostSystem.cs

* Update GhostSystem.cs
 2024-12-10 00:43:30 +03:00
Ed
22b0f46890 Roundleave ship clean up (#653) 
* cryo shuttle rework

* Update entities.ftl
 2024-12-09 20:39:56 +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
comasqw
cd618efc31 update crystals modalrPart structure 2024-12-09 20:59:59 +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
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
0tito
de19418126 Add Sprite changes to Logic Gates to show the input/output state (#33277) 2024-12-06 16:35:48 +01:00
Ed
02cbeee6dc Demiplane fixes (#632) 
* limit demiplace wshwooshing by interaction range, fix global gibbing

* Update base.yml

* fix #521
 2024-12-06 17:16:38 +03:00
Ed
7d410d6094 Fix debris chunks loot spawning (#33747) 
Update DungeonJob.PostGenBiome.cs
 2024-12-06 11:15:23 +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
IProduceWidgets
3e0b93d071 fix a station event weighting bug (#33584) 
* fractional weights dont work in StationEvents

* force-int

* sure why not, we can keep floats I guess.
 2024-12-05 22:52:02 -06:00
Ed
64df860b50 Salary for the guards (#631) 
* public API

* salary init

* salary finish

* Update entities.ftl

* Update salary.yml
 2024-12-06 00:59:37 +03:00
Winkarst
ce672acf91 Fix meteor's ArithmeticException (#33556) 
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
 2024-12-05 13:20:27 +01:00
Ed
319cd18ee8 demiplane closing - adventurers tp out and gib (#629) 2024-12-05 12:35:38 +03:00
Leon Friedrich
6f51aa4b15 More device configurator serialization fixes (#33664) 
More device configurator invalid entity serialization fixes
 2024-12-05 09:36:49 +01: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
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
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
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
Token
061b1b8adb Fix makeghostroleraffle command where 4 arguments (#31836) 
Fix makeghostroleraffle command with 4 arguments
 2024-11-30 21:11:44 +01:00
Ed
bb43b37fd8 Bugfixes (#619) 
* clean up

* Update empire_orders.yml
 2024-11-30 14:16:48 +03:00
Gansu
9236e9e5b9 Fix for arrivals deleting nuke (#33659) 
Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked

Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
 2024-11-30 13:48:04 +11:00
Ed
373d3a892b New Comoss island map (#618) 
* Create island_new.yml

* first map state
 2024-11-30 01:08:44 +03:00
DrSmugleaf
3ad227a904 Add admin log for ghost warping (#33636) 2024-11-29 10:46:24 +01: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
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
Niels Huylebroeck
49724a9b9d Turn off PointLights on VendingMachines when broken or off. (#33513) 
The light itself should already turn off due to `LitOnPowered`
component, but the broken state of a VendingMachine did not.

Fixes  #33382
 2024-11-25 13:35:14 +01:00
Schrödinger
f53e3ec3c1 [BUGFIX] "Ghost" in the lobby lets you see the whole chat (#33529) 
* fix bug, in ghost command lobby

* fix

* Fix build
 2024-11-25 10:20:31 +03:00
deltanedas
e436a50c36 fix exped caves generation (#32890) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-11-24 09:49:31 +01:00
MilenVolf
aa80a88cc4 Allow shuttles on planets to make FTL jump (#33507) 
This check conflicts with an attempt to FTL from the planet before expedition ends
 2024-11-24 11:11:47 +03:00
goet
855547a2d4 Ensure wires can always be cut (#32447) 
ensure wires are always cut
 2024-11-23 12:41:37 +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
5409815be9 Allow AI and observers to see electrified doors (#33466) 2024-11-23 17:37:14 +11:00
Ed
fff97fa819 adapt 2024-11-23 03:12:45 +03:00
IProduceWidgets
a28adf4ae4 baby proof the terminal (#33281) 
* baby proof the terminal

* Make a couple exceptions for items that you might take with you.

* alwayspoweredlights

* Uncuttable cables since cablecomp is a snowflake construction system

* chairs and vendors

* rerun heisentests

* rerun tests again
 2024-11-22 23:50:41 +01: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
5a9a2d463b Merge branch 'master' into powerhud 2024-11-22 19:38:55 +01:00
c4llv07e
646d41d3a7 Add telegram to the server info-links (#33459) 2024-11-22 16:38:41 +01:00