mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Make more turfs blend
This commit is contained in:
@@ -116,6 +116,15 @@
|
||||
wall_connections = dirs_to_corner_states(dirs)
|
||||
|
||||
/turf/simulated/wall/proc/can_join_with(var/turf/simulated/wall/W)
|
||||
if(material && W.material && material.icon_base == W.material.icon_base)
|
||||
//VOREStation Edit Start
|
||||
//No blending if no material
|
||||
if(!material || !W.material)
|
||||
return 0
|
||||
//We can blend if either is the same, or a subtype, of the other one
|
||||
if(istype(W.material, material.type) || istype(material, W.material.type))
|
||||
return 1
|
||||
//Also blend if they have the same iconbase
|
||||
if(material.icon_base == W.material.icon_base)
|
||||
return 1
|
||||
//VOREStation Edit End
|
||||
return 0
|
||||
|
||||
@@ -1151,9 +1151,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/talon/deckone/starboard_solar)
|
||||
"cq" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/talon/deckone/port_solar)
|
||||
"cr" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "16-0"
|
||||
@@ -5373,7 +5370,7 @@
|
||||
id = "very_fake";
|
||||
name = "Shuttle Bay Doors"
|
||||
},
|
||||
/turf/simulated/wall/rshull,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/talon/deckone/central_hallway)
|
||||
"kj" = (
|
||||
/obj/machinery/atmospherics/unary/engine{
|
||||
@@ -14322,7 +14319,7 @@ aL
|
||||
fD
|
||||
su
|
||||
kZ
|
||||
aM
|
||||
aC
|
||||
aL
|
||||
aL
|
||||
aL
|
||||
@@ -14591,9 +14588,9 @@ aC
|
||||
aL
|
||||
aL
|
||||
cl
|
||||
cq
|
||||
cq
|
||||
cq
|
||||
cl
|
||||
cl
|
||||
cl
|
||||
cl
|
||||
bS
|
||||
dH
|
||||
@@ -18026,8 +18023,8 @@ ij
|
||||
iF
|
||||
iF
|
||||
jf
|
||||
iF
|
||||
iF
|
||||
jY
|
||||
jY
|
||||
gT
|
||||
gT
|
||||
jY
|
||||
@@ -18298,7 +18295,7 @@ aP
|
||||
fS
|
||||
sk
|
||||
la
|
||||
aO
|
||||
aK
|
||||
aP
|
||||
aP
|
||||
aP
|
||||
|
||||
Reference in New Issue
Block a user