From b2c88230f0666ff76c685ab1e7cc6687e953f8e3 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 12 Dec 2017 22:39:45 +0200 Subject: [PATCH 1/2] Fixes a dumb runtime with basilisks --- .../mob/living/simple_animal/hostile/mining_mobs/basilisk.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 9dd6a629459..bc4686fd423 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -132,8 +132,9 @@ . = ..() if(.) var/mob/living/L = target - L.adjust_fire_stacks(0.1) - L.IgniteMob() + if (istype(L)) + L.adjust_fire_stacks(0.1) + L.IgniteMob() /obj/item/projectile/temp/basilisk/icewing damage = 5 From 5fe94d2e49652dfef6820831dfba882cab0a1afc Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 12 Dec 2017 22:59:40 +0200 Subject: [PATCH 2/2] destructive analyzer runtime thing --- code/modules/research/destructive_analyzer.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index b69f88d07b8..05acb20f0e8 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -128,9 +128,10 @@ Note: Must be placed within 3 tiles of the R&D Console return FALSE if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src)) return FALSE + var/loaded_type = loaded_item.type if(destroy_item(loaded_item)) linked_console.stored_research.research_points += point_value - linked_console.stored_research.deconstructed_items[loaded_item.type] = point_value + linked_console.stored_research.deconstructed_items[loaded_type] = point_value return TRUE