Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
This commit is contained in:
@@ -41,7 +41,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/W, mob/user, params)
|
||||
if(istype(W, /obj/item/toy/crayon))
|
||||
var/obj/item/toy/crayon/C = W
|
||||
var/clr = C.item_color
|
||||
var/clr = C.crayon_color
|
||||
|
||||
if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow")))
|
||||
to_chat(usr, "<span class='notice'>[src] refuses to take on this colour!</span>")
|
||||
@@ -49,41 +49,32 @@
|
||||
|
||||
to_chat(usr, "<span class='notice'>You colour [src] with [W].</span>")
|
||||
icon_state = "egg-[clr]"
|
||||
item_color = clr
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/blue
|
||||
icon_state = "egg-blue"
|
||||
item_color = "blue"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/green
|
||||
icon_state = "egg-green"
|
||||
item_color = "green"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/mime
|
||||
icon_state = "egg-mime"
|
||||
item_color = "mime"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/orange
|
||||
icon_state = "egg-orange"
|
||||
item_color = "orange"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/purple
|
||||
icon_state = "egg-purple"
|
||||
item_color = "purple"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/rainbow
|
||||
icon_state = "egg-rainbow"
|
||||
item_color = "rainbow"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/red
|
||||
icon_state = "egg-red"
|
||||
item_color = "red"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/egg/yellow
|
||||
icon_state = "egg-yellow"
|
||||
item_color = "yellow"
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/friedegg
|
||||
name = "fried egg"
|
||||
|
||||
Reference in New Issue
Block a user