Update corporate.dm

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

@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-/datum/species/corporate
-	name = "Corporate Agent"
-	id = "agent"
-	hair_alpha = 0
-	say_mod = "declares"
-	speedmod = -2//Fast
-	brutemod = 0.7//Tough against firearms
-	burnmod = 0.65//Tough against lasers
-	coldmod = 0
-	heatmod = 0.5//it's a little tough to burn them to death not as hard though.
-	punchdamagelow = 20
-	punchdamagehigh = 30//they are inhumanly strong
-	punchstunthreshold = 25
-	attack_verb = "smash"
-	attack_sound = 'sound/weapons/resonator_blast.ogg'
-	blacklisted = 1
-	use_skintones = 0
-	species_traits = list(RADIMMUNE,VIRUSIMMUNE,NOBLOOD,PIERCEIMMUNE,EYECOLOR,NODISMEMBER,NOHUNGER)
-=======
 /datum/species/corporate
 	name = "Corporate Agent"
 	id = "agent"
@@ -36,5 +16,4 @@
 	blacklisted = 1
 	use_skintones = 0
 	species_traits = list(SPECIES_ORGANIC,RADIMMUNE,VIRUSIMMUNE,NOBLOOD,PIERCEIMMUNE,EYECOLOR,NODISMEMBER,NOHUNGER)
->>>>>>> 9d487d2... Divides species in subtypes, makes viruses able to infect certain subtypes (#32858)
-	sexes = 0
+	sexes = 0