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

2666 Commits

Author SHA1 Message Date
comasqw
fff4287ad5 ревёрт "demiplane modifiers", всё же нужно делать биом 2024-12-12 01:07:35 +04:00
comasqw
d1e4501b6f Merge branch 'master' into MagicWands 2024-12-12 00:59:47 +04:00
comasqw
fc4f51f0dd demiplane modifiers 2024-12-12 00:58:55 +04:00
comasqw
06cb93fb1d recipes for workbench 2024-12-11 16:34:09 +04: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
comasqw
e7e4e61972 magic artifacts 2024-12-10 01:57:41 +04:00
Ed
22b0f46890 Roundleave ship clean up (#653) 
* cryo shuttle rework

* Update entities.ftl
 2024-12-09 20:39:56 +03:00
comasqw
fc90485838 Merge branch 'master' into MagicWands 2024-12-09 21:35:22 +04: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
15017b7c4f personal key loadout 2024-12-07 14:49:02 +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
ScarKy0
274c3ab0b9 Derelict Borg Revival (#33433) 
* Derelictn'tn't Borg!

* Clean *sparkles*

* Removed "S: Awaiting Changes"
 2024-12-06 00:22:38 -06:00
Winkarst
52a886947f Add a maintenance panel to bar signs (#33467) 
* Add a maintenance panel to bar signs

* Update Resources/Locale/en-US/wires/wire-names.ftl

* AI interactions

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-05 23:27:52 -06:00
Velcroboy
207c849e2d Adds Station Anchor Beacon (#33711) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2024-12-05 22:56:34 -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
Ed
094fbc445f localization sync 2024-12-05 14:43:43 +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
comasqw
a4395f2066 Merge branch 'master' into MagicWands 2024-12-05 00:46:27 +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
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
f6630e1ec9 Key distribution system (#625) 
* data restruct

* yay

* Update arenas.yml

* fixes

* auto labeling

* shuffle
 2024-12-03 12:34:07 +03:00
JIPDawg
638a1dc489 Fixed ghost role rules for some syndicate familiars (#32457) 
* fix ghost role rules for some syndicate familiars

* change from monkey rules to Team Antag rules.

* Resolve reviews + Fix rules for LoneOp and Xenos

* ghostrole rules

---------

Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
 2024-12-02 20:43:59 +01: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
IProduceWidgets
bf312f2306 Update Snowasis (#33364) 
* Update Snowasis

* Appease test gods

* Woops had the leftward animation backwards. Fixed.

* add santa suits and envelopes to chapel

* It looks worse unscaled but whatever.

* fix ghost role

* examines
 2024-11-30 23:30:01 -07:00
Ed
bb43b37fd8 Bugfixes (#619) 
* clean up

* Update empire_orders.yml
 2024-11-30 14:16:48 +03:00
VideoKompany
54a9dce68d add locale to Shuttle Console Map tab (#33651) 
fixed
 2024-11-30 13:54:37 +11:00
Alice "Arimah" Heurlin
360f6982f4 Display GPS coordinates on their own line (#33625) 2024-11-29 11:14:14 +03:00
Alpha-Two
93bdd813c4 Fix gender, maybe (#33631) 
Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>
 2024-11-29 08:54:46 +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
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
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
Ed
8057fad4d3 Skeleton demiplane antag (#609) 
* skeletons! ack

* nerf skeletons
 2024-11-24 22:08:05 +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
Ed
897a9cf683 localization sync (#597) 
* localization sync

* init

* Update entities.ftl

* внезапный респрайт лома
 2024-11-24 14:33:02 +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
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
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
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
ThatGuyUSA
0f0b141f21 Syndicate item fix ups (#33435) 
tweaks and fixes
 2024-11-21 14:22:57 +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