Morb0
33942c412a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
deltanedas
e1ff79b4b1
let cyberpen edit stamped papers ( #22457 )
...
* let cyberpen edit stamped papers
* desc
* little more desc
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-13 14:33:31 -07:00
Errant
711eafd747
Last Words can no longer be prefixed with a radio channel identifier ( #22459 )
2023-12-13 14:20:38 -07:00
DrSmugleaf
ad6dc94c60
Move MaskComponent to shared and add toggle events ( #22395 )
...
* Move MaskComponent to shared and add toggle events
* Datafield and network IsToggled
* Add missing dirty
2023-12-12 19:02:35 -07:00
tgrkzus
b968dea478
improve deconstruction text ( #22404 )
2023-12-12 17:07:04 -07:00
metalgearsloth
0e7275a74c
Restricted range cleanup ( #22402 )
2023-12-12 20:20:33 +11:00
mhamster
a47689ba43
MealsJsonGenerator typo fix ( #1628 )
2023-12-12 11:30:35 +03:00
lzk
b4256f1cfa
Remove lol emote chat sanitize ( #1630 )
2023-12-12 11:29:37 +03:00
Morb0
f22b645ff6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
2023-12-12 11:00:46 +03:00
Kevin Zheng
405e569cd5
Split up atmos speedup from heat scaling ( #22372 )
2023-12-12 00:49:20 -07:00
Leon Friedrich
70d663c0a6
Fix pvs override error ( #22366 )
2023-12-12 11:49:59 +11:00
Leon Friedrich
53bd668b71
Temporarily disable round-end PVS overrides ( #22365 )
2023-12-12 11:43:37 +11:00
Kevin Zheng
a2ed25ad03
Add atmos time compression ( #21954 )
...
Add atmos.speedup which is effectively a atmos-only time compression
CVar. This adjusts heat capacities and transfer rates to effectively
globally speed up the time constants of atmos.
This allows faster response to heating/cooling changes and faster
cleanups (by buffing scrubbers, pumps, and everything else) that is
tunable through one global time compression CVar.
It also achieves this without any thermodynamic unsoundness.
2023-12-11 15:59:47 -08:00
KP
d0085f9428
Prevent pacified players from throwing dangerous stuff ( #22268 )
2023-12-11 15:40:22 -08:00
Nemanja
6e91346ff3
artifact crusher ( #22301 )
2023-12-12 10:15:47 +11:00
Morb0
3aaeb7f61b
Fix upstream
2023-12-11 22:40:49 +03:00
Morb0
29a7082223
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
2023-12-11 21:56:43 +03:00
metalgearsloth
1bdf94da64
Audio fixes ( #22324 )
2023-12-11 21:26:55 +11:00
deltanedas
e85ca6a4f6
make syndie bag and rigs explosion resistant ( #22088 )
...
* remove empty file real
* support explosion resistance for non-worn things
* remove redundant entitystorage resistance
* port entitystorage optimisation to apply for everything with 100% resistance
* add explosion resistance for bag contents
* make thing reusable
* add resistance to chest rig too
* medical chest rig too
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-11 02:43:00 -07:00
metalgearsloth
02c8e585f7
Turn arrivals into a planetmap ( #21777 )
2023-12-11 20:34:19 +11:00
metalgearsloth
342b08418e
Fix planet command being ran on existing maps ( #21775 )
2023-12-11 19:51:02 +11:00
Kevin Zheng
6444f7b7c5
Make pipes leak when destroyed ( #20928 )
...
This plugs a meta where atmos techs were fireaxing pipes to remove them without leaking their contents.
2023-12-10 23:51:45 -08:00
Sirionaut
c095b7cd4a
Animals obey conservation of matter unless they are undead ( #21922 )
2023-12-10 19:20:41 -08:00
Simon
bd3bea176c
Cooler zombie moths ( #21744 )
2023-12-10 19:17:55 -08:00
deltanedas
90786a5e21
small food slicing cleanup ( #22291 )
...
* component cleanup
* slice system cleanup
* thank you entprotoid
* webedit 1
* webedit 2
* bruh this shitcode has sliceable food with no slice
* ok no persistence
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-10 16:13:48 -05:00
Errant
664d2b14b9
Don't allow disarm on incapacitated targets ( #22298 )
2023-12-10 13:54:41 -05:00
Pieter-Jan Briers
46e36934a6
High-latency DB testing stuff ( #22282 )
2023-12-10 16:30:12 +01:00
Morb
3a300a2e29
[Race] Vulpkanin ( #1595 )
2023-12-10 15:42:57 +03:00
Morb0
6b2c649308
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Textures/Tiles/attributions.yml
2023-12-10 10:43:49 +03:00
chromiumboy
b70c0845d0
Crew monitor revisit ( #22240 )
2023-12-10 16:38:50 +11:00
KP
e5fb3552a7
Prevent entities who do not have hands from setting off bombs. ( #22250 )
2023-12-10 14:12:59 +11:00
Vigers Ray
b64715bfc3
Fix entity logs verb ( #22231 )
2023-12-08 22:39:00 -06:00
Nemanja
e7e7974a24
Experimental Anomaly Vessel ( #22233 )
...
* experimental anomaly vessel
* sprote changes
2023-12-08 12:50:41 -06:00
Nemanja
736300d505
keybinds for opening bag/belt & context logic for opening storage window ( #22238 )
...
* keybinds for opening bag/belt & context logic for opening storage window
* no error por favor
2023-12-08 12:43:37 -06:00
lzk
5e95c05bcf
Add more words & symbold in chat sanitize ( #1605 )
2023-12-08 17:23:55 +03:00
lzk
4d406a3082
Locale moth accent ( #1610 )
2023-12-08 16:38:10 +03:00
Morb0
caf8ac8005
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +03:00
Leon Friedrich
287d22cc49
Inventory slot enumerator rejig ( #21788 )
2023-12-08 08:20:51 +11:00
deltanedas
88119c6469
nar'sie fake ( #20299 )
...
* import narsie sprite
* narsie_rises audio
* rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent
* add AnnounceOnSpawn system
* oop
* NAR'SIE HAS RISEN
* suffix
* base prototype, changes
* fix
* mapinit
* downscale
* new toys
* singuloose
* still not fix
* honki sprite
* add honki spawn animation
* revert spawnondespawn change
* really revert
* use LocId for announceonspawn
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-06 20:24:33 -05:00
Pieter-Jan Briers
b4f8393f42
Log server ID in connection logs table ( #21911 )
2023-12-07 09:48:56 +11:00
deltanedas
47359cf70f
medibot fixes and refactoring ( #21852 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-07 08:30:32 +11:00
Henry
80a1aadd5e
Disposals chute make it go splat ( #20848 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-06 20:07:52 +11:00
metalgearsloth
7eaa5a81c3
Pool NPC entitylookup fields ( #21806 )
2023-12-06 18:30:57 +11:00
Nemanja
89295d97b6
research console radio messages on unlock ( #22166 )
2023-12-06 18:00:51 +11:00
qwerltaz
daa70fc92c
Fix wallmount board dropping at random side of the wall ( #21920 )
...
* empty wallmount board at user
* change to DropNextTo
* add emptyAtUser to doors
2023-12-05 22:03:31 -05:00
T-Stalker
000ac6f63d
Change points per node to 6500 ( #22163 )
2023-12-05 18:16:08 -05:00
Dexler
6479d4d70c
Fixed projectile spells not counting user ( #22158 )
2023-12-05 17:21:26 -05:00
Vigers Ray
b9d60f0ea9
Fix loadout slots ( #1608 )
2023-12-05 17:40:41 +03:00
Arthur Asimov
3da699ad32
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
2023-12-05 07:42:45 +03:00
Tomás Alves
9d9cfbdd88
Change Biometrics after using Dna Scrambler Implant ( #22098 )
2023-12-04 18:18:49 -05:00
