Added Cheridan's hatchets!

Buffed stamped packing slips to be worth 2 supply points.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3298 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/hydro.dm

@@ -1594,7 +1594,7 @@
 	seed = "/obj/item/seeds/towermycelium"
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if(istype(W, /obj/item/weapon/circular_saw))
+		if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/fireaxe) || istype(W, /obj/item/weapon/melee/energy))
 			user.show_message("<span class='notice'>You make planks out of the [src]!</span>", 1)
 			for(var/i=0,i<2,i++)
 				new /obj/item/stack/sheet/wood (src.loc)

code/defines/obj/supplypacks.dm

@@ -197,6 +197,7 @@
 					"/obj/item/weapon/plantbgone",
 					"/obj/item/weapon/plantbgone",
 					"/obj/item/weapon/plantbgone",
+					"/obj/item/weapon/hatchet",
 					"/obj/item/weapon/minihoe",
 					"/obj/item/device/analyzer/plant_analyzer",
 					"/obj/item/clothing/gloves/botanic_leather",

code/defines/obj/weapon.dm

@@ -573,7 +573,7 @@
 /obj/item/weapon/fireaxe  // DEM AXES MAN, marker -Agouri
 	icon_state = "fireaxe0"
 	name = "fire axe"
-	desc = "Truly, the tool of a madman. Who would possibly think to fight fire with an axe?"
+	desc = "Let me axe you a question."
 	force = 5
 	w_class = 4.0
 	flags = ONBACK
@@ -1297,6 +1297,7 @@
 	icon = 'surgery.dmi'
 	icon_state = "drill"
 	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 15.0
 	w_class = 1.0
 	origin_tech = "materials=1;biotech=1"
 
@@ -1324,6 +1325,21 @@
 	w_class = 1.0
 	origin_tech = "biotech=2"
 
+/obj/item/weapon/hatchet
+	name = "hatchet"
+	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
+	icon = 'weapons.dmi'
+	icon_state = "hatchet"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 12.0
+	w_class = 1.0
+	throwforce = 15.0
+	throw_speed = 4
+	throw_range = 4
+	m_amt = 15000
+	origin_tech = "materials=2;combat=1"
+
+
 /*
 /obj/item/weapon/cigarpacket
 	name = "Pete's Cuban Cigars"

code/game/gamemodes/events/spacevines.dm

@@ -26,6 +26,8 @@
 			if(/obj/item/weapon/kitchen/utensil/knife) del src
 			if(/obj/item/weapon/scalpel) del src
 			if(/obj/item/weapon/fireaxe) del src
+			if(/obj/item/weapon/hatchet) del src
+			if(/obj/item/weapon/melee/energy) del src
 
 			//less effective weapons
 			if(/obj/item/weapon/wirecutters)

code/game/objects/crates.dm

@@ -164,17 +164,6 @@
 	icon_opened = "hydrocrateopen"
 	icon_closed = "hydrocrate"
 	density = 1
-/*	New() // This stuff shouldn't be here, it should be in /datum/supply_packs/hydroponics
-		..()
-		new /obj/item/weapon/plantbgone(src)
-		new /obj/item/weapon/plantbgone(src)
-		new /obj/item/weapon/plantbgone(src)
-		new /obj/item/weapon/minihoe(src)
-		new /obj/item/weapon/weedspray(src)
-		new /obj/item/weapon/weedspray(src)
-		new /obj/item/weapon/pestspray(src)
-		new /obj/item/weapon/pestspray(src)
-		new /obj/item/weapon/pestspray(src) */
 
 /obj/structure/closet/crate/hydroponics/prespawned
 	//This exists so the prespawned hydro crates spawn with their contents.
@@ -190,6 +179,7 @@
 		new /obj/item/weapon/plantbgone(src)
 		new /obj/item/weapon/plantbgone(src)
 		new /obj/item/weapon/plantbgone(src)
+		new /obj/item/weapon/hatchet(src)
 		new /obj/item/weapon/minihoe(src)
 //		new /obj/item/weapon/weedspray(src)
 //		new /obj/item/weapon/weedspray(src)

code/game/supplyshuttle.dm

@@ -7,7 +7,7 @@
 #define SUPPLY_POINTSPERCRATE 5	//Points per crate sent back.
 #define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station
 #define SUPPLY_DOCK_AREATYPE "/area/supply/dock"	//Type of the supply shuttle area for dock
-#define SUPPLY_POINTSPERSLIP 1 //points per packing slip sent back stamped.
+#define SUPPLY_POINTSPERSLIP 2 //points per packing slip sent back stamped.
 
 var/supply_shuttle_moving = 0
 var/supply_shuttle_at_station = 0