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

8922 Commits

Author SHA1 Message Date
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
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
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
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
Ed
37ff029956 return black roofs 2025-02-24 01:07:03 +03:00
Ed
c60f65c901 Update CP14DemiplaneSystem.Echoes.cs 2025-02-24 00:09:19 +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
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
chromiumboy
066c773965 Sentry turrets - Part 2: Basic prototype (#35031) 2025-02-24 00:39:44 +11:00
pathetic meowmeow
fabfdd0673 Refactor audio system to send collection IDs over the network (#33610) 2025-02-23 23:14:56 +11:00
Pieter-Jan Briers
f5c7809890 Stable merge for hotfix backport (#35412) 2025-02-23 02:15:34 +01:00
ScarKy0
a6861b0461 [HOTFIX] Borg emag notification and sound fix (#35394) 
epic stuff
 2025-02-23 01:49:58 +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
themias
30f673793b Fix sink draining sound (#34173) 2025-02-22 20:20:44 +11:00
Milon
f5eafc7ed3 make the detailed examine verb predicted (#35362) 
can we stop predicting things
 2025-02-21 11:30:06 -08:00
Ed
1c433ed581 Eng OBT (#930) 
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix

* en obt
 2025-02-21 20:29:37 +03:00
nikthechampiongr
09f75394be Require hwid (#35331) 
* Make cvar to require that the client has a modern hwid

* Ignore guests and don't disable cvar on dev

* Rename and add docs
 2025-02-20 19:04:45 +01:00
metalgearsloth
fa35c9623d Revert "Purge uses of TransformComponent.Anchored.set. Also adds parentheses." (#35332) 2025-02-21 00:12:12 +11:00
TemporalOroboros
a4001fba1b Purge uses of TransformComponent.Anchored.set. Also adds parentheses. (#34938) 2025-02-20 23:06:39 +11:00
Kyle Tyo
c8dce26dbb Replace obsolete FromMap calls with ToCoordinates (#35304) 2025-02-20 23:03:42 +11:00
Ed
224d96bd34 Sociopath delete (#917) 
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix
 2025-02-19 21:56:29 +03: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
Ed
72c0a51f60 Master fix (#913) 
* loadmap fixes

* Update PostMapInitTest and CP14StationZLevelsSystem to enhance map whitelisting and initialization

* fix #907

* Update PostMapInitTest.cs
 2025-02-18 16:49:57 +03:00
Errant
834e11a482 fix observer ghost spawn error (#35253) 2025-02-18 23:28:54 +11:00
slarticodefast
d171057680 UseInHandEvent cleanup (#35231) 2025-02-18 23:27:30 +11:00
Leon Friedrich
e09ef5aa6f Fix MappingCommand grid loading (#35233) 2025-02-18 23:25:14 +11:00
Simon
eff25810c5 [ChangeCVarCommand] Mapping Command (#35239) 
[ChangeCVarCommand] MappingCommand
 2025-02-18 11:26:08 +01: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
chromiumboy
2764638763 Minor station AI code cleanup (#34476) 2025-02-18 16:26:02 +11:00
lzk
3d7e7e8320 Make AllowedEmotes bypass whitelists and fix syndiborg ability to laugh (#31510) 2025-02-17 22:59:33 +01:00
Zachary Higgs
241d0e12e2 Fix SuperSlippery And StepTriggers persisting when UpdateSlip is called (#34525) 
* Fix superSlippery and stepTrigger values persist

- made values in SpillTileReaction's public so we can query the
prototype

- made the default values for slippery component and
StepTriggerComponent based on default constants
for easier resetting

- added a calculation and check in UpdateSlips to check
if a super slip is present as well as Update
relevant steptrigger and slip values based on the contents of the
solution

* The worlds biggest change

---------

Co-authored-by: Myra <vascreeper@yahoo.com>
 2025-02-17 21:53:23 +01:00
Winkarst
03c56efa00 New Feature: Votekick bans distinguish themselves as votekicks (#35258) 
* Feature

* Localization
 2025-02-17 21:39:12 +01:00
Errant
890ad4508a Don't count lobby players for latejoin antag ratio (#35209) 
pass playercount to midround antag calculation
 2025-02-17 11:27:39 +03:00
keronshb
7bf33ffaa9 Wizard Fix - Summon Ghost Event no longer shows Admin Ghosts or Revenants (#34994) 
* Prevents admin ghosts from being shown with ghost event

* Changes summon ghost tooltip to permanently visible

* Adds AllowGhostShownByEvent tag, adds it to regular observers, removes ghost hands check & revenant check and replaces it with a tag check.
 2025-02-16 21:29:10 +01:00
Ed
82d6fe07fe roof adapt 2025-02-16 22:56:10 +03:00
Simon
489876af8b Change visualize command perms to VarEdit instead of Admin (#35221) 
People with VarEdit can use VV but can't use visualize, makes no sense. 

Has headmin approval here: https://canary.discord.com/channels/310555209753690112/1193403928096821358/1340756276371787827
 2025-02-16 20:06:53 +01:00
slarticodefast
a82b234d0e fix use in hand for uplink items (#35218) 2025-02-16 19:47:41 +01:00
Leon Friedrich
ca9479fe69 Fix hitscan visuals (#34515) 
* Fix hitscan visuals

* remove unnecessary changes

* rename `mapDirection`
 2025-02-16 17:14:04 +01:00
Ed
bc53ed4aa5 Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/centcomm.yml
 2025-02-16 16:39:26 +03:00
ElectroJr
a556f03808 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into toolshed-eng-pr 2025-02-16 23:43:27 +13:00
Leon Friedrich
2bd7bb17f2 Refactor map loading & saving (#34020) 2025-02-16 21:36:35 +11:00
Saphire Lattice
d4911309cd Add health analyzer unrevivability warning (#32636) 
* Add health analyzer unrevivability warning

* Remove errornous comment
 2025-02-16 13:10:39 +03:00
Ed
d75b30b2a6 Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream 2025-02-16 12:55:34 +03:00
Simon
29029d2586 Add ability for admins to change certain cvars via command. (#35105) 
* Add ability for admins to change certain cvars via command.

* Cleanup

* More cleanup.

* Even more cleanup.

* WAITER! WAITER! ONE MORE COMMIT PLEASE!

* Remove requirement for Admin AdminFlag

Not needed as the command checks for the perms.

* Add search function to CVars and help text

* Move to controller instead.

* Add another cvar for testing

* Remove unused comment

* Move to Post Server Initialize

LoC does not work at the earlier stages of server initalization

* Remove unneeded comment

We clear out list so its no longer needed
 2025-02-16 10:06:13 +01:00
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
 2025-02-16 11:58:47 +03:00
Ed
ffa565484c Modular weapon inlay (#903) 
* slots lists

* blade inlay

* tadam
 2025-02-16 11:41:43 +03:00
metalgearsloth
b6ee183dc6 Add planet lighting (#32522) 
* Implements a Dynamic Lighting System on maps.

* Edit: the night should be a little bit brighter and blue now.

* Major edit: everything must be done on the client side now, with certain datafield replicated.
Changes were outlined in the salvage to accommodate the new lighting system.

* Edit: The offset is now serverside, this makes the time accurate in all situations.

* Removing ununsed import

* Minor tweaks

* Tweak in time precision

* Minor tweak + Unused import removed

* Edit: apparently RealTime is better for what I'm looking for

* Fix: Now the time is calculated correctly.

* Minor tweaks

* Adds condition for when the light should be updated

* Add planet lighting

* she

* close-ish

* c

* bittersweat

* Fixes

* Revert "Merge branch '22719' into 2024-09-29-planet-lighting"

This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing
changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86.

* Europa and day-night

* weh

* rooves working

* Clean

* Remove Europa

* Fixes

* fix

* Update

* Fix caves

* Update for engine

* Add sun shadows (planet lighting v2)

For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish.

* Documentation

* a

* Fixes

* Move blur to an overlay

* Slughands

* Fixes

* Remove v2 work

* Finalise

---------

Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com>
 2025-02-16 19:35:32 +11:00
ElectroJr
eedc992d57 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor 2025-02-16 16:52:51 +13:00
metalgearsloth
fb1d180c7d Docking allocs reduc (#34965) 
Stuff I had unstaged.
 2025-02-16 03:10:39 +01:00