Feat: Appearance overhaul (#152)

* part 1

* part 2

* part 2.1

* glass table

* conflict fix

* part 3

* crates and closets

* chairs and apc

* chairs and some structures

* chemistry

* kirchen, windows fix, aids and bureaucracy

* fix

* done?

* done... maybe

* ready

* doesn't work

* zabul

* Update gene_modder.dm

code/game/machinery/doors/poddoor.dm

@@ -14,6 +14,7 @@
 	damage_deflection = 70
 	var/id_tag = 1.0
 	var/protected = 1
+	var/blast_door_sound = 'sound/machines/blastdoor.ogg'
 
 /obj/machinery/door/poddoor/preopen
 	icon_state = "open"

code/game/machinery/doors/shutters.dm

@@ -8,6 +8,19 @@
 	damage_deflection = 20
 	dir = EAST
 
+/obj/machinery/door/poddoor/shutters
+	var/door_open_sound = 'sound/machines/shutters_open.ogg'
+	var/door_close_sound = 'sound/machines/shutters_close.ogg'
+
+/obj/machinery/door/poddoor/shutters/do_animate(animation)
+	switch(animation)
+		if("opening")
+			flick("opening", src)
+			playsound(src, door_open_sound, 30, TRUE)
+		if("closing")
+			flick("closing", src)
+			playsound(src, door_close_sound, 30, TRUE)
+
 /obj/machinery/door/poddoor/shutters/invincible
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 

code/game/objects/items/stacks/rods.dm

@@ -18,7 +18,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	name = "metal rod"
 	desc = "Some rods. Can be used for building, or something."
 	singular_name = "metal rod"
-	icon_state = "rods"
+	icon = 'icons/obj/stacks/minerals.dmi'
+	icon_state = "rods-5"
 	item_state = "rods"
 	flags = CONDUCT
 	w_class = WEIGHT_CLASS_NORMAL
@@ -85,7 +86,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	name = "fireproof rods"
 	desc = "Жаропрочные стержни, способные выдержать жар в несколько тысяч градусов. Могут использоваться для строительства мостов над лавой."
 	singular_name = "fireproof rod"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/stacks/minerals.dmi'
 	icon_state = "f_rods"
 	item_state = "f_rods"
 	flags = CONDUCT

code/game/objects/items/stacks/sheets/leather.dm

@@ -1,5 +1,7 @@
 /obj/item/stack/sheet/animalhide
 	name = "hide"
+	icon = 'icons/obj/stacks/organic.dmi'
+	icon_state = "sheet-monkey"
 	desc = "Something went wrong."
 	origin_tech = "biotech=3"
 
@@ -95,13 +97,15 @@ GLOBAL_LIST_INIT(xeno_recipes, list (
 	name = "hairless hide"
 	desc = "This hide was stripped of it's hair, but still needs tanning."
 	singular_name = "hairless hide piece"
+	icon = 'icons/obj/stacks/organic.dmi'
 	icon_state = "sheet-hairlesshide"
 	origin_tech = ""
 
 /obj/item/stack/sheet/wetleather
 	name = "wet leather"
 	desc = "This leather has been cleaned but still needs to be dried."
 	singular_name = "wet leather piece"
+	icon = 'icons/obj/stacks/organic.dmi'
 	icon_state = "sheet-wetleather"
 	origin_tech = ""
 	var/wetness = 30 //Reduced when exposed to high temperautres
@@ -111,6 +115,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list (
 	name = "leather"
 	desc = "The by-product of mob grinding."
 	singular_name = "leather piece"
+	icon = 'icons/obj/stacks/organic.dmi'
 	icon_state = "sheet-leather"
 	origin_tech = "materials=2"
 

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -171,6 +171,9 @@ GLOBAL_LIST_INIT(plasteel_recipes, list(
 	merge_type = /obj/item/stack/sheet/plasteel
 	point_value = 23
 
+/obj/item/stack/sheet/plasteel/fifty
+	amount = 50
+
 /obj/item/stack/sheet/plasteel/lowplasma
 	desc = "This sheet is an alloy of iron and plasma. There are an special barcode 'Low Plasma Level'"
 	materials = list(MAT_METAL=2000, MAT_PLASMA=400)
@@ -238,12 +241,14 @@ GLOBAL_LIST_INIT(wood_recipes, list(
 	desc = "One can only guess that this is a bunch of wood."
 	gender = PLURAL
 	singular_name = "wood plank"
+	icon = 'icons/obj/stacks/organic.dmi'
 	icon_state = "sheet-wood"
 	item_state = "sheet-wood"
 	origin_tech = "materials=1;biotech=1"
 	resistance_flags = FLAMMABLE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
 	merge_type = /obj/item/stack/sheet/wood
+	sheettype = "wood"
 
 /obj/item/stack/sheet/wood/cyborg
 	is_cyborg = 1
@@ -287,6 +292,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list(
 	name = "cloth"
 	desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell."
 	singular_name = "cloth roll"
+	icon = 'icons/obj/stacks/organic.dmi'
 	icon_state = "sheet-cloth"
 	origin_tech = "materials=2"
 	resistance_flags = FLAMMABLE
@@ -318,7 +324,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
 	desc = "A fabric sown from incredibly durable threads, known for its usefulness in armor production."
 	singular_name = "durathread roll"
 	icon_state = "sheet-durathread"
-	item_state = "sheet-cloth"
+	item_state = "sheet-durathread"
+	icon = 'icons/obj/stacks/organic.dmi'
 	resistance_flags = FLAMMABLE
 	force = 0
 	throwforce = 0
@@ -333,6 +340,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
 	desc = "A bundle of raw cotton ready to be spun on the loom."
 	singular_name = "raw cotton ball"
 	icon_state = "sheet-cotton"
+	icon = 'icons/obj/stacks/organic.dmi'
 	resistance_flags = FLAMMABLE
 	force = 0
 	throwforce = 0
@@ -345,6 +353,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
 	desc = "A bundle of raw durathread ready to be spun on the loom."
 	singular_name = "raw durathread ball"
 	icon_state = "sheet-durathreadraw"
+	icon = 'icons/obj/stacks/organic.dmi'
 	merge_type = /obj/item/stack/sheet/cotton/durathread
 	pull_effort = 70
 	loom_result = /obj/item/stack/sheet/durathread
@@ -390,6 +399,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list(
 	name = "cardboard"
 	desc = "Large sheets of card, like boxes folded flat."
 	singular_name = "cardboard sheet"
+	icon = 'icons/obj/stacks/miscellaneous.dmi'
 	icon_state = "sheet-card"
 	item_state = "sheet-card"
 	origin_tech = "materials=1"
@@ -494,7 +504,7 @@ GLOBAL_LIST_INIT(brass_recipes, list(
 	singular_name = "brass sheet"
 	icon_state = "sheet-brass"
 	item_state = "sheet-brass"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/stacks/minerals.dmi'
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	throwforce = 10
 	max_amount = 50
@@ -543,8 +553,9 @@ GLOBAL_LIST_INIT(brass_recipes, list(
 
 /obj/item/stack/sheet/bone
 	name = "bones"
-	icon = 'icons/obj/mining.dmi'
+	icon = 'icons/obj/stacks/organic.dmi'
 	icon_state = "bone"
+	item_state = "bone"
 	singular_name = "bone"
 	desc = "Someone's been drinking their milk."
 	force = 7
@@ -665,7 +676,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list(
 	singular_name = "cut bamboo"
 	icon_state = "sheet-bamboo"
 	item_state = "sheet-bamboo"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/stacks/organic.dmi'
 	sheettype = "bamboo"
 	force = 10
 	throwforce = 10
@@ -691,7 +702,7 @@ GLOBAL_LIST_INIT(cheese_recipes, list(
 	desc = "A stack of cheese that seems sturdier than regular cheese."
 	icon_state = "sheet-cheese"
 	item_state = "sheet-cheese"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/stacks/organic.dmi'
 	singular_name = "reinforced cheese block"
 	sheettype = "cheese"
 	force = 5

code/game/objects/items/stacks/sheets/sheets.dm

@@ -1,5 +1,8 @@
 /obj/item/stack/sheet
 	name = "sheet"
+	icon = 'icons/obj/stacks/minerals.dmi'
+	lefthand_file = 'icons/mob/inhands/sheet_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/sheet_righthand.dmi'
 	w_class = WEIGHT_CLASS_NORMAL
 	full_w_class = WEIGHT_CLASS_NORMAL
 	force = 5

code/game/objects/items/stacks/telecrystal.dm

@@ -3,7 +3,7 @@
 	desc = "It seems to be pulsing with suspiciously enticing energies."
 	description_antag = "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks."
 	singular_name = "telecrystal"
-	icon = 'icons/obj/telescience.dmi'
+	icon = 'icons/obj/stacks/minerals.dmi'
 	icon_state = "telecrystal"
 	w_class = WEIGHT_CLASS_TINY
 	max_amount = 50

code/game/objects/items/weapons/legcuffs.dm

@@ -15,7 +15,7 @@
 	name = "bear trap"
 	throw_speed = 1
 	throw_range = 1
-	icon_state = "beartrap"
+	icon_state = "beartrap0"
 	desc = "A trap used to catch bears and other legged creatures."
 	origin_tech = "engineering=4"
 	var/armed = 0

code/game/objects/items/weapons/storage/boxes.dm

@@ -158,7 +158,7 @@
 /obj/item/storage/box/masks
 	name = "sterile masks"
 	desc = "This box contains masks of sterility."
-	icon_state = "sterile"
+	icon_state = "sterile_box"
 
 /obj/item/storage/box/masks/populate_contents()
 	for(var/I in 1 to 7)

code/game/objects/items/weapons/storage/firstaid.dm

@@ -87,7 +87,7 @@
 
 /obj/item/storage/firstaid/toxin/Initialize(mapload)
 	. = ..()
-	icon_state = pick("antitox_firstaid", "antitox2_firstaid", "antitox3_firstaid", "antitox4_firstaid")
+	icon_state = pick("antitox_firstaid", "antitox2_firstaid", "antitox3_firstaid")
 
 /obj/item/storage/firstaid/toxin/populate_contents()
 	new /obj/item/reagent_containers/syringe/charcoal(src)
@@ -146,6 +146,10 @@
 	item_state = "firstaid-advanced"
 	med_bot_skin = "adv"
 
+/obj/item/storage/firstaid/adv/New()
+	..()
+	icon_state = pick("adv_firstaid", "adv2_firstaid")
+
 /obj/item/storage/firstaid/adv/populate_contents()
 	new /obj/item/stack/medical/bruise_pack(src)
 	new /obj/item/stack/medical/bruise_pack/advanced(src)
@@ -181,7 +185,7 @@
 
 /obj/item/storage/firstaid/tactical
 	name = "NT first-aid kit"
-	icon_state = "NT_firstaid"
+	icon_state = "bezerk"
 	desc = "I hope you've got insurance."
 	max_w_class = WEIGHT_CLASS_NORMAL
 	treatment_oxy = "perfluorodecalin"
@@ -207,7 +211,7 @@
 
 /obj/item/storage/firstaid/ertm
 	name = "NT ert-aid kit"
-	icon_state = "NT_ERT_firstaid"
+	icon_state = "bezerk"
 	desc = "I hope you've got insurance."
 	max_w_class = WEIGHT_CLASS_NORMAL
 	treatment_oxy = "perfluorodecalin"

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -364,13 +364,52 @@
 	desc = "It has some unsavory stains on it..."
 	icon_state = "bar"
 	item_chair = /obj/item/chair/stool/bar
+	var/image/armrest = null
+	can_buckle = TRUE
 
 /obj/structure/chair/stool/bar/dark
 	icon_state = "bar_dark"
 	item_chair = /obj/item/chair/stool/bar/dark
 
-/obj/structure/chair/stool/handle_layer()
-	return
+/obj/structure/chair/stool/bar/Initialize(mapload)
+	armrest = GetArmrest()
+	armrest.layer = ABOVE_MOB_LAYER
+	return ..()
+
+/obj/structure/chair/stool/bar/proc/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "bar_armrest")
+
+/obj/structure/chair/stool/bar/Destroy()
+	QDEL_NULL(armrest)
+	return ..()
+
+/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/M)
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/stool/bar/post_unbuckle_mob()
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/stool/bar/proc/update_armrest()
+	if(has_buckled_mobs())
+		add_overlay(armrest)
+	else
+		cut_overlay(armrest)
+
+/obj/structure/chair/stool/bar/proc/buckle_layer()
+	if(has_buckled_mobs() && dir == NORTH)
+		layer = BELOW_MOB_LAYER
+	else
+		layer = OBJ_LAYER
+
+/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/M)
+	. = ..()
+	buckle_layer()
+
+/obj/structure/chair/stool/bar/post_unbuckle_mob()
+	. = ..()
+	buckle_layer()
 
 /obj/item/chair
 	name = "chair"

code/game/objects/structures/tank_dispenser.dm

@@ -41,10 +41,10 @@
 	cut_overlays()
 	var/oxy_tank_amount = LAZYLEN(stored_oxygen_tanks)
 	switch(oxy_tank_amount)
-		if(1 to 3)
+		if(1 to 4)
 			overlays += "oxygen-[oxy_tank_amount]"
-		if(4 to INFINITY)
-			overlays += "oxygen-4"
+		if(5 to INFINITY)
+			overlays += "oxygen-5"
 
 	var/pla_tank_amount = LAZYLEN(stored_plasma_tanks)
 	switch(pla_tank_amount)

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -196,6 +196,7 @@
 	gibberoverlay.icon = icon
 	gibberoverlay.icon_state = "grinderoverlay"
 	gibberoverlay.overlays += image('icons/obj/kitchen.dmi', "gridle")
+	icon_state = "grinder_on"
 
 	var/image/feedee = new
 	occupant.dir = 2
@@ -205,17 +206,16 @@
 	holder.name = null //make unclickable
 	holder.overlays += feedee //add occupant to holder overlays
 	holder.pixel_y = 25 //above the gibber
-	holder.pixel_x = 2
 	holder.loc = get_turf(src)
 	holder.layer = MOB_LAYER //simulate mob-like layering
-	holder.anchored = 1
+	holder.anchored = TRUE
 
 	var/atom/movable/holder2 = new //holder for gibber overlay, used to simulate 3D effect
 	holder2.name = null
 	holder2.overlays += gibberoverlay
 	holder2.loc = get_turf(src)
 	holder2.layer = MOB_LAYER + 0.1 //3D, it's above the mob, rest of the gibber is behind
-	holder2.anchored = 1
+	holder2.anchored = TRUE
 
 	animate(holder, pixel_y = 16, time = animation_delay) //animate going down
 
@@ -230,7 +230,7 @@
 
 	qdel(holder) //get rid of holder object
 	qdel(holder2) //get rid of holder object
-	locked = 0 //unlock
+	locked = FALSE //unlock
 
 /obj/machinery/gibber/proc/startgibbing(mob/user, UserOverride=0)
 	if(!istype(user) && !UserOverride)

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -15,6 +15,13 @@
 	var/rating_speed = 1
 	var/rating_amount = 1
 
+/obj/machinery/processor/update_icon()
+	. = ..()
+	if(processing)
+		icon_state = "processor_on"
+		return
+	icon_state = initial(icon_state)
+
 /obj/machinery/processor/New()
 		..()
 		component_parts = list()
@@ -209,7 +216,8 @@
 	if(contents.len == 0)
 		to_chat(user, "<span class='warning'>\the [src] is empty.</span>")
 		return 1
-	processing = 1
+	processing = TRUE
+	update_icon()
 	user.visible_message("[user] turns on [src].", \
 		"<span class='notice'>You turn on [src].</span>", \
 		"<span class='italics'>You hear a food processor.</span>")
@@ -230,7 +238,8 @@
 			log_debug("The [O] in processor([src]) does not have a suitable recipe, but it was somehow put inside of the processor anyways.")
 			continue
 		P.process_food(loc, O, src)
-	processing = 0
+	processing = FALSE
+	update_icon()
 
 	visible_message("<span class='notice'>\the [src] has finished processing.</span>", \
 		"<span class='notice'>\the [src] has finished processing.</span>", \