Skip to content
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.

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

Merge upstream 17.03.2024 #1105

Merged
merged 12 commits into from
Mar 17, 2024

Merge remote-tracking branch 'official/master' into merge-upstream

81de55d
Select commit
Loading
Failed to load commit list.
Merged

Merge upstream 17.03.2024 #1105

Merge remote-tracking branch 'official/master' into merge-upstream
81de55d
Select commit
Loading
Failed to load commit list.
IconDiffBot-2 / IconDiffBot2 succeeded Mar 17, 2024 in 8s

Icon difference rendering

Please file any issues here.

Icons with diff:

Details

MODIFIED - icons/obj/terminals.dmi (0)
State Name (duplicate) Old Icon New Icon Status
atm_lightmask https://idb2.affectedarc07.co.uk/images/36878822/1105/8931253347456946707.png https://idb2.affectedarc07.co.uk/images/36878822/1105/12349316914429257744.png Modified
atm https://idb2.affectedarc07.co.uk/images/36878822/1105/1609649137399653950.gif https://idb2.affectedarc07.co.uk/images/36878822/1105/18430574546032931548.gif Modified
atm_off https://idb2.affectedarc07.co.uk/images/36878822/1105/16862365502250774608.png https://idb2.affectedarc07.co.uk/images/36878822/1105/6329304534122239823.png Modified
MODIFIED - icons/mob/screen_alert.dmi (0)
State Name (duplicate) Old Icon New Icon Status
succumb (0) https://idb2.affectedarc07.co.uk/images/36878822/1105/8745672855820859574.png Created
MODIFIED - icons/obj/cryogenic2.dmi (0)
State Name (duplicate) Old Icon New Icon Status
scanner_1 (0) https://idb2.affectedarc07.co.uk/images/36878822/1105/6840023443634896348.gif Deleted
scanner_0 (0) https://idb2.affectedarc07.co.uk/images/36878822/1105/18281438386808974471.gif Deleted