mosleyos
043116c1a9
Merge remote-tracking branch 'upstream/master' into upstream-sync
2024-12-17 20:10:20 +03:00
Morb0
e76bb1fa57
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Tiles/plating_burnt.png
2024-12-05 01:22:35 +03:00
Partmedia
cf202e805d
Fix sinks and toilets not draining ( #33691 )
...
* Fix AutoDrain
Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).
However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.
* Update documentation
2024-12-04 03:42:16 +01:00
MilenVolf
5fdf03c216
Replace obsolete GetTilesIntersecting methods ( #32455 )
...
* Remove usage of obsolete GetTilesIntersecting round 1
* Oop wrong uids
* Remove usage of obsolete GetLocalTilesIntersecting round 2
* Remove usage of obsolete GetLocalTilesIntersecting final round
* weh
* Fix using `SharedMapSystem` in `StencilOverlay`
2024-12-01 12:56:47 +11:00
Token
061b1b8adb
Fix makeghostroleraffle command where 4 arguments ( #31836 )
...
Fix makeghostroleraffle command with 4 arguments
2024-11-30 21:11:44 +01:00
Gansu
9236e9e5b9
Fix for arrivals deleting nuke ( #33659 )
...
Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked
Co-authored-by: aa5g21 <aa5g21@soton.ac.uk >
2024-11-30 13:48:04 +11:00
DrSmugleaf
3ad227a904
Add admin log for ghost warping ( #33636 )
2024-11-29 10:46:24 +01:00
mosleyos
0597aa8446
Update StationGoalPaperSystem.cs
2024-11-28 19:24:30 +03:00
mosleyos
d2a5b7979a
Update
2024-11-28 18:36:51 +03:00
beck-thompson
a790955b76
Light verb is now predicted ( #33622 )
...
Fix
2024-11-29 00:41:01 +11:00
slarticodefast
470c869ce2
Greytide Virus station event ( #33547 )
...
* proof of concept
* full implementation
* I commited a crime
* t
* min players increase
2024-11-27 00:50:20 +11:00
Niels Huylebroeck
49724a9b9d
Turn off PointLights on VendingMachines when broken or off. ( #33513 )
...
The light itself should already turn off due to `LitOnPowered`
component, but the broken state of a VendingMachine did not.
Fixes #33382
2024-11-25 13:35:14 +01:00
Schrödinger
f53e3ec3c1
[BUGFIX] "Ghost" in the lobby lets you see the whole chat ( #33529 )
...
* fix bug, in ghost command lobby
* fix
* Fix build
2024-11-25 10:20:31 +03:00
deltanedas
e436a50c36
fix exped caves generation ( #32890 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-11-24 09:49:31 +01:00
MilenVolf
aa80a88cc4
Allow shuttles on planets to make FTL jump ( #33507 )
...
This check conflicts with an attempt to FTL from the planet before expedition ends
2024-11-24 11:11:47 +03:00
Pupchansky
6b908f7f6a
апстрим с работнков
2024-11-23 18:54:06 +05:00
Pupchansky
488cadd0a8
апстрим
2024-11-23 18:39:01 +05:00
goet
855547a2d4
Ensure wires can always be cut ( #32447 )
...
ensure wires are always cut
2024-11-23 12:41:37 +01:00
metalgearsloth
5409815be9
Allow AI and observers to see electrified doors ( #33466 )
2024-11-23 17:37:14 +11:00
IProduceWidgets
a28adf4ae4
baby proof the terminal ( #33281 )
...
* baby proof the terminal
* Make a couple exceptions for items that you might take with you.
* alwayspoweredlights
* Uncuttable cables since cablecomp is a snowflake construction system
* chairs and vendors
* rerun heisentests
* rerun tests again
2024-11-22 23:50:41 +01:00
slarticodefast
5a9a2d463b
Merge branch 'master' into powerhud
2024-11-22 19:38:55 +01:00
c4llv07e
646d41d3a7
Add telegram to the server info-links ( #33459 )
2024-11-22 16:38:41 +01:00
Vasilis
94ac0b1399
Modern HWID integration ( #33265 )
2024-11-22 11:08:51 +00:00
chromiumboy
403528cbf3
Gas pipe sensors ( #33128 )
...
* Initial commit
* Monitored pipe node is now referenced by name
* Review changes
* Simplified construction
* Tweaked deconstruction to match other binary atmos devices
* Helper function removal
* Updated attribution
2024-11-21 21:46:10 -06:00
slarticodefast
3758715bdc
electrification hud
2024-11-22 00:43:02 +01:00
IProduceWidgets
f5930bb566
Coal presents and chrimmas tree options. Presents no longer itemify ( #33147 )
...
* Dont ensure ItemComp because it could lead to weirds, and also PickupOrDrop handles non-items already.
* presents and tree
* woops
* reviews a
2024-11-21 15:20:11 +01:00
Pieter-Jan Briers
75a096b6bd
Merge remote-tracking branch 'upstream/master' into 24-10-29-modern-hwid
2024-11-21 01:26:01 +01:00
metalgearsloth
a9be561ea7
Merge branch 'master' into ion-storm-refactor
2024-11-20 18:22:08 +11:00
metalgearsloth
a818c2a134
Temporarily make singularity a bit harder to loose as non-antag ( #33358 )
2024-11-20 16:55:58 +11:00
DrSmugleaf
f5d0e955e3
Fix imports
2024-11-19 21:16:49 -08:00
DrSmugleaf
b8b33b97af
Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared
2024-11-19 21:15:15 -08:00
LEVELcat
cc11a772a7
Merge branch 'master' of https://github.com/space-syndicate/space-station-14
2024-11-20 05:06:14 +03:00
Saphire
9c666457c2
Move some of the new singularity code into shared
...
Hopefully without explosions yay
2024-11-20 07:53:10 +06:00
SlamBamActionman
6e53cd98a4
Add emag functionality
2024-11-20 07:53:10 +06:00
MilenVolf
2002de9bb0
Localize planet dataset names ( #33398 )
...
* Localize planet names (borer)
* DatasetPrototype -> LocalizedDatasetPrototype
* Apply requested changes
2024-11-20 11:57:43 +11:00
Pieter-Jan Briers
c4e2eb9d02
.NET 9 forward compatibility changes ( #33421 )
...
This doesn't switch the projects over to .NET 9, but it does make them work on .NET 9 when we decide to switch in the future.
2024-11-20 11:17:45 +11:00
Morb0
fa377d8fc6
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/labeler.yml
# Content.Client/Lobby/UI/CharacterSetupGui.xaml
# Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
# Resources/Textures/Structures/Windows/mining.rsi/full.png
# Resources/Textures/Structures/Windows/mining.rsi/meta.json
# Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png
# Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
# Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
# Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
# Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
# Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/window.rsi/full.png
# Resources/Textures/Structures/Windows/window.rsi/meta.json
# Resources/Textures/Structures/Windows/window.rsi/window0.png
# Resources/Textures/Structures/Windows/window.rsi/window1.png
# Resources/Textures/Structures/Windows/window.rsi/window2.png
# Resources/Textures/Structures/Windows/window.rsi/window3.png
# Resources/Textures/Structures/Windows/window.rsi/window4.png
# Resources/Textures/Structures/Windows/window.rsi/window5.png
# Resources/Textures/Structures/Windows/window.rsi/window6.png
# Resources/Textures/Structures/Windows/window.rsi/window7.png
# Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
# Resources/migration.yml
2024-11-19 19:20:31 +03:00
Ilya246
909235cdbe
fix viewing nav slowing shuttle down ( #32381 )
...
fix
2024-11-19 03:59:42 +01:00
Saphire
68eaf6ff25
Bump the failsafe timer down
2024-11-19 08:11:10 +06:00
faint
79ff990ddf
Replace direct uses of GameTicker dictionary with TryGetValue ( #33222 )
...
Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario
2024-11-18 21:57:50 +03:00
ScarKy0
e290588624
Changes + Cleanup
2024-11-17 20:23:45 +01:00
ActiveMammmoth
22987fc77f
Wizard Summon Guns/Magic ( #32692 )
...
* mostly done but there's a bug with spawning
* RandomGlobalSpawnSpellEvent now actually works
* Summon Guns/Magic is working
* Added sound, cap gun, and auto pick up
* Added all requested changes/fixes from reviews
* Halving cooldowns
2024-11-17 17:46:31 +01:00
Saphire
476f90df09
Fix the component defaults
2024-11-17 04:31:41 +06:00
Saphire
a68c6cb29e
Temporarily make singularity a bit harder to loose as non-antag
2024-11-17 04:01:38 +06:00
MossyGreySlope
11963e50b1
Fix server crash when the seed extractor is used on the dev map ( #33312 )
...
handle event when using seed extractor
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-11-15 21:57:33 -06:00
Saphire Lattice
1f5eb6a08b
Fix utensils not being thrown away ( #33326 )
2024-11-15 21:39:19 -06:00
Saphire Lattice
e7e1d96051
Improve crayon UI to not be stuck in 1996 ( #33101 )
...
* Improve crayon UI to not be stuck in 1996
* Make a horrifying crayon spaghetti
* Crayon
* Undeprecate the crayon, describe the crayon
2024-11-15 21:25:06 -06:00
ScarKy0
3173a3461e
S: Awaiting Changes
2024-11-16 02:06:52 +01:00
ScarKy0
7d82a7bf5c
Merge branch 'space-wizards:master' into ion-storm-refactor
2024-11-16 00:50:48 +01:00
beck-thompson
da4fa9bea9
Clumsy system refactor ( #31147 )
...
* First commit
* Fixes
* Added the noise
* Renames
* Timespan
* Fixed space
* entity -> ent
* This shouldn't work
* opps....
* Datafield name change
* Better comments
* small comment
* Personal skill issue
* Event renames and stuff
* Couple fixes
* Defib ref fixes (Silly me)
* Added clumsy back!
* no hard code clumsy!
* Identity fix
* Event name change
* Comment change
* Function name change
* opp
* Update names
* Damage stuff!
* Fixes!
* Fixes
* opps
* This was hidden away!!
* negative diff feeds me
2024-11-16 00:46:01 +01:00
