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 [30.06.2024] #318

Merged
merged 39 commits into from
Jun 30, 2024

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

5e14d25
Select commit
Loading
Failed to load commit list.
Merged

Merge upstream [30.06.2024] #318

Merge remote-tracking branch 'off/master' into merge-upstream
5e14d25
Select commit
Loading
Failed to load commit list.
IconDiffBot-2 / IconDiffBot2 succeeded Jun 30, 2024 in 47s

Icon difference rendering

Please file any issues here.

Icons with diff:

Details

MODIFIED - icons/mob/inhands/clothing/masks_righthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
cigoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/5223460157810567270.png Deleted
candyoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4317831740717395134.png Deleted
cigon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/3054390193524729625.gif Deleted
cigaron (0) https://idb2.affectedarc07.co.uk/images/36878822/318/14697868524276415469.gif Deleted
cigaroff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/14657010379112342083.png Deleted
MODIFIED - icons/mob/actions/actions_cult.dmi (0)
State Name (duplicate) Old Icon New Icon Status
sword_fling (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8821422237249248048.gif Created
MODIFIED - icons/mob/clothing/neck.dmi (0)
State Name (duplicate) Old Icon New Icon Status
crimson_focus (0) https://idb2.affectedarc07.co.uk/images/36878822/318/9619062648635264726.png Created
MODIFIED - icons/mob/inhands/clothing/masks_lefthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
cigaron (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4103297367222696140.gif Deleted
cigaroff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16739597986343063404.png Deleted
candyoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16551670969905601639.png Deleted
cigon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/12361354840567626679.gif Deleted
cigoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/11289281688775319272.png Deleted
MODIFIED - icons/obj/cigarettes.dmi (0)
State Name (duplicate) Old Icon New Icon Status
candyoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13735499875072080812.png Created
candyon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16172354718157570641.gif Created
cigon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16236829941159783508.gif Created
cigar2on (0) https://idb2.affectedarc07.co.uk/images/36878822/318/9747429226684481383.png Created
cigarbutt (0) https://idb2.affectedarc07.co.uk/images/36878822/318/14918618186726559319.png Created
vapeopen_high (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8915540420183111817.png Created
vapeInput (0) https://idb2.affectedarc07.co.uk/images/36878822/318/689974194525500636.png Created
cobpipeoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/7962264680817739095.png Created
vapeopen_med (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16412993463923525822.png Created
pipeon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/12758063260584296656.gif Created
cigar2off (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4470367573708177916.png Created
vapeopen_low (0) https://idb2.affectedarc07.co.uk/images/36878822/318/7048833935504392061.png Created
cigbutt (0) https://idb2.affectedarc07.co.uk/images/36878822/318/5938169572700622474.png Created
spliffoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/15328455511481999536.png Created
roach (0) https://idb2.affectedarc07.co.uk/images/36878822/318/1767812337886123777.png Created
cobpipeon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8387101101143871321.gif Created
cigoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13102824008610691538.png Created
spliffon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/3684028289200826046.gif Created
pipeoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13174034932963872596.png Created
vapeOutlet (0) https://idb2.affectedarc07.co.uk/images/36878822/318/11973737123812056342.png Created
cigaroff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/11568126703243164697.png Created
candybum (0) https://idb2.affectedarc07.co.uk/images/36878822/318/738303787443269852.png Created
cigaron (0) https://idb2.affectedarc07.co.uk/images/36878822/318/6348618728390589107.png Created
MODIFIED - icons/mob/clothing/belt.dmi (0)
State Name (duplicate) Old Icon New Icon Status
hauntedblade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13341274059827796894.png Created
MODIFIED - icons/obj/clothing/neck.dmi (0)
State Name (duplicate) Old Icon New Icon Status
crimson_focus (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16361732813810020066.gif Created
MODIFIED - icons/obj/antags/cult/structures.dmi (0)
State Name (duplicate) Old Icon New Icon Status
summoning_orb (0) https://idb2.affectedarc07.co.uk/images/36878822/318/15762635745962454775.gif Deleted
MODIFIED - icons/mob/inhands/items_righthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
candyoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/867219226850501650.png Created
cigon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8573159854774085424.gif Created
cigoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/17784153448491425981.png Created
cigaron (0) https://idb2.affectedarc07.co.uk/images/36878822/318/10908394063416361512.gif Created
cigaroff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/7664141853096583124.png Created
MODIFIED - icons/mob/nonhuman-player/cult.dmi (0)
State Name (duplicate) Old Icon New Icon Status
glow_harvester_heretic_og (0) https://idb2.affectedarc07.co.uk/images/36878822/318/17860012371952547323.png Created
glow_harvester_heretic (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8480470464818411082.png Created
MODIFIED - icons/mob/inhands/64x64_righthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
cursed_blade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4561312606016806975.gif Created
hauntedblade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/11346710853009153890.gif Created
MODIFIED - icons/effects/effects.dmi (0)
State Name (duplicate) Old Icon New Icon Status
shield-greyscale (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13407199111486085054.gif Created
mech_toxin https://idb2.affectedarc07.co.uk/images/36878822/318/17751015269556761561.gif https://idb2.affectedarc07.co.uk/images/36878822/318/14499735812684772468.gif Modified
MODIFIED - icons/mob/actions/actions_ecult.dmi (0)
State Name (duplicate) Old Icon New Icon Status
cursed_steel (0) https://idb2.affectedarc07.co.uk/images/36878822/318/15238826127580307108.gif Created
furious_steel https://idb2.affectedarc07.co.uk/images/36878822/318/16354051301524787622.gif https://idb2.affectedarc07.co.uk/images/36878822/318/15741818908860338422.gif Modified
MODIFIED - icons/mob/inhands/64x64_lefthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
hauntedblade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/6095597057865040716.gif Created
cursed_blade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/3583016612826200126.gif Created
MODIFIED - icons/obj/clothing/masks.dmi (0)
State Name (duplicate) Old Icon New Icon Status
spliffoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13889673069635548519.png Deleted
vapeOutlet (0) https://idb2.affectedarc07.co.uk/images/36878822/318/11943574020771727203.png Deleted
cigon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/10825126769656199757.gif Deleted
spliffon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8039560852830959920.gif Deleted
roach (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13639923956469972496.png Deleted
candyoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8502678171245583021.png Deleted
pipeoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/3494529036130896584.png Deleted
cigoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/242342349334526738.png Deleted
cigbutt (0) https://idb2.affectedarc07.co.uk/images/36878822/318/8251183683905993117.png Deleted
vapeInput (0) https://idb2.affectedarc07.co.uk/images/36878822/318/9351950173191090171.png Deleted
cigaroff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4485429629351910184.png Deleted
cigar2off (0) https://idb2.affectedarc07.co.uk/images/36878822/318/2117100772752249391.png Deleted
candybum (0) https://idb2.affectedarc07.co.uk/images/36878822/318/10764986402663262693.png Deleted
cobpipeoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4913314067910886044.png Deleted
cigar2on (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4527320691012460681.png Deleted
vapeopen_high (0) https://idb2.affectedarc07.co.uk/images/36878822/318/14940256781843789370.png Deleted
glass_pipe (0) https://idb2.affectedarc07.co.uk/images/36878822/318/16224988900780339931.gif Deleted
candyon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/13086211475825867658.gif Deleted
vapeopen_low (0) https://idb2.affectedarc07.co.uk/images/36878822/318/3065668356915525841.png Deleted
cigarbutt (0) https://idb2.affectedarc07.co.uk/images/36878822/318/587233897862889722.png Deleted
cigaron (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4114441751519282681.png Deleted
vapeopen_med (0) https://idb2.affectedarc07.co.uk/images/36878822/318/7816645678516798962.png Deleted
MODIFIED - icons/obj/weapons/khopesh.dmi (0)
State Name (duplicate) Old Icon New Icon Status
cursed_blade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/7482511251714896948.png Created
MODIFIED - icons/obj/weapons/sword.dmi (0)
State Name (duplicate) Old Icon New Icon Status
hauntedblade (0) https://idb2.affectedarc07.co.uk/images/36878822/318/9186442782227730808.gif Created
MODIFIED - icons/obj/antags/cult/items.dmi (0)
State Name (duplicate) Old Icon New Icon Status
summoning_orb (0) https://idb2.affectedarc07.co.uk/images/36878822/318/17340490122964916984.gif Created
MODIFIED - icons/mob/inhands/items_lefthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
cigon (0) https://idb2.affectedarc07.co.uk/images/36878822/318/178765406656778290.gif Created
cigaron (0) https://idb2.affectedarc07.co.uk/images/36878822/318/3827245163657662652.gif Created
candyoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/4725390861365136357.png Created
cigaroff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/7257822610742482235.png Created
cigoff (0) https://idb2.affectedarc07.co.uk/images/36878822/318/11934139438286134985.png Created
View more details on IconDiffBot-2