Update colormate.dm

This commit is contained in:
silicons
2021-01-17 20:35:08 -07:00
committed by GitHub
parent 07b10f268b
commit 1aae6a2154
+20 -1
View File
@@ -6,10 +6,12 @@
density = TRUE
anchored = TRUE
circuit = /obj/item/circuitboard/machine/colormate
var/obj/item/inserted
var/atom/movable/inserted
var/activecolor = "#FFFFFF"
var/list/color_matrix_last
var/matrix_mode = FALSE
/// Allow holder'd mobs
var/mobs_allowed = TRUE
/// Minimum lightness for normal mode
var/minimum_normal_lightness = 50
/// Minimum lightness for matrix mode, tested using 4 test colors of full red, green, blue, white.
@@ -57,6 +59,15 @@
return
if(user.a_intent == INTENT_HARM)
return ..()
if(allow_mobs && istype(I, /obj/item/clothing/head/mob_holder))
var/obj/item/clothing/head/mob_holder/H = I
var/mob/victim = H.held_mob
if(!user.transferItemToLoc(I, src))
to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
return
if(!QDELETED(H))
H.release()
insert_mob(H, user)
if(is_type_in_list(I, allowed_types) && is_operational())
if(!user.transferItemToLoc(I, src))
@@ -69,6 +80,14 @@
else
return ..()
/obj/machinery/gear_painter/proc/insert_mob(mob/victim, mob/user)
if(inserted)
return
if(user)
visible_message("<span class='warning'>[user] stuffs [victim] into [src]!</span>")
inserted = victim
inserted.forceMove(src)
/obj/machinery/gear_painter/AllowDrop()
return FALSE