juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,100 Commits 57 Branches 0 Tags
2d4ace0b101e551dccaa0aa659e76df3c61dceb3
Commit Graph

9804 Commits

Author SHA1 Message Date
Nim
2d4ace0b10 Tip sprite (#954) 
* tip sprite

* fix

* heh

* solution
 2025-03-01 01:26:36 +03:00
Nim
310c711adf tweak (#953) 2025-02-28 17:03:23 +03:00
Ed
3fd47443ae Essence collector (#952) 
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
 2025-02-28 15:55:47 +03:00
Ed
f2c9fb6503 ballade balance 2025-02-27 17:30:39 +03:00
Ed
3d398e89ab integration whistler poison into alchemy (#950) 2025-02-27 15:12:30 +03:00
Nim
15d9657139 Invisible whistler (#941) 
* invisible whistler

* Parts

* spike

* flavor

* flavor

* filter

* sprite

* demiplan
 2025-02-27 14:02:30 +03:00
Ed
5524e029f4 Essence splitter (#948) 
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
 2025-02-27 13:48:38 +03:00
Ed
c6cc4daa3f Magical ballade (#946) 
* mana ballade

* mana gift + consume merged in 1 loadout option

* Update T0_mana_gift.yml
 2025-02-26 17:23:53 +03:00
Ed
9440115087 Fire ballade (#945) 2025-02-26 14:49:32 +03:00
Ed
1542459864 Books and bookshelf (#944) 
* guidebooks

* guard spawns

* books restruct

* bookshelf

* Update crates.yml
 2025-02-26 14:38:22 +03:00
Ed
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +03:00
Ed
d0f1bba9d8 speed up ballade (#942) 2025-02-26 10:51:23 +03:00
Ed
ba901d5e0e Crystals Update (#925) 
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
 2025-02-25 23:37:05 +03:00
Nim
6fb28fae4f sack craft (#937) 2025-02-25 17:34:04 +03:00
Ed
a370182cb6 Spell icons folder restruct (#940) 
* spell icon sprite restruct

* proto edit

* Update T1_fire_rune.yml
 2025-02-25 17:33:20 +03:00
creamybag
ba6ceac7ef DismasHair (#939) 
* DismasHair

* new rsi, new meta, new name
 2025-02-25 17:32:45 +03:00
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
Nim
3a0a4c17ea Сrafting changes (#932) 
* crafting

* tweak
 2025-02-25 10:31:59 +03:00
Ed
ae5b1118d8 Update shield.yml 2025-02-24 00:17:41 +03:00
Ed
b8575aba8f roofs update 2025-02-23 23:29:45 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
 2025-02-23 23:07:55 +03:00
keronshb
3192914fc5 Fix/Addition - Wizard Survivor Antag Status (#35226) 2025-02-23 12:24:36 -05:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
slarticodefast
55e22b6a94 Remove disablers from emagged lathe (#35423) 2025-02-23 10:05:23 -05:00
chromiumboy
066c773965 Sentry turrets - Part 2: Basic prototype (#35031) 2025-02-24 00:39:44 +11:00
ScarKy0
fad0b6a137 Swap price of EMAG and AD. (#35354) 
init
 2025-02-23 14:01:06 +01:00
K-Dynamic
17218b7277 Lattice tiles footsteps now sound like catwalks (#35421) 
change lattice from FootstepPlating to FootstepCatwalk
 2025-02-23 12:43:15 +01:00
Southbridge
f9c9ffadcc Amber Station Improvements (#35384) 
* Redid TEG, minor fixes around

* Ran fixgridatmos, variantize, fixrotations, tileswalls
 2025-02-23 01:31:04 -07:00
metalgearsloth
a457551108 Roof data rework (#35388) 2025-02-23 18:23:00 +11:00
GrownSamoyedDog
91678f75da Fixed Guidebook Sorting / Ordering (#34960) 
* fixed all yml and cs

* Subjective Rearranging

* fixed my accidentally removed xml endline

* Accidentally included for a different PR

* Added .ThenBy and cleaned up newplayer.yml
 2025-02-23 02:00:10 +01:00
keronshb
c922b4f843 Wizard: Smoke Spell (#35403) 
* Adds smoke spell for wizard

* Adds the actual sprites oops

* Removes repulse attract change

* Removes change again?
 2025-02-22 15:04:42 -08:00
Sparlight
e631fa893e Give dogs speech noises (#35383) 2025-02-22 22:34:29 +01:00
keronshb
ee31a1f293 Wizard: Repulse Spell (#35377) 2025-02-22 10:56:54 -05:00
Nim
d383d329c1 Reduces gauze (#928) 
* size

* ref

* hmm
 2025-02-22 17:28:32 +03:00
Ed
1020288d12 Epic alchemy buff (#931) 
* alchemy update

* damage heat
 2025-02-22 12:45:55 +03:00
Ed
36916b0952 returns ru CBT 2025-02-22 00:51:50 +03:00
Boaz1111
54bb2a31b7 Adds Colored Light Bulbs (#35333) 
* goober

* changes parenting
 2025-02-21 19:01:31 +01:00
lzk
b41a348ebf fix rubber hammer attack rotation (#35357) 2025-02-21 11:01:29 -05:00
KittenColony
93350c80e8 Alchemy Remaster - Foundation (T0 / T1) (#827) 
* Ported from broken repo

* Missed something

* Unfucks the port

* RU locale + EN typo fixes

* Simple solvent & Dye temperature / orgnization

* cleansing salt + reactions

* Healing solution stems bleeding

* Removed biological.yml duplicate

* Guidebook updating

* Update dye_brewing.yml

* Single character typos

* missed typos

* Salt dehydrating

* Dye now needs water (catalyst) to form

* Biological > Organic, Archaic > Arcane / Alchemized,+ RU Locale

* Adjusting & patches

* Chromium in Arcane

* Removed 0.1u empty from purification

* Update chromium_slime.yml

* test commenting out

* Uncommenting InverseEffect

* Revert "Uncommenting InverseEffect"

This reverts commit 19aaaa9246.

* Potential solution

* Revert Potential solution

* This might fix it.

* Suffering

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-21 17:58:40 +03:00
Nim
a39ea84e78 aprons (#926) 2025-02-21 17:38:03 +03:00
spderman3333
d6cc167506 Fixed Veggie pizza slice having 40u of reagent space (#35343) 
* Fixed Veg pizza slice having 40u of reagent space

* Changed FoodPizzaVegetableSlice to hold 10u rather than 6u

* Fixed donk pocket slice having 50u reagent space.
 2025-02-20 20:50:30 -08:00
keronshb
a9054c5e9c Mjollnir and Singularity Hammer for Wizard (#34446) 2025-02-20 18:38:52 -05:00
lzk
53c82ebdd6 2 lines yaml cleanup (#35338) 2025-02-20 20:24:21 +01:00
Deserty0
b8cc4c8c20 Fix (#922) 2025-02-20 19:22:29 +03:00
Deserty0
225d9b27f9 fix (#923) 2025-02-20 19:21:50 +03:00
Zokkie
580f908ca2 Fix to make all corpses butcher able and better disposable (#33727) 
* Made all corpses disposable. Argocytes, Mimics, Butterflies, Bees, Space Kangaroos, Laser Raptors and Watchers their corpses can now be butchered.

* Accidentally removed a line break. restored it.

* Removed a dash that did not belong there.

* Changed mimic giving a "Changeling Sting Can" when butchered instead of normal meat.
 2025-02-20 17:12:55 +01:00
creamybag
d32ed931b3 lightgreendress (#919) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-20 15:44:45 +03:00
Winkarst
3e449f755f Fix: Toys sounds (#33449) 
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-20 12:12:06 +11:00
FungiFellow
f189bdcf6e Removed Contraband Status from Flares (#34705) 
* Update shotgun.yml

* Update shotgun.yml

* Update shotgun.yml
 2025-02-19 16:27:34 -08:00
creamybag
b29cfaf2a8 Winter is coming... (#918) 2025-02-20 02:12:17 +03:00