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

# Conflicts:
#	icons/obj/toy.dmi

code/datums/shuttles.dm

@@ -25,6 +25,11 @@
 	port_id = "ferry"
 	name = "Base Shuttle Template (Ferry)"
 
+/datum/map_template/shuttle/admin
+	port_id = "admin"
+	name = "Base Shuttle Template (Admin)"
+
+
 
 // Shuttles start here:
 
@@ -117,3 +122,13 @@
 		definitely no zombifyin' reagents!"
 	admin_notes = "Meat currently contains no zombifying reagents, people on \
 		meatspike must be spawned in."
+
+/datum/map_template/shuttle/admin/hospital
+	suffix = "hospital"
+	name = "NHV Asclepius"
+	description = "Nanostrasen Hospital ship, for medical assistance during disasters."
+
+/datum/map_template/shuttle/admin/admin
+	suffix = "admin"
+	name = "NTV Argos"
+	description = "Default Admin ship. An older ship used for special operations."

code/datums/supplypacks.dm

@@ -1073,6 +1073,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	containertype = /obj/structure/closet/critter/cow
 	containername = "cow crate"
 
+/datum/supply_packs/organic/pig
+	name = "Pig Crate"
+	cost = 25
+	containertype = /obj/structure/closet/critter/pig
+	containername = "pig crate"
+
 /datum/supply_packs/organic/goat
 	name = "Goat Crate"
 	cost = 25

code/datums/uplink_item.dm

@@ -1544,10 +1544,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 12
 
 /datum/uplink_item/cyber_implants/reviver
-	name = "Reviver Implant"
-	desc = "This implant will attempt to revive you if you lose consciousness. Comes with an automated implanting tool."
+	name = "Hardened Reviver Implant"
+	desc = "This implant will attempt to revive you if you lose consciousness. It is invulnerable to EMPs. Comes with an automated implanting tool."
 	reference = "CIR"
-	item = /obj/item/organ/internal/cyberimp/chest/reviver
+	item = /obj/item/organ/internal/cyberimp/chest/reviver/hardened
 	cost = 8
 
 // POINTLESS BADASSERY