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

10420 Commits

Author SHA1 Message Date
Ed
e792440c19 Gob hairs (#1250) 
* renorma

* gobhairs
 2025-04-30 22:14:13 +03:00
Ed
d09386c990 fix 2025-04-30 21:03:50 +03:00
Ed
ef6d973301 Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
 2025-04-30 20:31:50 +03:00
Ed
0c8735f6df some hotfixes 2 2025-04-30 19:44:38 +03:00
Ed
818c7f5aa6 some hotgix 2025-04-30 18:57:13 +03:00
Ed
7f9e11be39 tornado blyat 2025-04-30 18:06:55 +03:00
Ed
9908710dae Update sewing_table.yml 2025-04-30 18:03:55 +03:00
Ed
2358bc46d6 Torches + Cotton (#1246) 
* torches add, wallmount crystals deletion

* cotton

* Update buy.yml

* craftis

* delete elemental quartz

* energy crystal resprite and rewamp

* fix

* Update misc.yml

* а

* delete rituals

* riat

* Update migration.yml

* Delete CP14ClientRitualSystem.cs

* Update statues.yml

* fix

* Update wallmount_lamp.yml

* fix
 2025-04-30 17:28:38 +03:00
Tornado Tech
ad2fc18356 Dimensional (#1140) 
* add: Temporamancy tree with new shadow swap spell

* feat: Increased tempo loadout to 2

* feat: Remove most popups from swap spell

* fix: Swap with no mob entities

* feat: Add CanCast to spell effect

* fix: Handeling cancaled event & swap state

* feat: Add UseCustomCastConditions

* feat: Add swap to magic shadow staff

* feat: Add tempo essence & magic type

* feat: Add Tempo type to all dimension spells

* fix: Magic shadow staff tempo manacost modify

* fix: Spell type local

* feat: Add touhou lore

* fix: Review

* feat: Add target dead block component

* feat: Remove checking access

* feat: Add RequireCanInteract

* feat: Remove essence

* fix: Review

* fuck

* fuck part 2

* Update Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs

* Update dimension.png

* minor nitpick

* fix

---------

Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-04-30 17:25:10 +03:00
Princess Cheeseballs
84178dd534 Puddle code hotfix 2 (#37046) 2025-04-29 21:10:00 +01:00
ActiveMammmoth
a8ff930763 Staff of Animation Fixes & Recharging (#37021) 2025-04-29 20:40:49 +01:00
Ed
b4ea0f69f5 Update tiefling.yml (#1245) 2025-04-29 18:11:36 +03:00
Ed
8cc50ea3a4 Update tiefling.yml 2025-04-29 17:20:25 +03:00
Ed
c3b6938388 unicorns 2025-04-29 17:14:05 +03:00
Ed
612ffb90cb Update ores.yml 2025-04-29 13:10:43 +03:00
keronshb
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
Nemanja
d4e40ae44b Revert "Add new color turtlenecks in WinterDrobe" (#36983) 
Revert "Add new color turtlenecks in WinterDrobe (#32920)"

This reverts commit 34cc49c175.
 2025-04-28 19:38:43 +02:00
ScarKy0
14cca7990a [HOTFIX] Fix maroon objective, change the text (#36990) 
* test

* text

* capital C

* guh
 2025-04-28 11:31:42 +02:00
Viator-MV
39c6544dc9 visionCorrector (#1230) 2025-04-27 13:24:52 +03:00
Ed
a1153843a2 Storage durability rebalance + Fuck nails (#1225) 
* fix storage

* bye nails

* Update target.yml

* f

* Update migration.yml

* Update migration.yml
 2025-04-26 17:20:52 +03:00
Ed
cff9dc6fcf Wendigo renamed to Lurker (#1213) 
* Добавлены изменения для создания пулл реквеста

* Update Step.yml

* rename!

* fix

* interrupting toggleable spells
 2025-04-26 16:38:54 +03:00
ArZarLordOfMango
07132cdbd8 [Fix]Roof (#1147) 
* roof

* why you dont work...

* fix and locale

* weh check

* Update no-roof-in-tile.ftl

* Update no-roof-in-tile.ftl

* Update roofs.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-04-26 15:23:11 +03:00
Ed
7941be4490 dungeon walls resprite, fix TOSTRING problem from C4viwlle 2025-04-26 13:29:23 +03:00
Ed
1ee7b9b76c fixes 2025-04-26 13:07:04 +03:00
Ed
8fbcaf496a some bugfixes 2025-04-25 23:17:06 +03:00
creamybag
72d8767a6d recoloring (#1221) 2025-04-25 18:27:07 +03:00
Ed
23e276b886 Update caves.yml 2025-04-25 14:22:05 +03:00
Ed
5484557c6d demiplane minor rebalance 2025-04-25 14:19:33 +03:00
Ed
a8b1b0ed37 sphere of light redesign 2025-04-25 14:11:36 +03:00
Ed
62cdf9e1c5 Bugfixes + QoL (#1218) 
* fix keyring

* fix #1209

* fix #1116

* fix water, test reenable ambient loop

* recipe categories in workbecnhes

* Update CP14StoreWindow.xaml

* refactor: review

* Update CP14WorkbenchWindow.xaml.cs

* Update SharedCP14MagicEnergySystem.cs

* categorizize all recipes + some UI fix

* Update round_end.yml

---------

Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
 2025-04-25 13:39:20 +03:00
themias
bce195b53e Fix disposal unit flush animation (#30677) 
* Fix disposal unit flush animation

* Revert "Fix disposal unit flush animation"

This reverts commit a596ecfd5f5368f87ef52cfb27884a8e000185c6.

* control by setting layer visibility rather than overwriting

* restore changes
 2025-04-24 18:59:39 -04:00
ScarKy0
56ee29ab41 Turnstiles lower volume + access reader (#36900) 
fixes
 2025-04-25 00:14:47 +02:00
slarticodefast
b3b6d47310 Disable shadows for observer pointlight (#36897) 
no shadows
 2025-04-24 22:42:21 +02:00
ScarKy0
a16504fa42 Tearable Deliveries V2 (#36815) 
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* init or smth

* minor tweaks

* I KEEP MERGE CONFLICTING MYSELF

* comments

* no icon

* slight increase

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* partial review

* message

* review

* pain

* stuff

---------

Co-authored-by: Lmorgan89 <billsmith116@gmail.com>
 2025-04-24 21:47:46 +02:00
Southbridge
3f588a1bb1 New Spawners, Modified Spawners, new Service/Theatre Airlock, and new Colorful Light Crate (#36750) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-24 10:41:55 -07:00
Nemanja
68881ac030 Fix small misc. turnstile issues (#36893) 
* Fix small misc. turnstile issues

* more missing things

* quieter
 2025-04-24 19:02:12 +02:00
J
1f722bcc44 Delivery system now has the possibility of penalisation (#36660) 
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* minor tweaks

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-04-24 18:05:32 +02:00
Nemanja
dc9844edd1 Genpop Closets & IDs (#36392) 
* Genpop IDs and Lockers

* placeholder generation, no ui yet.

* UI

* Fix time offset

* fix meta.jsons

* big speller

* Scarkyo review

* Add turnstile prototypes

* make IDs recyclable

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-04-24 16:32:11 +02:00
Ed
4bb614981f Keys & Locks crafting (#1207) 
* keeye

* random locks for demiplanes

* blank keys, material keys

* craft blank keys

* key file

* fix skill tree UIScaling

* fix audio and sounds and prediction

* delete crowbar, merge its into pickaxe

* QoL key shaping

* lock introdusing

* QoL progress lockpicking

* examinable lock

* lock insert

* mithril lockkpick

* Update wall_dirt.yml
 2025-04-24 17:10:52 +03:00
Nemanja
712954f1c4 Turnstiles (#36313) 
* construction rotation fix

* Turnstiles

* renaming

* review-slarticodefast-1

* mild attempts to fix (sorry sloth)

* move some more shit

* Remove engine dependency

* grid agnostic

* remove debug string

* fix json

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* remove pass delay for mispredict reasons.

* most minor of changes

* Give directional indicator on examine

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-24 13:39:40 +02:00
SG6732
b0edf7106f Meat Patty (#34896) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-23 20:45:27 -07:00
Smith
8478125fe8 Cotton Grilled Cheese Sandwich (#36135) 
* Working entity.

* New sprite by MadeOfHeartAndStone

* Removed deadspace, changed attribution in meta.json

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-24 05:24:37 +02:00
Milon
1d14d6b468 fix NoCargoOrderArbitrage fail (#36878) 
whoopsie
 2025-04-24 05:09:59 +02:00
RedBookcase
9a646634d4 Removed syndicate surgery duffel, added advanced circular saw to Medical Doctor uplink. (#35915) 
* Removed syndicate surgery duffel, added advanced circular saw to Medical Doctor uplink.

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

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2025-04-24 05:01:29 +02:00
beck-thompson
186cef25ca Put items inside cakes! (#31015) 
* First commit

* I'm silly

* Please be it

* Some more fixes

* Cleanup

* fine!

* removed = false

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-24 05:00:50 +02:00
Coolsurf6
b7a0bce4a4 Updated Syndicate and Ammo Contraband (#35102) 
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
 2025-04-23 19:57:53 -07:00
Samuka-C
6ef03b082f Xenoborgs part 1 (#36830) 
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-23 19:38:10 -07:00
Princess Cheeseballs
dca704c52c Moths can eat pills (#35609) 2025-04-23 19:28:34 -07:00
PotRoastPiggy
82269075bd Adds shorts/pants to ClothesMate vending machine (#35361) 
* Clothesmate shorts

* matches price of vend to the new contents
 2025-04-24 04:12:48 +02:00
No Elka
a8f05f5547 Make toy sword less obvious (#34199) 
* YAML fuckery

* Remove toy_sword.rsi

Not a webedit btw
 2025-04-24 03:21:35 +02:00