Fix upstream merge

[VMSolidus]

Need a forced restart, I bungled the last upstream merge by mistake, and we lost some new stuff

[github-actions]

RSI Diff Bot; head commit d536841 merging into 904b3b7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Ears/Headsets/base.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/cargo.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/centcom.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/command.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/engineering.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/freelance.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/medical.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/mining.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/robotics.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/science.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/security.rsi

State	Old	New	Status
icon			Modified
icon_alt			Modified

Resources/Textures/Clothing/Ears/Headsets/service.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi

State	Old	New	Status
icon_alt			Modified

Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi

State	Old	New	Status
icon_alt			Modified

Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi

State	Old	New	Status
icon_alt			Modified

Resources/Textures/Objects/Devices/communication.rsi

State	Old	New	Status
beacon			Modified
beacon_dead			Modified
radio-inhand-left			Modified
radio-inhand-right			Modified
radio			Modified
signaller			Modified
walkietalkie-off			Modified
walkietalkie-on			Modified
walkietalkie			Modified
old-radio-inhand-left			Removed
old-radio-inhand-right			Removed
old-radio			Removed

Resources/Textures/Objects/Devices/jammer.rsi

State	Old	New	Status
jammer			Modified
jammer-on			Added

Resources/Textures/Objects/Devices/signaller.rsi

State	Old	New	Status
signaller			Modified

Resources/Textures/Objects/Devices/station_beacon.rsi

State	Old	New	Status
blink			Modified
icon			Modified

Resources/Textures/Objects/Tools/crowbar.rsi

State	Old	New	Status
icon			Modified
red-icon			Modified

Resources/Textures/Objects/Tools/drill.rsi

State	Old	New	Status
drill_bolt			Modified
drill_screw			Modified

Resources/Textures/Objects/Tools/geiger.rsi

State	Old	New	Status
geiger_base			Modified
geiger_on_ext			Modified
geiger_on_high			Modified
geiger_on_idle			Modified
geiger_on_low			Modified
geiger_on_med			Modified

Resources/Textures/Objects/Tools/hand_labeler.rsi

State	Old	New	Status
hand_labeler			Modified

Resources/Textures/Objects/Tools/multitool.rsi

State	Old	New	Status
green-unlit			Modified
icon			Modified
red-unlit			Modified
yellow-unlit			Modified

Resources/Textures/Objects/Tools/rcd.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Objects/Tools/screwdriver.rsi

State	Old	New	Status
screwdriver-map			Modified
screwdriver-screwybits			Modified
screwdriver			Modified

Resources/Textures/Objects/Tools/seclite.rsi

State	Old	New	Status
seclite-on			Modified
seclite-overlay			Modified
seclite			Modified

Resources/Textures/Objects/Tools/spray_painter.rsi

State	Old	New	Status
spray_painter			Modified

Resources/Textures/Objects/Tools/welder.rsi

State	Old	New	Status
icon			Modified
welder_flame			Modified

Resources/Textures/Objects/Tools/welder_experimental.rsi

State	Old	New	Status
icon			Modified
welder_flame			Modified

Resources/Textures/Objects/Tools/welder_industrial.rsi

State	Old	New	Status
icon			Modified
welder_flame			Modified

Resources/Textures/Objects/Tools/welder_industrialadv.rsi

State	Old	New	Status
icon			Modified
welder_flame			Modified

Resources/Textures/Objects/Tools/wirecutters.rsi

State	Old	New	Status
cutters-cutty-thingy			Modified
cutters-map			Modified
cutters			Modified

Resources/Textures/Objects/Tools/wrench.rsi

State	Old	New	Status
icon			Modified

Resources/Textures/Structures/Doors/secret_door.rsi

State	Old	New	Status
assembly			Modified
closed			Modified
closing			Modified
open			Modified
opening			Modified

Resources/Textures/Structures/Walls/reinforced_diagonal.rsi

State	Old	New	Status
state0			Modified
state1			Modified

Resources/Textures/Structures/Walls/solid.rsi

State	Old	New	Status
full			Modified
reinf_construct-0			Modified
reinf_construct-1			Modified
reinf_construct-2			Modified
reinf_construct-3			Modified
reinf_construct-4			Modified
reinf_construct-5			Modified
reinf_over0			Modified
reinf_over1			Modified
reinf_over2			Modified
reinf_over3			Modified
reinf_over4			Modified
reinf_over5			Modified
reinf_over6			Modified
reinf_over7			Modified
rgeneric			Modified
solid0			Modified
solid1			Modified
solid2			Modified
solid3			Modified
solid4			Modified
solid5			Modified
solid6			Modified
solid7			Modified

Resources/Textures/Structures/Walls/solid_diagonal.rsi

State	Old	New	Status
state0			Modified
state1			Modified

Resources/Textures/Structures/Windows/plasma_diagonal.rsi

State	Old	New	Status
state0			Modified
state1			Modified

Resources/Textures/Structures/Windows/plasma_window.rsi

State	Old	New	Status
full			Modified
pwindow0			Modified
pwindow1			Modified

Resources/Textures/Clothing/Mask/neckgaiterred.rsi

State	Old	New	Status
equipped-MASK-reptilian			Added
equipped-MASK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Structures/Walls/shuttle.rsi

State	Old	New	Status
shuttle_construct-0			Added
shuttle_construct-1			Added
shuttle_construct-2			Added
shuttle_construct-3			Added
shuttle_construct-4			Added
shuttle_construct-5			Added

Edit: diff updated after d536841