Merge pull request #767 from Rei1226/rei20

Bug Fixes, New Suit, New Borg Module

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

@@ -222,6 +222,7 @@ obj/item/weapon/twohanded/
  */
 /obj/item/weapon/twohanded/hfrequency
 	icon_state = "hfrequency0"
+	item_state = "hfrequency0"
 	name = "high-frequency blade"
 	desc = "Keep hands off blade at all times."
 	slot_flags = SLOT_BACK

code/modules/clothing/spacesuits/ninja.dm

@@ -7,6 +7,15 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
 	siemens_coefficient = 0.2
 
+/obj/item/clothing/suit/space/jetstream
+	desc = "It appears to be Jetstream Sam's suit"
+	name = "Jetstream Sam's suit"
+	icon_state = "jetstream"
+	item_state = "jetstream"
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell)
+	slowdown = 0
+	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	siemens_coefficient = 0.2
 
 /obj/item/clothing/suit/space/space_ninja
 	name = "ninja suit"

code/modules/mob/living/silicon/robot/robot.dm

@@ -257,6 +257,7 @@
 		if("Combat")
 			module = new /obj/item/weapon/robot_module/combat(src)
 			module_sprites["Combat Android"] = "droid-combat"
+			module_sprites["Bladewolf"] = "bladewolf"
 			channels = list("Security" = 1)
 
 	//Custom_sprite check and entry