Merge pull request #601 from comma/master

Ashtrays

code/WorkInProgress/Chinsky/ashtray.dm

@@ -0,0 +1,133 @@
+/obj/item/ashtray
+	icon = 'ashtray.dmi'
+	var/
+		max_butts 	= 0
+		empty_desc 	= ""
+		icon_empty 	= ""
+		icon_half  	= ""
+		icon_full  	= ""
+		icon_broken	= ""
+
+/obj/item/ashtray/New()
+	..()
+	src.pixel_y = rand(-5, 5)
+	src.pixel_x = rand(-6, 6)
+	return
+
+/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (health < 1)
+		return
+	if (istype(W,/obj/item/clothing/mask/cigarette))
+		if(user)
+			if (contents.len >= max_butts)
+				user << "This ashtray is full."
+				return
+			user.u_equip(W)
+			W.loc = src
+			if ((user.client && user.s_active != src))
+				user.client.screen -= W
+			var/obj/item/clothing/mask/cigarette/cig = W
+			if (cig.lit == 1)
+				src.visible_message("[user] crushes a [cig] in the [src], putting it out.")
+				cig.put_out()
+			else if (cig.lit == 0)
+				user << "You place a [cig] in [src] without even smoking it. Why would you do that?"
+			else if (cig.lit == -1)
+				src.visible_message("[user] places a [cig] in the [src],.")
+			user.update_clothing()
+			add_fingerprint(user)
+			if (contents.len == max_butts)
+				icon_state = icon_full
+				desc = empty_desc + " It's stuffed full."
+			else if (contents.len > max_butts/2)
+				icon_state = icon_half
+				desc = empty_desc + " It's half-filled."
+	else
+		health = max(0,health - W.force)
+		user << "You hit [src] with [W]."
+		if (health < 1)
+			die()
+	return
+
+/obj/item/ashtray/throw_impact(atom/hit_atom)
+	if (health > 0)
+		health = max(0,health - 3)
+		if (health < 1)
+			die()
+			return
+		if (contents.len)
+			src.visible_message("\red [src] slams into [hit_atom] spilling its contents!")
+		for (var/obj/item/clothing/mask/cigarette/O in contents)
+			contents -= O
+			O.loc = src.loc
+		icon_state = icon_empty
+	return ..()
+
+/obj/item/ashtray/proc/die()
+	src.visible_message("\red [src] shatters spilling its contents!")
+	for (var/obj/item/clothing/mask/cigarette/O in contents)
+		contents -= O
+		O.loc = src.loc
+	icon_state = icon_broken
+
+/obj/item/ashtray/plastic
+	name = "plastic ashtray"
+	desc = "Cheap plastic ashtray."
+	icon_state = "ashtray_bl"
+	icon_empty = "ashtray_bl"
+	icon_half  = "ashtray_half_bl"
+	icon_full  = "ashtray_full_bl"
+	icon_broken  = "ashtray_bork_bl"
+	max_butts = 14
+	health = 24.0
+	g_amt = 30
+	m_amt = 30
+	empty_desc = "Cheap plastic ashtray."
+	throwforce = 3.0
+	die()
+		..()
+		name = "pieces of plastic"
+		desc = "Pieces of plastic with ash on them."
+		return
+
+
+/obj/item/ashtray/bronze
+	name = "bronze ashtray"
+	desc = "Massive bronze ashtray."
+	icon_state = "ashtray_br"
+	icon_empty = "ashtray_br"
+	icon_half  = "ashtray_half_br"
+	icon_full  = "ashtray_full_br"
+	icon_broken  = "ashtray_bork_br"
+	max_butts = 10
+	health = 72.0
+	m_amt = 80
+	empty_desc = "Massive bronze ashtray."
+	throwforce = 10.0
+
+	die()
+		..()
+		name = "pieces of bronze"
+		desc = "Pieces of bronze with ash on them."
+		return
+
+
+/obj/item/ashtray/glass
+	name = "glass ashtray"
+	desc = "Glass ashtray. Looks fragile."
+	icon_state = "ashtray_gl"
+	icon_empty = "ashtray_gl"
+	icon_half  = "ashtray_half_gl"
+	icon_full  = "ashtray_full_gl"
+	icon_broken  = "ashtray_bork_gl"
+	max_butts = 12
+	health = 12.0
+	g_amt = 60
+	empty_desc = "Glass ashtray. Looks fragile."
+	throwforce = 6.0
+
+	die()
+		..()
+		name = "shards of glass"
+		desc = "Shards of glass with ash on them."
+		return

code/game/machinery/autolathe.dm

@@ -307,6 +307,7 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/device/assembly/timer(), \
 		new /obj/item/weapon/light/tube(), \
 		new /obj/item/weapon/light/bulb(), \
+		new /obj/item/ashtray/glass()
 	)
 
 var/global/list/autolathe_recipes_hidden = list( \

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

@@ -120,6 +120,7 @@ ZIPPO
   var/butt_count = 5  //count of butt sprite variations
 	proc
 		light(var/flavor_text = "[usr] lights the [name].")
+		put_out()
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		..()
@@ -144,20 +145,26 @@ ZIPPO
 				O.show_message(flavor_text, 1)
 			processing_objects.Add(src)
 
+	put_out()
+		src.lit = -1
+		src.damtype = "brute"
+		src.icon_state = icon_butt + "[rand(0,butt_count)]"
+		src.item_state = icon_off
+		src.desc = "A [src.name] butt."
+		src.name = "[src.name] butt"
+
 
 	process()
 		var/turf/location = get_turf(src)
 		src.smoketime--
 		if(src.smoketime < 1)
-			src.lit = -1
-			src.damtype = "brute"
-			src.icon_state = icon_butt + "[rand(0,butt_count)]"
-			src.item_state = icon_off
-			src.desc = "A [src.name] butt."
-			src.name = "[src.name] butt"
 			if(ismob(src.loc))
 				var/mob/living/M = src.loc
 				M << "\red Your [src.name] goes out."
+				put_out()
+				M.update_clothing()
+			else
+				put_out()
 			processing_objects.Remove(src)
 			return
 		if(location)
@@ -167,14 +174,8 @@ ZIPPO
 
 	dropped(mob/user as mob)
 		if(src.lit == 1)
-			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red [] calmly drops and treads on the lit [], putting it out instantly.", user,src.name), 1)
-			src.lit = -1
-			src.damtype = "brute"
-			src.icon_state = icon_butt + "[rand(0,butt_count)]"
-			src.item_state = icon_off
-			src.desc = "A [src.name] butt."
-			src.name = "[src.name] butt"
+			src.visible_message("\red [user] calmly drops and treads on the lit [src], putting it out instantly.")
+			put_out()
 		return ..()
 
 

code/modules/recycling/disposal.dm

@@ -61,6 +61,15 @@
 			update()
 			return
 
+		if(istype(I, /obj/item/ashtray))
+			user << "\blue You empty the ashtray."
+			for(var/obj/item/O in I.contents)
+				O.loc = src
+				I.contents -= O
+			I.icon_state = I:icon_empty
+			update()
+			return
+
 		if(istype(I, /obj/item/weapon/weldingtool) && I:welding)
 			var/obj/item/weapon/weldingtool/W = I
 			playsound(src.loc, 'Welder.ogg', 100, 1)