Merge pull request #607 from ArchieBeepBoop/becomemodular

Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.

code/modules/cargo/packs.dm

@@ -1003,6 +1003,15 @@
 	contains = list(/obj/item/circuitboard/computer/sat_control)
 	crate_name= "shield control board crate"
 
+/datum/supply_pack/engine/energy_harvester
+	name = "Energy Harvesting Module"
+	desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model."
+	cost = 7500
+	access = ACCESS_CE
+	contains = list(/obj/item/energy_harvester)
+	crate_name = "energy harvesting module crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////// Engine Construction /////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

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

@@ -106,5 +106,24 @@
 	obj_damage = 70
 	melee_damage_lower = 15
 	melee_damage_upper = 18
+	var/held_icon = "carp"
+	
+/mob/living/simple_animal/hostile/carp/cayenne/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/wuv, "bloops happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "gnashes!", EMOTE_AUDIBLE)
+	AddElement(/datum/element/mob_holder, held_icon)
+
+/mob/living/simple_animal/hostile/carp/cayenne/lia
+	name = "Lia"
+	real_name = "Lia"
+	desc = "A failed experiment of Nanotrasen to create weaponised carp technology, now acquired by Kinaris. This less than intimidating carp now serves as the Head of Security's pet."
+	faction = list("neutral", "carp")
+	health = 200
+	icon_dead = "magicarp_dead"
+	icon_gib = "magicarp_gib"
+	icon_living = "magicarp"
+	icon_state = "magicarp"
+	maxHealth = 200
+	held_icon = "magicarp"
 
 #undef REGENERATION_DELAY