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

4617 Commits

Author SHA1 Message Date
Ed
f989980df3 Carcats species [Draft] (#1023) 
* body parts

* proto setup

* inhand displacements

* carcat cloak

* eyes

* gloves

* pants carcat

* pants

* shirt

* markings nose + ears

* Update 5.png

* shoes + naming

* helmet adapt

* carcat sounds

* Update sewing_table.yml

* s

* Update comoss.yml

* Update factoria.yml

* s
 2025-03-14 14:11:41 +03:00
Ed
55dd261f13 palisaade (#1012) 2025-03-12 17:32:48 +03:00
Ed
66058ffc49 Auto CBT (#997) 
* auto doggy

* fix

* fix
 2025-03-09 23:29:20 +03:00
Ed
0b5712ce97 Vampire antag (#988) 
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
 2025-03-07 14:52:43 +03:00
Tornado Tech
4a11cf9c53 Merge pull request #977 from crystallpunk-14/skill-remaster 
Knowledge refactor
 2025-03-06 22:29:36 +10:00
Ed
c1acf81541 NewTrade (#969) 
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
 2025-03-06 12:01:43 +03:00
Tornado Tech
7b5283b35b fix: Knowledge events usings (I hate Rider) 2025-03-06 18:56:06 +10:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2 
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
 2025-03-03 23:23:40 +03:00
Errant
3d9ce10f58 Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new players" (#35639) 
Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new playe…"

This reverts commit 4dfd3e5740.
 2025-03-03 07:49:13 +01:00
beck-thompson
4dfd3e5740 [HOTFIX] - Players with unknown playtimes now are tagged as new players (#35564) 
* Players with unknown playtimes now are tagged as new players

* Fix

* I'm silly it was in the same file

* Cavar update
 2025-03-02 20:45:54 +01:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955) 
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
 2025-03-02 13:28:13 +03:00
SlamBamActionman
41c51e2905 Implanter draw rework (#32136) 
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting
 2025-02-27 18:57:28 +01:00
deltanedas
7520d8a2c8 add button to print logprobe logs (#32255) 
* add EntityName at the bottom of LogProbe

* pass User into CartridgeMessageEvent

* add button to print logprobe logs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-02-27 14:47:16 +01:00
āda
3127f73c48 Multiple categories for lathe recipes (#34315) 
* first

* lint

* changes

* change null comparison

* linq

* indent

* fix indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-02-27 12:33:39 +01:00
Dora
53dc27cb1e Adding sorting to chem master (#34763) 
* Adding sorting to chem master

* Chem Master can now sort based on following categories
 - Alphabetical
 - Quantity
 - Time Added to Machine

* Sorting is disabled by default and persist in the machine for everyone

* Removed some pointless code from Chem Master's UI

* Changed None and Time Added's text to reflect what they do better

* Minor adjustments to the code requested by maintainers
 2025-02-27 12:19:52 +01:00
qwerltaz
7b0b401312 t-ray reveal for entities and draw depth fix (#33012) 
* t-rays show above catwalk

* a

* RevealSubfloorComponent

* revealSubfloorOnScan, add it to catwalk

* TrayScanReveal sys and comp

* Rr

* handle anchoring

* use tile indices for vector2i

* fix IsUnderRevealingEntity reset on pvs pop in reanchor

* fix exception on TrayScanRevealComponent remove

* fix IsUnderRevealingEntity not updating on pvs enter

* update to ent

* make subfloor retain respect for their relative draw depth

* fix carpets not revealing subfloor on plating

* chapel carpet

* ??

* draw depth gap for subfloor entities.

* revert alpha change

* remove abs from draw depth difference

* move TrayScanReveal to client

* delete old refactor

* let's show them above puddles too

* Remove superfluous component classes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-02-27 11:46:09 +01:00
Errant
c698b163b6 Admin Options tab (#35543) 
* admin options tab initial

* make admin tab only visible to admins
 2025-02-26 23:32:42 +01:00
Sparlight
9f4a4b81ac Add species-specific code for ToggleableLightVisuals (#35482) 2025-02-25 09:00:37 -08:00
pathetic meowmeow
ab9c78b066 Make escape key work as expected with multiple open inventories (#35040) 2025-02-25 17:40:39 +01:00
noirogen
263f915671 Adds new speech bubble opacity sliders to the accessibility menu. (#35346) 
* Adds new accessibility slider for speech bubble text opacity.
Adds new accessibility slider for speech bubble background opacity.
Adds new Cvars to track speech bubble text and background opacity settings.

* Adds a separate option slider for the opacity of the speaker's name on speech bubbles.

* Changes text and speaker default opacity to 100%, as it was before.

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-25 17:00:12 +01:00
Errant
285decd734 Make the version watermark less annoying (#35484) 
* make version watermark less annoying

* skreee
 2025-02-25 00:21:33 +01:00
Winkarst
5eeba30211 Cleanup: Make `EyeCursorOffsetSystem` sealed (#35481) 
Cleanup
 2025-02-24 17:46:04 -05:00
Winkarst
22398ea342 Cleanup: Fix field naming rule violation in `GhostComponent` (#35454) 
* Fix

* Update Content.Shared/Ghost/GhostComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-24 18:48:32 +01:00
Winkarst
969e7bdd39 Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside FlatpackSystem` (#35457) 
* Cleanup

* Update
 2025-02-24 18:37:50 +01:00
Winkarst
c71e6e67aa Cleanup: Pass in `IComponentFactory in EntityPrototype.TryGetComponent calls inside ChemistryGuideDataSystem` (#35456) 
* Cleanup

* Update
 2025-02-24 18:36:17 +01:00
Pieter-Jan Briers
05de5bd3eb Fix bogus AdminNameOverlay Rider error (#35432) 2025-02-24 15:37:54 +11: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
Errant
cc74880061 version watermark (#35284) 
* version watermark

* force version watermarks on vulture
 2025-02-23 20:01:17 +01:00
pathetic meowmeow
fdf19c6a90 Add a tertiary header parser to the guidebook document parser (#35315) 2025-02-23 19:48:38 +01:00
pathetic meowmeow
cbecc4cc4b Use new engine APIs for setting the scroll target of views (#35401) 2025-02-23 18:47:13 +01:00
pathetic meowmeow
b7414d85b4 Add microwave recipes to the guidebook (#34105) 2025-02-23 16:24:44 +01:00
metalgearsloth
1d004f4945 Sentry review (#35424) 
Co-authored-by: chromiumboy <chromium.boy@gmail.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
 2025-02-24 00:57:27 +11:00
metalgearsloth
634c4a7780 Fix window positions not saving (#35055) 
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2025-02-23 23:57:57 +11:00
pathetic meowmeow
fabfdd0673 Refactor audio system to send collection IDs over the network (#33610) 2025-02-23 23:14:56 +11: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
Winkarst
b912dedbfc New Feature: Admin Only messages in AHelp (#35283) 
* Feature

* Update

* Update

* Update

* Update Resources/Locale/en-US/administration/bwoink.ftl

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Yes

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2025-02-22 09:45:50 -08:00
Pieter-Jan Briers
1ef28203ea Comment out broken guidebook test speech code (#35398) 
This code blatantly doesn't work and causes compile failures with https://github.com/space-wizards/RobustToolbox/pull/5540. It's only used for testing purposes, so we're just removing it.

Basically taken from https://github.com/space-wizards/space-station-14/pull/33610 in another PR, so I can merge this first separately.
 2025-02-22 17:17:14 +01:00
metalgearsloth
f32ca4efef Minor SpriteFade stuff (#35385) 2025-02-23 00:37:00 +11:00
Errant
cb822fdb1a Merge branch 'stable' into master-merge 2025-02-20 20:29:44 +01:00
metalgearsloth
abb20c0256 Remove storage hotbar GUI bandaid (#35054) 
* Remove storage hotbar GUI bandaid

With BUI deferred opens it also happened to fix this issue which is nice.

* Update Content.Client/Storage/StorageBoundUserInterface.cs
 2025-02-20 17:51:01 +01:00
Kyle Tyo
c8dce26dbb Replace obsolete FromMap calls with ToCoordinates (#35304) 2025-02-20 23:03:42 +11:00
metalgearsloth
7e6e237277 General storage fixes (#34845) 
* Fix storage stars

* Fix some more storage bugs

- Fix positions not saving.
- Fix the 1-tick delay between parent and child storage UIs opening / closing.
- Fix BackButton being visible sometimes when it shouldn't be.

* milon is a furry
 2025-02-20 11:10:54 +01:00
Sigil
3ce81d35be Added a component that lets ranged weapons make melee attacks. (#29484) 2025-02-20 18:52:28 +11:00
Absotively
2beac0254c Make CharacterPickerButton the same height for dwarves as for non-dwarves (#35297) 
Character picker button height equality for dwarves
 2025-02-19 11:44:17 +01:00
Cooper Wallace
e0d911bc47 Wizard Recall shows Disappearing text at Coordinate (#35272) 
* Add prediction for coordinate based popups

* Remove use of deprecated EntityCoordinates.ToMap

* RecallItem displays disppearing text at entity coordinates

* Update Content.Shared/ItemRecall/SharedItemRecallSystem.cs

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

* Update Content.Shared/Popups/SharedPopupSystem.cs

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

* Add ItemRecall message for witnesses

* Update Content.Shared/ItemRecall/SharedItemRecallSystem.cs

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

* Update Resources/Locale/en-US/item-recall/item-recall.ftl

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

* Fix namespace issues

* Fix Loc string

* Dont fixstuff tired..

* Prefix THE

* Filter around the entity, and remove recipient if needed

* Alphabetical imports

* Update Content.Client/Popups/PopupSystem.cs

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

* fixup

* Better handling.

---------

Co-authored-by: Cooper Wallace <CooperWallace@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-18 20:47:10 -05:00
lzk
f39587c390 Small loadout window improvement (#35171) 
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-02-18 23:36:49 +11:00
Kyle Tyo
aca846c6ad Fix build ghosts not being placeable on a new round. (#35097) 2025-02-18 23:34:15 +11:00
SlamBamActionman
3200ba88a5 Add ability for +VVEDIT users to scale damage/healing in the game (#35255) 
* Initial commit

* Add universal modifier for all damage/heals, make guidebooks work.

* help text
 2025-02-18 08:28:42 +01:00
metalgearsloth
cf38814515 General storage fixes (#34845) 
* Fix storage stars

* Fix some more storage bugs

- Fix positions not saving.
- Fix the 1-tick delay between parent and child storage UIs opening / closing.
- Fix BackButton being visible sometimes when it shouldn't be.

* milon is a furry
 2025-02-17 19:24:34 +11:00