From a827b826f1927533f0fadb6aa1ee08e80cb28c35 Mon Sep 17 00:00:00 2001 From: Haha26315 Date: Sat, 10 Sep 2022 04:53:07 -0400 Subject: [PATCH 1/2] Handrail corner fix Fixes handrail corners appearing, edits handrail sprites to allow for internal railings to be made and look nice, ensures both sets of railings rely on the same update_icon code. --- .../code/game/objects/structures/railings.dm | 37 ++++++------------ hyperstation/icons/obj/railings.dmi | Bin 7008 -> 6885 bytes 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/hyperstation/code/game/objects/structures/railings.dm b/hyperstation/code/game/objects/structures/railings.dm index 6c2ce1a81..b995980fc 100644 --- a/hyperstation/code/game/objects/structures/railings.dm +++ b/hyperstation/code/game/objects/structures/railings.dm @@ -155,6 +155,18 @@ NeighborsCheck(UpdateNeighgors) overlays.Cut() + + //Ensure layering is appropriate to direction. + switch (src.dir) + if (NORTH) + layer = BELOW_MOB_LAYER + if (SOUTH) + layer = ABOVE_MOB_LAYER + if (EAST) + layer = BELOW_MOB_LAYER + if (WEST) + layer = BELOW_MOB_LAYER + if (!check || !anchored)//|| !anchored icon_state = "[icon_modifier]railing0" else @@ -263,7 +275,7 @@ . = ..() if(.) return - if(!shock(user, 70)) + if(shock(user, 70)) user.visible_message("[user] gets shocked by [src]!", null, null, COMBAT_MESSAGE_RANGE) /obj/structure/railing/attack_alien(mob/living/user) @@ -359,26 +371,3 @@ /obj/structure/railing/handrail/unachored anchored = FALSE -/obj/structure/railing/handrail/update_icon(var/UpdateNeighbors = 1) - overlays.Cut() - if (!check || !anchored)//|| !anchored - icon_state = "[icon_modifier]railing0" - else - icon_state = "[icon_modifier]railing1" - if (check & 32) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]corneroverlay") - if ((check & 16) || !(check & 32) || (check & 64)) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]frontoverlay_l") - if (!(check & 2) || (check & 1) || (check & 4)) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]frontoverlay_r") - if(check & 4) - switch (src.dir) - if (NORTH) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = 32) - if (SOUTH) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_x = -32) - layer = ABOVE_MOB_LAYER - if (EAST) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = -32) - if (WEST) - overlays += image ('hyperstation/icons/obj/railings.dmi', src, "[icon_modifier]mcorneroverlay", pixel_y = 32) \ No newline at end of file diff --git a/hyperstation/icons/obj/railings.dmi b/hyperstation/icons/obj/railings.dmi index 1604e6bdd8d099610c01783e704d8364ce19841f..a2bb08fcd8652af0c07942e0a371e72846943243 100644 GIT binary patch literal 6885 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 Ah5!Hn literal 7008 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 From 08f448728b62436f6f0933506c7a86676fa22a61 Mon Sep 17 00:00:00 2001 From: Haha26315 Date: Sat, 10 Sep 2022 04:58:39 -0400 Subject: [PATCH 2/2] Shock message update Makes sure the shock message appears every time a player is shocked successfully by a railing --- hyperstation/code/game/objects/structures/railings.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hyperstation/code/game/objects/structures/railings.dm b/hyperstation/code/game/objects/structures/railings.dm index b995980fc..c9c998180 100644 --- a/hyperstation/code/game/objects/structures/railings.dm +++ b/hyperstation/code/game/objects/structures/railings.dm @@ -275,8 +275,8 @@ . = ..() if(.) return - if(shock(user, 70)) - user.visible_message("[user] gets shocked by [src]!", null, null, COMBAT_MESSAGE_RANGE) + shock(user, 70) + /obj/structure/railing/attack_alien(mob/living/user) user.do_attack_animation(src) @@ -332,6 +332,7 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, src) s.start() + user.visible_message("[user] gets shocked by [src]!", null, null, COMBAT_MESSAGE_RANGE) return TRUE else return FALSE