From ee50dc7b01b2f772b77f4629d8922cb7753f63f6 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 24 Sep 2017 21:18:38 -0500 Subject: [PATCH] Moves the Promethean core to the chest. They no longer need heads. --- code/modules/organs/internal/brain.dm | 1 + code/modules/organs/subtypes/slime.dm | 47 +++++++++++++++++++++ code/modules/organs/subtypes/unbreakable.dm | 47 +-------------------- polaris.dme | 1 + 4 files changed, 50 insertions(+), 46 deletions(-) create mode 100644 code/modules/organs/subtypes/slime.dm diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 77ead516c3..0a99fb37f3 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -127,6 +127,7 @@ desc = "A complex, organic knot of jelly and crystalline particles." icon = 'icons/mob/slimes.dmi' icon_state = "green slime extract" + parent_organ = BP_TORSO /obj/item/organ/internal/brain/golem name = "chem" diff --git a/code/modules/organs/subtypes/slime.dm b/code/modules/organs/subtypes/slime.dm new file mode 100644 index 0000000000..1c9c11d75b --- /dev/null +++ b/code/modules/organs/subtypes/slime.dm @@ -0,0 +1,47 @@ +/obj/item/organ/external/chest/unbreakable/slime + nonsolid = 1 + max_damage = 50 + encased = 0 + +/obj/item/organ/external/groin/unbreakable/slime + nonsolid = 1 + max_damage = 30 + +/obj/item/organ/external/arm/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/arm/right/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/leg/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/leg/right/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/foot/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/foot/right/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/hand/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/hand/right/unbreakable/slime + nonsolid = 1 + max_damage = 5 + +/obj/item/organ/external/head/unbreakable/slime //They don't need this anymore. + nonsolid = 1 + cannot_gib = 0 + vital = 0 + max_damage = 5 + encased = 0 \ No newline at end of file diff --git a/code/modules/organs/subtypes/unbreakable.dm b/code/modules/organs/subtypes/unbreakable.dm index fcd819029e..61126769cd 100644 --- a/code/modules/organs/subtypes/unbreakable.dm +++ b/code/modules/organs/subtypes/unbreakable.dm @@ -40,49 +40,4 @@ /obj/item/organ/external/head/unbreakable cannot_break = 1 - dislocated = -1 - -// Slime limbs. -/obj/item/organ/external/chest/unbreakable/slime - nonsolid = 1 - max_damage = 50 - -/obj/item/organ/external/groin/unbreakable/slime - nonsolid = 1 - max_damage = 30 - -/obj/item/organ/external/arm/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/arm/right/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/leg/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/leg/right/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/foot/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/foot/right/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/hand/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/hand/right/unbreakable/slime - nonsolid = 1 - max_damage = 5 - -/obj/item/organ/external/head/unbreakable/slime - nonsolid = 1 - max_damage = 5 + dislocated = -1 \ No newline at end of file diff --git a/polaris.dme b/polaris.dme index df0a5c9089..b5fdce1307 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1840,6 +1840,7 @@ #include "code\modules\organs\subtypes\diona.dm" #include "code\modules\organs\subtypes\machine.dm" #include "code\modules\organs\subtypes\seromi.dm" +#include "code\modules\organs\subtypes\slime.dm" #include "code\modules\organs\subtypes\standard.dm" #include "code\modules\organs\subtypes\unathi.dm" #include "code\modules\organs\subtypes\unbreakable.dm"