diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 68009eec60..2d5b9394d0 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -114,6 +114,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ hologram.anchored = 1//So space wind cannot drag it. hologram.name = "[A.name] (Hologram)"//If someone decides to right click. hologram.SetLuminosity(2) //hologram lighting + hologram.color = color //painted holopad gives coloured holograms SetLuminosity(2) //pad lighting icon_state = "holopad1" A.holo = src diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 694b7ff6a8..2cbc12d324 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1592,13 +1592,13 @@ datum reaction_obj(var/obj/O, var/volume) ..() - if(istype(O,/obj) && !istype(O,/obj/item/weapon/reagent_containers)) - //painting glasses would just be a headache + if(istype(O,/obj)) O.color = color reaction_mob(var/mob/M, var/method=TOUCH, var/volume) ..() - if(istype(M,/mob)) + if(istype(M,/mob) && !istype(M,/mob/dead)) + //painting ghosts: not allowed M.color = color