Laser Cannon added to R&D(still needs a good sprite). Two Security Combat Shotguns added to armory. R&D can now make Stun Shells for shotguns. Traitors gets two new items. Suffocation rounds and syndicate shoes.

If I missed anything, forgive me.

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

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

@@ -32,10 +32,12 @@
 	menu_message += "<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=revolver'>Revolver</A> (6)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=revolver_ammo'>Ammo-357</A> for use with Revolver (2)<BR>"
+	menu_message += "<A href='byond://?src=\ref[src];buy_item=suffocation_revolver_ammo'>Ammo-418</A> for use with Revolver (3)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=xbow'>Energy Crossbow</A> (5)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=sword'>Energy Sword</A> (4)<BR>"
 	menu_message += "<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=jump'>Chameleon Jumpsuit</A> (3)<BR>"
+	menu_message += "<A href='byond://?src=\ref[src];buy_item=shoes'>Syndicate Shoes</A> (2)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
 	menu_message += "<BR>"
@@ -93,6 +95,10 @@
 				if (uses >= 2)
 					uses -= 2
 					new /obj/item/ammo_magazine(get_turf(hostpda))
+			if("suffocation_revolver_ammo")
+				if (uses >= 3)
+					uses -= 3
+					new /obj/item/ammo_magazine/a418(get_turf(hostpda))
 			if("xbow")
 				if (uses >= 5)
 					uses -= 5
@@ -109,6 +115,10 @@
 				if (uses >= 3)
 					uses -= 3
 					new /obj/item/clothing/under/chameleon(get_turf(hostpda))
+			if("shoes")
+				if (uses >= 2)
+					uses -= 2
+					new /obj/item/clothing/shoes/syndigaloshes(get_turf(hostpda))
 			if("card")
 				if (uses >= 3)
 					uses -= 3

code/game/objects/items.dm

@@ -437,6 +437,7 @@
 		istype(W, /obj/item/weapon/pen)                           || \
 		istype(W, /obj/item/weapon/weldingtool)      && W:welding || \
 		istype(W, /obj/item/weapon/zippo)            && W:lit     || \
+		istype(W, /obj/item/weapon/knifezippo)                    || \
 		istype(W, /obj/item/weapon/match)            && W:lit     || \
 		istype(W, /obj/item/clothing/mask/cigarette) && W:lit     || \
 		istype(W, /obj/item/weapon/wirecutters)                   || \

code/game/objects/items/clothing.dm

@@ -6,6 +6,7 @@ CAKEHAT
 SUNGLASSES
 SWAT SUIT
 CHAMELEON JUMPSUIT
+SYNDICATE SHOES
 DEATH COMMANDO GAS MASK
 THERMAL GLASSES
 */

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

@@ -283,4 +283,44 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 /obj/item/weapon/zippo/dropped(mob/user)
 	if(lit)
 		user.sd_SetLuminosity(user.luminosity - ZIPPO_LUM)
-		src.sd_SetLuminosity(ZIPPO_LUM)
+		src.sd_SetLuminosity(ZIPPO_LUM)
+
+
+
+
+/obj/item/weapon/knifezippo/attack_self(mob/user)
+	if(user.r_hand == src || user.l_hand == src)
+		if(!src.lit)
+			src.lit = 1
+			src.icon_state = "knifezippoon"
+			src.item_state = "knifezippoon"
+			for(var/mob/O in viewers(user, null))
+				O.show_message(text("\red Without even breaking stride, [] flips open and lights the [] in one smooth movement.", user, src), 1)
+
+		else
+			src.lit = 0
+			src.icon_state = "knifezippo"
+			src.item_state = "knifezippo"
+			for(var/mob/O in viewers(user, null))
+				O.show_message(text("\red You hear a quiet click, as [] shuts off the [] without even looking what they're doing. Wow.", user, src), 1)
+
+	else
+		return ..()
+	return
+
+/obj/item/weapon/knifezippo/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M, /mob))
+		return
+
+/obj/item/weapon/knifezippo/process()
+
+	while(src.lit)
+		var/turf/location = src.loc
+
+		if(istype(location, /mob/))
+			var/mob/M = location
+			if(M.l_hand == src || M.r_hand == src)
+				location = M.loc
+		if (istype(location, /turf))
+			location.hotspot_expose(700, 5)
+		sleep(10)

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

@@ -45,11 +45,14 @@
 
 		bumped = 0
 
-
 	weakbullet
 		damage = 15
 		mobdamage = list(BRUTE = 15, BURN = 0, TOX = 0, OXY = 0, CLONE = 0)
 
+	suffocationbullet
+		damage = 75
+		mobdamage = list(BRUTE = 50, BURN = 0, TOX = 0, OXY = 25, CLONE = 0)
+
 	beam
 		name = "laser"
 		icon_state = "laser"
@@ -68,6 +71,18 @@
 			damage = 50
 			mobdamage = list(BRUTE = 10, BURN = 40, TOX = 0, OXY = 0, CLONE = 0)
 
+	heavylaser
+		name = "heavy laser"
+		icon_state = "heavylaser"
+		pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+		damage = 40
+		mobdamage = list(BRUTE = 0, BURN = 40, TOX = 0, OXY = 0, CLONE = 0)
+		flag = "heavylaser"
+		New()
+			..()
+			effects["eyeblur"] = 10
+			effectprob["eyeblur"] = 100
+
 	fireball
 		name = "shock"
 		icon_state = "fireball"
@@ -114,6 +129,19 @@
 			effects["stutter"] = 10
 			effectprob["weak"] = 25
 
+	stunshot
+		name = "stunshot"
+		icon_state = "bullet"
+		flag = "stunshot"
+		damage = 5
+		mobdamage = list(BRUTE = 5, BURN = 0, TOX = 0, OXY = 0, CLONE = 0)
+		New()
+			..()
+			effects["stun"] = 20
+			effects["weak"] = 20
+			effects["stutter"] = 20
+			effectprob["weak"] = 45
+
 	bolt
 		name = "bolt"
 		icon_state = "cbbolt"
@@ -251,6 +279,17 @@
 		dir = pick(cardinal)
 
 
+	a418
+		name = "bullet casing (.418)"
+		desc = "A .418 bullet casing."
+		caliber = "357"
+
+		New()
+			BB = new /obj/item/projectile/suffocationbullet(src)
+			pixel_x = rand(-10.0, 10)
+			pixel_y = rand(-10.0, 10)
+			dir = pick(cardinal)
+
 	c38
 		name = "bullet casing (.38)"
 		desc = "A .38 bullet casing."
@@ -317,6 +356,17 @@
 				src.pixel_x = rand(-10.0, 10)
 				src.pixel_y = rand(-10.0, 10)
 
+		stunshell
+			desc = "A stunning shell."
+			name = "stun shell"
+			icon_state = "stunshell"
+			m_amt = 10000
+
+			New()
+				BB = new /obj/item/projectile/stunshot
+				src.pixel_x = rand(-10.0, 10)
+				src.pixel_y = rand(-10.0, 10)
+
 		dart
 			desc = "A dart for use in shotguns.."
 			name = "shotgun darts"
@@ -360,6 +410,14 @@
 				stored_ammo += new /obj/item/ammo_casing/c38(src)
 			update_icon()
 
+	a418
+		name = "ammo box (.418)"
+		icon_state = "418"
+		New()
+			for(var/i = 1, i <= 7, i++)
+				stored_ammo += new /obj/item/ammo_casing/a418(src)
+			update_icon()
+
 	c9mm
 		name = "Ammunition Box (9mm)"
 		icon_state = "9mm"
@@ -575,6 +633,20 @@
 						loaded += new /obj/item/ammo_casing/shotgun(src)
 					update_icon()
 
+			combat2
+				name = "security combat shotgun"
+				icon_state = "cshotgun"
+				w_class = 4.0
+				force = 12.0
+				flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
+				max_shells = 8
+				origin_tech = "combat=3"
+				maxpump = 2
+				New()
+					for(var/i = 1, i <= max_shells, i++)
+						loaded += new /obj/item/ammo_casing/shotgun/beanbag(src)
+					update_icon()
+
 			proc/pump(mob/M)
 				playsound(M, 'shotgunpump.ogg', 60, 1)
 				pumped = 0
@@ -603,14 +675,12 @@
 				icon_state = "mini-uzi"
 				w_class = 3.0
 				force = 16
-				max_shells = 20
 				caliber = ".45"
 				origin_tech = "combat=5;materials=2;syndicate=8"
 
 				New()
 					for(var/i = 1, i <= max_shells, i++)
 						loaded += new /obj/item/ammo_casing/c45(src)
-					update_icon()
 
 		silenced
 			name = "Silenced Pistol"
@@ -880,6 +950,42 @@
 						return 1
 					return 0
 
+		lasercannon
+			name = "laser cannon"
+			desc = "A heavy-duty laser cannon."
+			icon_state = "laser"
+			force = 15
+			fire_sound = 'pulse.ogg'
+			load_into_chamber()
+				if(in_chamber)
+					return 1
+				if(power_supply.charge < charge_cost)
+					return 0
+				switch (mode)
+					if(1)
+						in_chamber = new /obj/item/projectile/beam(src)
+					if(4)
+						in_chamber = new /obj/item/projectile/heavylaser(src)
+				power_supply.use(charge_cost)
+				return 1
+
+			attack_self(mob/living/user as mob)
+				mode++
+				switch(mode)
+					if(1)
+						user << "\red [src.name] is now set to kill."
+						fire_sound = 'Laser.ogg'
+						charge_cost = 50
+					else
+						mode = 4
+						user << "\red [src.name] is now set to slaughter"
+						fire_sound = 'pulse.ogg'
+						charge_cost = 100
+			New()
+				power_supply = new /obj/item/weapon/cell(src)
+				power_supply.give(power_supply.maxcharge)
+				update_icon()
+
 		shockgun
 			name = "shock gun"
 			desc = "A high tech energy weapon that stuns and burns a target."

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

@@ -35,10 +35,12 @@ SYNDICATE UPLINK
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=revolver'>Revolver</A> (6)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=revolver_ammo'>Ammo-357</A> for use with Revolver (2)<BR>"
+			dat += "<A href='byond://?src=\ref[src];buy_item=suffocation_revolver_ammo'>Ammo-418</A> for use with Revolver (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=xbow'>Energy Crossbow</A> (5)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=sword'>Energy Sword</A> (4)<BR>"
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=jump'>Chameleon Jumpsuit</A> (3)<BR>"
+			dat += "<A href='byond://?src=\ref[src];buy_item=shoes'>Syndicate Shoes</A> (2)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
 			dat += "<BR>"
@@ -90,6 +92,10 @@ SYNDICATE UPLINK
 					if (src.uses >= 2)
 						src.uses -= 2
 						new /obj/item/ammo_magazine(get_turf(src))
+				if("suffocation_revolver_ammo")
+					if (uses >= 3)
+						uses -= 3
+						new /obj/item/ammo_magazine/a418(get_turf(src))
 				if("xbow")
 					if (src.uses >= 5)
 						src.uses -= 5
@@ -106,6 +112,10 @@ SYNDICATE UPLINK
 					if (src.uses >= 3)
 						src.uses -= 3
 						new /obj/item/clothing/under/chameleon(get_turf(src))
+				if("shoes")
+					if (uses >= 2)
+						uses -= 2
+						new /obj/item/clothing/shoes/syndigaloshes(get_turf(src))
 				if("card")
 					if (src.uses >= 3)
 						src.uses -= 3