From 4c0548b534f8a33c05312ee04fe8ef6780c68e5b Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Thu, 10 Dec 2015 20:46:22 +0100 Subject: [PATCH] Adds directional client support for police tapes --- code/game/objects/items/weapons/policetape.dm | 21 ++++++++++++++---- icons/policetape.dmi | Bin 3566 -> 4486 bytes 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index cdb87b4d84f..9d820f68925 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -21,6 +21,19 @@ var/list/tape_roll_applications = list() var/tape_dir = 0 var/icon_base +/obj/item/tape/update_icon() + //Possible directional bitflags: 0 (AIRLOCK), 1 (NORTH), 2 (SOUTH), 4 (EAST), 8 (WEST), 3 (VERTICAL), 12 (HORIZONTAL) + switch (tape_dir) + if(0) // AIRLOCK + icon_state = "[icon_base]_door_[crumpled]" + if(3) // VERTICAL + icon_state = "[icon_base]_v_[crumpled]" + if(12) // HORIZONTAL + icon_state = "[icon_base]_h_[crumpled]" + else // END POINT (1|2|4|8) + icon_state = "[icon_base]_dir_[crumpled]" + dir = tape_dir + /obj/item/tape/New() ..() if(!hazard_overlays) @@ -120,13 +133,13 @@ var/list/tape_roll_applications = list() for(var/dir in list(NORTH, SOUTH)) if (possible_dirs & dir) TP.tape_dir += dir - TP.icon_state = "[TP.icon_base]_[TP.tape_dir]" + TP.update_icon() if(possible_dirs & (EAST|WEST)) var/obj/item/tape/TP = new tape_type(start) for(var/dir in list(EAST, WEST)) if (possible_dirs & dir) TP.tape_dir += dir - TP.icon_state = "[TP.icon_base]_[TP.tape_dir]" + TP.update_icon() start = null update_icon() usr << "You finish placing \the [src]." @@ -185,8 +198,8 @@ var/list/tape_roll_applications = list() break if(!tapetest) var/obj/item/tape/T = new tape_type(cur) - T.icon_state = "[T.icon_base]_[tape_dir]" T.tape_dir = tape_dir + T.update_icon() if(tape_dir & SOUTH) T.layer += 0.1 // Must always show above other tapes if(cur == end) @@ -229,7 +242,7 @@ var/list/tape_roll_applications = list() /obj/item/tape/proc/crumple() if(!crumpled) crumpled = 1 - icon_state = "[icon_state]_c" + update_icon() name = "crumpled [name]" /obj/item/tape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/icons/policetape.dmi b/icons/policetape.dmi index c28822a7ca088982337d3960f78189c1332ab87f..03efe3aef22c20773d7cd2464f26c05de1f1176c 100644 GIT binary patch delta 4438 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