From f510ad68b1d6bfb616560db0c2eff40a809bc008 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 17 May 2020 15:49:21 -0400 Subject: [PATCH] Add grey railing --- code/game/objects/structures/railing.dm | 27 +++++++++++++++--------- icons/obj/railing.dmi | Bin 815 -> 3976 bytes 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index 17b457b49e..ae21c406c3 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -1,7 +1,7 @@ // Based on railing.dmi from https://github.com/Endless-Horizon/CEV-Eris /obj/structure/railing name = "railing" - desc = "A standard steel railing. Play stupid games, win stupid prizes." + desc = "A standard steel railing, painted orange. Play stupid games, win stupid prizes." icon = 'icons/obj/railing.dmi' density = 1 throwpass = 1 @@ -14,6 +14,13 @@ var/health = 70 var/maxhealth = 70 var/check = 0 + var/icon_modifier = "" + +/obj/structure/railing/grey + name = "grey railing" + desc = "A standard steel railing. Prevents stupid people from falling to their doom." + icon_modifier = "grey_" + icon_state = "grey_railing0" /obj/structure/railing/New(loc, constructed = 0) ..() @@ -103,25 +110,25 @@ //layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do overlays.Cut() if (!check || !anchored)//|| !anchored - icon_state = "railing0" + icon_state = "[icon_modifier]railing0" else - icon_state = "railing1" + icon_state = "[icon_modifier]railing1" if (check & 32) - overlays += image ('icons/obj/railing.dmi', src, "corneroverlay") + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]corneroverlay") if ((check & 16) || !(check & 32) || (check & 64)) - overlays += image ('icons/obj/railing.dmi', src, "frontoverlay_l") + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]frontoverlay_l") if (!(check & 2) || (check & 1) || (check & 4)) - overlays += image ('icons/obj/railing.dmi', src, "frontoverlay_r") + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]frontoverlay_r") if(check & 4) switch (src.dir) if (NORTH) - overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_x = 32) + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = 32) if (SOUTH) - overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_x = -32) + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = -32) if (EAST) - overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_y = -32) + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = -32) if (WEST) - overlays += image ('icons/obj/railing.dmi', src, "mcorneroverlay", pixel_y = 32) + overlays += image ('icons/obj/railing.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = 32) /obj/structure/railing/verb/rotate_counterclockwise() set name = "Rotate Railing Counter-Clockwise" diff --git a/icons/obj/railing.dmi b/icons/obj/railing.dmi index c37c89c1597b73b9caf121e3f673905c415701df..3a1f07cdbf6054f97dc3c2822c72840eb446dc71 100644 GIT binary patch literal 3976 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