From be18146f0873e4571abd71c7bfabd96c3f51286a Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Fri, 29 Jan 2016 05:41:50 -0800 Subject: [PATCH] Increases the number of memes in the codebase --- .../mob/living/carbon/brain/brain_item.dm | 2 +- .../living/carbon/human/species/skeleton.dm | 6 +++++- code/modules/organs/organ_external.dm | 6 +++++- .../oldchem/reagents/drink/reagents_drink.dm | 18 ++++++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 5a0132f6bd8..a44b3d20450 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -104,7 +104,7 @@ icon_state = "green slime extract" /obj/item/organ/brain/golem - name = "chem" + name = "Runic mind" desc = "A tightly furled roll of paper, covered with indecipherable runes." icon = 'icons/obj/wizard.dmi' icon_state = "scroll" diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm index 82c7864dd46..16ae7862906 100644 --- a/code/modules/mob/living/carbon/human/species/skeleton.dm +++ b/code/modules/mob/living/carbon/human/species/skeleton.dm @@ -30,4 +30,8 @@ heat_level_1 = 999999999 heat_level_2 = 999999999 heat_level_3 = 999999999 - heat_level_3_breathe = 999999999 \ No newline at end of file + heat_level_3_breathe = 999999999 + + has_organ = list( + "brain" = /obj/item/organ/brain/golem, + ) \ No newline at end of file diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index f6c08a20d84..f80e1975b76 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -566,7 +566,11 @@ Note that amputating the affected organ does in fact remove the infection from t if(!(status & ORGAN_ROBOT) && W.bleeding()) W.bleed_timer-- - status |= ORGAN_BLEEDING + if(H && (H.species.flags & NO_BLOOD)) // Bloodless organic races are finicky + W.clamped = 1 + W.bleed_timer = 0 + else + status |= ORGAN_BLEEDING clamped |= W.clamped diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm index dc43ffb54b4..e58687cb925 100644 --- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm +++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm @@ -148,6 +148,24 @@ if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) if(holder.has_reagent("capsaicin")) holder.remove_reagent("capsaicin", 2) + + // Sometimes Crazylemon feels very silly + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(H.species.name in list("Skeleton")) + H.heal_overall_damage(4,4) + if(prob(5)) // 5% chance per proc to find a random limb, and mend it + var/list/our_organs = H.organs.Copy() + shuffle(our_organs) + for(var/obj/item/organ/external/L in our_organs) + if(istype(L)) + if(L.brute_dam < L.min_broken_damage) + L.status &= ~ORGAN_BROKEN + L.status &= ~ORGAN_SPLINTED + L.perma_injury = 0 + break // We're only checking one limb here, bucko + if(prob(3)) + H.say(pick("Thanks Mr Skeltal", "Thank for strong bones", "Doot doot!")) ..() return