From 5a07bfd2b3d4e3500bc375659fcae836567f7b9c Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Thu, 27 May 2021 16:31:57 +0000 Subject: [PATCH 1/2] Improve hull corner color finding slightly --- code/game/turfs/simulated/wall_types.dm | 104 ++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 5a68478bb2..9bbf222bd0 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -308,5 +308,109 @@ I.color = stripe_color add_overlay(I) +<<<<<<< HEAD +||||||| parent of b128dfbd81... Merge pull request #10446 from VOREStation/Arokha/cornerdirs +// Fake corners for making hulls look pretty +/obj/structure/hull_corner + name = "hull corner" + + icon = 'icons/turf/wall_masks.dmi' + icon_state = "hull_corner" + + anchored = TRUE + density = TRUE + breakable = TRUE + +/obj/structure/hull_corner/Initialize() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/hull_corner/LateInitialize() + . = ..() + update_look() + +/obj/structure/hull_corner/proc/update_look() + cut_overlays() + + var/turf/simulated/wall/T = get_step(src, dir) + if(!istype(T)) + log_error("[src] at [x],[y] not placed facing a hull") + return + + 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) + var/image/I = image(icon, icon_state+"_reinf", dir=dir) + I.color = R.icon_colour + add_overlay(I) +======= +// Fake corners for making hulls look pretty +/obj/structure/hull_corner + name = "hull corner" + + icon = 'icons/turf/wall_masks.dmi' + icon_state = "hull_corner" + + anchored = TRUE + density = TRUE + breakable = TRUE + +/obj/structure/hull_corner/Initialize() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/hull_corner/LateInitialize() + . = ..() + update_look() + +/obj/structure/hull_corner/proc/get_dirs_to_test() + 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) + var/image/I = image(icon, icon_state+"_reinf", dir=dir) + I.color = R.icon_colour + add_overlay(I) + break + + if(!T) + warning("Hull corner at [x],[y] not placed adjacent to a hull it can find.") +>>>>>>> b128dfbd81... Merge pull request #10446 from VOREStation/Arokha/cornerdirs +<<<<<<< HEAD +||||||| parent of b128dfbd81... Merge pull request #10446 from VOREStation/Arokha/cornerdirs +/obj/structure/hull_corner/long_horiz + icon = 'icons/turf/wall_masks64x32.dmi' + bound_width = 64 +======= +/obj/structure/hull_corner/long_vert/get_dirs_to_test() + return list(dir, turn(dir,90), turn(dir,-90)) + +/obj/structure/hull_corner/long_horiz + icon = 'icons/turf/wall_masks64x32.dmi' + bound_width = 64 + +/obj/structure/hull_corner/long_horiz/get_dirs_to_test() + return list(dir, turn(dir,90), turn(dir,-90)) +>>>>>>> b128dfbd81... Merge pull request #10446 from VOREStation/Arokha/cornerdirs From ecfaa8f6f6281ec02e2b2034d539cf2ee3d09a5b Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 27 May 2021 21:02:41 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/game/turfs/simulated/wall_types.dm | 47 +++++++++++++++---------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 00131f6f64..1ae9fca6e3 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -326,34 +326,43 @@ . = ..() update_look() +/obj/structure/hull_corner/proc/get_dirs_to_test() + 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) + var/image/I = image(icon, icon_state+"_reinf", dir=dir) + I.color = R.icon_colour + add_overlay(I) + break - var/turf/simulated/wall/T = get_step(src, dir) - if(!istype(T)) - log_error("[src] at [x],[y] not placed facing a hull") - return - - 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) - var/image/I = image(icon, icon_state+"_reinf", dir=dir) - I.color = R.icon_colour - add_overlay(I) + if(!T) + warning("Hull corner at [x],[y] not placed adjacent to a hull it can find.") /obj/structure/hull_corner/long_vert icon = 'icons/turf/wall_masks32x64.dmi' bound_height = 64 +/obj/structure/hull_corner/long_vert/get_dirs_to_test() + return list(dir, turn(dir,90), turn(dir,-90)) + /obj/structure/hull_corner/long_horiz icon = 'icons/turf/wall_masks64x32.dmi' bound_width = 64 /obj/structure/hull_corner/long_horiz/get_dirs_to_test() - return list(dir, turn(dir,90), turn(dir,-90)) \ No newline at end of file + return list(dir, turn(dir,90), turn(dir,-90))