mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-05 06:21:57 +00:00
26b04ede42
About The Pull Request Completely removes item_color and the clusterfuck of bad programming it caused. In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed In places where item_color was used as a dye color, it was converted to the new dye_color var In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay. A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items. Moved some mob overlay files relating to clothing to their own directory as well for organization purposes. Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results. Some bonus functionality to come out of this: the washing machine now supports arbitrary dye colors. Why It's Good For The Game It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it. Changelog cl add: Washing machines now support arbitrary dye color add: Washing machines now dye nearly every item. refactor: lots of backend changes to clothing overlays, report any issues /cl
107 lines
2.5 KiB
Plaintext
107 lines
2.5 KiB
Plaintext
//NEVER USE THIS IT SUX -PETETHEGOAT
|
|
//IT SUCKS A BIT LESS -GIACOM
|
|
|
|
/obj/item/paint
|
|
gender= PLURAL
|
|
name = "paint"
|
|
desc = "Used to recolor floors and walls. Can be removed by the janitor."
|
|
icon = 'icons/obj/items_and_weapons.dmi'
|
|
icon_state = "paint_neutral"
|
|
var/paint_color = "FFFFFF"
|
|
item_state = "paintcan"
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
resistance_flags = FLAMMABLE
|
|
max_integrity = 100
|
|
var/paintleft = 10
|
|
|
|
/obj/item/paint/red
|
|
name = "red paint"
|
|
paint_color = "C73232" //"FF0000"
|
|
icon_state = "paint_red"
|
|
|
|
/obj/item/paint/green
|
|
name = "green paint"
|
|
paint_color = "2A9C3B" //"00FF00"
|
|
icon_state = "paint_green"
|
|
|
|
/obj/item/paint/blue
|
|
name = "blue paint"
|
|
paint_color = "5998FF" //"0000FF"
|
|
icon_state = "paint_blue"
|
|
|
|
/obj/item/paint/yellow
|
|
name = "yellow paint"
|
|
paint_color = "CFB52B" //"FFFF00"
|
|
icon_state = "paint_yellow"
|
|
|
|
/obj/item/paint/violet
|
|
name = "violet paint"
|
|
paint_color = "AE4CCD" //"FF00FF"
|
|
icon_state = "paint_violet"
|
|
|
|
/obj/item/paint/black
|
|
name = "black paint"
|
|
paint_color = "333333"
|
|
icon_state = "paint_black"
|
|
|
|
/obj/item/paint/white
|
|
name = "white paint"
|
|
paint_color = "FFFFFF"
|
|
icon_state = "paint_white"
|
|
|
|
|
|
/obj/item/paint/anycolor
|
|
gender = PLURAL
|
|
name = "adaptive paint"
|
|
icon_state = "paint_neutral"
|
|
|
|
/obj/item/paint/anycolor/attack_self(mob/user)
|
|
var/t1 = input(user, "Please select a color:", "[src]", null) in list( "red", "blue", "green", "yellow", "violet", "black", "white")
|
|
if ((user.get_active_held_item() != src || user.stat || user.restrained()))
|
|
return
|
|
switch(t1)
|
|
if("red")
|
|
paint_color = "C73232"
|
|
if("blue")
|
|
paint_color = "5998FF"
|
|
if("green")
|
|
paint_color = "2A9C3B"
|
|
if("yellow")
|
|
paint_color = "CFB52B"
|
|
if("violet")
|
|
paint_color = "AE4CCD"
|
|
if("white")
|
|
paint_color = "FFFFFF"
|
|
if("black")
|
|
paint_color = "333333"
|
|
icon_state = "paint_[t1]"
|
|
add_fingerprint(user)
|
|
|
|
|
|
/obj/item/paint/afterattack(atom/target, mob/user, proximity)
|
|
. = ..()
|
|
if(!proximity)
|
|
return
|
|
if(paintleft <= 0)
|
|
icon_state = "paint_empty"
|
|
return
|
|
if(!isturf(target) || isspaceturf(target))
|
|
return
|
|
var/newcolor = "#" + paint_color
|
|
target.add_atom_colour(newcolor, WASHABLE_COLOUR_PRIORITY)
|
|
|
|
/obj/item/paint/paint_remover
|
|
gender = PLURAL
|
|
name = "paint remover"
|
|
desc = "Used to remove color from anything."
|
|
icon_state = "paint_neutral"
|
|
|
|
/obj/item/paint/paint_remover/afterattack(atom/target, mob/user, proximity)
|
|
. = ..()
|
|
if(!proximity)
|
|
return
|
|
if(!isturf(target) || !isobj(target))
|
|
return
|
|
if(target.color != initial(target.color))
|
|
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
|