From d5035e312840917180f5ad37d72ec567ae5f6cab Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sun, 23 Sep 2018 03:27:09 -0700 Subject: [PATCH 1/5] Initial (Fails Travis) (But works!) --- code/modules/mob/living/simple_animal/bot/mulebot.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 0efaefcce07..fe1f9f821f5 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -706,10 +706,14 @@ H.apply_damage(0.5*damage, BRUTE, "r_arm", run_armor_check("r_arm", "melee")) - var/turf/T = get_turf(src) + + + if(NO_BLOOD in H.dna.species.species_traits) + return + else + var/turf/T = get_turf(src) H.add_mob_blood(H) H.add_splatter_floor(T) - bloodiness += 4 var/list/blood_dna = H.get_blood_dna_list() From b34fed375d6cfa125b2e8c4c13bdb00a2e68153e Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sun, 23 Sep 2018 11:52:52 -0700 Subject: [PATCH 2/5] Makes Travis happy --- code/modules/mob/living/simple_animal/bot/mulebot.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index fe1f9f821f5..df5d0b38ff5 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -708,13 +708,13 @@ - if(NO_BLOOD in H.dna.species.species_traits) - return + if(NO_BLOOD in H.dna.species.species_traits)//Does the run over mob have blood? + return//If it doesn't it shouldn't bleed (Though a check should be made eventually for things with liquid in them, like slime people, vox armalis, etc.) else - var/turf/T = get_turf(src) - H.add_mob_blood(H) - H.add_splatter_floor(T) - bloodiness += 4 + var/turf/T = get_turf(src)//Where are we? + H.add_mob_blood(H)//Cover the victim in their own blood. + H.add_splatter_floor(T)//Put the blood where we are. + bloodiness += 4 var/list/blood_dna = H.get_blood_dna_list() if(blood_dna) From 556cf17916587563b423b44d3e5d635d1c6027e2 Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sun, 23 Sep 2018 12:09:17 -0700 Subject: [PATCH 3/5] Syntax Cleanup --- code/modules/mob/living/simple_animal/bot/mulebot.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index df5d0b38ff5..cd008b6ef2f 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -710,11 +710,11 @@ if(NO_BLOOD in H.dna.species.species_traits)//Does the run over mob have blood? return//If it doesn't it shouldn't bleed (Though a check should be made eventually for things with liquid in them, like slime people, vox armalis, etc.) - else - var/turf/T = get_turf(src)//Where are we? - H.add_mob_blood(H)//Cover the victim in their own blood. - H.add_splatter_floor(T)//Put the blood where we are. - bloodiness += 4 + + var/turf/T = get_turf(src)//Where are we? + H.add_mob_blood(H)//Cover the victim in their own blood. + H.add_splatter_floor(T)//Put the blood where we are. + bloodiness += 4 var/list/blood_dna = H.get_blood_dna_list() if(blood_dna) From b6064b38ef705181edf1ec883ea70090bf264ca8 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 24 Sep 2018 13:01:47 -0400 Subject: [PATCH 4/5] Automatic changelog generation for PR #9604 [ci skip] --- html/changelogs/AutoChangeLog-pr-9604.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9604.yml diff --git a/html/changelogs/AutoChangeLog-pr-9604.yml b/html/changelogs/AutoChangeLog-pr-9604.yml new file mode 100644 index 00000000000..d4b86d5975b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9604.yml @@ -0,0 +1,4 @@ +author: "Triiodine, Desolate," +delete-after: True +changes: + - bugfix: "Things without blood bleeding red when rolled over by a mulebot." From 9fc122a3b92a5d6f4a240156794d9b91adc6466b Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 24 Sep 2018 17:02:06 +0000 Subject: [PATCH 5/5] Automatic changelog compile, [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-9604.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-9604.yml diff --git a/html/changelog.html b/html/changelog.html index 3cdd68359ea..891769a7ae7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

24 September 2018

+

Triiodine, Desolate, updated:

+
    +
  • Things without blood bleeding red when rolled over by a mulebot.
    • +
+

19 September 2018

Birdtalon updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 94d45ea8528..0b87e0355bf 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -6982,3 +6982,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2018-09-19: Birdtalon: - bugfix: Screwdrivers now open fire alarms instead of wirecutters. +2018-09-24: + Triiodine, Desolate,: + - bugfix: Things without blood bleeding red when rolled over by a mulebot. diff --git a/html/changelogs/AutoChangeLog-pr-9604.yml b/html/changelogs/AutoChangeLog-pr-9604.yml deleted file mode 100644 index d4b86d5975b..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9604.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Triiodine, Desolate," -delete-after: True -changes: - - bugfix: "Things without blood bleeding red when rolled over by a mulebot."