ci: pull tg maplint identical atom support, add and fix matching cables lint (#25051)

This commit is contained in:
warriorstar-orion
2024-04-13 18:24:58 +00:00
committed by GitHub
parent 41469cfa06
commit e36f09d01c
6 changed files with 27 additions and 70 deletions
@@ -1277,10 +1277,6 @@
icon_state = "0-2"
},
/obj/structure/cable,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Aft)
"eg" = (
@@ -1602,7 +1598,6 @@
outputting = 0
},
/obj/structure/cable,
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/ruin/unpowered/BMPship/Aft)
"fb" = (
@@ -1136,20 +1136,6 @@
/obj/item/storage/firstaid,
/turf/simulated/floor/plasteel,
/area/ruin/space/onehalf/abandonedbridge)
"df" = (
/obj/structure/lattice,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/template_noop,
/area/space/nearstation)
"dg" = (
/obj/structure/girder/reinforced,
/obj/item/stack/sheet/plasteel,
@@ -1190,26 +1176,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/onehalf/abandonedbridge)
"dm" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
/obj/machinery/door/poddoor/preopen{
id_tag = "onehalf bridge";
name = "bridge blast door"
},
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/onehalf/abandonedbridge)
"dn" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -1796,7 +1762,7 @@ Ab
cr
cW
ch
dm
dl
ac
aa
"}
@@ -1905,7 +1871,7 @@ ai
ai
ai
cZ
df
ai
ai
af
aa
+14 -23
View File
@@ -3010,20 +3010,6 @@
},
/turf/simulated/floor/plasteel/grimy,
/area/ruin/space/derelict/crew_quarters)
"hp" = (
/obj/machinery/power/solar,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
/area/ruin/space/derelict/solar_control)
"hq" = (
/obj/item/stack/ore/uranium,
/turf/template_noop,
@@ -7502,7 +7488,6 @@
"sp" = (
/obj/machinery/power/solar/fake,
/obj/structure/cable,
/obj/structure/cable,
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
@@ -7537,7 +7522,6 @@
/turf/template_noop,
/area/ruin/space/derelict/solar_control)
"st" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
/obj/structure/cable,
/turf/simulated/floor/plasteel/airless{
@@ -7575,6 +7559,13 @@
},
/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal,
/area/ruin/space/derelict/arrival)
"NK" = (
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/template_noop,
/area/template_noop)
"Oh" = (
/obj/effect/spawner/airlock/w_to_e{
req_access_txt = 0
@@ -14166,7 +14157,7 @@ ac
ac
ac
ac
ac
NK
ac
ac
ac
@@ -14356,18 +14347,18 @@ ac
ac
ac
ac
hp
hp
hp
hp
hp
hs
hs
hs
hs
hs
ac
jO
ac
jO
ag
hs
hp
hs
hs
hs
hs
-5
View File
@@ -788,11 +788,6 @@
},
/area/mine/laborcamp/security)
"cz" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -0,0 +1,4 @@
/obj/structure/cable:
banned_neighbors:
/obj/structure/cable:
identical: true
+7 -1
View File
@@ -66,7 +66,13 @@ class BannedNeighbor:
def matches(self, identified: Content, neighbor: Content):
if self.identical:
return neighbor == identified
if identified.path != neighbor.path:
return False
if identified.var_edits != neighbor.var_edits:
return False
return True
if self.typepath is not None:
if self.typepath.matches_path(neighbor.path):