diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm
index daefa3a70e3..eb72daf923e 100644
--- a/code/defines/obj/clothing/gimmick.dm
+++ b/code/defines/obj/clothing/gimmick.dm
@@ -306,11 +306,25 @@
 	icon_state = "pirate"
 	item_state = "pirate"
 
-/obj/item/clothing/suit/pirate
-	name = "pirate coat"
+/obj/item/clothing/head/piratecaptain
+	name = "pirate hat"
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state = "pirate"
+
+/obj/item/clothing/suit/pirate
+	name = "pirate coat"
+	desc = "Yarr."
+	icon_state = "hoscap"
+	item_state = "pirate_cap"
+	flags = FPRINT | TABLEPASS
+
+
+/obj/item/clothing/suit/piratecaptain
+	name = "pirate captain coat"
+	desc = "Yarr."
+	icon_state = "jensencoat"
+	item_state = "piratecap"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/glasses/eyepatch
diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index 0558d2d7f94..44b755fba74 100644
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -471,6 +471,14 @@
 	containername = "Riot gear crate"
 	access = access_armory
 
+/datum/supply_packs/loyalty
+	name = "Loyalty implant crate"
+	contains = list ("obj/item/storage/lockbox/loyalty")
+	cost = 60
+	containertype = "/obj/structure/crate/secure"
+	containername = "Loyalty implant crate"
+	access = access_armory
+
 /datum/supply_packs/ballistic
 	name = "Ballistic gear crate"
 	contains = list("/obj/item/clothing/suit/armor/bulletproof",
diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm
index 3f29b420ac9..633da956119 100644
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -353,10 +353,6 @@
 		usr << "\red You're not a changeling, something's wrong!"
 		return
 
-	if(usr.stat == 2)
-		usr << "\red We are dead."
-		return
-
 	if(usr.changeling.chem_charges < 20)
 		usr << "\red We don't have enough stored chemicals to do that!"
 		return
@@ -372,25 +368,25 @@
 
 	usr.emote("gasp")
 
-	spawn(550)
-		if (usr.stat != 2)
-			//usr.fireloss = 0
-			usr.toxloss = 0
-			//usr.bruteloss = 0
-			usr.oxyloss = 0
-			usr.paralysis = 0
-			usr.stunned = 0
-			usr.weakened = 0
-			usr.radiation = 0
-			//usr.health = 100
-			//usr.updatehealth()
-			var/mob/living/M = src
-			M.heal_overall_damage(1000, 1000)
-			usr.reagents.clear_reagents()
-			usr.lying = 0
-			usr.canmove = 1
-			usr << "\blue We have regenerated."
-			usr.visible_message(text("\red <B>[usr] appears to wake from the dead, having healed all wounds.</B>"))
+	spawn(1200)
+		usr.stat = 0
+		//usr.fireloss = 0
+		usr.toxloss = 0
+		//usr.bruteloss = 0
+		usr.oxyloss = 0
+		usr.paralysis = 0
+		usr.stunned = 0
+		usr.weakened = 0
+		usr.radiation = 0
+		//usr.health = 100
+		//usr.updatehealth()
+		var/mob/living/M = src
+		M.heal_overall_damage(1000, 1000)
+		usr.reagents.clear_reagents()
+		usr.lying = 0
+		usr.canmove = 1
+		usr << "\blue We have regenerated."
+		usr.visible_message(text("\red <B>[usr] appears to wake from the dead, having healed all wounds.</B>"))
 
 		usr.changeling.changeling_fakedeath = 0
 		if (usr.changeling.changeling_level == 1)
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 6429c9e17a6..8017ed9a9d9 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -55,9 +55,9 @@
 	fire_sound = 'lasercannonfire.ogg'
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
-	equip_cooldown = 7
-	name = "mkIV Ion Heavy Repeater"
-	icon_state = "mecha_laser"
+	equip_cooldown = 40
+	name = "mkIV Ion Heavy Cannon"
+	icon_state = "mecha_ion"
 	energy_drain = 120
 	projectile = /obj/item/projectile/ion
 	fire_sound = 'Laser.ogg'
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 456745e0eb7..99d5233ab85 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -92,7 +92,6 @@
 						/obj/item/mecha_parts/mecha_equipment/weapon/honker,
 						/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
 						/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
-						/obj/item/mecha_parts/mecha_equipment/repair_droid,
 						/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,
 						/obj/item/mecha_parts/mecha_equipment/plasma_generator
 						),
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index a59754dee87..6849c5d7bf2 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -7,6 +7,7 @@
 		return
 	if(alert("BEGIN THE TOURNAMENT?",,"Yes","No")=="No")
 		return
+
 	for(var/mob/living/carbon/human/H in world)
 		if(H.stat == 2 || !(H.client)) continue
 		if(is_special_character(H)) continue
@@ -28,19 +29,18 @@
 		for(var/datum/objective/OBJ in H.mind.objectives)
 			H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
 			obj_count++
-		new /obj/item/weapon/pinpointer(H.loc)
 
 		for (var/obj/item/I in H)
 			if (istype(I, /obj/item/weapon/implant))
 				continue
 			del(I)
 
-
 		H.equip_if_possible(new /obj/item/clothing/under/kilt(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/clothing/head/beret(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/weapon/claymore(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/clothing/shoes/combat(H), H.slot_shoes)
+		H.equip_if_possible(new /obj/item/weapon/pinpointer(H.loc), H.slot_l_store)
 
 		var/obj/item/weapon/card/id/W = new(H)
 		W.name = "[H.real_name]'s ID Card"
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 2773409049f..86018aab4e3 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -654,14 +654,14 @@ datum
 			req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3)
 			build_path = "/obj/item/mecha_parts/mecha_equipment/gravcatapult"
 
-		mech_repair_droid
+		/*mech_repair_droid
 			name = "Exosuit Module Design (Repair Droid Module)"
 			desc = "Automated Repair Droid. BEEP BOOP"
 			id = "mech_repair_droid"
 			build_type = MECHFAB
 			req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3)
 			build_path = "/obj/item/mecha_parts/mecha_equipment/repair_droid"
-
+			*/
 		mech_plasma_generator
 			name = "Exosuit Module Design (Plasma Converter Module)"
 			desc = "Exosuit-mounted plasma converter."
diff --git a/html/changelog.html b/html/changelog.html
index 9a25dad59b7..097ef849097 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,17 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. 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'>7 November 2011</font><b>
+<ul>
+  <li><b>Kor updated:</b>
+  <ul>
+    <li>Repair bots (mechs) are now adminspawn only</li>
+    <li>Extra loyalty implants are now orderable via cargo bay (60 points for 4 implants)</li>
+    <li>Changeling regen stasis now takes two full minutes to use, but can be used while dead. Burning and gibbing are the only way to keep them dead now.</li>
+  </ul>
+  </li>
+</ul>
+
 <b><font color='blue'>29 October 2011</font><b>
 <ul>
   <li><b>ConstantA updated:</b>
diff --git a/icons/misc/mech_construct.dmi b/icons/misc/mech_construct.dmi
index b57e48d008a..4f9b1c6d1f5 100644
Binary files a/icons/misc/mech_construct.dmi and b/icons/misc/mech_construct.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index c279f930e4d..d137a5f24c0 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index a4c4b9f0a7f..7194412ab8c 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ