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 10.05.2024 #258

Merged
merged 108 commits into from
May 11, 2024
+2,779 −1,112

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

c360cea
Select commit
Loading
Failed to load commit list.
Merged

Merge upstream 10.05.2024 #258

Merge remote-tracking branch 'off/master' into merge-upstream
c360cea
Select commit
Loading
Failed to load commit list.
IconDiffBot-2 / IconDiffBot2 succeeded May 11, 2024 in 20s

Icon difference rendering

Please file any issues here.

Icons with diff:

Details

ADDED - icons/turf/floors/grass_damaged.dmi (0)
State Name (duplicate) Old Icon New Icon Status
grass_damaged-0 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/4034313234650669140.png Created
grass_damaged-1 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12401135151850208974.png Created
grass_damaged-2 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/11216767487033766533.png Created
grass_damaged-3 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/13869163649467184099.png Created
grass_damaged-4 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/7588764698087641375.png Created
grass_damaged-5 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/5046977577265779433.png Created
grass_damaged-6 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/5426676843242629428.png Created
grass_damaged-7 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/14032632118881696962.png Created
grass_damaged-8 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/4362421228305618854.png Created
grass_damaged-9 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/6664548148352292792.png Created
grass_damaged-10 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/13704784378756494805.png Created
grass_damaged-11 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/11348913888422671451.png Created
grass_damaged-12 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/7487416935797522183.png Created
grass_damaged-13 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/11072843941085775313.png Created
grass_damaged-14 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/7533948838993396902.png Created
grass_damaged-15 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12166172245778485252.png Created
grass_damaged-21 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/5701226911507557156.png Created
grass_damaged-23 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/2169528399081589558.png Created
grass_damaged-29 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/1613654362828695095.png Created
grass_damaged-31 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/2390018875552239875.png Created
grass_damaged-38 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/758970549523728274.png Created
grass_damaged-39 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/4876546913561751437.png Created
grass_damaged-46 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/6898063302238219084.png Created
grass_damaged-47 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/14702890543785418891.png Created
grass_damaged-55 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/4140130370676148459.png Created
grass_damaged-63 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/9388849846914807353.png Created
grass_damaged-74 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12318342721022376167.png Created
grass_damaged-75 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/2968996390420226060.png Created
grass_damaged-78 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/7685352682747527223.png Created
grass_damaged-79 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/17447981202005273414.png Created
grass_damaged-95 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/1278487752384299294.png Created
grass_damaged-110 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/7068084446627648103.png Created
grass_damaged-111 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/2387976787296515067.png Created
grass_damaged-127 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/17370714679426614280.png Created
grass_damaged-137 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/403943456108159088.png Created
grass_damaged-139 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12358010770817755148.png Created
grass_damaged-141 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/4948394439629704539.png Created
grass_damaged-143 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12600970476908482911.png Created
grass_damaged-157 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/11260502505122627038.png Created
grass_damaged-159 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/13379965832582638356.png Created
grass_damaged-175 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/16982239814915460991.png Created
grass_damaged-191 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/16507511273841208964.png Created
grass_damaged-203 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/17252774461240562342.png Created
grass_damaged-207 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12430595653913590200.png Created
grass_damaged-223 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/16681690452278347281.png Created
grass_damaged-239 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/13333626326258937638.png Created
grass_damaged-255 (0) https://idb2.affectedarc07.co.uk/images/36878822/258/17701097459903422838.png Created
MODIFIED - icons/mob/inhands/weapons/guns_lefthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12981971277191914284.png Created
regal_pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/3143197404842396496.png Created
pipepistol (0) https://idb2.affectedarc07.co.uk/images/36878822/258/406944539495562585.png Created
regal_pipepistol (0) https://idb2.affectedarc07.co.uk/images/36878822/258/3050799581978283072.png Created
MODIFIED - icons/mob/inhands/weapons/guns_righthand.dmi (0)
State Name (duplicate) Old Icon New Icon Status
regal_pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12661865064722401048.png Created
regal_pipepistol (0) https://idb2.affectedarc07.co.uk/images/36878822/258/9508582468754420193.png Created
pipepistol (0) https://idb2.affectedarc07.co.uk/images/36878822/258/18077479335342274620.png Created
pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/15366259515057528137.png Created
MODIFIED - icons/obj/railings.dmi (0)
State Name (duplicate) Old Icon New Icon Status
railing https://idb2.affectedarc07.co.uk/images/36878822/258/2461680376748008968.png https://idb2.affectedarc07.co.uk/images/36878822/258/17198603237244232579.png Modified
MODIFIED - icons/obj/weapons/guns/wide_guns.dmi (0)
State Name (duplicate) Old Icon New Icon Status
pipegun_bolt_locked (0) https://idb2.affectedarc07.co.uk/images/36878822/258/8317450579307896878.png Created
pipepistol (0) https://idb2.affectedarc07.co.uk/images/36878822/258/5767077831517431107.png Created
regal_pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/17983234331811662329.png Created
regal_pipepistol_bolt_locked (0) https://idb2.affectedarc07.co.uk/images/36878822/258/16364291234876904111.png Created
pipepistol_bolt_locked (0) https://idb2.affectedarc07.co.uk/images/36878822/258/12952175994713495631.png Created
regal_pipepistol_bolt (0) https://idb2.affectedarc07.co.uk/images/36878822/258/11075551841710477095.png Created
pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/5577996564738739084.png Created
pipegun_bolt (0) https://idb2.affectedarc07.co.uk/images/36878822/258/9588647167819993178.png Created
pipepistol_bolt (0) https://idb2.affectedarc07.co.uk/images/36878822/258/3285306115824086370.png Created
regal_pipegun_bolt (0) https://idb2.affectedarc07.co.uk/images/36878822/258/7605669172406676954.png Created
regal_pipegun_bolt_locked (0) https://idb2.affectedarc07.co.uk/images/36878822/258/303054489839666540.png Created
regal_pipepistol (0) https://idb2.affectedarc07.co.uk/images/36878822/258/11515592001798442376.png Created
MODIFIED - icons/mob/clothing/belt_mirror.dmi (0)
State Name (duplicate) Old Icon New Icon Status
regal_pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/2004378329577560227.png Created
pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/5664755858784791628.png Created
MODIFIED - icons/mob/clothing/back.dmi (0)
State Name (duplicate) Old Icon New Icon Status
pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/4604036666662935549.png Created
regal_pipegun (0) https://idb2.affectedarc07.co.uk/images/36878822/258/8147373367762076940.png Created
MODIFIED - icons/effects/random_spawners.dmi (0)
State Name (duplicate) Old Icon New Icon Status
junkround (0) https://idb2.affectedarc07.co.uk/images/36878822/258/10745933891209171947.png Created
View more details on IconDiffBot-2