Fixes for APC:

- fixed issue 88: monkeys now can play with APC.
- Silicon liveforms cannot use malfhacked APCs if they arent an AT who hacked APC or his slaved borgs.
Fixed issue 121.
Latejoiners got their backpacks back.
Fixed attack log.
Fixed ammo icons not showing in dreammaker map editor.

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

code/game/objects/devices/PDA/PDA.dm

@@ -626,7 +626,7 @@
 			name = "PDA-[owner] ([ownjob])"
 			user << "\blue Card scanned."
 		else
-			var/input=alert("Would you like to inert the card or update owner information?",,"Insert","Update")
+			var/input=alert("Would you like to insert the card or update owner information?",,"Insert","Update")
 			//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
 
 			if ( ( (src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )

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

@@ -17,9 +17,9 @@ var/const/PROJECTILE_DART = 8
 	icon_state = "bullet"
 	density = 1
 	throwforce = 0.1 //an attempt to make it possible to shoot your way through space
-	unacidable = 1//Just to be sure.
-	anchored = 1.0
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	unacidable = 1 //Just to be sure.
+	anchored = 1 // I'm not sure if it is a good idea. Bullets sucked to space and curve trajectories near singularity could be awesome. --rastaf0
+	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT // ONBELT???
 	var
 		def_zone = ""
 		damage_type = PROJECTILE_BULLET
@@ -58,25 +58,23 @@ var/const/PROJECTILE_DART = 8
 		icon_state = "cbbolt"
 
 	Bump(atom/A as mob|obj|turf|area)
+		if(firer && istype(A, /mob))
+			var/mob/M = A
+			if(!silenced)
+				visible_message("\red [A.name] has been shot by [firer.name].", "\blue You hear a [istype(src, /obj/item/projectile/beam) ? "gunshot" : "laser blast"].")
+			else
+				M << "\red You've been shot!"
+			if(istype(firer, /mob))
+				M.attack_log += text("[] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, firer, firer.ckey, M, M.ckey, src)
+				firer.attack_log += text("[] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, firer, firer.ckey, M, M.ckey, src)
+			else
+				M.attack_log += text("[] <b>UNKOWN SUBJECT (No longer exists)</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, M, M.ckey, src)
 		spawn(0)
 			if(A)
 				A.bullet_act(damage_type, src, def_zone)
 				if(istype(A,/turf) && !istype(src, /obj/item/projectile/beam))
 					for(var/obj/O in A)
 						O.bullet_act(damage_type, src, def_zone)
-			if(firer && istype(A, /mob))
-				var/mob/M = A
-				if(!silenced)
-					visible_message("\red [A.name] has been shot by [firer.name].", "\blue You hear a [istype(src, /obj/item/projectile/beam) ? "gunshot" : "laser blast"].")
-				else
-					if(M)
-						if(M.client)
-							M << "\red You've been shot!"
-						if(istype(firer, /mob))
-							M.attack_log += text("[] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, firer, firer.client, M, M.client, src)
-							firer.attack_log += text("[] <b>[]/[]</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, firer, firer.client, M, M.client, src)
-					else
-						M.attack_log += text("[] <b>UNKOWN SUBJECT (No longer exists)</b> shot <b>[]/[]</b> with a <b>[]</b>", world.time, M, M.client, src)
 			del(src)
 		return
 
@@ -201,8 +199,19 @@ var/const/PROJECTILE_DART = 8
 			for(var/i = 1, i <= 7, i++)
 				stored_ammo += new /obj/item/ammo_casing/c38(src)
 			update_icon()
+/*
+	shotgun
+		name = "ammo box (12gauge)"
+		desc = "A box of 12 gauge shell"
+		icon_state = "" //no sprite :'(
+		caliber = "shotgun"
+		m_amt = 25000
 
-
+		New()
+			BB = new /obj/item/projectile/shotgun(src)
+			src.pixel_x = rand(-10.0, 10)
+			src.pixel_y = rand(-10.0, 10)
+*/
 ///////////////////////////////////////////////
 //////////////////////Guns/////////////////////
 ///////////////////////////////////////////////
@@ -259,7 +268,7 @@ var/const/PROJECTILE_DART = 8
 				return 0
 
 		New()
-			for(var/i = 1, i <= 7, i++)
+			for(var/i = 1, i <= max_shells, i++)
 				loaded += new /obj/item/ammo_casing(src)
 			update_icon()
 
@@ -293,12 +302,12 @@ var/const/PROJECTILE_DART = 8
 		detective
 			desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
 			name = ".38 revolver"
-			max_shells = 7
+			icon_state = "detective"
 			force = 14.0
 			caliber = "38"
 
 			New()
-				for(var/i = 1, i <= 7, i++)
+				for(var/i = 1, i <= max_shells, i++)
 					loaded += new /obj/item/ammo_casing/c38(src)
 				update_icon()
 
@@ -323,6 +332,8 @@ var/const/PROJECTILE_DART = 8
 			caliber = "shotgun"
 
 			New()
+				for(var/i = 1, i <= max_shells, i++)
+					loaded += new /obj/item/ammo_casing/shotgun/beanbag(src)
 				update_icon()
 
 			combat
@@ -333,6 +344,10 @@ var/const/PROJECTILE_DART = 8
 				flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
 				max_shells = 8
 				origin_tech = "combat=3"
+				New()
+					for(var/i = 1, i <= max_shells, i++)
+						loaded += new /obj/item/ammo_casing/shotgun(src)
+					update_icon()
 
 	energy
 		icon_state = "energy"
@@ -395,7 +410,7 @@ var/const/PROJECTILE_DART = 8
 				icon_state = "caplaser"
 				desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
 				force = 10
-				origin_tech = null
+				origin_tech = null //forgotten technology of ancients lol
 
 			cyborg
 				load_into_chamber()