Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate * Update miscellaneous.dm * Delete miscellaneous.dm.rej * Delete pet.dm.rej * Update pet.dm * Update species.dm * Update miscellaneous.dm * Update species.dm * Update miscellaneous.dm * Delete species.dm.rej * Update species.dm pretty sure I got all the indentation correct THIS time, ffs * Update species.dm * Update species.dm fucking tabs man, fucking tabs.
This commit is contained in:
CitadelStationBot
committed by
Poojawa
Poojawa
parent
a8c4c86e1c
commit
a905c15dad
@@ -22,9 +22,9 @@
|
||||
if(R.glass_icon_state)
|
||||
icon_state = R.glass_icon_state
|
||||
else
|
||||
var/image/I = image(icon, "glassoverlay")
|
||||
I.color = mix_color_from_reagents(reagents.reagent_list)
|
||||
add_overlay(I)
|
||||
var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "glassoverlay")
|
||||
reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list)
|
||||
add_overlay(reagent_overlay)
|
||||
else
|
||||
icon_state = "glass_empty"
|
||||
name = "drinking glass"
|
||||
@@ -64,9 +64,9 @@
|
||||
icon_state = largest_reagent.shot_glass_icon_state
|
||||
else
|
||||
icon_state = "shotglassclear"
|
||||
var/image/I = image(icon, "shotglassoverlay")
|
||||
I.color = mix_color_from_reagents(reagents.reagent_list)
|
||||
add_overlay(I)
|
||||
var/mutable_appearance/shot_overlay = mutable_appearance(icon, "shotglassoverlay")
|
||||
shot_overlay.color = mix_color_from_reagents(reagents.reagent_list)
|
||||
add_overlay(shot_overlay)
|
||||
|
||||
|
||||
else
|
||||
|
||||
@@ -101,37 +101,36 @@
|
||||
filling_color = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4])
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/customizable/update_overlays(obj/item/weapon/reagent_containers/food/snacks/S)
|
||||
var/image/I = new(icon, "[initial(icon_state)]_filling")
|
||||
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
|
||||
if(S.filling_color == "#FFFFFF")
|
||||
I.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
|
||||
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
|
||||
else
|
||||
I.color = S.filling_color
|
||||
filling.color = S.filling_color
|
||||
|
||||
switch(ingredients_placement)
|
||||
if(INGREDIENTS_SCATTER)
|
||||
I.pixel_x = rand(-1,1)
|
||||
I.pixel_y = rand(-1,1)
|
||||
filling.pixel_x = rand(-1,1)
|
||||
filling.pixel_y = rand(-1,1)
|
||||
if(INGREDIENTS_STACK)
|
||||
I.pixel_x = rand(-1,1)
|
||||
I.pixel_y = 2 * ingredients.len - 1
|
||||
filling.pixel_x = rand(-1,1)
|
||||
filling.pixel_y = 2 * ingredients.len - 1
|
||||
if(INGREDIENTS_STACKPLUSTOP)
|
||||
I.pixel_x = rand(-1,1)
|
||||
I.pixel_y = 2 * ingredients.len - 1
|
||||
filling.pixel_x = rand(-1,1)
|
||||
filling.pixel_y = 2 * ingredients.len - 1
|
||||
if(our_overlays)
|
||||
our_overlays.Cut(ingredients.len) //???, add overlay calls later in this proc will queue the compile if necessary
|
||||
var/image/TOP = new(icon, "[icon_state]_top")
|
||||
var/mutable_appearance/TOP = mutable_appearance(icon, "[icon_state]_top")
|
||||
TOP.pixel_y = 2 * ingredients.len + 3
|
||||
add_overlay(I)
|
||||
add_overlay(filling)
|
||||
add_overlay(TOP)
|
||||
return
|
||||
if(INGREDIENTS_FILL)
|
||||
cut_overlays()
|
||||
I.color = filling_color
|
||||
filling.color = filling_color
|
||||
if(INGREDIENTS_LINE)
|
||||
I.pixel_y = rand(-8,3)
|
||||
I.pixel_x = I.pixel_y
|
||||
filling.pixel_x = filling.pixel_y = rand(-8,3)
|
||||
|
||||
add_overlay(I)
|
||||
add_overlay(filling)
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/customizable/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/slice, reagents_per_slice)
|
||||
@@ -248,14 +247,14 @@
|
||||
name = "[customname] sandwich"
|
||||
BS.reagents.trans_to(src, BS.reagents.total_volume)
|
||||
ingMax = ingredients.len //can't add more ingredients after that
|
||||
var/image/TOP = new(icon, "[BS.icon_state]")
|
||||
var/mutable_appearance/TOP = mutable_appearance(icon, "[BS.icon_state]")
|
||||
TOP.pixel_y = 2 * ingredients.len + 3
|
||||
add_overlay(TOP)
|
||||
if(istype(BS, /obj/item/weapon/reagent_containers/food/snacks/breadslice/custom))
|
||||
var/image/O = new(icon, "[initial(BS.icon_state)]_filling")
|
||||
O.color = BS.filling_color
|
||||
O.pixel_y = 2 * ingredients.len + 3
|
||||
add_overlay(O)
|
||||
var/mutable_appearance/filling = new(icon, "[initial(BS.icon_state)]_filling")
|
||||
filling.color = BS.filling_color
|
||||
filling.pixel_y = 2 * ingredients.len + 3
|
||||
add_overlay(filling)
|
||||
qdel(BS)
|
||||
return
|
||||
else
|
||||
@@ -313,7 +312,7 @@
|
||||
/obj/item/weapon/reagent_containers/glass/bowl/update_icon()
|
||||
cut_overlays()
|
||||
if(reagents && reagents.total_volume)
|
||||
var/image/filling = image('icons/obj/food/soupsalad.dmi', "fullbowl")
|
||||
var/mutable_appearance/filling = mutable_appearance('icons/obj/food/soupsalad.dmi', "fullbowl")
|
||||
filling.color = mix_color_from_reagents(reagents.reagent_list)
|
||||
add_overlay(filling)
|
||||
else
|
||||
|
||||
@@ -234,13 +234,13 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/proc/update_overlays(obj/item/weapon/reagent_containers/food/snacks/S)
|
||||
cut_overlays()
|
||||
var/image/I = new(src.icon, "[initial(icon_state)]_filling")
|
||||
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
|
||||
if(S.filling_color == "#FFFFFF")
|
||||
I.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
|
||||
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
|
||||
else
|
||||
I.color = S.filling_color
|
||||
filling.color = S.filling_color
|
||||
|
||||
add_overlay(I)
|
||||
add_overlay(filling)
|
||||
|
||||
// initialize_cooked_food() is called when microwaving the food
|
||||
/obj/item/weapon/reagent_containers/food/snacks/proc/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency = 1)
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/slab/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/slice, reagents_per_slice)
|
||||
..()
|
||||
var/image/I = new(icon, "rawcutlet_coloration")
|
||||
I.color = filling_color
|
||||
slice.add_overlay(I)
|
||||
var/mutable_appearance/filling = mutable_appearance(icon, "rawcutlet_coloration")
|
||||
filling.color = filling_color
|
||||
slice.add_overlay(filling)
|
||||
slice.filling_color = filling_color
|
||||
slice.name = "raw [name] cutlet"
|
||||
slice.meat_type = name
|
||||
|
||||
@@ -383,13 +383,13 @@
|
||||
icon = 'icons/obj/lollipop.dmi'
|
||||
icon_state = "lollipop_stick"
|
||||
list_reagents = list("nutriment" = 1, "vitamin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //Honk
|
||||
var/image/head
|
||||
var/mutable_appearance/head
|
||||
var/headcolor = rgb(0, 0, 0)
|
||||
tastes = list("candy" = 1)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/lollipop/New()
|
||||
..()
|
||||
head = image(icon = 'icons/obj/lollipop.dmi', icon_state = "lollipop_head")
|
||||
head = mutable_appearance('icons/obj/lollipop.dmi', "lollipop_head")
|
||||
change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255)))
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/lollipop/proc/change_head_color(C)
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
if(ishuman(hit_atom))
|
||||
var/mob/living/carbon/human/H = hit_atom
|
||||
var/image/creamoverlay = image('icons/effects/creampie.dmi')
|
||||
var/mutable_appearance/creamoverlay = mutable_appearance('icons/effects/creampie.dmi')
|
||||
if(H.dna.species.id == "lizard")
|
||||
creamoverlay.icon_state = "creampie_lizard"
|
||||
else
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
/obj/machinery/gibber/New()
|
||||
..()
|
||||
src.add_overlay(image('icons/obj/kitchen.dmi', "grjam"))
|
||||
add_overlay("grjam")
|
||||
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/gibber(null)
|
||||
B.apply_default_parts(src)
|
||||
|
||||
@@ -72,15 +72,15 @@
|
||||
/obj/machinery/gibber/update_icon()
|
||||
cut_overlays()
|
||||
if (dirty)
|
||||
src.add_overlay(image('icons/obj/kitchen.dmi', "grbloody"))
|
||||
add_overlay("grbloody")
|
||||
if(stat & (NOPOWER|BROKEN))
|
||||
return
|
||||
if (!occupant)
|
||||
src.add_overlay(image('icons/obj/kitchen.dmi', "grjam"))
|
||||
add_overlay("grjam")
|
||||
else if (operating)
|
||||
src.add_overlay(image('icons/obj/kitchen.dmi', "gruse"))
|
||||
add_overlay("gruse")
|
||||
else
|
||||
src.add_overlay(image('icons/obj/kitchen.dmi', "gridle"))
|
||||
add_overlay("gridle")
|
||||
|
||||
/obj/machinery/gibber/attack_paw(mob/user)
|
||||
return src.attack_hand(user)
|
||||
|
||||
@@ -59,21 +59,20 @@
|
||||
icon_state = "pizzabox_open"
|
||||
if(pizza)
|
||||
icon_state = "pizzabox_messy"
|
||||
var/image/pizzaimg = image(pizza.icon, icon_state = pizza.icon_state)
|
||||
pizzaimg.pixel_y = -3
|
||||
add_overlay(pizzaimg)
|
||||
var/mutable_appearance/pizza_overlay = mutable_appearance(pizza.icon, pizza.icon_state)
|
||||
pizza_overlay.pixel_y = -3
|
||||
add_overlay(pizza_overlay)
|
||||
if(bomb)
|
||||
bomb.icon_state = "pizzabomb_[bomb_active ? "active" : "inactive"]"
|
||||
var/image/bombimg = image(bomb.icon, icon_state = bomb.icon_state)
|
||||
bombimg.pixel_y = 5
|
||||
add_overlay(bombimg)
|
||||
else
|
||||
var/mutable_appearance/bomb_overlay = mutable_appearance(bomb.icon, bomb.icon_state)
|
||||
bomb_overlay.pixel_y = 5
|
||||
add_overlay(bomb_overlay)
|
||||
icon_state = "pizzabox[boxes.len + 1]"
|
||||
var/obj/item/pizzabox/box = boxes.len ? boxes[boxes.len] : src
|
||||
if(box.boxtag != "")
|
||||
var/image/tagimg = image(icon, icon_state = "pizzabox_tag")
|
||||
tagimg.pixel_y = boxes.len * 3
|
||||
add_overlay(tagimg)
|
||||
var/mutable_appearance/tag_overlay = mutable_appearance(icon, "pizzabox_tag")
|
||||
tag_overlay.pixel_y = boxes.len * 3
|
||||
add_overlay(tag_overlay)
|
||||
|
||||
/obj/item/pizzabox/attack_self(mob/user)
|
||||
if(boxes.len > 0)
|
||||
|
||||
Reference in New Issue
Block a user