From 9c2a7939dfce3bff640abd2a5d790b464e68fd09 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 22 Jul 2021 19:22:56 -0400 Subject: [PATCH] powder that makes you say yes --- code/game/turfs/simulated/wall_types.dm | 63 +++++++++++++++++++++---- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 1c9ac0c761..b4ee72a333 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -88,7 +88,10 @@ /turf/simulated/wall/durasteel/Initialize(mapload) . = ..(mapload, "durasteel", "durasteel") - +/turf/simulated/wall/durasteel/blueserg/New(var/newloc) + ..(newloc,"durasteel", "durasteel") +/turf/simulated/wall/durasteel/blueserg/attackby(obj/item/I, mob/user) + return /turf/simulated/wall/wood/Initialize(mapload) . = ..(mapload, MAT_WOOD) @@ -101,6 +104,19 @@ /turf/simulated/wall/log_sif/Initialize(mapload) . = ..(mapload, MAT_SIFLOG) +/turf/unsimulated/wall/ice + name = "Ice wall" + desc = "Frigid Ice that seems to be stronger then most manmade structures" + icon = 'icons/turf/snow_new.dmi' + icon_state = "Icerock" + +/turf/unsimulated/wall/bronze + name = "Bronze wall" + desc = "A huge chunk of warm metal. The clanging of machinery emanates from within." + icon = 'icons/obj/clockwork_objects.dmi' + icon_state = "clockwork_wall" + + // Shuttle Walls /turf/simulated/shuttle/wall name = "autojoin wall" @@ -243,6 +259,29 @@ icon_state = "void-hc" hard_corner = 1 +/turf/simulated/shuttle/wall/voidcraft/hard_corner/blue + name = "hardcorner wall" + icon_state = "void-hc" + hard_corner = 1 + stripe_color = "#0000FF" + +/turf/simulated/shuttle/wall/voidcraft/hard_corner/lightblue + name = "hardcorner wall" + icon_state = "void-hc" + hard_corner = 1 + stripe_color = "#33ccff" + +/turf/simulated/shuttle/wall/voidcraft/hard_corner/green + name = "hardcorner wall" + icon_state = "void-hc" + hard_corner = 1 + stripe_color = "#00FF00" + +/turf/simulated/shuttle/wall/voidcraft/hard_corner/red + name = "hardcorner wall" + icon_state = "void-hc" + stripe_color = "#FF0000" + hard_corner = 1 /turf/simulated/shuttle/wall/voidcraft/no_join name = "nojoin wall" icon_state = "void-nj" @@ -254,6 +293,12 @@ /turf/simulated/shuttle/wall/voidcraft/blue stripe_color = "#0000FF" +/turf/simulated/shuttle/wall/voidcraft/lightblue + stripe_color = "#33ccff" + +/turf/simulated/shuttle/wall/voidcraft/orange + stripe_color = "#cc3300" + /turf/simulated/shuttle/wall/voidcraft/green stripe_color = "#00FF00" @@ -291,20 +336,18 @@ return list(dir, turn(dir,90)) /obj/structure/hull_corner/proc/update_look() - cut_overlays() - var/turf/simulated/wall/T for(var/direction in get_dirs_to_test()) T = get_step(src, direction) if(!istype(T)) continue - + name = T.name desc = T.desc - + var/datum/material/B = T.material var/datum/material/R = T.reinf_material - + if(B?.icon_colour) color = B.icon_colour if(R?.icon_colour) @@ -362,7 +405,7 @@ if(decided_to_blend) dirs += direction break blend_obj_loop // breaks outer loop - + /turf/simulated/wall/eris/r_wall icon_state = "rgeneric" /turf/simulated/wall/eris/r_wall/Initialize(mapload) @@ -375,7 +418,7 @@ wall_masks = 'icons/turf/wall_masks_bay.dmi' var/list/blend_objects = list(/obj/machinery/door) var/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) - + var/stripe_color // Adds a colored stripe to the walls /turf/simulated/wall/bay/can_join_with_low_wall(var/obj/structure/low_wall/WF) @@ -389,7 +432,7 @@ I = image(wall_masks, "stripe[wall_connections[i]]", dir = 1<<(i-1)) I.color = stripe_color add_overlay(I) - + /turf/simulated/wall/bay/special_wall_connections(list/dirs, list/inrange) ..() for(var/direction in cardinal) @@ -414,4 +457,4 @@ /turf/simulated/wall/bay/r_wall icon_state = "rgeneric" /turf/simulated/wall/bay/r_wall/Initialize(mapload) - . = ..(mapload, "plasteel","plasteel") \ No newline at end of file + . = ..(mapload, "plasteel","plasteel")