Merge pull request #76 from Tastyfish/master

The closet tg merge broke charge crates

code/defines/obj/supplypacks.dm

@@ -17,7 +17,7 @@
 
 /datum/supply_packs/charge
 	cost = 10
-	containertype = "/obj/structure/crate"
+	containertype = "/obj/structure/closet/crate"
 
 /datum/supply_packs/charge/medical
 	name = "Medical Charge"

code/game/asteroid/asteroid.dm

@@ -152,7 +152,7 @@ var/global/list/space_surprises = list(/obj/item/clothing/mask/facehugger,
 													/obj/item/weapon/rcd,
 													/obj/item/weapon/rcd_ammo,
 													/obj/item/weapon/spacecash,
-													/obj/item/weapon/cloaking_device,
+													///obj/item/weapon/cloaking_device,
 												//	/obj/item/weapon/gun/energy/teleport_gun,
 													/obj/item/weapon/rubber_chicken,
 													/obj/item/weapon/melee/energy/sword/pirate

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -139,8 +139,8 @@ datum/hSB
 							continue
 						if(istype(O, /obj/item/weapon/camera))
 							continue
-						if(istype(O, /obj/item/weapon/cloaking_device))
-							continue
+						/*if(istype(O, /obj/item/weapon/cloaking_device))
+							continue*/
 						if(istype(O, /obj/item/weapon/dummy))
 							continue
 						if(istype(O, /obj/item/weapon/melee/energy/sword))

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

@@ -52,7 +52,7 @@
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=space'>Syndicate-made Space Suit (inludes a helmet)</A> (3)<BR>"
 	menu_message += "<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=projector'>Chameleon-projector</A> (4)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=cloak'>Cloaking Device</A> (4)<BR>"
+	//menu_message += "<A href='byond://?src=\ref[src];buy_item=cloak'>Cloaking Device</A> (4)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=emag'>Electromagnet Card</A> (3)<BR>"
 	menu_message += "<A href='byond://?src=\ref[src];buy_item=empbox'>5 EMP Grenades</A> (4)<BR>"
 	menu_message += "<BR>"
@@ -153,10 +153,10 @@
 				if (uses >= 4)
 					uses -= 4
 					new /obj/item/device/chameleon(get_turf(hostpda))
-			if("cloak")
+			/*if("cloak")
 				if (uses >= 4)
 					uses -= 4
-					new /obj/item/weapon/cloaking_device(get_turf(hostpda))
+					new /obj/item/weapon/cloaking_device(get_turf(hostpda))*/
 			if("sword")
 				if (uses >= 4)
 					uses -= 4

code/game/objects/devices/flash.dm

@@ -128,11 +128,11 @@
 				del(animation)
 
 		for(var/mob/living/carbon/M in oviewers(3, null))
-			if(prob(50))
+			/*if(prob(50))
 				if (locate(/obj/item/weapon/cloaking_device, M))
 					for(var/obj/item/weapon/cloaking_device/S in M)
 						S.active = 0
-						S.icon_state = "shield0"
+						S.icon_state = "shield0"*/
 			var/safety = M:eyecheck()
 			if(!safety)
 				flick("flash", M.flash)

code/game/objects/devices/shields.dm

@@ -23,7 +23,7 @@
 	return
 */
 
-
+/*
 /obj/item/weapon/cloaking_device
 	name = "cloaking device"
 	desc = "Use this to become invisible to the human eyesocket."
@@ -53,4 +53,5 @@
 /obj/item/weapon/cloaking_device/emp_act(severity)
 	active = 0
 	icon_state = "shield0"
-	..()
+	..()
+*/

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

@@ -151,10 +151,10 @@ FLASHBANG
 			T.hotspot_expose(700,125)
 
 		for(var/mob/living/carbon/M in viewers(T, null))
-			if (locate(/obj/item/weapon/cloaking_device, M))
+			/*if (locate(/obj/item/weapon/cloaking_device, M))
 				for(var/obj/item/weapon/cloaking_device/S in M)
 					S.active = 0
-					S.icon_state = "shield0"
+					S.icon_state = "shield0"*/
 
 			M << "\red <B>BANG</B>"
 

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

@@ -14,9 +14,11 @@
 	item_state = "flight"
 	name = "Hand labeler"
 
-/obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob)
+/obj/item/weapon/hand_labeler/afterattack(atom/A as obj|mob, mob/user as mob)
 	if(A==loc)      // if placing the labeller into something (e.g. backpack)
 		return      // don't remove any labels
+	if(!A.labels)
+		return
 	if(A.labels.len == 1)
 		var/t = A.labels[1]
 		A.name = copytext(A.name,1,lentext(A.name) - (lentext(t) + 2))
@@ -78,6 +80,8 @@
 		if(ishuman(A))
 			user << "\red You can't label humans."
 			return
+		if(!A.labels)
+			A.labels = new()
 		for(var/i = 1, i < A.labels.len, i++)
 			if(label == A.labels[i])
 				user << "\red [A] already has that label!"

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

@@ -146,14 +146,14 @@ SYNDICATE UPLINK
 					if (src.uses >= 7)
 						src.uses -= 7
 						new /obj/item/weapon/aiModule/syndicate(get_turf(src))
-				if("cloak")
+				/*if("cloak")
 					if (src.uses >= 4)
 						if (ticker.mode.config_tag!="nuclear" || \
 							(input(currentUser,"Spawning a cloak in nuke is generally regarded as entirely dumb, are you sure?") in list("Confirm", "Abort")) == "Confirm" \
 						)
 							if (src.uses >= 4)
 								src.uses -= 4
-								new /obj/item/weapon/cloaking_device(get_turf(src))
+								new /obj/item/weapon/cloaking_device(get_turf(src))*/
 				if("sword")
 					if (src.uses >= 4)
 						src.uses -= 4

code/game/objects/storage/storage.dm

@@ -286,7 +286,7 @@
 
 		if ("murder")
 			new /obj/item/weapon/melee/energy/sword(src)
-			new /obj/item/weapon/cloaking_device(src)
+			//new /obj/item/weapon/cloaking_device(src)
 			new /obj/item/weapon/card/emag(src)
 			return
 

code/modules/admin/verbs/debug.dm

@@ -431,7 +431,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/glasses/thermal/monocle(M), M.slot_glasses)
 			M.equip_if_possible(new /obj/item/clothing/head/det_hat(M), M.slot_head)
 
-			M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store)
+			//M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store)
 
 			M.equip_if_possible(new /obj/item/weapon/gun/projectile(M), M.slot_r_hand)
 			M.equip_if_possible(new /obj/item/ammo_magazine/a357(M), M.slot_l_store)
@@ -544,7 +544,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), M.slot_glasses)
 			M.equip_if_possible(new /obj/item/clothing/suit/wcoat(M), M.slot_wear_suit)
 			M.equip_if_possible(new /obj/item/weapon/melee/energy/sword(M), M.slot_l_store)
-			M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store)
+			//M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store)
 
 			var/obj/item/weapon/secstorage/sbriefcase/sec_briefcase = new(M)
 			for(var/obj/item/briefcase_item in sec_briefcase)

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -431,10 +431,10 @@
 
 
 	var/shielded = 0
-	for (var/obj/item/weapon/cloaking_device/S in src)
+	/*for (var/obj/item/weapon/cloaking_device/S in src)
 		if (S.active)
 			shielded = 2
-			break
+			break*/
 
 	if (shielded == 2 || alien_invis)
 		invisibility = 2

code/modules/mob/living/carbon/human/human.dm

@@ -1055,10 +1055,10 @@
 		l_hand.screen_loc = ui_lhand
 
 	var/shielded = 0
-	for (var/obj/item/weapon/cloaking_device/S in src)
+	/*for (var/obj/item/weapon/cloaking_device/S in src)
 		if (S.active)
 			shielded = 2
-			break
+			break*/
 
 	if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_active)
 		shielded = 3

code/modules/mob/living/living_defense.dm

@@ -37,11 +37,11 @@
 
 
 /mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
-	var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src)
+	/*var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src)
 	if(C && C.active)
 		C.attack_self(src)//Should shut it off
 		src << "\blue Your [C.name] was disrupted!"
-		stunned = max(stunned, 2)
+		stunned = max(stunned, 2)*/
 
 	flash_weak_pain()