juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,615 Commits 57 Branches 0 Tags
a99f2fcd50d9be7c682e7d207e86b99b4b1eb3e6
Commit Graph

10719 Commits

Author SHA1 Message Date
Red
a99f2fcd50 Remove random reaction system (#1345) 
* wow

* d
 2025-06-01 15:01:32 +03:00
Alexsey Bezyuk
759e7c73d9 furnace radius (#1346) 2025-06-01 12:33:38 +03:00
Ed
bd783f9ec0 Update herbals.yml 2025-05-31 22:04:20 +03:00
Ed
1818f253ae chest fix 2025-05-31 18:07:14 +03:00
Red
10090292a1 Master fix (#1342) 
* Update web.yml

* cocoon loot

* Update web.yml
 2025-05-31 17:50:01 +03:00
Red
71527bb4eb Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web 
Spider content update
 2025-05-31 14:31:44 +03:00
Ed
0dd379dec3 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-30 23:24:23 +03:00
Nim
b28c5605b9 zombie speed (#1337) 2025-05-30 18:22:39 +03:00
Red
7d658de8a1 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-30 14:54:06 +03:00
Ed
df9c7e4439 try fix new lines 2025-05-30 14:52:00 +03:00
Ed
66022d1312 Update onion.yml 2025-05-30 14:39:47 +03:00
Ed
d8e4698191 return vanilla vgroid gen 2025-05-30 14:38:35 +03:00
Ed
44149a6db8 global whitelist fix 2025-05-30 14:04:04 +03:00
Ed
f78b1e07c5 cs fix, demiplane fix 2025-05-30 13:28:08 +03:00
Kit
2c5655ee69 Update Blood healing and blood absorpsion (#1331) 2025-05-30 01:59:48 +03:00
Ed
5e6d1d0b3a dungenore wawa 2025-05-29 22:14:14 +03:00
Ed
8006578845 fix #1311 2025-05-29 00:57:12 +03:00
Red
7642f49b00 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-29 00:50:36 +03:00
Ed
9b6ceb8d18 caves fix 2025-05-29 00:45:41 +03:00
Fr0goo
3d964cbf04 Goblin Speech noise (#1304) 
* Goblin Speech noise

added some goblin speech noises using various already existing goblin sounds. just cropped and stuff

* Fixed capitalization

* Apply suggestions from code review

Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>

---------

Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
 2025-05-29 00:24:21 +03:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308) 
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
 2025-05-29 00:22:47 +03:00
Lucson1337
0551caf98f Eye patch/глазная повязка (#1329) 2025-05-29 00:22:20 +03:00
Aisu9
995429d041 Small healing magic rebalance. (#1323) 
* Healing small rebalance

* Healing spell small rebalance 2

* Healing Spell Rebalance 3

* Update cure_wounds.yml

* Update cure_poison.yml

* Update cure_wounds.yml

* Update cure_poison.yml

* Update cure_heat.yml

* Update cure_wounds.yml
 2025-05-29 00:21:31 +03:00
Ignaz "Ian" Kraft
33bb537f81 make heat and freeze work on reagents (#1314) 
* make heat and freeze work on reagents

* has to run before AdjustTemperature

* implement suggested changes

* almost missed this edge case

* 0k is the limit

* cleanup
 2025-05-28 00:24:01 +03:00
Nim
2607eaeddd Polymorph return (#1327) 
* polymorph return

* AliveTarget
 2025-05-28 00:08:58 +03:00
Ed
f509f0e152 entityloottable conflicts fix 2025-05-27 12:42:46 +03:00
Ed
d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
 2025-05-27 12:21:14 +03:00
Kit
89dd70d7cd Iceshard nerf (#1324) 2025-05-27 11:38:03 +03:00
Sefaia
f77a2c55c3 Added Guidebook entry for Locks, Keys and Lockpicking (#1307) 
* Added Guidebook entry for Locks, Keys and Lockpicking

* Created a Mechanics Catagory for the Guidebook and allocated the two entries to it.

* Reorganized Lock and Lockpicking along adding TODO on mechanics

* Oops! Correcting a mistake at Lockpicking 101. Thank you @Woolpix18!

* Added a small fun fact about Lockpicks.

* Added Guidebook entries for Russian (IN NEED OF TRANSLATION) and simplified the guidebook entries for ease of reading.

* Update mechanics.yml

* Update mechanics.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-05-27 11:32:13 +03:00
Errant
02fe5b4ac5 HOTFIX Cryochem revert (#37844) 
* Revert "Traumoxadone (#37236)"

This reverts commit 55ec2632a8.

* Revert "Cryoxadone Tweaks (#37132)"

This reverts commit 406bfa3308.

* Revert "Stelloxadone (#37131)"

This reverts commit f415ad51c3.

* whitespace test fail evasive maneuver

* changelog 1984
 2025-05-26 16:49:34 +02:00
Nim
a1323c7b29 Tavernkeeper's Sandwich (#1280) 
* burger

* Sandwich

* Separator

* CP14Sandwich
 2025-05-26 12:53:07 +03:00
Nim
91cebc07c4 Merge pull request #1278 from Nimfar11/books 
Books sprite
 2025-05-26 12:52:58 +03:00
Ed
d44579df78 s 2025-05-26 12:30:16 +03:00
Ed
d34ece9eed Update asteroid.yml 2025-05-26 12:10:01 +03:00
Errant
99236def28 comment out slotblocker yaml (#37827) 
* comment out slotblocker yaml

* let me fix this real quick xD

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-26 00:05:47 +02:00
Ed
924897e27d f 2025-05-23 15:08:17 +03:00
Ed
262a8a30c9 gf 2025-05-23 14:58:41 +03:00
Ed
8e7f68c062 part of fixes 2025-05-23 14:57:20 +03:00
Ed
3a9e6dc409 Update walls.yml 2025-05-23 13:52:18 +03:00
Red
40246e9b13 Merge branch 'master' into ed-12-05-2025-upstream 2025-05-23 12:58:11 +03:00
Cuir
14074a2ff3 Window improvements (#1292) 
* Added stone brick and marble brick windows to the crafting menu proper.
Sanitized capitalization of construction graph ids and nodes (but not entities).
Sanitized stone and marble structure descriptions.

* Windows that are built with frames now leave those frames behind when you smash them instead of disintegrating entirely.

* Syntax error because entity id

* wooden windows

* Added a base window frame as well as a wooden window frame and its broken variant.
Frames can be vaulted through, and the broken glass variant will deal slash damage and a short stun upon entering.
Wooden windows now deconstruct and shatter into both types of frames, which can also be deconstructed.
Fixed an issue with window collisions when connected across tiles.
Gave wooden windows their own prototype file and construction graph.

* stonevrick windows

* Added functionality to stone window frame types.
Fixed an issue where shattered windows weren't triggering unless they were flammable.

* some parenting work

* fix fixtures

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-23 12:03:36 +03:00
Sukilove
aadcaabf0e Rotated Keyfile (#1299) 
* Rotated the inventory sprite Keyfile by 45 degrees

* Update CP14RoundEndSystem.CBT.cs

* Rotated another 45 degrees
 2025-05-22 23:26:34 +03:00
Nemanja
19c88963b4 Add gold and silver material crates, balance cargo mat crate prices (#37713) 2025-05-22 01:42:20 -07:00
YoungThug
b95bcbffed Rat King Chat Indicator (#37184) 
* Rat King Chat Indicator

* BUFFRATWHEN

* Added it to the crown wawa

* Ignore this

* Whats the limit for stuff I can put here?

* Fix da merge conflicts for real this time

* WE DID ITgit add -A

* Errant Requested Changes
 2025-05-22 01:47:04 -04:00
Wolfkey-SomeoneElseTookMyUsername
e72e25aba1 Add disposal signalers (#37535) 
* Add disposal signalers

* Sprite changes

* Some requested changes

* Requested changes + change spelling to be with two l's to be consistent with the remote signaller
 2025-05-21 22:18:57 -04:00
ArtisticRoomba
7d7858d41c Significantly improve Tesla generator power stability (#37626) 
* Significantly improve Tesla generator power stability

* Second round of balancing
 2025-05-21 21:39:48 -04:00
AsnDen
d7a17739c6 Screaming for cyborgs (#32329) 2025-05-21 12:49:56 -07:00
HTML/Crystal
3385c45d80 Change Arachnid Layering (#36357) 
* 1 commit ops

* untouching this before anyone has to tell me
 2025-05-21 10:40:55 -07:00
mubururu_
4d0a0ac5c5 make some stuff require two hands (#37683) 
* get splitted

* thievy 1 handed

* scarko changes
 2025-05-21 19:11:34 +02:00
Red
352707f1d7 Remove Guildmaster & Merchant roles (#1296) 
* b

* Update round_end.yml

* Update round_end.yml
 2025-05-21 19:33:00 +03:00