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

29419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ed
5384adb2b3 Blacksmith again (#652) 
* golden and copper sword

* copper sickle

* maces

* shovels

* modular axes

* fixes
 2024-12-09 00:40:27 +03:00
Ed
c2b7c5146d second blacksmith 2024-12-08 14:43:12 +03:00
Ed
61454e351c Another blacksmith minor update (#648) 
* modular golden sickle

* anvil and furnace resprite

* Update comoss.yml
 2024-12-08 14:17:48 +03:00
Ed
dc5333ee18 localization update 2024-12-08 01:19:57 +03: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
264ef809bd Update personal_objectives.yml 2024-12-07 20:49:51 +03:00
Ed
ccc97f0e70 Update CP14SandboxRU.xml 2024-12-07 15:04:28 +03:00
Ed
15017b7c4f personal key loadout 2024-12-07 14:49:02 +03:00
Ed
2d54561a31 Update ContentLocalizationManager.cs 2024-12-07 12:41:51 +03:00
Nim
417668b88b Crayon (#634) 
* crayon

* add crayon into loots

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-07 00:50:54 +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
ce34c6f2a0 Update lockTypes.yml 2024-12-05 21:25:34 +03:00
Ed
8252418fdc Update personalHouse.yml 2024-12-05 18:19:10 +03:00
Ed
094fbc445f localization sync 2024-12-05 14:43:43 +03:00
Ed
319cd18ee8 demiplane closing - adventurers tp out and gib (#629) 2024-12-05 12:35:38 +03:00
Ed
304e1a268a Balance pack (#628) 
* map fixes, move crystalls from houses into startgear

* fix lock types

* fix item throwing, reduce lock powers, add lockpick into anvil

* new store positions

* restruct swords

* nerf skeleton, bone halberd
 2024-12-05 00:29:14 +03:00
A.Ne.
e6a6900719 Prototypes for Guard (#616) 
* Prototypes for Guard

* imperial laws

* merge

* yml clean up

* flags + change in imperial laws

* map update

* guard clothing resprite

* cool guard helmet

* guards grip and halberd

* fill cabinets, add guard commander stamp

* key and keyring fix

* Update arenas.yml

* Update migration.yml

* tapestry fix

* guidebook spacing

* Update meta.json

* add bold tags

* Update flags_wallmount.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-04 18:11:33 +03:00
Ed
0e88b6dc6f Table fences (#626) 
* collision fucks

* map update
 2024-12-03 16:21:07 +03: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
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