mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +00:00
Changes tape coloring + slight rework
This commit is contained in:
@@ -69,6 +69,11 @@
|
|||||||
#define COLOR_PALE_RED_GRAY "#CC9090"
|
#define COLOR_PALE_RED_GRAY "#CC9090"
|
||||||
#define COLOR_PALE_PURPLE_GRAY "#BDA2BA"
|
#define COLOR_PALE_PURPLE_GRAY "#BDA2BA"
|
||||||
#define COLOR_PURPLE_GRAY "#A2819E"
|
#define COLOR_PURPLE_GRAY "#A2819E"
|
||||||
|
#define COLOR_RED_LIGHT "#FF3333"
|
||||||
|
#define COLOR_DEEP_SKY_BLUE "#00e1ff"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Shuttles.
|
// Shuttles.
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
/obj/item/taperoll
|
/obj/item/taperoll
|
||||||
name = "tape roll"
|
name = "tape roll"
|
||||||
icon = 'icons/policetape.dmi'
|
icon = 'icons/policetape.dmi'
|
||||||
icon_state = "rollstart"
|
icon_state = "tape"
|
||||||
w_class = ITEMSIZE_SMALL
|
w_class = ITEMSIZE_SMALL
|
||||||
var/turf/start
|
var/turf/start
|
||||||
var/turf/end
|
var/turf/end
|
||||||
var/tape_type = /obj/item/tape
|
var/tape_type = /obj/item/tape
|
||||||
var/icon_base
|
var/icon_base = "tape"
|
||||||
|
|
||||||
var/apply_tape = FALSE
|
var/apply_tape = FALSE
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ var/list/tape_roll_applications = list()
|
|||||||
var/lifted = 0
|
var/lifted = 0
|
||||||
var/crumpled = 0
|
var/crumpled = 0
|
||||||
var/tape_dir = 0
|
var/tape_dir = 0
|
||||||
var/icon_base
|
var/icon_base = "tape"
|
||||||
|
|
||||||
/obj/item/tape/update_icon()
|
/obj/item/tape/update_icon()
|
||||||
//Possible directional bitflags: 0 (AIRLOCK), 1 (NORTH), 2 (SOUTH), 4 (EAST), 8 (WEST), 3 (VERTICAL), 12 (HORIZONTAL)
|
//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()
|
|||||||
/obj/item/taperoll/police
|
/obj/item/taperoll/police
|
||||||
name = "police tape"
|
name = "police tape"
|
||||||
desc = "A roll of police tape used to block off crime scenes from the public."
|
desc = "A roll of police tape used to block off crime scenes from the public."
|
||||||
icon_state = "police"
|
|
||||||
tape_type = /obj/item/tape/police
|
tape_type = /obj/item/tape/police
|
||||||
icon_base = "police"
|
color = COLOR_RED_LIGHT
|
||||||
|
|
||||||
/obj/item/tape/police
|
/obj/item/tape/police
|
||||||
name = "police tape"
|
name = "police tape"
|
||||||
desc = "A length of police tape. Do not cross."
|
desc = "A length of police tape. Do not cross."
|
||||||
req_access = list(access_security)
|
req_access = list(access_security)
|
||||||
icon_base = "police"
|
color = COLOR_RED_LIGHT
|
||||||
|
|
||||||
/obj/item/taperoll/engineering
|
/obj/item/taperoll/engineering
|
||||||
name = "engineering tape"
|
name = "engineering tape"
|
||||||
desc = "A roll of engineering tape used to block off working areas from the public."
|
desc = "A roll of engineering tape used to block off working areas from the public."
|
||||||
icon_state = "engineering"
|
|
||||||
tape_type = /obj/item/tape/engineering
|
tape_type = /obj/item/tape/engineering
|
||||||
icon_base = "engineering"
|
color = COLOR_YELLOW
|
||||||
|
|
||||||
/obj/item/taperoll/engineering/applied
|
/obj/item/taperoll/engineering/applied
|
||||||
apply_tape = TRUE
|
apply_tape = TRUE
|
||||||
@@ -84,28 +82,31 @@ var/list/tape_roll_applications = list()
|
|||||||
name = "engineering tape"
|
name = "engineering tape"
|
||||||
desc = "A length of engineering tape. Better not cross it."
|
desc = "A length of engineering tape. Better not cross it."
|
||||||
req_one_access = list(access_engine,access_atmospherics)
|
req_one_access = list(access_engine,access_atmospherics)
|
||||||
icon_base = "engineering"
|
color = COLOR_YELLOW
|
||||||
|
|
||||||
/obj/item/taperoll/atmos
|
/obj/item/taperoll/atmos
|
||||||
name = "atmospherics tape"
|
name = "atmospherics tape"
|
||||||
desc = "A roll of atmospherics tape used to block off working areas from the public."
|
desc = "A roll of atmospherics tape used to block off working areas from the public."
|
||||||
icon_state = "atmos"
|
|
||||||
tape_type = /obj/item/tape/atmos
|
tape_type = /obj/item/tape/atmos
|
||||||
icon_base = "atmos"
|
color = COLOR_DEEP_SKY_BLUE
|
||||||
|
|
||||||
/obj/item/tape/atmos
|
/obj/item/tape/atmos
|
||||||
name = "atmospherics tape"
|
name = "atmospherics tape"
|
||||||
desc = "A length of atmospherics tape. Better not cross it."
|
desc = "A length of atmospherics tape. Better not cross it."
|
||||||
req_one_access = list(access_engine,access_atmospherics)
|
req_one_access = list(access_engine,access_atmospherics)
|
||||||
icon_base = "atmos"
|
color = COLOR_DEEP_SKY_BLUE
|
||||||
|
|
||||||
/obj/item/taperoll/update_icon()
|
/obj/item/taperoll/update_icon()
|
||||||
overlays.Cut()
|
overlays.Cut()
|
||||||
|
var/image/overlay = image(icon = src.icon)
|
||||||
|
overlay.appearance_flags = RESET_COLOR
|
||||||
if(ismob(loc))
|
if(ismob(loc))
|
||||||
if(!start)
|
if(!start)
|
||||||
overlays += "start"
|
overlay.icon_state = "start"
|
||||||
else
|
else
|
||||||
overlays += "stop"
|
overlay.icon_state = "stop"
|
||||||
|
overlays += overlay
|
||||||
|
|
||||||
|
|
||||||
/obj/item/taperoll/dropped(mob/user)
|
/obj/item/taperoll/dropped(mob/user)
|
||||||
update_icon()
|
update_icon()
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 5.9 KiB |
Reference in New Issue
Block a user