mirror of
https://github.com/quotefox/Hyper-Station-13.git
synced 2026-08-29 07:36:16 +01:00
Merge pull request #1629 from DragonTrance/more-colors
Ports tgstation's Color Standardization, adds Color Defines and Signals
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
var/obj/item/card/id/knight/W = H.wear_id
|
||||
W.assignment = "Knight"
|
||||
W.registered_name = H.real_name
|
||||
W.id_color = "#0000FF" //Regular knights get simple blue. Doesn't matter much because it's variable anyway
|
||||
W.id_color = COLOR_BLUE //Regular knights get simple blue. Doesn't matter much because it's variable anyway
|
||||
W.update_label(H.real_name)
|
||||
W.update_icon()
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/obj/item/ammo_casing/caseless/foam_dart/tag
|
||||
name = "lastag foam dart"
|
||||
desc = "Foam darts fitted with special lights. Compatible with existing laser tag systems. Ages 8 and up."
|
||||
color = "#FF00FF"
|
||||
color = COLOR_MAGENTA
|
||||
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/tag
|
||||
/obj/item/ammo_casing/caseless/foam_dart/tag/red
|
||||
name = "lastag red foam dart"
|
||||
color = "#FF0000"
|
||||
color = COLOR_RED
|
||||
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/tag/red
|
||||
/obj/item/ammo_casing/caseless/foam_dart/tag/blue
|
||||
name = "lastag blue foam dart"
|
||||
color = "#0000FF"
|
||||
color = COLOR_BLUE
|
||||
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/tag/blue
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon_state = "foambox"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag
|
||||
max_ammo = 40
|
||||
color = "#FF00FF"
|
||||
color = COLOR_MAGENTA
|
||||
|
||||
/obj/item/ammo_box/foambox/tag/red
|
||||
name = "ammo box (Lastag Red Foam Darts)"
|
||||
@@ -12,7 +12,7 @@
|
||||
icon_state = "foambox"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/red
|
||||
max_ammo = 40
|
||||
color = "#FF0000"
|
||||
color = COLOR_RED
|
||||
|
||||
/obj/item/ammo_box/foambox/tag/blue
|
||||
name = "ammo box (Lastag Blue Foam Darts)"
|
||||
@@ -20,4 +20,4 @@
|
||||
icon_state = "foambox"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/blue
|
||||
max_ammo = 40
|
||||
color = "#0000FF"
|
||||
color = COLOR_BLUE
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
light_range = 2
|
||||
speed = 0.6
|
||||
range = 25
|
||||
light_color = LIGHT_COLOR_RED
|
||||
light_color = COLOR_SOFT_RED
|
||||
|
||||
/obj/item/projectile/bullet/nlmags //non-lethal boolets
|
||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||
@@ -204,7 +204,7 @@
|
||||
light_range = 3
|
||||
speed = 0.6
|
||||
range = 35
|
||||
light_color = LIGHT_COLOR_RED
|
||||
light_color = COLOR_SOFT_RED
|
||||
|
||||
/obj/item/projectile/bullet/nlmagrifle //non-lethal boolets
|
||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||
@@ -358,7 +358,7 @@
|
||||
forcedodge = TRUE
|
||||
range = 6
|
||||
light_range = 1
|
||||
light_color = LIGHT_COLOR_RED
|
||||
light_color = COLOR_SOFT_RED
|
||||
|
||||
/obj/item/projectile/bullet/mags/hyper/inferno
|
||||
icon_state = "magjectile-large"
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
/obj/item/projectile/bullet/reusable/foam_dart/tag/red
|
||||
name = "lastag red foam dart"
|
||||
color = "#FF0000"
|
||||
color = COLOR_RED
|
||||
suit_types = list(/obj/item/clothing/suit/bluetag)
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/red
|
||||
/obj/item/projectile/bullet/reusable/foam_dart/tag/blue
|
||||
color = "#0000FF"
|
||||
color = COLOR_BLUE
|
||||
name = "lastag blue foam dart"
|
||||
suit_types = list(/obj/item/clothing/suit/redtag)
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/tag/blue
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
name = "Macrocillin"
|
||||
description = "Glowing yellow liquid."
|
||||
reagent_state = LIQUID
|
||||
color = "#FFFF00" // rgb: 255, 255, 0
|
||||
color = COLOR_YELLOW // rgb: 255, 255, 0
|
||||
overdose_threshold = 20
|
||||
|
||||
/datum/reagent/medicine/macrocillin/on_mob_life(mob/living/M, method=INGEST)
|
||||
@@ -24,7 +24,7 @@
|
||||
name = "Microcillin"
|
||||
description = "Murky purple liquid."
|
||||
reagent_state = LIQUID
|
||||
color = "#800080"
|
||||
color = COLOR_PURPLE
|
||||
overdose_threshold = 20
|
||||
|
||||
/datum/reagent/microcillin/on_mob_life(mob/living/M, method=INGEST)
|
||||
@@ -42,7 +42,7 @@
|
||||
name = "Normalcillin"
|
||||
description = "Translucent cyan liquid."
|
||||
reagent_state = LIQUID
|
||||
color = "#00FFFF"
|
||||
color = COLOR_CYAN
|
||||
overdose_threshold = 20
|
||||
|
||||
/datum/reagent/medicine/normalcillin/on_mob_life(mob/living/M, method=INGEST)
|
||||
|
||||
Reference in New Issue
Block a user