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
@@ -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.