From 29fa57a69a548a6cbc44741438ea5922301ad31d Mon Sep 17 00:00:00 2001
From: "Superxpdude@gmail.com"
 <Superxpdude@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 16 Aug 2011 18:23:42 +0000
Subject: [PATCH] TRAITOR BUNDLES: Randomized boxes of 11-13 crystals worth
 traitor items, costs 10 telecrystals. CHANGELOG UPDATED

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2020 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj/storage.dm             |  2 ++
 code/game/objects/devices/PDA/uplink.dm |  7 +++-
 code/game/objects/storage/storage.dm    | 44 +++++++++++++++++++++++++
 icons/changelog.html                    | 17 +++++++++-
 4 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 42789dc55b8..e61cfd64187 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -98,6 +98,8 @@
 /obj/item/weapon/storage/survival_kit/engineer
 	name = "Centcom Engineer Kit"
 
+/obj/item/weapon/storage/box/syndicate
+
 /obj/item/weapon/storage/pillbottlebox
 	name = "pill bottles"
 	desc = "A box of pill bottles."
diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm
index 5f33623e3bb..ba9475c7af5 100644
--- a/code/game/objects/devices/PDA/uplink.dm
+++ b/code/game/objects/devices/PDA/uplink.dm
@@ -63,7 +63,8 @@
 	menu_message += "<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=toolbox'>Syndicate Toolbox</A> (Includes various tools) (1)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=balloon'>Syndicate Balloon</A> (Useless) (10)<BR>"
-
+	menu_message += "<BR>"
+	menu_message += "<A href='byond://?src=\ref[src];buy_item=bundle'>Syndicate Bundle</A> (Contains an assorted selection of syndicate items)(10)<BR>"
 
 	menu_message += "<HR>"
 	return
@@ -196,6 +197,10 @@
 				if(uses >= 10)
 					uses -= 10
 					new /obj/item/toy/syndicateballoon(get_turf(hostpda))
+			if("bundle")
+				if(uses >= 10)
+					uses -= 10
+					new /obj/item/weapon/storage/box/syndicate(get_turf(hostpda))
 
 		generate_menu()
 		print_to_host(menu_message)
diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm
index 22ec29167ea..79f96d15abf 100644
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -215,6 +215,50 @@
 	new /obj/item/weapon/tank/emergency_oxygen/engi( src )
 	return
 
+/obj/item/weapon/storage/box/syndicate/New()
+	..()
+	switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1)))
+		if ("bloodyspai")
+			new /obj/item/clothing/under/chameleon(src)
+			new /obj/item/clothing/mask/gas/voice(src)
+			new /obj/item/weapon/card/id/syndicate(src)
+			new /obj/item/clothing/shoes/syndigaloshes(src)
+			return
+
+		if ("stealth")
+			new /obj/item/weapon/gun/energy/crossbow(src)
+			new /obj/item/weapon/pen/sleepypen(src)
+			new /obj/item/device/chameleon(src)
+			return
+
+		if ("screwed")
+			new /obj/spawner/newbomb/timer/syndicate(src)
+			new /obj/spawner/newbomb/timer/syndicate(src)
+			new /obj/item/device/powersink(src)
+			new /obj/item/clothing/suit/space/syndicate(src)
+			new /obj/item/clothing/head/helmet/space/syndicate(src)
+			return
+
+		if ("guns")
+			new /obj/item/weapon/gun/projectile(src)
+			new /obj/item/ammo_magazine(src)
+			new /obj/item/weapon/card/emag(src)
+			new /obj/item/weapon/plastique(src)
+			return
+
+		if ("murder")
+			new /obj/item/weapon/melee/energy/sword(src)
+			new /obj/item/weapon/cloaking_device(src)
+			new /obj/item/weapon/card/emag(src)
+			return
+
+		if("freedom")
+			var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
+			O.imp = new /obj/item/weapon/implant/freedom(O)
+			var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src)
+			U.imp = new /obj/item/weapon/implant/uplink(U)
+			return
+
 /obj/item/weapon/storage/dice/New()
 	new /obj/item/weapon/dice( src )
 	new /obj/item/weapon/dice/d20( src )
diff --git a/icons/changelog.html b/icons/changelog.html
index 0c30ff5e7c1..b0ca0a17e68 100644
--- a/icons/changelog.html
+++ b/icons/changelog.html
@@ -45,7 +45,22 @@ Stuff which is in development and not yet visible to players or just code relate
 (is. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit tho. Thanks. -->
 
-<b><font color-'blue'>15 August 2011.</font color><b>
+<b><font color='blue'>16 August 2011.</font color><b>
+<ul>
+  <li><b>Superxpdude updated</b>:
+  <ul>
+    <li>Traitor item bundles: Contains a random selection of traitor gear</li>
+  </ul>
+</ul>
+
+<ul>
+  <li><b>Uhangi updated</b>:
+  <ul>
+    <li>.38 Special Ammo can now be made from unhacked autolathes</li>
+  </ul>
+</ul>
+
+<b><font color='blue'>15 August 2011.</font color><b>
 <ul>
   <li><b>Superxpdude updated</b>:
   <ul>