Revert "12/21 modernizations from TG live"

This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
+7 -9
View File
@@ -9,10 +9,9 @@
icon_state = "paint_neutral"
item_color = "FFFFFF"
item_state = "paintcan"
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FLAMMABLE
obj_integrity = 100
max_integrity = 100
w_class = 3
burn_state = FLAMMABLE
burntime = 5
var/paintleft = 10
/obj/item/weapon/paint/red
@@ -58,7 +57,7 @@
/obj/item/weapon/paint/anycolor/attack_self(mob/user)
var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "violet", "black", "white")
if ((user.get_active_held_item() != src || user.stat || user.restrained()))
if ((user.get_active_hand() != src || user.stat || user.restrained()))
return
switch(t1)
if("red")
@@ -84,10 +83,9 @@
if(paintleft <= 0)
icon_state = "paint_empty"
return
if(!istype(target) || isspaceturf(target))
if(!istype(target) || istype(target, /turf/open/space))
return
var/newcolor = "#" + item_color
target.add_atom_colour(newcolor, WASHABLE_COLOUR_PRIORITY)
target.color = "#" + item_color
/obj/item/weapon/paint/paint_remover
gender = PLURAL
@@ -98,4 +96,4 @@
if(!proximity)
return
if(istype(target) && target.color != initial(target.color))
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
target.color = initial(target.color)