Merge in changes from our upstream #457

Icon difference rendering

Please file any issues here.

Icons with diff:

MODIFIED - icons/mob/items/lefthand_hats.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
hardhat0_old_orange (0)			Created
hardhat0_old_dblue (0)			Created
hardhat0_old_yellow (0)			Created
hardhat0_old_white (0)			Created
hardhat0_old_red (0)			Created
hardhat0_dblue			Modified
hardhat0_red			Modified
hardhat0_white			Modified
hardhat0_yellow			Modified
hardhat0_orange			Modified

MODIFIED - icons/obj/trash.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
cb01 (0)			Created
cb06 (0)			Created
cb04 (0)			Created
cb05 (0)			Created
cb10 (0)			Created
cb03 (0)			Created
cb07 (0)			Created
cb08 (0)			Created
cb09 (0)			Created
cb02 (0)			Created

MODIFIED - icons/turf/stomach_vr.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
flesh_floor_mover (0)			Created
enzyme_shallow (0)			Created
composite (0)			Created
fleshdoor (0)			Created

MODIFIED - icons/inventory/feet/mob.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
half_moon (0)			Created
neo_jack_white (0)			Created
ballet (0)			Created
neo_jack_silver (0)			Created

MODIFIED - icons/inventory/back/mob_vr.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
jetpack-breaker-on (0)			Created
jetpack-breaker (0)			Created

MODIFIED - icons/obj/tank.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
jetpack-breaker (0)			Created
jetpack-breaker-on (0)			Created
indicator_emergency_double1			Modified
indicator_emergency_doubleoverload			Modified
indicator_emergency_double2			Modified
bomb_assembly			Modified
indicator_emergency2			Modified
phoron_vox			Modified
indicator_emergency_double3			Modified
indicator_tank4			Modified
indicator_emergency4			Modified
phoron-purple			Modified
indicator_tank0			Modified
indicator_tank5			Modified
indicator_emergency3			Modified
indicator_emergency_double4			Modified
indicator_tankoverload			Modified
indicator_tank3			Modified
indicator_tank6			Modified
indicator_tank2			Modified
indicator_emergencyoverload			Modified
emergency_nitro			Modified
indicator_tank1			Modified
emergency_double_nitro			Modified
indicator_emergency1			Modified

MODIFIED - icons/obj/power.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
ccharger-emergency-on (0)			Created
ccharger-slime-on (0)			Created
ccharger-mech-on (0)			Created
ccharger-standard-on (0)			Created
smes-og1			Modified
solarbold			Modified
circ-excold			Modified
smes-op2			Modified
gsmes_overcharge			Modified
tank			Modified
smes-og4			Modified
gsmes			Modified
filter			Modified
potatodanger			Modified
apc2-nocover			Modified
bbox_on			Modified
apco1-1			Modified
apcewires			Modified
teg-oc11			Modified
teg-unassembled			Modified
portgen0			Modified
switch-dbl-up			Modified
gridchecker_off			Modified
potatoon			Modified
portgen2on			Modified
apcox-1			Modified
light-p-overlay			Modified
circ-cold			Modified
teg-op1			Modified
smes-op1			Modified
eggrad			Modified
potato_cell			Modified
gsmes_og1			Modified
solar_panel			Modified
portgen0legacy			Modified
spbaseold			Modified
apc1-b-nocover			Modified
apco2-1			Modified
solar_panel-b			Modified
circ-unassembled			Modified
bbox_fault			Modified
teg-op5			Modified
potato			Modified
circ-assembled			Modified
bbox_off			Modified
teg-op8			Modified
circ-hot			Modified
apco3-0			Modified
ccharger-o2			Modified
apc-b			Modified
teg-op9			Modified
smes			Modified
switch-dbl-down			Modified
teg-oc10			Modified
gsmes_og3			Modified
light0-overlay			Modified
portgen1legacy			Modified
apco2-3			Modified
apco3-2			Modified
circ-off			Modified
smes-og2			Modified
teg-oc01			Modified
tracker			Modified
portgen0on			Modified
gsmes_og4			Modified
circ-slow			Modified
portgen1			Modified
teg-op4			Modified
apco2-0			Modified
gsmes_charging			Modified
apc0			Modified
circ-exhot			Modified
apco1-0			Modified
ccharger1			Modified
portgen2			Modified
teg-op7			Modified
apco0-1			Modified
teg-op3			Modified
apc1			Modified
sp_base			Modified
light1-overlay			Modified
ccharger0			Modified
solarold			Modified
smes-crit			Modified
apc-spark			Modified
portgen1on			Modified
ccharger-o3			Modified
apco2-2			Modified
teg-op10			Modified
smes-oc0			Modified
apco1-2			Modified
apco0-2			Modified
ccharger-o4			Modified
apc1-nocover			Modified
trackerold			Modified
teg-assembled			Modified
apcmaint			Modified
apco3-1			Modified
gridchecker_on			Modified
apc2-b-nocover			Modified
apco1-3			Modified
gsmes_og2			Modified
teg-broken			Modified
apc2			Modified
switch-down			Modified
switch-up			Modified
smes-oc2			Modified
teg_mid			Modified
smes-og3			Modified
teg-op2			Modified
smes-og5			Modified
ccharger-o1			Modified
apcemag			Modified
crema_switch			Modified
smes-oc1			Modified
apco0-3			Modified
circ-run			Modified
ccharger2			Modified
gsmes_outputting			Modified
portgen2legacy			Modified
teg-op11			Modified
apco0-0			Modified
ccharger-o0			Modified
smes-op0			Modified
teg-op6			Modified
apcox-0			Modified