Merge remote-tracking branch 'upstream/master' into purges-assisted-organs

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -14,7 +14,7 @@
 	organ_tag = "brain"
 	parent_organ = "head"
 	slot = "brain"
-	vital = 1
+	vital = TRUE
 	hidden_pain = TRUE //the brain has no pain receptors, and brain damage is meant to be a stealthy damage type.
 	var/mmi_icon = 'icons/obj/assemblies.dmi'
 	var/mmi_icon_state = "mmi_full"

code/modules/surgery/organs/organ.dm

@@ -4,7 +4,7 @@
 	var/dead_icon
 	var/mob/living/carbon/human/owner = null
 	var/status = 0
-	var/vital //Lose a vital limb, die immediately.
+	var/vital = FALSE //Lose a vital limb, die immediately.
 	var/damage = 0 // amount of damage to the organ
 
 	var/min_bruised_damage = 10

code/modules/surgery/organs/organ_internal.dm

@@ -5,7 +5,6 @@
 	throwforce = 0
 	var/slot
 	// DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
-	vital = 0
 	var/non_primary = 0
 	var/unremovable = FALSE //Whether it shows up as an option to remove during surgery.
 

code/modules/surgery/organs/subtypes/machine.dm

@@ -1,7 +1,6 @@
 // IPC limbs.
 /obj/item/organ/external/head/ipc
 	can_intake_reagents = 0
-	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
 	encased = null
@@ -109,7 +108,7 @@
 	organ_tag = "heart"
 	parent_organ = "chest"
 	slot = "heart"
-	vital = 1
+	vital = TRUE
 	status = ORGAN_ROBOT
 	species = "Machine"
 
@@ -142,7 +141,7 @@
 	name = "brain"
 	organ_tag = "brain"
 	parent_organ = "chest"
-	vital = 1
+	vital = TRUE
 	max_damage = 200
 	slot = "brain"
 	status = ORGAN_ROBOT

code/modules/surgery/organs/subtypes/standard.dm

@@ -10,7 +10,7 @@
 	min_broken_damage = 35
 	w_class = WEIGHT_CLASS_HUGE
 	body_part = UPPER_TORSO
-	vital = 1
+	vital = TRUE
 	amputation_point = "spine"
 	gendered_icon = 1
 	parent_organ = null
@@ -44,7 +44,7 @@
 	min_broken_damage = 35
 	w_class = WEIGHT_CLASS_BULKY // if you know what I mean ;)
 	body_part = LOWER_TORSO
-	vital = 1
+	vital = TRUE
 	parent_organ = "chest"
 	amputation_point = "lumbar"
 	gendered_icon = 1
@@ -158,7 +158,6 @@
 	min_broken_damage = 35
 	w_class = WEIGHT_CLASS_NORMAL
 	body_part = HEAD
-	vital = 1
 	parent_organ = "chest"
 	amputation_point = "neck"
 	gendered_icon = 1

code/modules/surgery/organs/subtypes/vox.dm

@@ -10,7 +10,7 @@
 	organ_tag = "stack"
 	slot = "vox_stack"
 	status = ORGAN_ROBOT
-	vital = 1
+	vital = TRUE
 
 /obj/item/organ/internal/stack/vox
 	name = "vox cortical stack"

html/changelog.html

@@ -56,6 +56,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">09 July 2018</h2>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Enabled augmentation of the head</li>
+				<li class="rscadd">Adds cybernetic heart, lungs, liver, and kidneys to R&D and Robotics; also adds cybernetic upgraded lungs</li>
+			</ul>
+
 			<h2 class="date">07 July 2018</h2>
 			<h3 class="author">Fox McCloud updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -6587,3 +6587,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Kyep:
   - rscdel: Removed PDA chatrooms. NTNet Relay Chatrooms, part of modular computers,
       still exist.
+2018-07-09:
+  Fox McCloud:
+  - tweak: Enabled augmentation of the head
+  - rscadd: Adds cybernetic heart, lungs, liver, and kidneys to R&D and Robotics;
+      also adds cybernetic upgraded lungs

html/changelogs/AutoChangeLog-pr-9179.yml

@@ -0,0 +1,4 @@
+author: "Fox McCloud"
+delete-after: True
+changes: 
+  - tweak: "Heads are no longer vital organs, but brains still are"

html/changelogs/AutoChangeLog-pr-9185.yml

@@ -1,5 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - tweak: "Enabled augmentation of the head"
-  - rscadd: "Adds cybernetic heart, lungs, liver, and kidneys to R&D and Robotics; also adds cybernetic upgraded lungs"