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

29395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
f6630e1ec9 Key distribution system (#625) 
* data restruct

* yay

* Update arenas.yml

* fixes

* auto labeling

* shuffle
 2024-12-03 12:34:07 +03: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
8057fad4d3 Skeleton demiplane antag (#609) 
* skeletons! ack

* nerf skeletons
 2024-11-24 22:08:05 +03:00
Ed
191112a8a8 Tampestry (#607) 
* Update T0_cure_heat.yml

* tampestry

* palisade wip
 2024-11-24 18:27:18 +03: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
Nim
b72c2bfb7b Mosquitoes (#593) 
* mos

* more fix

* spawner

* balance review

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-24 15:22:35 +03:00
A.Ne.
dbc2fd689a follow on use inhand (#606) 2024-11-24 14:36:35 +03:00
Ed
897a9cf683 localization sync (#597) 
* localization sync

* init

* Update entities.ftl

* внезапный респрайт лома
 2024-11-24 14:33:02 +03:00
A.Ne.
b37113f7f2 add multiple parents supproting (#598) 
* add multiple parents supproting

* change yaml path for parsing

* Update yaml_parser.py

* Update localization_helper.py

* fix
 2024-11-24 13:40:20 +03:00
Ed
42127c4682 Guards roles and clothings (#608) 
* white-blue chainmails for guard

* steal cloaks from mercenaryes to guards

* loadouts

* guard cloak resprite

* job spawners

* skills

* Update migration.yml

* Update crates.yml

* remove recipes

* Update jobs.yml

* Update migration.yml
 2024-11-24 13:39:53 +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
slarticodefast
09ca45a621 Merge staging into master (#33462) 2024-11-22 18:32:30 +01:00
Pieter-Jan Briers
b4ec946bd9 Fix sandbox error with new HWID code. (#33461) 
Oops
 2024-11-22 18:14:46 +01:00
c4llv07e
646d41d3a7 Add telegram to the server info-links (#33459) 2024-11-22 16:38:41 +01:00
Ed
a6c7bc5993 haha 2024-11-22 14:49:48 +03: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
PJBot
a3edf04dd3 Automatic changelog update 2024-11-22 03:47:17 +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
PJBot
38c70d6c9b Automatic changelog update 2024-11-22 02:57:12 +00:00
DrSmugleaf
5a751a820a Fix admin ghosts not being able to see items in pockets or interact with them (#31076) 
* Fix admin ghosts not being able to see items in pouches or interact with them

* fix

* oops

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-22 03:56:05 +01:00
Ed
8ad951183c Merge branch 'master' into ed-20-11-2024-upstream-sync 2024-11-21 22:50:28 +03:00
Ed
548433baca Torch craft (#603) 
* fix

* Update crates.yml

* loadout torch, flint craft workbench
 2024-11-21 22:48:14 +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
Vasilis
4f703ae9ce Fix approval labeler (#33440) 
* Fix approval labeler

* Update labeler-review.yml

* Update labeler-review.yml
 2024-11-21 17:51:18 +01:00
PJBot
11ee2f9a37 Automatic changelog update 2024-11-21 14:21:21 +00: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
ThatGuyUSA
0f0b141f21 Syndicate item fix ups (#33435) 
tweaks and fixes
 2024-11-21 14:22:57 +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
metalgearsloth
beeffdb5e1 Update to Robust v237.2.0 (#33436) 2024-11-21 11:16:55 +11:00
Pieter-Jan Briers
5c0a32b8b8 Update to Robust v237.2.0 2024-11-21 00:07:12 +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
A.Ne.
4abd793ef9 lockkey system tweak (#601) 
* lockkey system tweak

* Update SharedCP14LockKeySystem.cs

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-20 23:16:00 +03:00
metalgearsloth
cb246f5d7d Set airlock unlit layers as invisible (#32484) 
Doesn't really affect anything due to appearance bulldozing this but this aligns with their actual normal states so.
 2024-11-20 11:10:05 +03:00
PJBot
f9533a637a Automatic changelog update 2024-11-20 07:56:20 +00:00
metalgearsloth
98caf50626 Ion storm refactor (#33311) 2024-11-20 18:55:12 +11:00
metalgearsloth
a9be561ea7 Merge branch 'master' into ion-storm-refactor 2024-11-20 18:22:08 +11:00
PJBot
4f3ac3ea68 Automatic changelog update 2024-11-20 07:19:45 +00:00
metalgearsloth
59b09383ca Capacitor Crafting Change (#31966) 2024-11-20 18:18:37 +11:00
PJBot
a7003acd77 Automatic changelog update 2024-11-20 05:57:05 +00:00
metalgearsloth
a818c2a134 Temporarily make singularity a bit harder to loose as non-antag (#33358) 2024-11-20 16:55:58 +11:00
metalgearsloth
8acbf87d8f Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared (#33428) 2024-11-20 16:53:18 +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