Merge in changes from our upstream #457

Icon difference rendering

Please file any issues here.

Icons with diff:

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

State Name (duplicate)	Old Icon	New Icon	Status
mat_staff1 (0)			Created
mat_staff0 (0)			Created
mat_staff (0)			Created

MODIFIED - icons/inventory/face/mob_vr_fox.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
cigar2off (0)			Deleted
pipeoff (0)			Deleted
cobpipeon (0)			Deleted
cigon (0)			Deleted
cigoff (0)			Deleted
cigar2on (0)			Deleted
cigaron (0)			Deleted
pipeon (0)			Deleted
cobpipeoff (0)			Deleted
cigaroff (0)			Deleted
cobpipe_on (0)			Created
cigar2 (0)			Created
spliffoff (0)			Created
cigar2_burnt (0)			Created
cigar2_on (0)			Created
cobpipe_burnt (0)			Created
joint (0)			Created
pipe (0)			Created
hr_cigoff (0)			Created
hr_cigon (0)			Created
cigar_on (0)			Created
cobpipe (0)			Created
joint_on (0)			Created
cig (0)			Created
joint_burnt (0)			Created
pipe_burnt (0)			Created
pipe_on (0)			Created
cigar (0)			Created
cig_on (0)			Created
cigar_burnt (0)			Created
cig_burnt (0)			Created
spliffon (0)			Created

MODIFIED - icons/inventory/head/mob_vr_tajaran.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
breaker_helmet (0)			Created

MODIFIED - icons/inventory/head/item_vr_unathi.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
breaker_helmet (0)			Created

MODIFIED - icons/inventory/face/mob_vr_sergal.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
cobpipe (1)			Deleted
cobpipe_on (1)			Deleted
cobpipe			Modified
cobpipe_on			Modified

MODIFIED - icons/inventory/head/item_tajaran.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
breaker_helmet (0)			Created

ADDED - maps/atoll/icons/objs/temple.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
temple (0)			Created

MODIFIED - icons/mob/human_races/sprite_accessories/ears.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
zorgoia (0)			Created
zorgoia_inner (0)			Created
zorgoia_tips (0)			Created

MODIFIED - icons/mob/human_races/r_nevrean.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
head_m			Modified
head_f			Modified

ADDED - icons/mob/taursuits_lizard_ch.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
plaguedoctor (0)			Created
hasd_suit (0)			Created
apron (0)			Created
apron_white (0)			Created
surgical (0)			Created
poncho (0)			Created

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

State Name (duplicate)	Old Icon	New Icon	Status
em_light_50 (0)			Deleted
backup_0 (0)			Deleted
backup_25 (0)			Deleted
backup_50 (0)			Deleted
secborg_0 (0)			Deleted
crap_50 (0)			Deleted
em_light_100 (0)			Deleted
em_light_0 (0)			Deleted
em_light_75 (0)			Deleted
backup_75 (0)			Deleted
secborg_50 (0)			Deleted
secborg_75 (0)			Deleted
crap_0 (0)			Deleted
crap_75 (0)			Deleted
secborg_100 (0)			Deleted
secborg_25 (0)			Deleted
em_light_25 (0)			Deleted
crap_100 (0)			Deleted
secborg (0)			Deleted
crap_25 (0)			Deleted
hype_device_cell_100 (0)			Created
lead (0)			Created
hype_device_cell_75 (0)			Created
hype_device_cell_50 (0)			Created
device_crap (0)			Created
hype_device_cell_25 (0)			Created
hype_device_cell (0)			Created
hype_device_cell_0 (0)			Created
random_device (0)			Created
cap_weapon_cell_25			Modified
up_device_cell_25			Modified
white_75			Modified
standard_75			Modified
sc_weapon_cell_0			Modified
standard_50			Modified
white			Modified
emp_weapon_cell_75			Modified
crap			Modified
apc_100			Modified
blue_0			Modified
random			Modified
blue			Modified
high_100			Modified
weapon_cell_50			Modified
modded_0			Modified
weapon_cell_75			Modified
cap_weapon_cell_50			Modified
mech_100			Modified
backup_100			Modified
potato			Modified
hyper_75			Modified
standard_0			Modified
super_0			Modified
white_50			Modified
standard			Modified
up_device_cell_100			Modified
emp_weapon_cell_0			Modified
blue_75			Modified
sc_weapon_cell_25			Modified
up_device_cell_0			Modified
infinity_0			Modified
modded_25			Modified
blue_50			Modified
high_50			Modified
cap_weapon_cell_0			Modified
standard_100			Modified
sc_weapon_cell			Modified
super_25			Modified
high_25			Modified
emp_weapon_cell_100			Modified
hyper_25			Modified
apc_0			Modified
hyper			Modified
mech_25			Modified
hyper_0			Modified
infinity_75			Modified
infinity_25			Modified
apc_50			Modified
white_100			Modified
white_25			Modified
device_cell			Modified
device_cell_100			Modified
mech			Modified
mech_75			Modified
high			Modified
weapon_cell			Modified
blue_25			Modified
white_0			Modified
mech_0			Modified
sc_weapon_cell_100			Modified
infinity			Modified
cap_weapon_cell_75			Modified
high_0			Modified
weapon_cell_25			Modified
emp_weapon_cell_25			Modified
em_light			Modified
modded_75			Modified
sc_weapon_cell_50			Modified
weapon_cell_0			Modified
up_device_cell_75			Modified
backup			Modified
mech_50			Modified
super_100			Modified
hyper_100			Modified
apc_25			Modified
up_device_cell_50			Modified
standard_25			Modified
device_cell_50			Modified
up_device_cell			Modified
cap_weapon_cell_100			Modified
modded_50			Modified
super_75			Modified
device_cell_25			Modified
hyper_50			Modified
super			Modified
infinity_100			Modified
emp_weapon_cell			Modified
apc			Modified
modded			Modified
blue_100			Modified
emp_weapon_cell_50			Modified
weapon_cell_100			Modified
infinity_50			Modified
device_cell_0			Modified
apc_75			Modified
cap_weapon_cell			Modified
super_50			Modified
device_cell_75			Modified
sc_weapon_cell_75			Modified
modded_100			Modified
high_75			Modified

MODIFIED - icons/obj/props/decor64x64.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
alteviangen-fuel-33 (0)			Created
alteviangen (0)			Created
alteviangenwrecked (0)			Created
alteviangen-fuel-66 (0)			Created
alteviangen-fuel-100 (0)			Created
sunkensail (0)			Created
alteviangenon (0)			Created

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

State Name (duplicate)	Old Icon	New Icon	Status
uglyminearmed (0)			Deleted
uglymine (0)			Deleted
landmine (0)			Created
forcemaul_nocell0 (0)			Created
forcemaul_active0 (0)			Created
forcemaul_active1 (0)			Created
hedget (0)			Created
forcemaul_nocell1 (0)			Created
forcemaul0 (0)			Created
clippers (0)			Created
forcemaul1 (0)			Created
landmine_armed (0)			Created
hatchet			Modified
hoe			Modified