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

8624 Commits

Author SHA1 Message Date
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
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
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
Ed
319cd18ee8 demiplane closing - adventurers tp out and gib (#629) 2024-12-05 12:35:38 +03: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
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
Ed
bb43b37fd8 Bugfixes (#619) 
* clean up

* Update empire_orders.yml
 2024-11-30 14:16:48 +03:00
Ed
373d3a892b New Comoss island map (#618) 
* Create island_new.yml

* first map state
 2024-11-30 01:08:44 +03: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
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
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
c4llv07e
646d41d3a7 Add telegram to the server info-links (#33459) 2024-11-22 16:38:41 +01:00
Ed
66fe15f8c7 Balance tweaks (#604) 
* x2 damage

* Update CP14MagicWeaknessSystem.cs

* split cure burn

* split blood purification

* extinguish torch by interact

* Update torch.yml

* Update T0_cure_heat.yml

* fix fireSpread
 2024-11-22 14:14:22 +03:00
Vasilis
94ac0b1399 Modern HWID integration (#33265) 2024-11-22 11:08:51 +00:00
chromiumboy
403528cbf3 Gas pipe sensors (#33128) 
* Initial commit

* Monitored pipe node is now referenced by name

* Review changes

* Simplified construction

* Tweaked deconstruction to match other binary atmos devices

* Helper function removal

* Updated attribution
 2024-11-21 21:46:10 -06:00
Ed
8ad951183c Merge branch 'master' into ed-20-11-2024-upstream-sync 2024-11-21 22:50:28 +03:00
Ed
96fc06a443 Fire update (#602) 
* fire spread fixes and optimization

* fix liquid drops nefty and suffix

* some sharedization

* melee fire extinguish

* clean up fireSpread system

* caution popup

* cuffable zombies

* fix zombie AI

* lighter

* torch integration attempt

* fix torch igniting

* yml tweaks

* bonus flammable damage
 2024-11-21 22:01:14 +03:00
IProduceWidgets
f5930bb566 Coal presents and chrimmas tree options. Presents no longer itemify (#33147) 
* Dont ensure ItemComp because it could lead to weirds, and also PickupOrDrop handles non-items already.

* presents and tree

* woops

* reviews a
 2024-11-21 15:20:11 +01:00
Pieter-Jan Briers
75a096b6bd Merge remote-tracking branch 'upstream/master' into 24-10-29-modern-hwid 2024-11-21 01:26:01 +01:00
A.Ne.
4fcfab972d demiplane crates fix #589 (#599) 
* demiplane crates fix #589

* change component to MapGridComponent

* simplification

* Update CP14DemiplanSystem.Generation.cs

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-20 23:37:44 +03:00
metalgearsloth
a9be561ea7 Merge branch 'master' into ion-storm-refactor 2024-11-20 18:22:08 +11:00
metalgearsloth
a818c2a134 Temporarily make singularity a bit harder to loose as non-antag (#33358) 2024-11-20 16:55:58 +11:00
DrSmugleaf
f5d0e955e3 Fix imports 2024-11-19 21:16:49 -08:00
DrSmugleaf
b8b33b97af Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared 2024-11-19 21:15:15 -08:00
Saphire
9c666457c2 Move some of the new singularity code into shared 
Hopefully without explosions yay
 2024-11-20 07:53:10 +06:00
SlamBamActionman
6e53cd98a4 Add emag functionality 2024-11-20 07:53:10 +06:00
MilenVolf
2002de9bb0 Localize planet dataset names (#33398) 
* Localize planet names (borer)

* DatasetPrototype -> LocalizedDatasetPrototype

* Apply requested changes
 2024-11-20 11:57:43 +11:00
Pieter-Jan Briers
c4e2eb9d02 .NET 9 forward compatibility changes (#33421) 
This doesn't switch the projects over to .NET 9, but it does make them work on .NET 9 when we decide to switch in the future.
 2024-11-20 11:17:45 +11:00
Ed
ed638c94a8 Merge remote-tracking branch 'upstream/stable' into ed-20-11-2024-upstream-sync 
# Conflicts:
#	Resources/Maps/cog.yml
 2024-11-20 00:34:51 +03:00
Ed
e79b046c4a Magic redesign (#594) 
* water spell textures

* water creation spell

* mana consume, and mana glove

* remove mana transfer ring

* Update migration.yml

* copy Wizden loadout PR

* add sprite component to all spells

* spell dummy loadouts

* delete spell traits

* really give spells from loadouts

* update crates fill and demiplane spawners

* beer creation spell, fix passivedamage

* Update PassiveDamageSystem.cs
 2024-11-20 00:23:44 +03:00
Ilya246
909235cdbe fix viewing nav slowing shuttle down (#32381) 
fix
 2024-11-19 03:59:42 +01:00
Saphire
68eaf6ff25 Bump the failsafe timer down 2024-11-19 08:11:10 +06:00
faint
79ff990ddf Replace direct uses of GameTicker dictionary with TryGetValue (#33222) 
Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario
 2024-11-18 21:57:50 +03:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
ScarKy0
e290588624 Changes + Cleanup 2024-11-17 20:23:45 +01:00
ActiveMammmoth
22987fc77f Wizard Summon Guns/Magic (#32692) 
* mostly done but there's a bug with spawning

* RandomGlobalSpawnSpellEvent now actually works

* Summon Guns/Magic is working

* Added sound, cap gun, and auto pick up

* Added all requested changes/fixes from reviews

* Halving cooldowns
 2024-11-17 17:46:31 +01:00
Saphire
476f90df09 Fix the component defaults 2024-11-17 04:31:41 +06:00
Saphire
a68c6cb29e Temporarily make singularity a bit harder to loose as non-antag 2024-11-17 04:01:38 +06:00
Ed
ef6f23e4b8 Remove demiplan fun (#587) 
* disable roomfills

* demiplan examination random disable
 2024-11-16 17:37:06 +03:00
Ed
06308961ed Revert "Revert "Added personal signature system"" (#586) 
* Revert "Revert "Added personal signature system (#382)" (#471)"

This reverts commit 9f93931057.

* Update pen.yml
 2024-11-16 17:30:38 +03:00
MossyGreySlope
11963e50b1 Fix server crash when the seed extractor is used on the dev map (#33312) 
handle event when using seed extractor

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-15 21:57:33 -06:00