Upstream merge as of Aug 25 #418

Icon difference rendering

Please file any issues here.

Icons with diff:

DELETED - icons/obj/items/storage.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
briefcase (0)			Deleted
suitcase (0)			Deleted
red (0)			Deleted
yellow (0)			Deleted
green (0)			Deleted
blue (0)			Deleted
secure (0)			Deleted
secure0 (0)			Deleted
secureb (0)			Deleted
securespark (0)			Deleted
securecrateemag (0)			Deleted
securecratesparks (0)			Deleted
securecrater (0)			Deleted
securecrateg (0)			Deleted
largebins (0)			Deleted
largebin (0)			Deleted
largebinopenfs (0)			Deleted
largebinopenf (0)			Deleted
largebinopenb (0)			Deleted
largebing (0)			Deleted
largebinr (0)			Deleted
largebinemag (0)			Deleted
largebinsparks (0)			Deleted
largebinsopen (0)			Deleted
largebinopen (0)			Deleted
safe (0)			Deleted
safe0 (0)			Deleted
safeb (0)			Deleted
safespark (0)			Deleted
bible (0)			Deleted
tome (0)			Deleted
tome_hefa (0)			Deleted
moneybag (0)			Deleted
deliverycrate (0)			Deleted
deliverycloset (0)			Deleted
deliverycrateSmall (0)			Deleted
deliverycrate5 (0)			Deleted
deliverycrate4 (0)			Deleted
deliverycrate3 (0)			Deleted
deliverycrate2 (0)			Deleted
deliverycrate1 (0)			Deleted
delivery_label (0)			Deleted
delivery_tag (0)			Deleted
trashcart (0)			Deleted
trashcartopen (0)			Deleted
trashcartweld (0)			Deleted
syndicate (0)			Deleted
trashbag_empty (0)			Deleted
trashbag_small (0)			Deleted
trashbag_mid (0)			Deleted
trashbag_full (0)			Deleted
lockbox+l (0)			Deleted
lockbox+b (0)			Deleted
lockbox (0)			Deleted
trashbag (0)			Deleted
giftbag0 (0)			Deleted
giftbag1 (0)			Deleted
giftbag2 (0)			Deleted
wallet (0)			Deleted
walletid (0)			Deleted
walletid_gold (0)			Deleted
walletid_silver (0)			Deleted
walletid_centcom (0)			Deleted
box_of_doom (0)			Deleted
evidence (0)			Deleted
evidenceobj (0)			Deleted
largemetalr (0)			Deleted
largemetalg (0)			Deleted
excavation (0)			Deleted
cashbag (0)			Deleted
inf_box (0)			Deleted
minebox (0)			Deleted
minebox_e (0)			Deleted
m94 (0)			Deleted
m94_e (0)			Deleted
syringe_case (0)			Deleted
surgical_case (0)			Deleted
firstaid (0)			Deleted
ointment (0)			Deleted
firefirstaid (0)			Deleted
antitoxin (0)			Deleted
antitoxfirstaid (0)			Deleted
antitoxfirstaid2 (0)			Deleted
antitoxfirstaid3 (0)			Deleted
radfirstaid (0)			Deleted
radfirstaid2 (0)			Deleted
radfirstaid3 (0)			Deleted
purplefirstaid (0)			Deleted
o2 (0)			Deleted
bezerk (0)			Deleted
advfirstaid (0)			Deleted
kit_empty (0)			Deleted
m37_holster (0)			Deleted
m37_holster_full (0)			Deleted
s_m37_holster (0)			Deleted
s_m37_holster_full (0)			Deleted
d_m37_holster (0)			Deleted
d_m37_holster_full (0)			Deleted
c_m37_holster (0)			Deleted
c_m37_holster_full (0)			Deleted
machete_holster (0)			Deleted
machete_holster_full (0)			Deleted
arnold-machete-pouch_full (0)			Deleted
arnold-machete-pouch (0)			Deleted
macheteB_holster (0)			Deleted
macheteB_holster_full (0)			Deleted
mealpack (0)			Deleted
mealpackopened (0)			Deleted
box (0)			Deleted
id (0)			Deleted
bodybags (0)			Deleted
glasses (0)			Deleted
pillbox (0)			Deleted
syringe (0)			Deleted
flashbang (0)			Deleted
flashbang_e (0)			Deleted
emp (0)			Deleted
emp_e (0)			Deleted
handcuff (0)			Deleted
latex (0)			Deleted
sterile (0)			Deleted
implant (0)			Deleted
mousetraps (0)			Deleted
spray (0)			Deleted
beaker (0)			Deleted
light (0)			Deleted
lighttube (0)			Deleted
lightstick (0)			Deleted
lightstick2 (0)			Deleted
lightmixed (0)			Deleted
pda (0)			Deleted
disk_kit (0)			Deleted
donk_kit (0)			Deleted
circuit (0)			Deleted
solution_trays (0)			Deleted
mre1 (0)			Deleted
mre2 (0)			Deleted
twobore (0)			Deleted
crate_secure_open_ammo (0)			Deleted
crate_open_ammo (0)			Deleted
crate_closed_ammo (0)			Deleted
crate_secure_locked_ammo (0)			Deleted
crate_secure_unlocked_ammo (0)			Deleted
crate_secure_locked_basic (0)			Deleted
crate_secure_unlocked_basic (0)			Deleted
crate_secure_basic_open (0)			Deleted
crate_closed_basic (0)			Deleted
crate_open_basic (0)			Deleted
katana_holster (0)			Deleted
katana_holster_full (0)			Deleted
ceremonial_sword_holster (0)			Deleted
ceremonial_sword_holster_full (0)			Deleted
nade_placeholder (0)			Deleted
nade_placeholder_e (0)			Deleted
s_nade_placeholder (0)			Deleted
s_nade_placeholder_e (0)			Deleted
d_nade_placeholder (0)			Deleted
d_nade_placeholder_e (0)			Deleted
c_nade_placeholder (0)			Deleted
c_nade_placeholder_e (0)			Deleted
train_nade_placeholder (0)			Deleted
train_nade_placeholder_e (0)			Deleted
teargas_nade_placeholder (0)			Deleted
teargas_nade_placeholder_e (0)			Deleted
frag_nade_placeholder (0)			Deleted
frag_nade_placeholder_e (0)			Deleted
airburst_nade_placeholder_e (0)			Deleted
m89 (0)			Deleted
m89_e (0)			Deleted
s_frag_nade_placeholder (0)			Deleted
s_airburst_frag_nade_placeholder (0)			Deleted
s_frag_nade_placeholder_e (0)			Deleted
s_airburst_nade_placeholder_e (0)			Deleted
phos_nade_placeholder (0)			Deleted
phos_nade_placeholder_e (0)			Deleted
s_phos_nade_placeholder (0)			Deleted
s_phos_nade_placeholder_e (0)			Deleted
d_phos_nade_placeholder (0)			Deleted
d_phos_nade_placeholder_e (0)			Deleted
c_phos_nade_placeholder (0)			Deleted
c_phos_nade_placeholder_e (0)			Deleted
matebacase (0)			Deleted
c_matebacase (0)			Deleted
surgical_tray (0)			Deleted
surgical_tray_e (0)			Deleted
medicomp (0)			Deleted
medicomp_open (0)			Deleted
seedbag (0)			Deleted
plantbag (0)			Deleted
kit_case_old (0)			Deleted
kit_case_e_old (0)			Deleted
spec_kit (0)			Deleted
kit_case (0)			Deleted
kit_case_e (0)			Deleted
smartgun (0)			Deleted
sniper (0)			Deleted
scout (0)			Deleted
demo (0)			Deleted
grenadier (0)			Deleted
pyro (0)			Deleted
b18 (0)			Deleted
sentry (0)			Deleted
airburst_nade_placeholder (0)			Deleted
m43case (0)			Deleted
co2_box (0)			Deleted
implantbox (0)			Deleted
incenbuck (0)			Deleted
incenslug (0)			Deleted
medicbox (0)			Deleted
medicbox_e (0)			Deleted
upgradedkitbox (0)			Deleted
upgradedkitbox_e (0)			Deleted
guncase (0)			Deleted
guncase_e (0)			Deleted
guncase_blue (0)			Deleted
guncase_blue_e (0)			Deleted
guncase_red (0)			Deleted
guncase_red_e (0)			Deleted
upgradekit (0)			Deleted
upgradekit_alt (0)			Deleted
pro_case_mini_old (0)			Deleted
pro_case_large_old (0)			Deleted
pro_case_large (0)			Deleted
pro_case_mini (0)			Deleted
+defense (0)			Deleted
+medic (0)			Deleted
+jtac (0)			Deleted
+sniper (0)			Deleted
+engi (0)			Deleted
+flamer (0)			Deleted
+dots (0)			Deleted
+pursuit (0)			Deleted
+crayon (0)			Deleted
+shield (0)			Deleted
+spotter (0)			Deleted
pdt_box (0)			Deleted
cryo_defense_kit (0)			Deleted
cryo_defense_kit_e (0)			Deleted
donator_kit (0)			Deleted
toolkit (0)			Deleted
toolkit_empty (0)			Deleted
fuelbox (0)			Deleted
fuelbox_e (0)			Deleted

MODIFIED - icons/mob/xenos/predalien.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
Normal Predalien Dead			Modified
Normal Predalien Knocked Down			Modified
Normal Predalien Walking			Modified
Normal Predalien Running			Modified
Normal Predalien Sleeping			Modified

MODIFIED - icons/mob/humans/onmob/uniform_0.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
corporate_orange_d (0)			Created
d_io_d (0)			Created
io_d (0)			Created
provost_ci_d (0)			Created
provost_ci (0)			Created
scrubsolive (0)			Created
scrubsgrey (0)			Created
c_io_d (0)			Created
corporate_orange (0)			Created

ADDED - icons/obj/items/storage/holsters.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
m37_holster (0)			Created
m37_holster_full (0)			Created
s_m37_holster (0)			Created
s_m37_holster_full (0)			Created
d_m37_holster (0)			Created
d_m37_holster_full (0)			Created
c_m37_holster (0)			Created
c_m37_holster_full (0)			Created
machete_holster (0)			Created
machete_holster_full (0)			Created
arnold-machete-pouch_full (0)			Created
arnold-machete-pouch (0)			Created
macheteB_holster (0)			Created
macheteB_holster_full (0)			Created
smartgun_machete_holster (0)			Created
smartgun_machete_holster_full (0)			Created
katana_holster (0)			Created
katana_holster_full (0)			Created
ceremonial_sword_holster (0)			Created
ceremonial_sword_holster_full (0)			Created