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

This commit is contained in:
Fox McCloud
2018-07-09 03:13:10 -04:00
10 changed files with 23 additions and 15 deletions
@@ -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"