shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494

Browse Source 
[MIRROR] Fixes two unrelated runtimes
This commit is contained in:
deathride58
2017-12-14 03:54:08 +00:00
committed by GitHub
parent a4fafb2b51 2e83779018
commit fb492b5a14
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+3 -2
View File
@@ -137,8 +137,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
code/modules/research/destructive_analyzer.dm
+3 -2
View File
@@ -121,10 +121,11 @@ 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/dtype = loaded_item.type
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[dtype] = point_value
linked_console.stored_research.deconstructed_items[loaded_type] = point_value
return TRUE
/obj/machinery/rnd/destructive_analyzer/proc/unload_item()