Skip to content

Commit c9c0469

Browse files
committedApr 19, 2017
Changes tape coloring + slight rework
1 parent 8d2f8c2 commit c9c0469

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed
 

‎code/__defines/misc.dm

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
#define COLOR_PALE_RED_GRAY "#CC9090"
7070
#define COLOR_PALE_PURPLE_GRAY "#BDA2BA"
7171
#define COLOR_PURPLE_GRAY "#A2819E"
72+
#define COLOR_RED_LIGHT "#FF3333"
73+
#define COLOR_DEEP_SKY_BLUE "#00e1ff"
74+
75+
76+
7277

7378
// Shuttles.
7479

‎code/game/objects/items/weapons/policetape.dm

+15-14
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/obj/item/taperoll
33
name = "tape roll"
44
icon = 'icons/policetape.dmi'
5-
icon_state = "rollstart"
5+
icon_state = "tape"
66
w_class = ITEMSIZE_SMALL
77
var/turf/start
88
var/turf/end
99
var/tape_type = /obj/item/tape
10-
var/icon_base
10+
var/icon_base = "tape"
1111

1212
var/apply_tape = FALSE
1313

@@ -33,7 +33,7 @@ var/list/tape_roll_applications = list()
3333
var/lifted = 0
3434
var/crumpled = 0
3535
var/tape_dir = 0
36-
var/icon_base
36+
var/icon_base = "tape"
3737

3838
/obj/item/tape/update_icon()
3939
//Possible directional bitflags: 0 (AIRLOCK), 1 (NORTH), 2 (SOUTH), 4 (EAST), 8 (WEST), 3 (VERTICAL), 12 (HORIZONTAL)
@@ -60,22 +60,20 @@ var/list/tape_roll_applications = list()
6060
/obj/item/taperoll/police
6161
name = "police tape"
6262
desc = "A roll of police tape used to block off crime scenes from the public."
63-
icon_state = "police"
6463
tape_type = /obj/item/tape/police
65-
icon_base = "police"
64+
color = COLOR_RED_LIGHT
6665

6766
/obj/item/tape/police
6867
name = "police tape"
6968
desc = "A length of police tape. Do not cross."
7069
req_access = list(access_security)
71-
icon_base = "police"
70+
color = COLOR_RED_LIGHT
7271

7372
/obj/item/taperoll/engineering
7473
name = "engineering tape"
7574
desc = "A roll of engineering tape used to block off working areas from the public."
76-
icon_state = "engineering"
7775
tape_type = /obj/item/tape/engineering
78-
icon_base = "engineering"
76+
color = COLOR_YELLOW
7977

8078
/obj/item/taperoll/engineering/applied
8179
apply_tape = TRUE
@@ -84,28 +82,31 @@ var/list/tape_roll_applications = list()
8482
name = "engineering tape"
8583
desc = "A length of engineering tape. Better not cross it."
8684
req_one_access = list(access_engine,access_atmospherics)
87-
icon_base = "engineering"
85+
color = COLOR_YELLOW
8886

8987
/obj/item/taperoll/atmos
9088
name = "atmospherics tape"
9189
desc = "A roll of atmospherics tape used to block off working areas from the public."
92-
icon_state = "atmos"
9390
tape_type = /obj/item/tape/atmos
94-
icon_base = "atmos"
91+
color = COLOR_DEEP_SKY_BLUE
9592

9693
/obj/item/tape/atmos
9794
name = "atmospherics tape"
9895
desc = "A length of atmospherics tape. Better not cross it."
9996
req_one_access = list(access_engine,access_atmospherics)
100-
icon_base = "atmos"
97+
color = COLOR_DEEP_SKY_BLUE
10198

10299
/obj/item/taperoll/update_icon()
103100
overlays.Cut()
101+
var/image/overlay = image(icon = src.icon)
102+
overlay.appearance_flags = RESET_COLOR
104103
if(ismob(loc))
105104
if(!start)
106-
overlays += "start"
105+
overlay.icon_state = "start"
107106
else
108-
overlays += "stop"
107+
overlay.icon_state = "stop"
108+
overlays += overlay
109+
109110

110111
/obj/item/taperoll/dropped(mob/user)
111112
update_icon()

‎icons/policetape.dmi

1.54 KB
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.