From d550b699e1e7e9e2aedaf5956c4f4ee426a61ad9 Mon Sep 17 00:00:00 2001 From: Bedshaped Date: Thu, 25 Aug 2016 15:49:40 +0100 Subject: [PATCH] Fixes #803, fixes #226 (#809) bugfix: "IV Drips not letting you set allowable rates." tweak: "Min chemical volume lowered to avoid weird behaviour at low rates." rscadd: "Examining an IV Drip will tell you the transfer rate." bugfix: "Spiderbots are no longer invulnerable." tweak: "Destroyed spiderbots will leave behind a brain." tweak: "Spiderbot health increased from 10 to 25." --- code/game/machinery/iv_drip.dm | 3 ++- .../mob/living/simple_animal/friendly/spiderbot.dm | 12 +++++++----- code/setup.dm | 2 +- html/changelogs/Bedshaped-PR-809.yml | 11 +++++++++++ 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/Bedshaped-PR-809.yml diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 63f1455d195..666390dd432 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -153,6 +153,7 @@ if (!(user in view(2)) && user!=src.loc) return user << "The IV drip is [mode ? "injecting" : "taking blood"]." + user << "The transfer rate is set to [src.transfer_amount] u/sec" if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) @@ -177,7 +178,7 @@ return set_rate: var/amount = input("Set transfer rate as u/sec (between 4 and 0.001)") as num - if ((0.001 > transfer_amount || transfer_amount > 4) && transfer_amount != 0) + if ((0.001 > amount || amount > 4) && amount != 0) usr << "Entered value must be between 0.001 and 4." goto set_rate if (transfer_amount == 0) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 4114a639b9b..14ab5cf7b37 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -24,8 +24,8 @@ wander = 0 - health = 10 - maxHealth = 10 + health = 25 + maxHealth = 25 hunger_enabled = 0 attacktext = "shocked" @@ -212,10 +212,12 @@ if(camera) camera.status = 0 - held_item.loc = src.loc - held_item = null + if (held_item) + held_item.loc = src.loc + held_item = null - gibs(loc, viruses, null, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics. + eject_brain() + gibs(loc, viruses, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics. qdel(src) return diff --git a/code/setup.dm b/code/setup.dm index 6c3a09e9cf3..800630b34fe 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -103,7 +103,7 @@ #define CHEM_TOUCH 1 #define CHEM_INGEST 2 #define CHEM_BLOOD 3 -#define MINIMUM_CHEMICAL_VOLUME 0.01 +#define MINIMUM_CHEMICAL_VOLUME 0.001 #define SOLID 1 #define LIQUID 2 #define GAS 3 diff --git a/html/changelogs/Bedshaped-PR-809.yml b/html/changelogs/Bedshaped-PR-809.yml new file mode 100644 index 00000000000..46fff62acb4 --- /dev/null +++ b/html/changelogs/Bedshaped-PR-809.yml @@ -0,0 +1,11 @@ +author: Bedshaped + +delete-after: True + +changes: + - bugfix: "IV Drips not letting you set allowable rates." + - tweak: "Min chemical volume lowered to avoid weird behaviour at low rates." + - rscadd: "Examining an IV Drip will tell you the transfer rate." + - bugfix: "Spiderbots are no longer invulnerable." + - tweak: "Destroyed spiderbots will leave behind a brain." + - tweak: "Spiderbot health increased from 10 to 25."