Merge branch 'master' into economy-update-junk

2026-07-12 08:12:23 +01:00 · 2022-07-06 16:28:45 -06:00
parent 7b9f638832 0584d6b79a
commit c7c6e2d193
196 changed files with 865 additions and 721 deletions
@@ -15,6 +15,10 @@
 	resistance_flags = FIRE_PROOF
 	var/obj/item/card/held_card
 	var/user = ""
+	light_power = 0
+	light_range = 7
+	light_color = COLOR_VIVID_RED
+
 	var/pin = 0

 /obj/machinery/atm/ui_interact(mob/user)
@@ -168,7 +168,7 @@
 	icon_state = null
 	item_state = null
 	w_class = WEIGHT_CLASS_NORMAL
-	light_color = "#FFCC66"
+	light_color = COLOR_CREAMY_ORANGE
 	icon_off = "pipe"
 	icon_on = "pipe_lit"