Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm

code/game/objects/items/devices/taperecorder.dm

@@ -39,7 +39,7 @@
 		return
 
 /obj/item/device/taperecorder/emag_act(user as mob)			
-	if(!emagged == 0)
+	if(emagged == 0)
 		emagged = 1
 		recording = 0
 		user << "<span class='warning'>PZZTTPFFFT</span>"

code/game/supplyshuttle.dm

@@ -367,8 +367,24 @@ var/list/mechtoys = list(
 			temp += "<b>Request from: [get_supply_group_name(cat)]</b><BR><BR>"
 			for(var/supply_type in supply_controller.supply_packs )
 				var/datum/supply_packs/N = supply_controller.supply_packs[supply_type]
-				if(N.hidden || N.contraband || N.group != cat) continue								//Have to send the type instead of a reference to
-				temp += "<A href='?src=\ref[src];doorder=[supply_type]'>[N.name]</A> Cost: [N.cost]<BR>"		//the obj because it would get caught by the garbage
+				if(N.hidden || N.contraband || N.group != cat) continue
+				temp += "<A href='?src=\ref[src];doorder=[supply_type]'>[N.name]</A>" //Have to send the type instead of a reference to the obj because it would get caught by the garbage
+				temp += " (<A href='?src=\ref[src];see_contents=[supply_type]'>contents</A>)"
+				temp += " Cost: [N.cost]<BR>"
+
+	else if (href_list["see_contents"])
+		//Find the correct supply_pack datum
+		var/datum/supply_packs/P = supply_controller.supply_packs[href_list["see_contents"]]
+		if(!istype(P))	return
+		
+		var/cat = P.group
+		var/tempaccess = get_access_desc(P.access)
+		
+		temp = "<b>Supply points: [supply_controller.points]</b><BR>"
+		temp += "<A href='?src=\ref[src];order=[cat]'>Back to [get_supply_group_name(cat)]</A><HR><BR><BR>"
+		temp += "Access restriction: [tempaccess ? tempaccess : "None"]<br><br>"
+		temp += "Contents of <b>[P.name]</b>:<BR>"
+		temp += P.manifest
 
 	else if (href_list["doorder"])
 		if(world.time < reqtime)
@@ -563,8 +579,10 @@ var/list/mechtoys = list(
 			temp += "<b>Request from: [get_supply_group_name(cat)]</b><BR><BR>"
 			for(var/supply_type in supply_controller.supply_packs )
 				var/datum/supply_packs/N = supply_controller.supply_packs[supply_type]
-				if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue								//Have to send the type instead of a reference to
-				temp += "<A href='?src=\ref[src];doorder=[supply_type]'>[N.name]</A> Cost: [N.cost]<BR>"		//the obj because it would get caught by the garbage
+				if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue
+				temp += "<A href='?src=\ref[src];doorder=[supply_type]'>[N.name]</A>" //Have to send the type instead of a reference to the obj because it would get caught by the garbage
+				temp += " (<A href='?src=\ref[src];see_contents=[supply_type]'>contents</A>)"
+				temp += " Cost: [N.cost]<BR>"
 
 		/*temp = "Supply points: [supply_controller.points]<BR><HR><BR>Request what?<BR><BR>"
 
@@ -575,6 +593,20 @@ var/list/mechtoys = list(
 			temp += "<A href='?src=\ref[src];doorder=[supply_name]'>[supply_name]</A> Cost: [N.cost]<BR>"    //the obj because it would get caught by the garbage
 		temp += "<BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"*/
 
+	else if (href_list["see_contents"])
+		//Find the correct supply_pack datum
+		var/datum/supply_packs/P = supply_controller.supply_packs[href_list["see_contents"]]
+		if(!istype(P))	return
+		
+		var/cat = P.group
+		var/tempaccess = get_access_desc(P.access)
+		
+		temp = "<b>Supply points: [supply_controller.points]</b><BR>"
+		temp += "<A href='?src=\ref[src];order=[cat]'>Back to [get_supply_group_name(cat)]</A><HR><BR><BR>"
+		temp += "Access restriction: [tempaccess ? tempaccess : "None"]<br><br>"
+		temp += "Contents of <b>[P.name]</b>:<BR>"
+		temp += P.manifest
+	
 	else if (href_list["doorder"])
 		if(world.time < reqtime)
 			for(var/mob/V in hearers(src))

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -549,10 +549,6 @@
 
 // Harvest an animal's delicious byproducts
 /mob/living/simple_animal/proc/harvest()
-	new meat_type (get_turf(src))
-	if(prob(95))
-		del(src)
-		return
 	gib()
 	return
 

code/modules/paperwork/paper.dm

@@ -553,7 +553,7 @@
 
 /obj/item/weapon/paper/armory
 	name = "paper- 'Armory Inventory'"
-	info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>3 Gas Masks<br>1 Lockbox of Loyalty Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Advanced Tasers"
+	info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>6 Gas Masks<br>1 Lockbox of Loyalty Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Advanced Tasers"
 
 /obj/item/weapon/paper/firingrange
 	name = "paper- 'Firing Range Instructions'"