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.

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

Merge Upstream [01.08.2024] #1408

Merged
merged 37 commits into from
Aug 1, 2024

Merge branch 'master-offs' into merge_upstream

c3c2310
Select commit
Loading
Failed to load commit list.
Merged

Merge Upstream [01.08.2024] #1408

Merge branch 'master-offs' into merge_upstream
c3c2310
Select commit
Loading
Failed to load commit list.
IconDiffBot-2 / IconDiffBot2 succeeded Aug 1, 2024 in 23s

Icon difference rendering

Please file any issues here.

Icons with diff:

Details

MODIFIED - icons/obj/card.dmi (0)
State Name (duplicate) Old Icon New Icon Status
tourist (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/10032458134263396057.png Created
MODIFIED - icons/mob/inhands/weapons_lefthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
snakesfang (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/1481659386366555624.png Created
MODIFIED - icons/obj/weapons/melee.dmi (0)
State Name (duplicate) Old Icon New Icon Status
snakesfang (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/12035487537379174325.png Created
MODIFIED - icons/mob/clothing/belt.dmi (0)
State Name (duplicate) Old Icon New Icon Status
sheath-rapier (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/5741822772124853404.png Deleted
sheath-sword (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/1274220532617881730.png Created
snakesfangsheath (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/17811923819583436358.png Created
snakesfangsheath-sword (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/6783693918939524162.png Created
MODIFIED - icons/mob/simple_human.dmi (0)
State Name (duplicate) Old Icon New Icon Status
spaceinfected (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/17494433374633101339.png Created
spaceinfected_ranged (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/4484767641196584982.png Created
MODIFIED - icons/mob/inhands/weapons_righthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
snakesfang (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/7377128684710001312.png Created
MODIFIED - icons/mob/hud/sechud.dmi (0)
State Name (duplicate) Old Icon New Icon Status
hudtourist (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/1032688929810546441.png Created
MODIFIED - icons/obj/clothing/belts.dmi (0)
State Name (duplicate) Old Icon New Icon Status
sheath-rapier (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/9763352037723189359.png Deleted
snakesfangsheath-sword (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/8364114335814804491.png Created
snakesfangsheath (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/6775833539045623644.png Created
sheath-sword (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/2476566057618039147.png Created
ADDED - icons/mob/fleshling.dmi (0)
State Name (duplicate) Old Icon New Icon Status
fleshling (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/7539936386235030647.gif Created
fleshling (1) https://idb2.affectedarc07.co.uk/images/36878822/1408/11034897240401016303.gif Created
legion-smash (0) https://idb2.affectedarc07.co.uk/images/36878822/1408/13333117973895369545.gif Created
View more details on IconDiffBot-2