mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Shuttle wall fixes (#31003)
* Shuttle diag wall fixes * Proper smoothing now * Removing an awful colon check that shouldn'tve been used in the first place * Trying this Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
@@ -30,8 +30,11 @@
|
|||||||
if(!A)
|
if(!A)
|
||||||
return 0
|
return 0
|
||||||
if(is_type_in_list(A, canSmoothWith()))
|
if(is_type_in_list(A, canSmoothWith()))
|
||||||
// COLON OPERATORS ARE TERRIBLE BUT I HAVE NO CHOICE
|
if(istype(A, /turf/simulated/wall))
|
||||||
if(src.mineral == A:mineral)
|
var/turf/simulated/wall/W = A
|
||||||
|
if(src.mineral == W.mineral)
|
||||||
|
return 1
|
||||||
|
else
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
@@ -85,9 +88,12 @@
|
|||||||
for(var/atom/A in T)
|
for(var/atom/A in T)
|
||||||
A.relativewall()
|
A.relativewall()
|
||||||
|
|
||||||
/turf/simulated/wall/New()
|
/turf/simulated/wall/New(loc)
|
||||||
..()
|
..(loc)
|
||||||
|
if(ticker && ticker.current_state >= GAME_STATE_PLAYING)
|
||||||
|
initialize()
|
||||||
|
|
||||||
|
/turf/simulated/wall/initialize()
|
||||||
// SMOOTH US WITH OUR NEIGHBORS
|
// SMOOTH US WITH OUR NEIGHBORS
|
||||||
relativewall()
|
relativewall()
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/turf/simulated/wall/shuttle
|
/turf/simulated/wall/shuttle
|
||||||
icon_state = "wall1"
|
icon_state = "swall0"
|
||||||
explosion_block = 2
|
explosion_block = 2
|
||||||
icon = 'icons/turf/shuttle.dmi'
|
icon = 'icons/turf/shuttle.dmi'
|
||||||
thermal_conductivity = 0.05
|
thermal_conductivity = 0.05
|
||||||
@@ -13,7 +13,6 @@
|
|||||||
/turf/simulated/wall/shuttle,
|
/turf/simulated/wall/shuttle,
|
||||||
/obj/machinery/door/unpowered/shuttle,
|
/obj/machinery/door/unpowered/shuttle,
|
||||||
/obj/structure/shuttle,
|
/obj/structure/shuttle,
|
||||||
/obj/structure/grille,
|
|
||||||
)
|
)
|
||||||
return smoothables
|
return smoothables
|
||||||
|
|
||||||
@@ -44,9 +43,12 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
/turf/simulated/wall/shuttle/black
|
/turf/simulated/wall/shuttle/black
|
||||||
icon_state = "wall3"
|
icon_state = "bswall0"
|
||||||
walltype = "bswall"
|
walltype = "bswall"
|
||||||
|
|
||||||
|
/turf/simulated/wall/shuttle/unsmoothed
|
||||||
|
icon_state = "wall1"
|
||||||
|
|
||||||
/turf/simulated/wall/shuttle/unsmoothed/relativewall()
|
/turf/simulated/wall/shuttle/unsmoothed/relativewall()
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -66,6 +68,11 @@
|
|||||||
layer = TURF_LAYER
|
layer = TURF_LAYER
|
||||||
anchored = 1
|
anchored = 1
|
||||||
|
|
||||||
|
/obj/structure/shuttle/diag_wall/Cross(atom/movable/mover, turf/target, height=1.5, air_group = 0)
|
||||||
|
if(air_group)
|
||||||
|
return 0
|
||||||
|
return !density
|
||||||
|
|
||||||
/obj/structure/shuttle/diag_wall/ex_act(severity)
|
/obj/structure/shuttle/diag_wall/ex_act(severity)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user