Ed
ae01ebda0e
Merge pull request #595 from crystallpunk-14/ed-20-11-2024-upstream-sync
...
Upstream sync
2024-11-23 13:44:10 +03:00
Ed
fff97fa819
adapt
2024-11-23 03:12:45 +03:00
Ed
677e5194d6
Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync
...
# Conflicts:
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/Traits/TraitSystem.cs
# Content.Shared/CCVar/CCVars.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Maps/box.yml
# Resources/Maps/core.yml
2024-11-23 01:48:24 +03:00
slarticodefast
09ca45a621
Merge staging into master ( #33462 )
2024-11-22 18:32:30 +01:00
Pieter-Jan Briers
b4ec946bd9
Fix sandbox error with new HWID code. ( #33461 )
...
Oops
2024-11-22 18:14:46 +01:00
c4llv07e
646d41d3a7
Add telegram to the server info-links ( #33459 )
2024-11-22 16:38:41 +01:00
Ed
a6c7bc5993
haha
2024-11-22 14:49:48 +03:00
Ed
66fe15f8c7
Balance tweaks ( #604 )
...
* x2 damage
* Update CP14MagicWeaknessSystem.cs
* split cure burn
* split blood purification
* extinguish torch by interact
* Update torch.yml
* Update T0_cure_heat.yml
* fix fireSpread
2024-11-22 14:14:22 +03:00
Vasilis
94ac0b1399
Modern HWID integration ( #33265 )
2024-11-22 11:08:51 +00:00
PJBot
a3edf04dd3
Automatic changelog update
2024-11-22 03:47:17 +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
PJBot
38c70d6c9b
Automatic changelog update
2024-11-22 02:57:12 +00:00
DrSmugleaf
5a751a820a
Fix admin ghosts not being able to see items in pockets or interact with them ( #31076 )
...
* Fix admin ghosts not being able to see items in pouches or interact with them
* fix
* oops
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-11-22 03:56:05 +01:00
Ed
8ad951183c
Merge branch 'master' into ed-20-11-2024-upstream-sync
2024-11-21 22:50:28 +03:00
Ed
548433baca
Torch craft ( #603 )
...
* fix
* Update crates.yml
* loadout torch, flint craft workbench
2024-11-21 22:48:14 +03:00
Ed
96fc06a443
Fire update ( #602 )
...
* fire spread fixes and optimization
* fix liquid drops nefty and suffix
* some sharedization
* melee fire extinguish
* clean up fireSpread system
* caution popup
* cuffable zombies
* fix zombie AI
* lighter
* torch integration attempt
* fix torch igniting
* yml tweaks
* bonus flammable damage
2024-11-21 22:01:14 +03:00
Vasilis
4f703ae9ce
Fix approval labeler ( #33440 )
...
* Fix approval labeler
* Update labeler-review.yml
* Update labeler-review.yml
2024-11-21 17:51:18 +01:00
PJBot
11ee2f9a37
Automatic changelog update
2024-11-21 14:21:21 +00: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
ThatGuyUSA
0f0b141f21
Syndicate item fix ups ( #33435 )
...
tweaks and fixes
2024-11-21 14:22:57 +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
beeffdb5e1
Update to Robust v237.2.0 ( #33436 )
2024-11-21 11:16:55 +11:00
Pieter-Jan Briers
5c0a32b8b8
Update to Robust v237.2.0
2024-11-21 00:07:12 +01:00
A.Ne.
4fcfab972d
demiplane crates fix #589 ( #599 )
...
* demiplane crates fix #589
* change component to MapGridComponent
* simplification
* Update CP14DemiplanSystem.Generation.cs
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-11-20 23:37:44 +03:00
A.Ne.
4abd793ef9
lockkey system tweak ( #601 )
...
* lockkey system tweak
* Update SharedCP14LockKeySystem.cs
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-11-20 23:16:00 +03:00
metalgearsloth
cb246f5d7d
Set airlock unlit layers as invisible ( #32484 )
...
Doesn't really affect anything due to appearance bulldozing this but this aligns with their actual normal states so.
2024-11-20 11:10:05 +03:00
PJBot
f9533a637a
Automatic changelog update
2024-11-20 07:56:20 +00:00
metalgearsloth
98caf50626
Ion storm refactor ( #33311 )
2024-11-20 18:55:12 +11:00
metalgearsloth
a9be561ea7
Merge branch 'master' into ion-storm-refactor
2024-11-20 18:22:08 +11:00
PJBot
4f3ac3ea68
Automatic changelog update
2024-11-20 07:19:45 +00:00
metalgearsloth
59b09383ca
Capacitor Crafting Change ( #31966 )
2024-11-20 18:18:37 +11:00
PJBot
a7003acd77
Automatic changelog update
2024-11-20 05:57:05 +00:00
metalgearsloth
a818c2a134
Temporarily make singularity a bit harder to loose as non-antag ( #33358 )
2024-11-20 16:55:58 +11:00
metalgearsloth
8acbf87d8f
Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared ( #33428 )
2024-11-20 16:53:18 +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
Saphire
44db676b24
Actually make the emagging popup work properly
2024-11-20 09:32:50 +06:00
PJBot
1b3672e095
Automatic changelog update
2024-11-20 02:06:21 +00:00
metalgearsloth
75acce0d62
Fix: Examine Damage now specifies no damage ( #33064 )
2024-11-20 13:05:15 +11:00
PJBot
a13a4f7a99
Automatic changelog update
2024-11-20 02:00:37 +00:00
metalgearsloth
b177a1d019
Coloured Light Cost Reduction ( #33376 )
2024-11-20 12:59:31 +11:00
metalgearsloth
0ec23362fe
Merge into master: Increase softcap back to 80 ( #33400 ) ( #33419 )
2024-11-20 12:56:29 +11:00
PJBot
7e8e2c7212
Automatic changelog update
2024-11-20 01:55:55 +00:00
qwerltaz
e98383d572
Construction menu grid view ( #32577 )
...
* button
* implement populate grid view
* tweak min width
* Make grid button toggle visible
* tweak min window size
* fix missing recipe button when mirroring item
* make grid buttons toggleable
* align button texture vertically
* selected grid item has plain color background
* tweak window width so all buttons look good
* rename select method, defer colouring
* get icon better
* whoops
* simpler button toggle
* spritesys frame0, move spritesys
* delete old sprite system refs
2024-11-20 12:54:49 +11:00
beck-thompson
1fa1975e60
Fix toggle verbs ( #32138 )
...
First commit
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-11-20 12:53:52 +11: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
PJBot
35e2c641c1
Automatic changelog update
2024-11-20 01:06:27 +00:00
Plykiya
fdf3df9fbd
Crew monitoring crate updated to contain flatpacks, science access instead of engi ( #33417 )
...
* Make a crew monitoring crate with flatpacks
* fix image
* migration
2024-11-20 12:05:20 +11:00
Saphire Lattice
eebf06d9d6
Automatically add "Approved" to maintainer PRs ( #33337 )
...
* Add an Approved labeler for maintainer PRs
* Be extra safe with conditions
2024-11-20 12:03:52 +11:00
