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

19663 Commits

Author SHA1 Message Date
comasqw
544a260f4b Update SpellStorage 2024-11-26 22:21:30 +04: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
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
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
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
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
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
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
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
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
PJBot
1b3672e095 Automatic changelog update 2024-11-20 02:06:21 +00:00
metalgearsloth
75acce0d62 Fix: Examine Damage now specifies no damage (#33064) 2024-11-20 13:05:15 +11:00
PJBot
a13a4f7a99 Automatic changelog update 2024-11-20 02:00:37 +00:00
metalgearsloth
b177a1d019 Coloured Light Cost Reduction (#33376) 2024-11-20 12:59:31 +11:00
metalgearsloth
0ec23362fe Merge into master: Increase softcap back to 80 (#33400) (#33419) 2024-11-20 12:56:29 +11:00
PJBot
7e8e2c7212 Automatic changelog update 2024-11-20 01:55:55 +00:00
qwerltaz
e98383d572 Construction menu grid view (#32577) 
* button

* implement populate grid view

* tweak min width

* Make grid button toggle visible

* tweak min window size

* fix missing recipe button when mirroring item

* make grid buttons toggleable

* align button texture vertically

* selected grid item has plain color background

* tweak window width so all buttons look good

* rename select method, defer colouring

* get icon better

* whoops

* simpler button toggle

* spritesys frame0, move spritesys

* delete old sprite system refs
 2024-11-20 12:54:49 +11:00
beck-thompson
1fa1975e60 Fix toggle verbs (#32138) 
First commit

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-11-20 12:53:52 +11:00
PJBot
35e2c641c1 Automatic changelog update 2024-11-20 01:06:27 +00:00
Plykiya
fdf3df9fbd Crew monitoring crate updated to contain flatpacks, science access instead of engi (#33417) 
* Make a crew monitoring crate with flatpacks

* fix image

* migration
 2024-11-20 12:05:20 +11:00
PJBot
ed1ae96fa2 Automatic changelog update 2024-11-20 01:01:45 +00:00
PJBot
efa28fc650 Automatic changelog update 2024-11-20 00:58:08 +00: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
Plykiya
7f5bae99bb Fix security riot crate (#33415) 
* move riot crate from security to armory category

* Move riot crate to armory, actually make it require armory access to unlock
 2024-11-20 11:57:01 +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
PJBot
42ee90e53e Automatic changelog update 2024-11-19 20:32:47 +00:00
ArZarLordOfMango
a949cf33e9 Toggle clothing fix (#32826) 
* toggle clothing fix

* some adding
 2024-11-19 21:31:37 +01:00
nikthechampiongr
895648aa2c Increase softcap back to 80 (#33400) 2024-11-19 13:13:02 +01:00