From 4dc9fc4362b14921abb43844a8a4e92a5be915e1 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 5 Jul 2018 22:24:13 -0400 Subject: [PATCH 1/3] Heads No Longer Vital (Brains Still Are) --- code/modules/mob/living/carbon/brain/brain_item.dm | 2 +- code/modules/surgery/organs/organ.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 1 - code/modules/surgery/organs/subtypes/machine.dm | 5 ++--- code/modules/surgery/organs/subtypes/standard.dm | 5 ++--- code/modules/surgery/organs/subtypes/vox.dm | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 8c02bac91d1..0a8f6fb3b83 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/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" diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 5837fab5925..846ac334ab9 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/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 diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 42d2c98a66d..490e67a2bb5 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -7,7 +7,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. diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm index 2be14a91f14..7c68fc11f28 100644 --- a/code/modules/surgery/organs/subtypes/machine.dm +++ b/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 diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index 30c4e173cdc..1a548de7d0a 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/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 diff --git a/code/modules/surgery/organs/subtypes/vox.dm b/code/modules/surgery/organs/subtypes/vox.dm index bb56c41030d..3d4a4641c30 100644 --- a/code/modules/surgery/organs/subtypes/vox.dm +++ b/code/modules/surgery/organs/subtypes/vox.dm @@ -10,7 +10,7 @@ organ_tag = "stack" slot = "vox_stack" robotic = 2 - vital = 1 + vital = TRUE /obj/item/organ/internal/stack/vox name = "vox cortical stack" \ No newline at end of file From 907c8c7adcb792b73e6c1588c774e00d8586ee76 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 9 Jul 2018 05:19:13 +0000 Subject: [PATCH 2/3] Automatic changelog compile, [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-9185.yml | 5 ----- 3 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-9185.yml diff --git a/html/changelog.html b/html/changelog.html index 24f7b0201a3..a350934e1de 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
+

09 July 2018

+

Fox McCloud updated:

+
    +
  • Enabled augmentation of the head
    • +
  • Adds cybernetic heart, lungs, liver, and kidneys to R&D and Robotics; also adds cybernetic upgraded lungs
    • +
+

07 July 2018

Fox McCloud updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d3973e02532..7732120f9f2 100644 --- a/html/changelogs/.all_changelog.yml +++ b/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 diff --git a/html/changelogs/AutoChangeLog-pr-9185.yml b/html/changelogs/AutoChangeLog-pr-9185.yml deleted file mode 100644 index 26195311bd2..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9185.yml +++ /dev/null @@ -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" From 597737360747c51a5933bc92c1392519931ad93c Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 9 Jul 2018 02:43:48 -0400 Subject: [PATCH 3/3] Automatic changelog generation for PR #9179 [ci skip] --- html/changelogs/AutoChangeLog-pr-9179.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9179.yml diff --git a/html/changelogs/AutoChangeLog-pr-9179.yml b/html/changelogs/AutoChangeLog-pr-9179.yml new file mode 100644 index 00000000000..f5d40daa250 --- /dev/null +++ b/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"