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

9171 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
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
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
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
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
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
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
metalgearsloth
59b09383ca Capacitor Crafting Change (#31966) 2024-11-20 18:18:37 +11:00
metalgearsloth
a818c2a134 Temporarily make singularity a bit harder to loose as non-antag (#33358) 2024-11-20 16:55:58 +11:00
metalgearsloth
b177a1d019 Coloured Light Cost Reduction (#33376) 2024-11-20 12:59:31 +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
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
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
ArZarLordOfMango
a949cf33e9 Toggle clothing fix (#32826) 
* toggle clothing fix

* some adding
 2024-11-19 21:31:37 +01:00
ScarKy0
437a586906 Welded secret doors no longer say they are welded shut. (#33365) 
Init
 2024-11-18 23:07:02 -06: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
Ubaser
824efd4b25 Dim light bulbs (#33383) 
add
 2024-11-17 23:32:07 -07:00
Justice League
97be261631 Reduced cost of coloured light fixtures 2024-11-17 18:55:57 -05:00
ThatGuyUSA
31d5a66866 Chemical synthesis kit tweak (#33345) 
* butcherable surgery caps

* readded cardboard box

* butcherable now?

* butcherable now?

* one day ill figure this out

* changed label of hyperzine syringe

* removed the thing in hats.yml that wasn't supposed to be here

* Update Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-17 23:08:20 +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
SpaceRox1244
d9c677e91b Adds paper label visuals to closets and lockers (#33318) 
* Modifies label sprites and adds label visuals to closets

* Removes redundant GenericVisualizer component
 2024-11-16 21:27:29 -06:00
ThatGuyUSA
5cd92431b9 Throwing Knife description tweak (#33349) 
changed description
 2024-11-16 19:03:14 -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
K-Dynamic
4f659b9d6d Solar assembly crate buff (#33019) 
* more flatpacks + glass

* solar crate price increase

* price increase

* 1250 spesos

* Update Resources/Prototypes/Catalog/Fills/Crates/engines.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-15 22:30:47 -06:00
Southbridge
862c2ac858 BRB sign in the Bureaucracy Crate (#33341) 
Added the brb sign to the Bureaucracy Crate
 2024-11-15 21:26:47 -06:00
Saphire Lattice
e7e1d96051 Improve crayon UI to not be stuck in 1996 (#33101) 
* Improve crayon UI to not be stuck in 1996

* Make a horrifying crayon spaghetti

* Crayon

* Undeprecate the crayon, describe the crayon
 2024-11-15 21:25:06 -06:00
beck-thompson
da4fa9bea9 Clumsy system refactor (#31147) 
* First commit

* Fixes

* Added the noise

* Renames

* Timespan

* Fixed space

* entity -> ent

* This shouldn't work

* opps....

* Datafield name change

* Better comments

* small comment

* Personal skill issue

* Event renames and stuff

* Couple fixes

* Defib ref fixes (Silly me)

* Added clumsy back!

* no hard code clumsy!

* Identity fix

* Event name change

* Comment change

* Function name change

* opp

* Update names

* Damage stuff!

* Fixes!

* Fixes

* opps

* This was hidden away!!

* negative diff feeds me
 2024-11-16 00:46:01 +01:00
SpaceRox1244
09d0565413 Adds gorilla gauntlet storage sprite and updates hit sound (#33167) 
* Adds storage sprite for gorilla gauntlet

* Specifies a heavier hitsound for gorilla gauntlet

* Modifies gauntlet icon and storage sprite

* Updates credit to my new username
 2024-11-15 16:48:28 -06:00
lzk
089f190266 Add succumb action 10 sec delay (#32985) 
* Add succumb action 10 sec delay

* add somthing

* add delay to last words as well

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-15 22:21:08 +01:00
RedBookcase
4fc7a4c56e Edited Snow White reaction to output proper amount of drink. (#33331) 
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2024-11-16 02:52:19 +06:00
Ubaser
cf96679d0b New ruin variant (#33332) 
add
 2024-11-15 12:18:44 -07:00
Ubaser
97ce69fef6 Command external airlocks (#33333) 
add
 2024-11-15 14:40:52 +01:00
Preston Smith
465170f1e1 Prevent Digiboard recycling (#33315) 
* add `HighRiskItem` tag

* Correct tags

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-11-15 13:54:53 +07:00