Skip to content

Solving future merge conflicts #5699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kocma-san wants to merge 24 commits into
base: master
Choose a base branch
from

Fix all our broken grep checks

be4b540
Select commit
Loading
Failed to load commit list.
Open

Solving future merge conflicts #5699

Fix all our broken grep checks
be4b540
Select commit
Loading
Failed to load commit list.
IconDiffBot-2 / IconDiffBot2 succeeded Nov 8, 2025 in 40s

Icon difference rendering

Please file any issues here.

Icons with diff:

Details

MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/modsuit.dmi (0)
State Name (duplicate) Old Icon New Icon Status
jumper-chestplate (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/18078736654237941034.png Created
jumper-boots-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/4719392821111066536.png Created
jumper-control-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/6817451929701971630.png Created
jumper-helmet (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/11073494810130484142.png Created
jumper-control (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/7706550796698812913.png Created
jumper-chestplate-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/12211462511905443096.png Created
jumper-boots (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/14441924587000024783.png Created
jumper-helmet-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/1917185200949105313.png Created
jumper-gauntlets-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/13067776497769949333.png Created
jumper-gauntlets (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/3096456308393434873.png Created
ADDED - modular_nova/master_files/icons/donator/obj/clothing/back.dmi (0)
State Name (duplicate) Old Icon New Icon Status
xplore_go_bag (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/18032326293277255033.png Created
MODIFIED - modular_nova/master_files/icons/donator/obj/clothing/cloaks.dmi (0)
State Name (duplicate) Old Icon New Icon Status
paddedsec (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/14815207823523275272.png Created
noble_mantle (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/16913823046115390252.png Created
paddedsechood (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/15256875012339572166.png Created
tattered_cloak (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/9244469816311573404.png Created
MODIFIED - modular_nova/master_files/icons/donator/obj/clothing/masks.dmi (0)
State Name (duplicate) Old Icon New Icon Status
gambits_mask (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/12612624381562097712.png Created
ADDED - modular_nova/modules/ahabs_spear/icons/projectiles.dmi (0)
State Name (duplicate) Old Icon New Icon Status
ahabprojectile (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/16242513198184441364.png Created
ADDED - modular_nova/master_files/icons/donator/mob/clothing/back.dmi (0)
State Name (duplicate) Old Icon New Icon Status
xplore_go_bag (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/11787355196442605571.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi (0)
State Name (duplicate) Old Icon New Icon Status
starbouquet (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/12816344497085640284.png Created
paddedsec (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/14668549472240421917.png Created
jumper-box (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/12803813737492898670.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/uniform.dmi (0)
State Name (duplicate) Old Icon New Icon Status
dagmardress_a (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/13909134542518911939.png Created
dagmardress_b (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/1644182169533128501.png Created
dagmardress_c (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/10182700283655216196.png Created
ADDED - modular_nova/modules/ahabs_spear/icons/l_hand_ahab.dmi (0)
State Name (duplicate) Old Icon New Icon Status
crusher_ahab0 (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/13674594918533344545.png Created
crusher_ahab1 (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/643049513369436579.png Created
ADDED - modular_nova/modules/ahabs_spear/icons/back.dmi (0)
State Name (duplicate) Old Icon New Icon Status
crusher_ahab (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/1788091020554686619.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/head.dmi (0)
State Name (duplicate) Old Icon New Icon Status
merctac_hood (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/10158416235157891433.png Created
ecologist_hood (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/6409556647570916176.png Created
MODIFIED - modular_nova/master_files/icons/donator/obj/clothing/hats.dmi (0)
State Name (duplicate) Old Icon New Icon Status
merctac_hood (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/7560679553053088916.png Created
ecologist_hood (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/10799985346313977277.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/hands.dmi (0)
State Name (duplicate) Old Icon New Icon Status
ecologist_claw (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/1715236135500816556.png Created
merctac_gloves (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/3847102217352799718.png Created
MODIFIED - modular_nova/master_files/icons/donator/obj/clothing/gloves.dmi (0)
State Name (duplicate) Old Icon New Icon Status
ecologist_claw (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/7962614994391069991.png Created
merctac_gloves (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/16359604066311927683.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/mask.dmi (0)
State Name (duplicate) Old Icon New Icon Status
gambits_mask (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/10780208471867364558.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/uniform_digi.dmi (0)
State Name (duplicate) Old Icon New Icon Status
ecologist_under (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/11339186189271827641.png Created
ADDED - modular_nova/modules/ahabs_spear/icons/ahabs_spear.dmi (0)
State Name (duplicate) Old Icon New Icon Status
crusher_ahab_lit (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/2587310791234730113.png Created
crusher_ahab_uncharged (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/16905009757911982947.gif Created
crusher_ahab (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/11841324363095374010.png Created
ahab_retool (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/12511055193742849459.png Created
MODIFIED - modular_nova/master_files/icons/obj/plushes.dmi (0)
State Name (duplicate) Old Icon New Icon Status
plushie_delphi (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/9228026459762249496.gif Created
plushie_commandant (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/9628076823776256516.png Created
MODIFIED - modular_nova/master_files/icons/donator/obj/clothing/uniform.dmi (0)
State Name (duplicate) Old Icon New Icon Status
dagmardress_a (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/981074519060630092.png Created
dagmardress_b (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/3406616152914705311.png Created
dagmardress_c (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/1927036859091874734.png Created
MODIFIED - modular_nova/master_files/icons/donator/obj/custom.dmi (0)
State Name (duplicate) Old Icon New Icon Status
jumper-box (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/6557822842103524600.png Created
starbouquet (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/14770231835695282403.png Created
dagger (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/4381226812674139374.png Created
crystal (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/761011078886681659.png Created
precision_dagger (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/16194702776893558263.png Created
MODIFIED - modular_nova/modules/modular_ert/icons/pizza/righthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
hotknife https://idb2.affectedarc07.co.uk/images/42476729/5699/10950841387231323098.png https://idb2.affectedarc07.co.uk/images/42476729/5699/3475732364664459480.png Modified
MODIFIED - modular_nova/master_files/icons/donator/obj/clothing/modsuit.dmi (0)
State Name (duplicate) Old Icon New Icon Status
jumper-gauntlets-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/4237478868067150667.png Created
jumper-boots-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/12811634121332703748.png Created
jumper-boots (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/13662253192654199308.png Created
jumper-chestplate-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/5099957103833164199.png Created
jumper-control (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/5439278027722971601.png Created
jumper-helmet-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/9925838118449419558.png Created
jumper-chestplate (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/3139910722100745592.png Created
jumper-control-sealed (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/3378448164863890091.png Created
jumper-gauntlets (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/14692829813776317874.png Created
jumper-helmet (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/13152150444534908790.png Created
ADDED - modular_nova/master_files/icons/donator/mob/clothing/feet_digi.dmi (0)
State Name (duplicate) Old Icon New Icon Status
ecologist_boots (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/3987660653466546503.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/head_muzzled.dmi (0)
State Name (duplicate) Old Icon New Icon Status
seva_melon https://idb2.affectedarc07.co.uk/images/42476729/5699/4964766964306044734.png https://idb2.affectedarc07.co.uk/images/42476729/5699/9993175672784416307.png Modified
MODIFIED - modular_nova/master_files/icons/donator/mob/clothing/suit_digi.dmi (0)
State Name (duplicate) Old Icon New Icon Status
explorer_melon (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/16826365880490259591.png Created
ADDED - modular_nova/modules/ahabs_spear/icons/r_hand_ahab.dmi (0)
State Name (duplicate) Old Icon New Icon Status
crusher_ahab0 (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/14414117310750701315.png Created
crusher_ahab1 (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/13728543239201436527.png Created
MODIFIED - modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi (0)
State Name (duplicate) Old Icon New Icon Status
jumper-box (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/18421202830004864499.png Created
starbouquet (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/8407546172935419709.png Created
paddedsec (0) https://idb2.affectedarc07.co.uk/images/42476729/5699/10481649866700976024.png Created
View more details on IconDiffBot-2