Merge pull request #28 from Fox-McCloud/Sprite-Updates

Sprite Updates

code/datums/supplypacks.dm

@@ -870,6 +870,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 					/obj/item/weapon/storage/pill_bottle/happy,
 					/obj/item/weapon/storage/pill_bottle/random_drug_bottle,
 					/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
+					/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims,
 					/obj/item/weapon/grenade/smokebomb,
 					/obj/item/clothing/mask/cigarette/cigar/cohiba,
 					/obj/item/weapon/reagent_containers/food/drinks/cans/ale,

code/game/machinery/vending.dm

@@ -779,10 +779,10 @@
 	product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
 	vend_delay = 34
 	icon_state = "cigs"
-	products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/rollingpaperpack = 5)
+	products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/rollingpaperpack = 5)
 	contraband = list(/obj/item/weapon/lighter/zippo = 4)
-	premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2)
-	prices = list(/obj/item/weapon/storage/fancy/cigarettes = 60,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 60, /obj/item/weapon/rollingpaperpack = 20)
+	premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1)
+	prices = list(/obj/item/weapon/storage/fancy/cigarettes = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 60, /obj/item/weapon/rollingpaperpack = 20)
 	refill_canister = /obj/item/weapon/vending_refill/cigarette
 
 /obj/machinery/vending/cigarette/New()

code/game/objects/items/devices/radio/headset.dm

@@ -78,14 +78,14 @@
 /obj/item/device/radio/headset/headset_sci
 	name = "science radio headset"
 	desc = "A sciency headset. Like usual. To access the science channel, use :n."
-	icon_state = "com_headset"
+	icon_state = "sci_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_sci
 
 /obj/item/device/radio/headset/headset_medsci
 	name = "medical research radio headset"
 	desc = "A headset that is a result of the mating between medical and science. To access the medical channel, use :m. For science, use :n."
-	icon_state = "med_headset"
+	icon_state = "medsci_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_medsci
 
@@ -158,7 +158,7 @@
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
-	
+
 /obj/item/device/radio/headset/headset_service
 	name = "service radio headset"
 	desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean. To access the service channel, use :z."

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

@@ -200,14 +200,14 @@
 	name = "\improper DromedaryCo packet"
 	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
 	icon_state = "Dpacket"
-	item_state = "Dpacket"
+	item_state = "cigpacket"
 
 
 /obj/item/weapon/storage/fancy/cigarettes/syndicate
 	name = "\improper Syndicate Cigarettes"
 	desc = "A packet of six evil-looking cigarettes, A label on the packaging reads, \"Donk Co\""
 	icon_state = "robustpacket"
-	item_state = "robustpacket"
+	item_state = "cigpacket"
 
 /obj/item/weapon/storage/fancy/cigarettes/syndicate/New()
 	..()
@@ -218,13 +218,62 @@
 	name = "cigarette packet"
 	desc = "An obscure brand of cigarettes."
 	icon_state = "syndiepacket"
-	item_state = "syndiepacket"
+	item_state = "cigpacket"
 
 /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate/New()
 	..()
 	for(var/i = 1 to storage_slots)
 		reagents.add_reagent("doctorsdelight",15)
 
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift
+	name = "\improper Uplift Smooth packet"
+	desc = "Your favorite brand, now menthol flavored."
+	icon_state = "upliftpacket"
+	item_state = "cigpacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust
+	name = "\improper Robust packet"
+	desc = "Smoked by the robust."
+	icon_state = "robustpacket"
+	item_state = "cigpacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold
+	name = "\improper Robust Gold packet"
+	desc = "Smoked by the truly robust."
+	icon_state = "robustgpacket"
+	item_state = "cigpacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold/New()
+	..()
+	for(var/i = 1 to storage_slots)
+		reagents.add_reagent("gold",1)
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp
+	name = "\improper Carp Classic packet"
+	desc = "Since 2313."
+	icon_state = "carppacket"
+	item_state = "cigpacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori
+	name = "\improper Midori Tabako packet"
+	desc = "You can't understand the runes, but the packet smells funny."
+	icon_state = "midoripacket"
+	item_state = "cigpacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims
+	name ="\improper Shady Jim's Super Slims"
+	desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!"
+	icon_state = "shadyjimpacket"
+	item_state = "cigpacket"
+
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims/New()
+	..()
+	for(var/i = 1 to storage_slots)
+		reagents.add_reagent("lipozine",4)
+		reagents.add_reagent("ammonia",2)
+		reagents.add_reagent("plantbgone",1)
+		reagents.add_reagent("toxin",1.5)
+
 /*
  * Vial Box
  */

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

@@ -343,6 +343,7 @@
 			src.w_class = 4
 			src.force = 15
 			src.damtype = "fire"
+			hitsound = "sound/items/welder.ogg"
 			src.icon_state = "welder1"
 			processing_objects.Add(src)
 		else
@@ -357,6 +358,7 @@
 		src.w_class = 2
 		src.force = 3
 		src.damtype = "brute"
+		hitsound = "swing_hit"
 		src.icon_state = "welder"
 		src.welding = 0