Borg Adjustments (#6600)

balance: "Medical borg's are now able to handle tanks, breath mask's and organs with chem gripper."
    tweak: "Renames Hunter Killers to Military Frames."

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

@@ -305,7 +305,7 @@
 		if(!(S.status & ORGAN_ASSISTED) || user.a_intent != I_HELP)
 			return ..()
 
-		if(M.isSynthetic() && M == user && !(M.get_species() == "Hunter-Killer"))
+		if(M.isSynthetic() && M == user && !(M.get_species() == "Military Frame"))
 			to_chat(user, "<span class='warning'>You can't repair damage to your own body - it's against OH&S.</span>")
 			return
 		if(S.brute_dam == 0)

code/modules/clothing/spacesuits/rig/suits/terminator.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/rig/terminator
-	name = "\improper Hunter-Killer exoskeleton"
+	name = "\improper Military Frame exoskeleton"
 	desc = "A robust synth exoskeleton outfitted with state of the art infiltration tools. Creepy."
 	icon_state = "terminator_rig"
 	suit_type = "synthetic exoskeleton"

code/modules/mob/living/carbon/human/human_powers.dm

@@ -341,7 +341,7 @@
 	last_special = world.time + 25
 
 /mob/living/carbon/human/proc/detonate_flechettes()
-	set category = "Hunter-Killer"
+	set category = "Military Frame"
 	set name = "Detonate Flechettes"
 	set desc = "Detonate all explosive flechettes in a range of seven meters."
 
@@ -367,7 +367,7 @@
 
 
 /mob/living/carbon/human/proc/state_laws()
-	set category = "Hunter-Killer"
+	set category = "Military Frame"
 	set name = "State Laws"
 	set desc = "State your laws aloud."
 
@@ -453,7 +453,7 @@
 	last_special = world.time + 200
 
 /mob/living/carbon/human/proc/self_destruct()
-	set category = "Hunter-Killer"
+	set category = "Military Frame"
 	set name = "Engage Self-Destruct"
 	set desc = "When all else has failed, bite the bullet."
 

code/modules/mob/living/carbon/human/human_species.dm

@@ -114,7 +114,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
 	. = ..(mapload, "Unbranded Frame")
 
 /mob/living/carbon/human/terminator/Initialize(mapload)
-	. = ..(mapload, "Hunter-Killer")
+	. = ..(mapload, "Military Frame")
 	add_language(LANGUAGE_SOL_COMMON, 1)
 	add_language(LANGUAGE_UNATHI, 1)
 	add_language(LANGUAGE_SIIK_MAAS, 1)

code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm

@@ -119,7 +119,7 @@
 	return
 
 /datum/species/machine/terminator
-	name = "Hunter-Killer"
+	name = "Military Frame"
 	short_name = "hks"
 	name_plural = "HKs"
 	bald = 1

code/modules/mob/living/carbon/human/stripping.dm

@@ -56,6 +56,7 @@
 	// Are we placing or stripping?
 	var/stripping
 	var/obj/item/held = user.get_active_hand()
+
 	if(!istype(held) || is_robot_module(held))
 		if(!istype(target_slot))  // They aren't holding anything valid and there's nothing to remove, why are we even here?
 			return 0
@@ -68,10 +69,8 @@
 		visible_message("<span class='danger'>\The [user] is trying to remove \the [src]'s [target_slot.name]!</span>")
 	else
 		visible_message("<span class='danger'>\The [user] is trying to put \a [held] on \the [src]!</span>")
-
 	if(!do_mob(user,src,HUMAN_STRIP_DELAY))
 		return 0
-
 	if(!stripping && user.get_active_hand() != held)
 		return 0
 
@@ -82,7 +81,6 @@
 		equip_to_slot_if_possible(held, text2num(slot_to_strip), 0, 1, 1)
 		if(held.loc != src)
 			user.put_in_hands(held)
-
 	return 1
 
 // Empty out everything in the target's pockets.

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

@@ -243,6 +243,8 @@
 
 	can_hold = list(
 		/obj/item/weapon/reagent_containers/glass,
+		/obj/item/weapon/reagent_containers/food/snacks/monkeycube,
+		/obj/item/organ,
 		/obj/item/weapon/reagent_containers/pill,
 		/obj/item/weapon/reagent_containers/spray,
 		/obj/item/weapon/storage/pill_bottle,
@@ -250,6 +252,9 @@
 		/obj/item/stack/material/phoron
 		)
 
+
+
+
 /obj/item/weapon/gripper/service //Used to handle food, drinks, and seeds.
 	name = "service gripper"
 	icon_state = "gripper"

code/modules/power/cable.dm

@@ -516,7 +516,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 		if (!S) return
 		if(!(S.status & ORGAN_ASSISTED) || user.a_intent != I_HELP)
 			return ..()
-		if(M.isSynthetic() && M == user && !(M.get_species() == "Hunter-Killer"))
+		if(M.isSynthetic() && M == user && !(M.get_species() == "Military Frame"))
 			to_chat(user, "<span class='warning'>You can't repair damage to your own body - it's against OH&S.</span>")
 			return
 

html/changelogs/hk47.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Lady Fowl
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - balance: "Medical borg's are now able to handle organs and monkey cubes."
+  - tweak: "Renames Hunter Killers to Military Frames."