Fixed stamped supply slips not giving the points they're supposed to.

Added large crates, for dense objects. Currently they're only used for water and fuel tanks, and mulebots.

Removed uterus.dmm and tgstation.2.0.8.dmm from the repo, as they were unused and outdated.

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

code/defines/obj/supplypacks.dm

@@ -189,7 +189,7 @@
 	name = "MULEbot Crate"
 	contains = list("/obj/machinery/bot/mulebot")
 	cost = 20
-	containertype = "/obj/structure/closet/crate"
+	containertype = "/obj/structure/largecrate/mule"
 	containername = "MULEbot Crate"
 
 /datum/supply_packs/hydroponics // -- Skie
@@ -204,7 +204,7 @@
 					"/obj/item/clothing/gloves/botanic_leather",
 					"/obj/item/clothing/suit/apron") // Updated with new things
 	cost = 10
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = "/obj/structure/closet/crate/hydroponics"
 	containername = "Hydroponics crate"
 	access = access_hydroponics
 
@@ -223,7 +223,7 @@
 					"/obj/item/seeds/potatoseed",
 					"/obj/item/seeds/sugarcaneseed")
 	cost = 10
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = "/obj/structure/closet/crate/hydroponics"
 	containername = "Seeds crate"
 	access = access_hydroponics
 
@@ -240,7 +240,7 @@
 					"/obj/item/seeds/bananaseed",
 					"/obj/item/seeds/eggyseed")
 	cost = 15
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = "/obj/structure/closet/crate/hydroponics"
 	containername = "Exotic Seeds crate"
 	access = access_hydroponics
 
@@ -333,13 +333,19 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Mechanical maintenance crate"
 
-/datum/supply_packs/waterfueltank
-	name = "Water/Fuel tank crate"
-	contains = list("/obj/structure/reagent_dispensers/watertank",
-					"/obj/structure/reagent_dispensers/fueltank")
-	cost = 15
-	containertype = "/obj/structure/closet/crate"
-	containername = "Water/Fuel tank crate"
+/datum/supply_packs/watertank
+	name = "Water tank crate"
+	contains = list("/obj/structure/reagent_dispensers/watertank")
+	cost = 8
+	containertype = "/obj/structure/largecrate"
+	containername = "water tank crate"
+
+/datum/supply_packs/fueltank
+	name = "Fuel tank crate"
+	contains = list("/obj/structure/reagent_dispensers/fueltank")
+	cost = 8
+	containertype = "/obj/structure/largecrate"
+	containername = "fuel tank crate"
 
 /datum/supply_packs/engine
 	name = "Emitter crate"
@@ -392,10 +398,8 @@
 
 /datum/supply_packs/mecha_odysseus
 	name = "Circuit Crate (\"Odysseus\")"
-	contains = list(
-						"/obj/item/weapon/circuitboard/mecha/odysseus/peripherals", //TEMPORARY due to lack of circuitboard printer
-						"/obj/item/weapon/circuitboard/mecha/odysseus/main" //TEMPORARY due to lack of circuitboard printer
-						)
+	contains = list("/obj/item/weapon/circuitboard/mecha/odysseus/peripherals", //TEMPORARY due to lack of circuitboard printer
+					"/obj/item/weapon/circuitboard/mecha/odysseus/main") //TEMPORARY due to lack of circuitboard printer
 	cost = 25
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "\"Odysseus\" Circuit Crate"
@@ -595,7 +599,7 @@
 
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
-	contains = list("/obj/item/weapon/contraband/poster","/obj/item/weapon/cigpacket/dromedaryco") //We randomly pick 5 items from this list through the constructor, look below
+	contains = list("/obj/item/weapon/contraband/poster", "/obj/item/weapon/cigpacket/dromedaryco")
 	name = "Contraband crate"
 	cost = 30
 	containertype = "/obj/structure/closet/crate"

code/defines/obj/weapon.dm

@@ -176,7 +176,7 @@
 /obj/item/weapon/spacecash/c1000
 	icon_state = "spacecash1000"
 	access = access_crate_cash
-	desc = "It's worth 1000 credits."
+	desc = "It's worth 1000 credits. El oh dee ess of ee em oh en ee! What's that spell? LOADSAMONEY, probly!"
 
 /obj/item/device/mass_spectrometer
 	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."

code/game/objects/ladders.dm

@@ -40,23 +40,27 @@
 	if(up && down)
 		switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
 			if("Up")
-				user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>")
+				user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
+									 "<span class='notice'>You climb up \the [src]!</span>")
 				user.loc = get_turf(up)
 				up.add_fingerprint(user)
 			if("Down")
-				user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>")
+				user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
+									 "<span class='notice'>You climb down \the [src]!</span>")
 				user.loc = get_turf(down)
 				down.add_fingerprint(user)
 			if("Cancel")
 				return
 
 	else if(up)
-		user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>")
+		user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
+							 "<span class='notice'>You climb up \the [src]!</span>")
 		user.loc = get_turf(up)
 		up.add_fingerprint(user)
 
 	else if(down)
-		user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>")
+		user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
+							 "<span class='notice'>You climb up \the [src]!</span>")
 		user.loc = get_turf(down)
 		down.add_fingerprint(user)
 

code/game/objects/largecrate.dm

@@ -0,0 +1,27 @@
+/obj/structure/largecrate
+	name = "large crate"
+	desc = "A hefty wooden crate."
+	icon = 'storage.dmi'
+	icon_state = "densecrate"
+	density = 1
+	flags = FPRINT
+
+/obj/structure/largecrate/attack_hand(mob/user as mob)
+	user << "<span class='notice'>You need a crowbar to pry this open!</span>"
+	return
+
+/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /obj/item/stack/sheet/wood(src)
+		var/turf/T = get_turf(src)
+		for(var/obj/O in contents)
+			O.loc = T
+		user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
+							 "<span class='notice'>You pry open \the [src].</span>", \
+							 "<span class='notice'>You hear splitting wood.</span>")
+		del(src)
+	else
+		return attack_hand(user)
+
+/obj/structure/largecrate/mule
+	icon_state = "mulecrate"

code/game/supplyshuttle.dm

@@ -207,8 +207,13 @@ This method wont take into account storage items developed in the future and doe
 	var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
 
 	for(var/turf/T in get_area_turfs(shuttleat) )
+		var/obj/item/weapon/paper/slip = locate(/obj/item/weapon/paper/manifest) in T
+		if(slip)
+			if(slip.stamped.len)	//yes, the clown stamp will work. clown is the highest authority on the station, it makes sense
+				supply_shuttle_points += SUPPLY_POINTSPERSLIP
+			del(slip)
 		var/crate = locate(/obj/structure/closet/crate) in T
-		if (crate)
+		if(crate)
 			del(crate)
 			supply_shuttle_points += SUPPLY_POINTSPERCRATE
 
@@ -230,7 +235,7 @@ This method wont take into account storage items developed in the future and doe
 		var/pickedloc = 0
 		var/found = 0
 		for(var/C in markers)
-			if (locate(/obj/structure/closet/crate) in get_turf(C)) continue
+			if ((locate(/obj/structure/closet/crate) in get_turf(C)) || (locate(/obj/structure/largecrate) in get_turf(C))) continue
 			found = 1
 			pickedloc = get_turf(C)
 		if (!found) pickedloc = get_turf(pick(markers))

icons/sprites_todo.txt

@@ -1,9 +0,0 @@
-O Things that need to be resprited:
-	* Put stuff here
-
-O Things with sprites that are ready to be coded:
-	* Bins, secure bins, AK-331, M41 Rifle, eZ-13 Pulse Rifle, AI Display Trollface, 	  	  AI Display friend computer eye, thermal monocle, boxing bell (in objects), minimoog,
-	  head slime xeno
-
-O Things that are coded that need sprites:
-	* Put stuff here too

tgstation.dme

@@ -596,7 +596,9 @@
 #include "code\game\objects\grille.dm"
 #include "code\game\objects\items.dm"
 #include "code\game\objects\kitchen.dm"
+#include "code\game\objects\ladders.dm"
 #include "code\game\objects\lamarr.dm"
+#include "code\game\objects\largecrate.dm"
 #include "code\game\objects\mineral_doors.dm"
 #include "code\game\objects\new_year.dm"
 #include "code\game\objects\noticeboard.dm"
@@ -1113,8 +1115,6 @@
 #include "code\modules\security levels\security levels.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
-#include "code\WorkInProgress\organs\implants.dm"
-#include "code\WorkInProgress\organs\organs.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\tgstation.2.0.9.dmm"